upstream/transmission-web-control
1
0
Fork 0
mirror of https://github.com/ronggang/transmission-web-control.git synced 2025-04-16 07:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge balonik's fix for total size shown in tree and basic pagination ui option +folders

Browse Source
This commit is contained in:
DarkAlexWang 2017-05-22 23:08:17 -04:00
parent 9846e41725
commit 573c44364d
10 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/transmission-control-full.tar.gz
View File

Binary file not shown.

24
src/index.html
View File

@ -9,26 +9,26 @@
<link rel='shortcut icon' href='favicon.ico' type='image/x-icon'/ >
<title>Transmission Web Control</title>
<!-- 样式表 -->
<link rel="stylesheet" type="text/css" href="tr-web-control/style/base.css?v=20170411" />
<link rel="stylesheet" type="text/css" href="tr-web-control/script/easyui/themes/default/easyui.css?v=20170411"/>
<link rel="stylesheet" type="text/css" href="tr-web-control/script/easyui/themes/icon.css?v=20170411"/>
<link rel="stylesheet" type="text/css" href="tr-web-control/style/base.css?v=20170522" />
<link rel="stylesheet" type="text/css" href="tr-web-control/script/easyui/themes/default/easyui.css?v=20170522"/>
<link rel="stylesheet" type="text/css" href="tr-web-control/script/easyui/themes/icon.css?v=20170522"/>
<!-- 基础类库 -->
<script type="text/javascript" src="tr-web-control/script/jquery/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="tr-web-control/script/jquery/jquery.form.js"></script>
<script type="text/javascript" src="tr-web-control/script/jquery/json2.min.js"></script>
<script type="text/javascript" src="tr-web-control/script/jquery/Base64.js"></script>
<script type="text/javascript" src="tr-web-control/script/easyui/jquery.easyui.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/easyui/jquery.easyui.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/easyui/plugins/jquery.datagrid.drophead.js"></script>
<!-- -->
<!-- 系统类库 -->
<script type="text/javascript" src="tr-web-control/script/min/public.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/cookies.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/clientDevice.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/transmission.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/transmission.torrents.min.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/system.min.js?v=20170504"></script>
<script type="text/javascript" src="tr-web-control/config.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/plugin.js?v=20170411"></script>
<script type="text/javascript" src="tr-web-control/script/min/public.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/min/cookies.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/min/clientDevice.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/min/transmission.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/min/transmission.torrents.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/script/min/system.min.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/config.js?v=20170522"></script>
<script type="text/javascript" src="tr-web-control/plugin.js?v=20170522"></script>
</head>
<style type="text/css">
.tree-title {

6
src/tr-web-control/config.js
View File

@ -5,10 +5,14 @@ system.config = {
,reloadStep: 5000
// The default num of entries for each page
,pageSize: 30
// Enable/disable pagination for torrentlist.datagrid
,pagination: true
// Options in torrentlist.datagrid PageList
,pageList: [10,20,30,40,50,100,150,200,250,300]
// The initial interface defaults to the selected node, the name can refer to the language package tree
,defaultSelectNode: "actively"
// Whether the torrent details are automatically expanded
,autoExpandAttribute: false
// default language
,defaultLang: ""
};
};

6
src/tr-web-control/script/min/system.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
src/tr-web-control/script/min/transmission.torrents.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/tr-web-control/script/system.js
View File

@ -2,13 +2,16 @@
var system = {
version:"1.1 Beta"
,rootPath: "tr-web-control/"
,codeupdate:"20170518"
,codeupdate:"20170522"
,configHead: "transmission-web-control"
// default config, can be customized in config.js
,config:{
autoReload: true
,reloadStep: 5000
,pageSize: 30
,defaultSelectNode: null
,pagination: true
,pageList:[10,20,30,40,50,100,150,200,250,300]
,defaultSelectNode: null
,autoExpandAttribute: false
,defaultLang: ""
}
@ -19,7 +22,7 @@ var system = {
}
// Local data storage
,dictionary:{
folders:null
folders: null
}
,checkUpdateScript:"https://transmission-control.googlecode.com/svn/resouces/checkupdate.js"
,contextMenus:{
@ -581,11 +584,12 @@ var system = {
system.control.torrentlist.datagrid({
autoRowHeight:false
,pagination:true
,pagination:system.config.pagination
,rownumbers:true
,remoteSort:false
,checkOnSelect:false
,pageSize:system.config.pageSize
,pageList:system.config.pageList
,idField:"id"
,fit: true
,striped:true

4
src/tr-web-control/script/transmission.torrents.js
View File

@ -175,7 +175,7 @@ transmission.torrents = {
}
// Total size
this.totalSize=item.totalSize;
this.totalSize+=item.totalSize;
// Time left
if (item.rateDownload>0&&item.leftUntilDone>0)
@ -221,8 +221,6 @@ transmission.torrents = {
this.all[item.id]=item;
//this.totalSize+=item.totalSize;
// Set the directory
if ($.inArray(item.downloadDir, transmission.downloadDirs)==-1)
{

4
src/tr-web-control/template/dialog-system-config.html
View File

@ -397,7 +397,7 @@
thisDialog.find("#download-dir-free-space").text(tmp);
// Local dictionary folder list (not including transmission.downloadDirs)
if (system.dictionary.folders == null) {
if (system.dictionary.folders == null || system.dictionary.folders == "") {
thisDialog.find("#local-storage-dictionary-folders").val("");
} else{
thisDialog.find("#local-storage-dictionary-folders").val(system.dictionary.folders);
@ -620,7 +620,7 @@
function saveLocalData()
{
if(thisDialog.find("#local-storage-dictionary-folders").val().replace(/^\s*[\r\n]/gm, "").length==0) {
system.dictionary.folders=null;
system.dictionary.folders= "";
} else {
system.dictionary.folders = thisDialog.find("#local-storage-dictionary-folders").val().replace(/^\s*[\r\n]/gm, "");
}

2
src/tr-web-control/template/dialog-torrent-add.html
View File

@ -61,7 +61,7 @@
thisDialog.find("#download-dir").val(system.downloadDir);
var downloadDirs = $.merge([],transmission.downloadDirs);
if (system.dictionary.folders != null)
if (system.dictionary.folders != null && system.dictionary.folders != "")
{
$.merge(downloadDirs,system.dictionary.folders.split("\n"));
}

2
src/tr-web-control/template/dialog-torrent-addfile.html
View File

@ -50,7 +50,7 @@
thisDialog.find("#download-dir").val(system.downloadDir);
var downloadDirs = $.merge([],transmission.downloadDirs);
if (system.dictionary.folders != null)
if (system.dictionary.folders != null && system.dictionary.folders != "")
{
$.merge(downloadDirs,system.dictionary.folders.split("\n"));
}