+
diff --git a/plugins/WebUi/templates/advanced/index.html b/plugins/WebUi/templates/advanced/index.html
new file mode 100644
index 000000000..637aa6bdc
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/index.html
@@ -0,0 +1,105 @@
+$def with (torrent_list)
+$:render.header(_('Torrent list'))
+
+
+[Add]
+[Up]
+[Down]
+[Delete]
+[Info]
+[Pause]
+[Start]
+
+
+
+
+
+
+
+$:part_stats()
+
+Deluge:$torrent.name
+
+
+
+
+
+
+$:render.tab_meta(torrent)
+
+$:render.footer()
diff --git a/plugins/WebUi/templates/deluge/index.html b/plugins/WebUi/templates/deluge/index.html
index b177c7b8c..1dad40b9b 100644
--- a/plugins/WebUi/templates/deluge/index.html
+++ b/plugins/WebUi/templates/deluge/index.html
@@ -1,7 +1,6 @@
$def with (torrent_list)
$:render.header(_('Torrent list'))
-
+
+
+
+
+
+
+
+
+
+
+
+$:render.footer()
+
diff --git a/plugins/WebUi/templates/advanced/part_stats.html b/plugins/WebUi/templates/advanced/part_stats.html
new file mode 100644
index 000000000..6ce594919
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/part_stats.html
@@ -0,0 +1,36 @@
+$def with (stats)
+
+
+
+
+$_('Auto refresh:')
+$if getcookie('auto_refresh') == '1':
+ ($getcookie('auto_refresh_secs')) $_('seconds')
+ $:render.part_button('GET', '/refresh/set', _('Set'), 'tango/preferences-system.png')
+ $:render.part_button('POST', '/refresh/off', _('Disable'), 'tango/process-stop.png')
+$else:
+ $_('Off')
+ $:render.part_button('POST', '/refresh/on', _('Enable'), 'tango/view-refresh.png')
+$#end
+
+
+
+
+
+ $_('Connections') : $stats.num_connections ($stats.max_num_connections)
+
+ $_('Down Speed') : $stats.download_rate ($stats.max_download)
+
+ $_('Up Speed') : $stats.upload_rate ($stats.max_upload)
+
+
+
+
+
+
+
+ $_('About')
+
+
+
+
diff --git a/plugins/WebUi/templates/advanced/part_tb_button.html b/plugins/WebUi/templates/advanced/part_tb_button.html
new file mode 100644
index 000000000..bc5ec9a21
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/part_tb_button.html
@@ -0,0 +1,35 @@
+$def with (method, func, title, image='')
+
+
\ No newline at end of file
diff --git a/plugins/WebUi/templates/advanced/static/advanced.css b/plugins/WebUi/templates/advanced/static/advanced.css
new file mode 100644
index 000000000..d197ad0fc
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/static/advanced.css
@@ -0,0 +1,136 @@
+/*
-----------------------------------------------------------
Theme Name: Simple
Theme URI: http://deluge-torrent.org
Description: Deluge Theme
Version: 1.0
-----------------------------------------------------------
*/
BODY {
background: #304663 url(../../static/images/simple_bg.jpg) repeat-x;
font-family: Bitstream Vera;
font-size: 10pt;
margin: 0;
+ padding:0;
+ border:0;
}
/* GENERIC STYLES */
a img {border: 0px}
hr {color: #627082; margin: 15px 0 15px 0;}
+td {font-family: Bitstream Vera;}
/* STRUCTURE */
#page {
min-width: 800px;
margin-left: auto;
margin-right: auto;
+ margin: 0;
+ padding:0;
+ font-family: Bitstream Vera;
}
#main_content {
background:url(../../static/images/simple_line.jpg) repeat-x;
+ margin: 0;
+ padding:0;
}
#simple_logo {
background:url(../../static/images/simple_logo.jpg) no-repeat;
}
#main {
+ margin: 0;
+ padding:0;
padding-top: 20px;
color: #fff;
}
#main form table {
border: #2a425c 1px solid;
}
#main form table tr {
border: 0px;
}
#main form table tr th {
background: #1f3044;
font-size: 16px;
border: 0px;
+ white-space: nowrap;
}
#main form table tr td{
border: 0px;
color: #fff;
font-size: 12px;
white-space: nowrap;
}
#main form table tr th a {
color: #8fa6c3;
font-size: 16px;
white-space: nowrap;
}
#main form table tr th a, a:active, a:visited { color: #8fa6c3; text-decoration: none; }
#main form table tr th a:hover {color: #fff; text-decoration: underline;}
#main form table tr td a {
color: #fff;
font-size: 12px;
white-space: nowrap;
}
#main form table tr td a, a:active, a:visited { color: #fff; text-decoration: none;}
#main form table tr td a:hover {color: #fff; text-decoration: underline;}
#main a {
color: #fff;
font-size: 12px;
}
#main a, a:active, a:visited { color: #fff; text-decoration: none;}
#main a:hover {color: #fff; text-decoration: underline;}
.info {
text-align: right;
padding: 0 50px 0 0;
color: #8fa6c3;
font-size: 16px;
letter-spacing: 4px;
font-weight: bold;
}
.title {
color: #dce4ee;
font-size: 32px;
padding: 10px 50px 0 0;
text-align: right;
}
.title a, a:active, a:visited { color: #dce4ee; text-decoration: none;}
.title a:hover {color: #fff; text-decoration: underline;}
#button {
border:1px solid #23344b;
background: #99acc3;
color: #000;
+ font-family: Bitstream Vera;
font-size:10px;
margin-top:5px;
}
INPUT{
border:1px solid #23344b;
background: #99acc3;
color: #000;
}
TEXTAREA{
border:1px solid #23344b;
background: #99acc3;
width:480px;
}
.footertext a { color: #c0c0c0; text-decoration:none;}
.footertext a:visited { color: #c0c0c0; text-decoration:none;}
.footertext a:active { color: #c0c0c0; text-decoration:none;}
.footertext a:hover {color: #fff; text-decoration: underline;}
.footertext {
text-align: center;
padding: 60px 0 0 0;
font-size: 8pt;
left: -100px;
font-family: Bitstream Vera;
color: #fff;
position: relative;
}
.clearfix:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
div.progress_bar{
background-color:#4573a5;
/*color:blue;*/
-moz-border-radius:5px; /*ff only setting*/
}
+
+div.progress_bar_outer { /*used in table-view*/
+ width:150px;
+}
+
td.progress_bar {
white-space: nowrap;
}
td.info_label {
font-weight: bold;
}
td {
font-size: 10pt;
color: #d1dae5;
white-space: nowrap;
}
tr {
font-size: 10pt;
color: #d1dae5;
}
+
+div.panel {
+ padding:10px;
+ width:750px;
+ background-color: #37506f;
+ -moz-border-radius:10px; /*ff-only!*/
+ margin-top:10px;
+ margin-bottom:10px;
+}
+
+
+/*New styles:*/
+
+div.deluge_button {
+ display:inline;
+}
+form.deluge_button {
+ display:inline;
+}
+button.deluge_button {
+ background-color: #37506f;
+ border:1px solid #68a;
+
+ background: #99acc3;
+ color: #000;
+ vertical-align:middle;
+ -moz-border-radius:7px;
+}
+button.deluge_button:hover {
+ background-color:#68a;
+}
+div.error {
+ background-color:#FFFFFF;
+ color:#AA0000;
+ font-weight:bold;
+ -moz-border-radius:10px;
+ width:200px;
+ margin-bottom:20px;
+ padding:10px;
+
+}
+
+tr.torrent_table:hover {
+ background-color:#68a;
+}
+
+tr.torrent_table_selected {
+ background-color:#900;
+}
+
+th.torrent_table:hover {
+ background-color:#68a;
+}
+
+img.button {
+ margin-bottom:0px;
+ padding:0px;
+ position:relative;
+ top:2px;
+}
+
+body.inner {
+ background:none;
+}
+
+#stats_panel {
+ -moz-border-radius:0px;
+ width:100%;
+ position:fixed;
+ bottom:0px;
+ left:0px;
+ background-color:#304663;
+ margin: 0;
+ padding:0;
+ text-align:left;
+ height:20px;
+}
+
+#about {
+ position:fixed;
+ bottom:0px;
+ right:10px;
+}
+
+#info_panel_div2 {
+ position:fixed;
+ bottom:10px;
+ right:0px;
+ width:100%;
+ background-color:#304663;
+}
+
+#refresh_panel {
+ -moz-border-radius:0px;
+ width:100%;
+ position:fixed;
+ bottom:20px;
+ left:0px;
+ background-color:#304663;
+ margin: 0;
+ padding:0;
+ text-align:right;
+ height:20px;
+}
+
+#refresh_panel button {
+ background-color:#304663;
+ color:#FFFFFF;
+ border:0;
+ position:relative;
+ top:0px;
+ height:20px;
+}
+#refresh_panel button:hover {
+ text-decoration: underline;
+}
+
+
/* Hides from IE-mac \*/
* html .clearfix {height: 1%;}
.clearfix {display: block;}
/* End hide from IE-mac */
\ No newline at end of file
diff --git a/plugins/WebUi/templates/advanced/static/deluge.js b/plugins/WebUi/templates/advanced/static/deluge.js
new file mode 100644
index 000000000..33e7cbdc4
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/static/deluge.js
@@ -0,0 +1,122 @@
+/*
+all javascript is optional, everything should work web 1.0
+but javascript may/will enhance the experience.
+i'm not a full time web-dev so don't expect beautifull patterns.
+There's so much crap out there,i can't find good examples.
+so i'd rather start from scratch,
+Probably broken in an unexpected way , but worksforme.
+*/
+state = {
+ 'row_js_continue':true
+ ,'selected_rows': new Array()
+};
+
+function $(el_id){
+ return document.getElementById(el_id)
+}
+function get_row(id){
+ return $('torrent_' + id);
+}
+
+function on_click_row(e,id) {
+ /*filter out web 1.0 events for detail-link and pause*/
+ if (state.row_js_continue) {
+ on_click_action(e,id);
+ }
+ state.row_js_continue = true;
+}
+
+function on_click_row_js(e, id) {
+ /*real onClick event*/
+ if (!e.ctrlKey) {
+ deselect_rows();
+ }
+ select_row(id);
+ open_inner_details(id);
+}
+
+function select_row(id){
+ var row = get_row(id);
+ if (row) {
+ row.className = 'torrent_table_selected';
+ state.selected_rows[state.selected_rows.length] = id;
+ setCookie('selected_rows',state.selected_rows);
+ }
+}
+function deselect_rows(){
+ for (i in state.selected_rows) {
+ deselect_row(state.selected_rows[i]);
+ }
+ state.selected_rows = new Array();
+}
+function deselect_row(id){
+ var row = get_row(id);
+ if (row) {
+ row.className = 'torrent_table'
+ /*TODO : remove from state.selected_rows*/
+ }
+}
+function reselect_rows(){
+ var selected_rows = getCookie('selected_rows').split(',');
+ for (i in getCookie('selected_rows')) {
+ select_row(selected_rows[i]);
+ }
+}
+
+function open_details(e, id){
+ alert(id);
+ window.location.href = '/torrent/info/' + id;
+}
+
+function open_inner_details(id){
+ /*probably broken for IE, use FF!*/
+ $('torrent_info').src = '/torrent/info_inner/' + id;
+}
+
+function on_click_do_nothing(e, id){
+}
+
+on_click_action = on_click_do_nothing;
+
+/*toobar buttons, */
+function toolbar_post(url) {
+ /*this feels hacky, but it's the only way i know of*/
+ var ids = state.selected_rows.join(',');
+ var form = $('toolbar_form');
+ form.action = url +ids;
+ form.submit();
+ return false;
+}
+
+function toolbar_get(url) {
+ /*this feels hacky, but it's the only way i know of*/
+ var ids = state.selected_rows.join(',');
+ window.location.href = url +ids;
+ return false;
+}
+
+/*stuff copied from various places:*/
+/*http://www.w3schools.com/js/js_cookies.asp*/
+function setCookie(c_name,value,expiredays)
+{
+ var exdate=new Date()
+ exdate.setDate(exdate.getDate()+expiredays)
+ document.cookie=c_name+ "=" +escape(value)+
+ ((expiredays==null) ? "" : ";expires="+exdate.toGMTString())
+}
+
+function getCookie(c_name)
+{
+if (document.cookie.length>0)
+ {
+ c_start=document.cookie.indexOf(c_name + "=")
+ if (c_start!=-1)
+ {
+ c_start=c_start + c_name.length+1
+ c_end=document.cookie.indexOf(";",c_start)
+ if (c_end==-1) c_end=document.cookie.length
+ return unescape(document.cookie.substring(c_start,c_end))
+ }
+ }
+return ""
+}
\ No newline at end of file
diff --git a/plugins/WebUi/templates/advanced/static/scrolling_table.css b/plugins/WebUi/templates/advanced/static/scrolling_table.css
new file mode 100644
index 000000000..b046bd9c4
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/static/scrolling_table.css
@@ -0,0 +1,106 @@
+/*Taken from:
+http://www.imaputz.com/cssStuff/bigFourVersion.html
+*/
+
+/* define height and width of scrollable area. Add 16px to width for scrollbar */
+div.tableContainer {
+ clear: both;
+ /*border: 1px solid #963;*/
+ height: 285px;
+ overflow: auto;
+ width: 756px;
+}
+
+/* Reset overflow value to hidden for all non-IE browsers. */
+html>body div.tableContainer {
+ overflow: hidden;
+ width: 756px
+}
+
+/* define width of table. IE browsers only */
+div.tableContainer table {
+ float: left;
+ width: 740px;
+}
+
+/* define width of table. Add 16px to width for scrollbar. */
+/* All other non-IE browsers. */
+html>body div.tableContainer table {
+ width: 756px
+}
+
+/* set table header to a fixed position. WinIE 6.x only */
+/* In WinIE 6.x, any element with a position property set to relative and is a child of */
+/* an element that has an overflow property set, the relative value translates into fixed. */
+/* Ex: parent element DIV with a class of tableContainer has an overflow property set to auto */
+thead.fixedHeader tr {
+ position: relative
+}
+
+/* set THEAD element to have block level attributes. All other non-IE browsers */
+/* this enables overflow to work on TBODY element. All other non-IE, non-Mozilla browsers */
+html>body thead.fixedHeader tr {
+ display: block
+}
+
+/* define the table content to be scrollable */
+/* set TBODY element to have block level attributes. All other non-IE browsers */
+/* this enables overflow to work on TBODY element. All other non-IE, non-Mozilla browsers */
+/* induced side effect is that child TDs no longer accept width: auto */
+html>body tbody.scrollContent {
+ display: block;
+ height: 262px;
+ overflow: auto;
+ width: 100%
+}
+
+/* make TD elements pretty. Provide alternating classes for striping the table */
+/* http://www.alistapart.com/articles/zebratables/ */
+tbody.scrollContent td, tbody.scrollContent tr.normalRow td {
+ /*background: #FFF;*/
+
+ border-bottom: none;
+ border-left: none;
+ /*border-right: 1px solid #CCC;
+ border-top: 1px solid #DDD;*/
+ padding: 2px 3px 3px 4px
+}
+
+tbody.scrollContent tr.alternateRow td {
+ /*background: #EEE;*/
+ border-bottom: none;
+ border-left: none;
+ /*border-right: 1px solid #CCC;
+ border-top: 1px solid #DDD;*/
+ padding: 2px 3px 3px 4px
+}
+
+/* define width of TH elements: 1st, 2nd, and 3rd respectively. */
+/* Add 16px to last TH for scrollbar padding. All other non-IE browsers. */
+/* http://www.w3.org/TR/REC-CSS2/selector.html#adjacent-selectors */
+html>body thead.fixedHeader th {
+ width: 200px
+}
+
+html>body thead.fixedHeader th + th {
+ width: 240px
+}
+
+html>body thead.fixedHeader th + th + th {
+ width: 316px
+}
+
+/* define width of TD elements: 1st, 2nd, and 3rd respectively. */
+/* All other non-IE browsers. */
+/* http://www.w3.org/TR/REC-CSS2/selector.html#adjacent-selectors */
+html>body tbody.scrollContent td {
+ width: 200px
+}
+
+html>body tbody.scrollContent td + td {
+ width: 240px
+}
+
+html>body tbody.scrollContent td + td + td {
+ width: 300px
+}
\ No newline at end of file
diff --git a/plugins/WebUi/templates/advanced/torrent_info_inner.html b/plugins/WebUi/templates/advanced/torrent_info_inner.html
new file mode 100644
index 000000000..907bfcf55
--- /dev/null
+++ b/plugins/WebUi/templates/advanced/torrent_info_inner.html
@@ -0,0 +1,15 @@
+$def with (torrent)
+
+
+
+
+
$:render.part_button('GET', '/torrent/add', _('Add torrent'), 'tango/list-add.png')
diff --git a/plugins/WebUi/templates/deluge/part_stats.html b/plugins/WebUi/templates/deluge/part_stats.html
index 55a2a74b5..342b8049f 100644
--- a/plugins/WebUi/templates/deluge/part_stats.html
+++ b/plugins/WebUi/templates/deluge/part_stats.html
@@ -14,7 +14,7 @@ $else:
$#end
-
+
+
$column_name\
$if active_up:
diff --git a/plugins/WebUi/templates/deluge/tab_meta.html b/plugins/WebUi/templates/deluge/tab_meta.html
new file mode 100644
index 000000000..6a1de18de
--- /dev/null
+++ b/plugins/WebUi/templates/deluge/tab_meta.html
@@ -0,0 +1,85 @@
+$def with (torrent)
+
diff --git a/plugins/WebUi/templates/deluge/torrent_delete.html b/plugins/WebUi/templates/deluge/torrent_delete.html
index 77f32949a..a9aceb551 100644
--- a/plugins/WebUi/templates/deluge/torrent_delete.html
+++ b/plugins/WebUi/templates/deluge/torrent_delete.html
@@ -1,10 +1,15 @@
-$def with (torrent)
-$:render.header(_("Remove %s ") % torrent.name)
+$def with (torrent_ids, torrent_list)
+$:render.header(_("Remove torrent"))
$_('Connections') : $stats.num_connections ($stats.max_num_connections)
@@ -26,8 +26,9 @@ $#end
-
- ($_('About'))
+
+ ($_('About'))
+
diff --git a/plugins/WebUi/templates/deluge/sort_column_head.html b/plugins/WebUi/templates/deluge/sort_column_head.html
index 1de008a79..c18a50004 100644
--- a/plugins/WebUi/templates/deluge/sort_column_head.html
+++ b/plugins/WebUi/templates/deluge/sort_column_head.html
@@ -1,5 +1,5 @@
$def with (column_id, column_name, order, active_up, active_down)
-| + + + | +
+
|
+
+
|
+
+
|
-