From ae6a517c4f27ef4fbf8d3b785f71eabb85adf409 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 18:34:11 -0800 Subject: [PATCH 01/13] remove confirmations when changing feed enabled status & feed filter order --- interfaces/Plush/templates/config_rss.tmpl | 6 +-- .../Plush/templates/static/javascripts/config.js | 53 +++++----------------- 2 files changed, 14 insertions(+), 45 deletions(-) diff --git a/interfaces/Plush/templates/config_rss.tmpl b/interfaces/Plush/templates/config_rss.tmpl index cde3112..f37af1a 100644 --- a/interfaces/Plush/templates/config_rss.tmpl +++ b/interfaces/Plush/templates/config_rss.tmpl @@ -36,7 +36,7 @@ - /> + /> id="activeFeedLink">$feed_item @@ -94,7 +94,7 @@ - + @@ -249,7 +249,7 @@ - + - @@ -202,6 +202,16 @@ + - - + @@ -277,6 +277,16 @@ + - +
/>$T('enabled').capitalize()
/>$T('enabled').capitalize()
$T('feed')
$T('rss-type') $T('rss-filter') $T('category')$T('priority') Mode $T('script')$T('priority')
+ + - -
+ + - - From f49fd961707e090a01998fd83b18cfbae6acfc06 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 18:50:22 -0800 Subject: [PATCH 03/13] rework rss details + add feed --- interfaces/Plush/templates/config_rss.tmpl | 32 ++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/interfaces/Plush/templates/config_rss.tmpl b/interfaces/Plush/templates/config_rss.tmpl index d425206..df8b52e 100644 --- a/interfaces/Plush/templates/config_rss.tmpl +++ b/interfaces/Plush/templates/config_rss.tmpl @@ -49,19 +49,18 @@
+ +
-

$T('none')

+

$T('addFeed'):

-

-
- - -

+
- From 87225e62004e5e8cb39038f24ebc26fa59a02795 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 18:52:16 -0800 Subject: [PATCH 04/13] add space to add nzb modal to distinguish between 2 upload methods and then the upload options --- interfaces/Plush/templates/_inc_modals.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/Plush/templates/_inc_modals.tmpl b/interfaces/Plush/templates/_inc_modals.tmpl index 4f88dc8..ed5f7c0 100644 --- a/interfaces/Plush/templates/_inc_modals.tmpl +++ b/interfaces/Plush/templates/_inc_modals.tmpl @@ -62,7 +62,7 @@
$T('Plush-uploadTip') -

+



$T('pp'): #if $cat_list# From a07972c3a6612bb86c09aa7c80417f13bac31be2 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 19:03:45 -0800 Subject: [PATCH 05/13] style up history job processing modal --- interfaces/Plush/templates/history.tmpl | 57 +++++++++++++++------------------ 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/interfaces/Plush/templates/history.tmpl b/interfaces/Plush/templates/history.tmpl index b726c60..ca64ccf 100644 --- a/interfaces/Plush/templates/history.tmpl +++ b/interfaces/Plush/templates/history.tmpl @@ -29,39 +29,32 @@
-
- - <% - compl = datetime.datetime.fromtimestamp(float(line['completed'])).strftime(time_format('%Y-%m-%d %H:%M:%S')) - %> - - - - - - -
$T('completed')$T('name')$T('size')$T('status')
$compl$line.name - $line.action_line - $line.fail_message$line.size$Tx('post-'+$line.status)
-

- - - -
$Tx('stage-'+$stage.name.title.lower())
- -
$action
- -
- - -
$T('category')
-
$line.category
-
- - -
$T('msg-path')
-
$line.storage
-
- + + <% compl = datetime.datetime.fromtimestamp(float(line['completed'])).strftime(time_format('%Y-%m-%d %H:%M:%S')) %> + + + + + + + + + class="odd"> + + + + class="odd"> + + + + class="odd"> + +
$T('completed')$compl
$T('name')$line.name - $line.action_line - $line.fail_message
$T('size')$line.size
$T('status')$Tx('post-'+$line.status)
$Tx('stage-'+$stage.name.title.lower()) + + $action
+ +
$T('category')$line.category
$T('msg-path')$line.storage
From 9cbbcde82872ce0d622c5cbf7dd4b59016a10c57 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 19:06:09 -0800 Subject: [PATCH 06/13] remove pathing from tooltips in history (too much data for tooltip) --- interfaces/Plush/templates/history.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/Plush/templates/history.tmpl b/interfaces/Plush/templates/history.tmpl index ca64ccf..30f69a6 100644 --- a/interfaces/Plush/templates/history.tmpl +++ b/interfaces/Plush/templates/history.tmpl @@ -75,7 +75,7 @@
 
-

$T('category'): $line.category

$T('Plush-path'):


$T('Plush-storage'):
'> 
+

$T('category'): $line.category'> 
 
From 4fc1966bc96222ec68e5821385119757eed12aa7 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 19:15:02 -0800 Subject: [PATCH 07/13] another history verbosity modal tweak --- interfaces/Plush/templates/history.tmpl | 16 ++++++++-------- interfaces/Plush/templates/static/javascripts/plush.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interfaces/Plush/templates/history.tmpl b/interfaces/Plush/templates/history.tmpl index 30f69a6..0c0a173 100644 --- a/interfaces/Plush/templates/history.tmpl +++ b/interfaces/Plush/templates/history.tmpl @@ -38,14 +38,6 @@ $T('status')$Tx('post-'+$line.status) - - - class="odd">$Tx('stage-'+$stage.name.title.lower()) - - $action
- - - class="odd">$T('category')$line.category @@ -54,6 +46,14 @@ class="odd">$T('msg-path')$line.storage + + + class="odd">$Tx('stage-'+$stage.name.title.lower()) + + $action
+ + + diff --git a/interfaces/Plush/templates/static/javascripts/plush.js b/interfaces/Plush/templates/static/javascripts/plush.js index f725564..9e2e83d 100644 --- a/interfaces/Plush/templates/static/javascripts/plush.js +++ b/interfaces/Plush/templates/static/javascripts/plush.js @@ -938,7 +938,7 @@ jQuery(function($){ $("#historyTable .modal-detail").colorbox({ inline:true, href: function(){return "#details-"+$(this).parent().parent().attr('id');}, title:function(){return $(this).text();}, - innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 }); + innerWidth:"80%", innerHeight:"300px", initialWidth:"80%", initialHeight:"300px", speed:0, opacity:0.7 }); // Build pagination only when needed if ($.plush.histPerPage=="1") // disabled history From 252c65042f74e67a0395c3984e5bfb872d420a7c Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 19:35:24 -0800 Subject: [PATCH 08/13] re-order priority column for config>categories as well and fix an odd alignment issue --- interfaces/Plush/templates/config_cat.tmpl | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/interfaces/Plush/templates/config_cat.tmpl b/interfaces/Plush/templates/config_cat.tmpl index 5666047..7bab210 100644 --- a/interfaces/Plush/templates/config_cat.tmpl +++ b/interfaces/Plush/templates/config_cat.tmpl @@ -24,8 +24,8 @@ $T('category') - $T('mode') $T('priority') + $T('mode') $T('script') $T('catFolderPath') $T('catTags') @@ -47,18 +47,6 @@ - - - - + + + + From e57f164855674e4a37a4a075dfec5f3b5f18e162 Mon Sep 17 00:00:00 2001 From: xamphear Date: Mon, 21 Feb 2011 23:19:00 -0500 Subject: [PATCH 09/13] test commit --- interfaces/Plush/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/Plush/README.txt b/interfaces/Plush/README.txt index 16b0d07..889521b 100644 --- a/interfaces/Plush/README.txt +++ b/interfaces/Plush/README.txt @@ -1,5 +1,5 @@ -Plush for SABnzbd+ 0.6.x | Dec 22 2010 +Plush for SABnzbd+ 0.6.x | Feb 21 2010 assembled by pairofdimes - see LICENSE-CC.txt http://forums.sabnzbd.org contributions welcome From f2e47840470fdac083fba405c576d4531bb17228 Mon Sep 17 00:00:00 2001 From: pairofdimes Date: Mon, 21 Feb 2011 20:30:54 -0800 Subject: [PATCH 10/13] test commit --- interfaces/Plush/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/Plush/README.txt b/interfaces/Plush/README.txt index 889521b..8cfceee 100644 --- a/interfaces/Plush/README.txt +++ b/interfaces/Plush/README.txt @@ -1,5 +1,5 @@ -Plush for SABnzbd+ 0.6.x | Feb 21 2010 +Plush for SABnzbd+ 0.6.x | Feb. 21 2010 assembled by pairofdimes - see LICENSE-CC.txt http://forums.sabnzbd.org contributions welcome From 6b3bc1220f5657ce434f502e3edb95243d506f49 Mon Sep 17 00:00:00 2001 From: xamphear Date: Thu, 24 Feb 2011 00:16:09 -0500 Subject: [PATCH 11/13] fixed divs in footer, doctype in header, set cookies to global and applied containerWidth to all pages --- interfaces/Plush/templates/_inc_footer.tmpl | 8 ++++- interfaces/Plush/templates/_inc_header.tmpl | 42 +++++++++++++++++----- interfaces/Plush/templates/_inc_modals.tmpl | 5 +-- .../Plush/templates/static/javascripts/plush.js | 24 ++++++------- .../static/stylesheets/colorschemes/gold/gold.css | 9 +++-- 5 files changed, 62 insertions(+), 26 deletions(-) diff --git a/interfaces/Plush/templates/_inc_footer.tmpl b/interfaces/Plush/templates/_inc_footer.tmpl index 9f7ff46..5df0f05 100644 --- a/interfaces/Plush/templates/_inc_footer.tmpl +++ b/interfaces/Plush/templates/_inc_footer.tmpl @@ -1,4 +1,9 @@ -#if $pane!="Main"# +#if $pane=="Main"# + +#else if $pane=="Nzo" + +#else# + #if $pane!="Connections" and $pane !="RSS"##end if#
@@ -8,5 +13,6 @@ #include $webdir + "/_inc_modals.tmpl"# + diff --git a/interfaces/Plush/templates/_inc_header.tmpl b/interfaces/Plush/templates/_inc_header.tmpl index 070df09..7eb2ca7 100644 --- a/interfaces/Plush/templates/_inc_header.tmpl +++ b/interfaces/Plush/templates/_inc_header.tmpl @@ -26,36 +26,60 @@ #if $pane=="Main"# - #else if $pane=="Nzo"# - + + #else# - + + #end if# - +
- #if $pane=="Main"#

$T('link-forceDisc')

@@ -51,6 +50,8 @@ $T("Plush-blockRefresh")
+#if $pane=="Main"# +
@@ -142,7 +143,7 @@
- #end if# +#end if#
diff --git a/interfaces/Plush/templates/static/javascripts/plush.js b/interfaces/Plush/templates/static/javascripts/plush.js index 9e2e83d..1b228cf 100644 --- a/interfaces/Plush/templates/static/javascripts/plush.js +++ b/interfaces/Plush/templates/static/javascripts/plush.js @@ -9,7 +9,7 @@ jQuery(function($){ // Plush defaults refreshRate: $.cookie('refreshRate') ? $.cookie('refreshRate') : 30, // refresh rate in seconds - containerWidth: $.cookie('containerWidth') ? $.cookie('containerWidth') : '90%', // refresh rate in seconds + containerWidth: $.cookie('containerWidth') ? $.cookie('containerWidth') : '90%', // width of all elements on page queuePerPage: $.cookie('queuePerPage') ? $.cookie('queuePerPage') : 5, // pagination - nzbs per page histPerPage: $.cookie('histPerPage') ? $.cookie('histPerPage') : 5, // pagination - nzbs per page confirmDeleteQueue: $.cookie('confirmDeleteQueue') == 0 ? false : true, // confirm queue nzb removal @@ -148,33 +148,33 @@ jQuery(function($){ // Refresh rate $("#refreshRate-option").val($.plush.refreshRate).change( function() { $.plush.refreshRate = $("#refreshRate-option").val(); - $.cookie('refreshRate', $.plush.refreshRate, { expires: 365 }); + $.cookie('refreshRate', $.plush.refreshRate, { expires: 365, path: '/' }); $.plush.Refresh(); }); - // Refresh rate + // Container width $("#containerWidth-option").val($.plush.containerWidth).change( function() { $.plush.containerWidth = $("#containerWidth-option").val(); - $.cookie('containerWidth', $.plush.containerWidth, { expires: 365 }); - $('#page-wrap').css('width',$.plush.containerWidth); + $.cookie('containerWidth', $.plush.containerWidth, { expires: 365, path: '/' }); + $('#master-width').css('width',$.plush.containerWidth); }).trigger('change'); // Confirm Queue Deletions toggle $("#confirmDeleteQueue").attr('checked', $.plush.confirmDeleteQueue ).change( function() { $.plush.confirmDeleteQueue = $("#confirmDeleteQueue").attr('checked'); - $.cookie('confirmDeleteQueue', $.plush.confirmDeleteQueue ? 1 : 0, { expires: 365 }); + $.cookie('confirmDeleteQueue', $.plush.confirmDeleteQueue ? 1 : 0, { expires: 365, path: '/' }); }); // Confirm History Deletions toggle $("#confirmDeleteHistory").attr('checked', $.plush.confirmDeleteHistory ).change( function() { $.plush.confirmDeleteHistory = $("#confirmDeleteHistory").attr('checked'); - $.cookie('confirmDeleteHistory', $.plush.confirmDeleteHistory ? 1 : 0, { expires: 365 }); + $.cookie('confirmDeleteHistory', $.plush.confirmDeleteHistory ? 1 : 0, { expires: 365, path: '/' }); }); // Block Refreshes on Hover toggle $("#blockRefresh").attr('checked', $.plush.blockRefresh ).change( function() { $.plush.blockRefresh = $("#blockRefresh").attr('checked'); - $.cookie('blockRefresh', $.plush.blockRefresh ? 1 : 0, { expires: 365 }); + $.cookie('blockRefresh', $.plush.blockRefresh ? 1 : 0, { expires: 365, path: '/' }); }); // Sabnzbd restart @@ -272,7 +272,7 @@ jQuery(function($){ $.plush.multiOpsChecks = new Array(); $('').appendTo('#queue tr td.nzb_status_col'); } - $.cookie('multiOps', $.plush.multiOps ? 1 : 0, { expires: 365 }); + $.cookie('multiOps', $.plush.multiOps ? 1 : 0, { expires: 365, path: '/' }); }); if ($.plush.multiOps) $('#multiops_toggle').trigger('click'); @@ -426,7 +426,7 @@ jQuery(function($){ $("#queue-pagination-perpage").change(function(event){ $.plush.queuecurpage = Math.floor($.plush.queuecurpage * $.plush.queuePerPage / $(event.target).val() ); $.plush.queuePerPage = $(event.target).val(); - $.cookie('queuePerPage', $.plush.queuePerPage, { expires: 365 }); + $.cookie('queuePerPage', $.plush.queuePerPage, { expires: 365, path: '/' }); $.plush.queueforcerepagination = true; $.plush.RefreshQueue(); }); @@ -842,7 +842,7 @@ jQuery(function($){ $("#history-pagination-perpage").change(function(event){ $.plush.histcurpage = Math.floor($.plush.histcurpage * $.plush.histPerPage / $(event.target).val() ); $.plush.histPerPage = $(event.target).val(); - $.cookie('histPerPage', $.plush.histPerPage, { expires: 365 }); + $.cookie('histPerPage', $.plush.histPerPage, { expires: 365, path: '/' }); $.plush.histforcerepagination = true; if ($.plush.histPerPage=="1") $("#history-pagination").html(''); // pagination rebuild not triggered on blank history (disabled) @@ -926,7 +926,7 @@ jQuery(function($){ // show all / show failed $('#failed_only').change(function(){ $.plush.failedOnly = $("#failed_only").val(); - $.cookie('failedOnly', $.plush.failedOnly, { expires: 365 }); + $.cookie('failedOnly', $.plush.failedOnly, { expires: 365, path: '/' }); $.plush.RefreshHistory(); }).val($.plush.failedOnly); diff --git a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css index cacb68b..030a069 100644 --- a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css +++ b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css @@ -489,9 +489,14 @@ body { #page-wrap { clear:both; margin: 0px auto; +} + +#master-width { + clear:both; + margin: 0px auto; width: 90%; } - + .box_banner_hr { background-repeat: repeat-x; height: 4px; @@ -1837,4 +1842,4 @@ padding: 5px 10px; } .apikey { width:220px; -} \ No newline at end of file +} From 31269bb7d69f7a28c94443600f6514052394ad8c Mon Sep 17 00:00:00 2001 From: xamphear Date: Thu, 24 Feb 2011 09:09:50 -0500 Subject: [PATCH 12/13] make add nzb modal a little prettier --- interfaces/Plush/templates/_inc_modals.tmpl | 9 ++++----- .../static/stylesheets/colorschemes/gold/gold.css | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/interfaces/Plush/templates/_inc_modals.tmpl b/interfaces/Plush/templates/_inc_modals.tmpl index 4583b34..fe747b6 100644 --- a/interfaces/Plush/templates/_inc_modals.tmpl +++ b/interfaces/Plush/templates/_inc_modals.tmpl @@ -55,7 +55,7 @@
-

+
@@ -63,9 +63,9 @@
$T('Plush-uploadTip') -



+
$T('pp'): - +
#if $cat_list# #end if#
$T('category'):
- -
+
$T('Plush-addnzb-filename'):
diff --git a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css index 030a069..79b850a 100644 --- a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css +++ b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css @@ -219,8 +219,24 @@ body { width:190px; } +#add_nzb_pp td{ + padding: 5px; +} +#add_nzb_hr { + margin-top: 15px; + margin-bottom: 15px; +} +#add_nzb_hr hr { + height: 1px; + border: 0; + color: #B1B1B1; + background-color: #B1B1B1; + width: 95%; + text-align: left; + margin: 0 auto 0 0; +} /* --------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------ From e9aaed58f40eda2b799d7fa6f5b80a4cec296e39 Mon Sep 17 00:00:00 2001 From: xamphear Date: Thu, 24 Feb 2011 11:23:56 -0500 Subject: [PATCH 13/13] fixed the position of the toolbars and the main queue/history divs --- interfaces/Plush/templates/main.tmpl | 450 ++++++++++----------- .../static/stylesheets/colorschemes/gold/gold.css | 7 +- 2 files changed, 229 insertions(+), 228 deletions(-) diff --git a/interfaces/Plush/templates/main.tmpl b/interfaces/Plush/templates/main.tmpl index c8be940..bc0031e 100644 --- a/interfaces/Plush/templates/main.tmpl +++ b/interfaces/Plush/templates/main.tmpl @@ -1,225 +1,225 @@ - - - - -
- - - -
-
- - - - - -
-
-
-
- -
 
- -
-
- - -
-

$T('menu-history').upper()

-
-
    -
  • -
    • -
    • -
-
-
-
- - -
-
-
-
- -
 
- -
-
 
-
- -
- -
-
-
-
- -
- - + + + + +
+ + + +
+
+ + + + + +
+
+
+
+ +
 
+ +
+
+ + +
+

$T('menu-history').upper()

+
+
    +
  • +
    • +
    • +
+
+
+
+ + +
+
+
+
+ +
 
+ +
+
 
+
+ +
+ +
+
+
+
+ +
+ + diff --git a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css index 79b850a..3971461 100644 --- a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css +++ b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css @@ -265,11 +265,11 @@ body { height: 30px; } .navigation ul#navigation_menu_left { - margin-left:110px; + margin-left:108px; float:left; } .navigation ul#navigation_menu_right { - margin-right:110px; + margin-right:108px; float:right; } @@ -504,7 +504,8 @@ body { #page-wrap { clear:both; - margin: 0px auto; + margin-left: 98px; + margin-right: 98px; } #master-width {