diff --git a/interfaces/Plush/README.txt b/interfaces/Plush/README.txt index 16b0d07..8cfceee 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 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,10 +50,12 @@ $T("Plush-blockRefresh")
+#if $pane=="Main"# +
-

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

+
$T('pp'): - +
#if $cat_list# #end if#
$T('category'):
- -
+
$T('Plush-addnzb-filename'):
@@ -142,7 +142,7 @@
- #end if# +#end if#
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 @@ - - - - + + + + diff --git a/interfaces/Plush/templates/config_rss.tmpl b/interfaces/Plush/templates/config_rss.tmpl index 36ec6b8..68f1474 100644 --- a/interfaces/Plush/templates/config_rss.tmpl +++ b/interfaces/Plush/templates/config_rss.tmpl @@ -36,7 +36,7 @@ - /> + /> id="activeFeedLink">$feed_item @@ -49,19 +49,18 @@ + + + -

$T('none')

+

$T('addFeed'):

-

-
- - -

+
- @@ -94,7 +92,7 @@ - + @@ -173,9 +171,9 @@ + - @@ -196,12 +194,22 @@ + - - + @@ -249,7 +247,7 @@ - + -
/>$T('enabled').capitalize()
/>$T('enabled').capitalize()
$T('feed')
$T('rss-type') $T('rss-filter') $T('category')$T('priority') Mode $T('script')$T('priority')
+ + - -
+ + - - diff --git a/interfaces/Plush/templates/history.tmpl b/interfaces/Plush/templates/history.tmpl index 9955b95..364ed1e 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)
-

+ + <% compl = datetime.datetime.fromtimestamp(float(line['completed'])).strftime(time_format('%Y-%m-%d %H:%M:%S')) %> + + + + - - - -
$Tx('stage-'+$stage.name.title.lower())
- -
$action
- -
- - -
$T('category')
-
$line.category
-
- - -
$T('msg-path')
-
$line.storage
-
- + + + + 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)
$T('category')$line.category
$T('msg-path')$line.storage
$Tx('stage-'+$stage.name.title.lower()) + + $action
+ +
@@ -82,7 +75,7 @@
 
-

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

$T('Plush-path'):


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

$T('category'): $line.category'> 
 
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/javascripts/config.js b/interfaces/Plush/templates/static/javascripts/config.js index a69225e..86e33fc 100644 --- a/interfaces/Plush/templates/static/javascripts/config.js +++ b/interfaces/Plush/templates/static/javascripts/config.js @@ -179,48 +179,17 @@ jQuery(document).ready(function($){ break; case 'RSS': - /* - $(':checkbox').click(function(event){ // toggle feed - $(event.target).parents('form:first').attr('action','toggle_rss_feed').submit(); - return false; - }); - $('#config_content .EntryFieldSet .preview_feed').click(function(event){ - $.fn.colorbox({ - href:'test_rss_feed?'+$(event.target).parents('form:first').serialize(), - innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 - }); - return false; - }); - $(document).bind('cbox_complete', function(){ - $('#cboxTitle').text( $('#cboxLoadedContent h3').text() ); - $('#cboxLoadedContent input, #cboxLoadedContent h3').hide(); // hide back button, title - $('#cboxLoadedContent a').click(function(event){ - if( $(event.target).attr('target') != '_blank' ) { - $.ajax({ url: $(event.target).attr('href') }); // ajax downloads - $(event.target).replaceWith('Download'); - return false; - } - }); - }); - $('#config_content .EntryFieldSet .download_feed').click(function(event){ - if(confirm($(event.target).attr('rel'))) { - $.fn.colorbox({ - href:'download_rss_feed?'+$(event.target).parents('form:first').serialize(), - innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 - }); - } - return false; - }); - $('#config_content .EntryFieldSet .delete_feed').click(function(event){ - if(confirm($(event.target).attr('rel'))) - $(event.target).parents('form:first').attr('action','del_rss_feed').submit(); - return false; - }); - $('#config_content .EntryFieldSet .filter_order').change(function(event){ // update filter order - window.onbeforeunload = null; - window.location = $(event.target).val()+'&session='+apikey; - }); - */ + + $('.toggleFeedCheckbox').click(function(){ // enable/disable feed + window.onbeforeunload = null; // lose data? + this.form.action='toggle_rss_feed?session=$session'; + this.form.submit(); + return false; + }); + $('.rssOrderSelect').change(function(){ // change filter order + window.onbeforeunload = null; // lose data? + location = this.options[this.selectedIndex].value; + }); break; case 'Email': diff --git a/interfaces/Plush/templates/static/javascripts/plush.js b/interfaces/Plush/templates/static/javascripts/plush.js index f725564..4ad43d1 100644 --- a/interfaces/Plush/templates/static/javascripts/plush.js +++ b/interfaces/Plush/templates/static/javascripts/plush.js @@ -4,12 +4,12 @@ jQuery(function($){ $.plush = { - + // *************************************************************** // 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 @@ -18,7 +18,7 @@ jQuery(function($){ failedOnly: $.cookie('failedOnly') == 1 ? 1 : 0, // prevent refreshing when hovering queue multiOps: $.cookie('multiOps') == 1 ? true : false, // is multi-operations menu visible in queue multiOpsChecks: null, - + // *************************************************************** // $.plush.Init() -- initialize all the UI events @@ -33,7 +33,7 @@ jQuery(function($){ // *************************************************************** // $.plush.InitAddNZB() -- "Add NZB" Methods - + InitAddNZB : function() { // Fetch NZB by URL/Newzbin Report ID $('#addID').click(function(){ // also works when hitting enter because of
@@ -54,7 +54,7 @@ jQuery(function($){ success: $.plush.RefreshQueue }); $("#addID_input").val(''); - $('#nzbname').val(''); + $('#nzbname').val(''); } return false; // aborts submission }); @@ -87,10 +87,10 @@ jQuery(function($){ }, // end $.plush.InitAddNZB() - + // *************************************************************** // $.plush.InitMainMenu() -- Main Menu Events - + InitMainMenu : function() { $('.juiButton').button(); @@ -114,18 +114,18 @@ jQuery(function($){ function(){ $(this).addClass('sprite_q_queuesfHover'); }, function(){ $(this).removeClass('sprite_q_queuesfHover'); } ); - + // modals $("#help").colorbox({ inline:true, href:"#help_modal", title:$("#help").text(), innerWidth:"375px", innerHeight:"350px", initialWidth:"375px", initialHeight:"350px", speed:0, opacity:0.7 }); $("#add_nzb").colorbox({ inline:true, href:"#add_nzb_modal", title:$("#add_nzb").text(), - innerWidth:"375px", innerHeight:"350px", initialWidth:"375px", initialHeight:"350px", speed:0, opacity:0.7 + innerWidth:"375px", innerHeight:"370px", initialWidth:"375px", initialHeight:"370px", speed:0, opacity:0.7 }); $("#plush_options").colorbox({ inline:true, href:"#plush_options_modal", title:$("#plush_options").text(), innerWidth:"375px", innerHeight:"350px", initialWidth:"375px", initialHeight:"350px", speed:0, opacity:0.7 }); - + // Max Speed main menu input -- don't change value on refresh when focused $("#maxSpeed-option").focus(function(){ $.plush.focusedOnSpeedChanger = true; }) .blur(function(){ $.plush.focusedOnSpeedChanger = false; }) @@ -144,49 +144,49 @@ jQuery(function($){ data: {mode:'config', name:'set_speedlimit', value: str, apikey: $.plush.apikey} }); }); - + // 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 $('#sabnzbd_restart').click( function(){ return confirm($(this).attr('rel')); }); - + // Sabnzbd shutdown $('#sabnzbd_shutdown').click( function(){ return confirm($(this).attr('rel')); }); - + // Queue "Upon Completion" script $("#onQueueFinish-option").change( function() { if ($(this).val() && $(this).val()!="") @@ -199,7 +199,7 @@ jQuery(function($){ data: {mode:'queue', name:'change_complete_action', value: $(this).val(), apikey: $.plush.apikey} }); }); - + // Queue Purge $('#queue_purge').click(function(event) { $.colorbox({ inline:true, href:"#queue_purge_modal", title:'', @@ -226,7 +226,7 @@ jQuery(function($){ }); }); - + // Queue sort (6-in-1) $('#queue_sort_list .queue_sort').click(function(event) { var sort, dir; @@ -245,7 +245,7 @@ jQuery(function($){ success: $.plush.RefreshQueue }); }); - + // Queue pause intervals $('#set_pause_list .set_pause').click(function(event) { var minutes = $(event.target).attr('rel'); @@ -259,7 +259,7 @@ jQuery(function($){ success: $.plush.RefreshQueue }); }); - + $('#multiops_toggle').click(function(){ if( $('#multiops_bar').is(':visible') ) { // hide $('#multiops_bar').hide(); @@ -272,11 +272,11 @@ 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'); - + // Manual refresh $('#manual_refresh_wrapper').click(function(e){ // prevent button text highlighting @@ -290,8 +290,8 @@ jQuery(function($){ }); }, // end $.plush.InitMainMenu() - - + + // *************************************************************** // $.plush.InitTooltips() -- title tootlips on hover @@ -311,7 +311,7 @@ jQuery(function($){ * http://www.gnu.org/licenses/gpl.html * */ - + var $liveTip = $('
').hide().appendTo('body'), $win = $(window), showTip; @@ -386,7 +386,7 @@ jQuery(function($){ if (event.type == 'mousemove' && $link.data('tipActive')) { tip.position(event); } - + }); }, @@ -395,7 +395,7 @@ jQuery(function($){ // $.plush.InitQueue() - Queue Events InitQueue : function() { - + // Pause/resume toggle (queue) $('#pause_resume').click(function(event) { $('.queue-buttons-pause .sprite_q_menu_pausefor').removeClass('sprite_q_menu_pausefor_on'); @@ -426,11 +426,11 @@ 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(); }); - + // Skip queue refresh on mouseover $('#queue').hover( function(){ $.plush.skipRefresh=true; }, // over @@ -447,7 +447,7 @@ jQuery(function($){ } } ); - + // NZB pause/resume individual toggle $('#queue').delegate('.nzb_status','click',function(event){ var pid = $(this).parent().parent().attr('id'); @@ -467,7 +467,7 @@ jQuery(function($){ }); } }); - + // NZB individual deletion $('#queue').delegate('.sprite_ql_cross','click', function(event) { $('#delete_nzb_modal_title').text( $(this).parent().prev().prev().prev().children('a:first').text() ); @@ -479,7 +479,7 @@ jQuery(function($){ }); return false; }); - + // if (!$.plush.confirmDeleteQueue || confirm($.plush.Tconfirmation)){ /* delid = $(event.target).parent().parent().attr('id'); @@ -521,7 +521,7 @@ jQuery(function($){ } }); }); - + // 3-in-1 change nzb [category + processing + script] $('#queue .change_cat, #queue .change_opts, #queue .change_script').live('change',function(e){ var val = $(this).parent().parent().attr('id'); @@ -539,7 +539,7 @@ jQuery(function($){ } }); }); - + // NZB icon hover states -- done here rather than in CSS:hover due to sprites $('#queueTable tr').live('mouseover mouseout', function(event) { if (event.type == 'mouseover') { @@ -570,16 +570,16 @@ jQuery(function($){ } }); } - + // Sustained binding of events for elements added to DOM // Same idea as jQuery live(), but use jQuery livequery() plugin for functions/events not supported by live() $('#queueTable').livequery(function() { - + // Build pagination only when needed - if ( ( $.plush.queueforcerepagination && $.plush.queuenoofslots > $.plush.queuePerPage) || $.plush.queuenoofslots > $.plush.queuePerPage && - Math.ceil($.plush.queueprevslots/$.plush.queuePerPage) != + if ( ( $.plush.queueforcerepagination && $.plush.queuenoofslots > $.plush.queuePerPage) || $.plush.queuenoofslots > $.plush.queuePerPage && + Math.ceil($.plush.queueprevslots/$.plush.queuePerPage) != Math.ceil($.plush.queuenoofslots/$.plush.queuePerPage) ) { - + $.plush.queueforcerepagination = false; if ( $("#queueTable tr:visible").length - 1 < 1 ) // don't leave stranded on non-page $.plush.queuecurpage--; @@ -597,17 +597,17 @@ jQuery(function($){ $("#queue-pagination").html(''); // remove pages if history empty } $.plush.queueprevslots = $.plush.queuenoofslots; // for the next refresh - + // Drag and drop sorting $("#queueTable").tableDnD({ onDrop: function(table, row) { - + if (table.tBodies[0].rows.length < 2) return false; - + // adjust odd row background coloring - $("tr:odd", '#queueTable').removeClass("alt"); - $("tr:even", '#queueTable').addClass("alt"); + $("tr:odd", '#queueTable').removeClass("alt"); + $("tr:even", '#queueTable').addClass("alt"); // determine which position the repositioned row is at now var val2; @@ -631,9 +631,9 @@ jQuery(function($){ } } }); - + }); // end livequery - + $.plush.InitQueueMultiOperations(); }, // end $.plush.InitQueue() @@ -643,7 +643,7 @@ jQuery(function($){ // $.plush.InitQueueMultiOperations() - Queue Multi-Operation Events InitQueueMultiOperations : function() { - + // selections $("#multiops_select_all").click(function(){ $("INPUT[type='checkbox']","#queueTable").attr('checked', true).trigger('change'); @@ -680,7 +680,7 @@ jQuery(function($){ e.target.unselectable = "on"; e.target.style.MozUserSelect = "none"; }); - + // reset ui options $('#multi_reset').click(function(){ $('#multi_status, #multi_cat, #multi_priority, #multi_pp, #multi_script').val(''); @@ -688,7 +688,7 @@ jQuery(function($){ // apply options - cat/priority/pp/script $('#multi_apply').click(function(){ - + var nzo_ids = ""; $("INPUT[type='checkbox']:checked","#queueTable").each( function() { nzo_ids += "," + $(this).parent().parent().attr('id'); @@ -770,19 +770,19 @@ jQuery(function($){ }, // end $.plush.InitQueueMultiOperations() - + // *************************************************************** // $.plush.InitHistory() -- History Events InitHistory : function() { - + // Search $('#historySearchForm').submit(function(){ $.plush.histcurpage = 0; $.plush.RefreshHistory(); return false; }); - + // Purge $('#hist_purge').click(function(event) { $.colorbox({ inline:true, href:"#history_purge_modal", title:$(this).text(), @@ -837,18 +837,18 @@ jQuery(function($){ // Set history per-page preference $("#history-pagination-perpage").val($.plush.histPerPage); $.plush.histcurpage = 0; // default 1st page - + // Pagination per-page selection $("#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) $.plush.RefreshHistory(); }); - + // nzb retry, click 'add nzb' link to show upload form $('#history .retry-nzbfile').live('click',function(){ $('#retry_modal_title').text( $(this).parent().parent().prev().children('a:first').text() ); @@ -858,7 +858,7 @@ jQuery(function($){ }); return false; }); - + // NZB individual removal $('#history').delegate('.sprite_ql_cross','click', function(event) { $('#delete_nzb_modal_title').text( $(this).parent().prev().prev().children('a:first').text() ); @@ -875,12 +875,12 @@ jQuery(function($){ }); // if (!$.plush.confirmDeleteHistory || confirm($.plush.Tconfirmation)){ - + $('#delete_nzb_modal_remove_nzb, #delete_nzb_modal_remove_files','#delete_nzb_modal').click(function(e){ var del_files=0; if ($(this).attr('id')=="delete_nzb_modal_remove_files") del_files=1; - + delid = $('#delete_nzb_modal_job').val(); mode = $('#delete_nzb_modal_mode').val(); $('#'+delid).fadeTo('normal',0.25); @@ -906,7 +906,7 @@ jQuery(function($){ }); return false; }); - + // Remove NZB hover states -- done here rather than in CSS:hover due to sprites $('#historyTable tr').live('mouseover mouseout', function(event) { if (event.type == 'mouseover') { @@ -926,27 +926,27 @@ 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); // Sustained binding of events for elements added to DOM $('#historyTable').livequery(function() { - + // modal for viewing script logs $('#historyTable .modal').colorbox({ innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 }); $("#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 $("#history-pagination").html(''); // remove pages if history empty - else if ( ( $.plush.histforcerepagination && $.plush.histnoofslots > $.plush.histPerPage) || $.plush.histnoofslots > $.plush.histPerPage && - Math.ceil($.plush.histprevslots/$.plush.histPerPage) != + else if ( ( $.plush.histforcerepagination && $.plush.histnoofslots > $.plush.histPerPage) || $.plush.histnoofslots > $.plush.histPerPage && + Math.ceil($.plush.histprevslots/$.plush.histPerPage) != Math.ceil($.plush.histnoofslots/$.plush.histPerPage) ) { - + $.plush.histforcerepagination = false; if ( $("#historyTable tr:visible").length - 1 < 1 ) // don't leave stranded on non-page $.plush.histcurpage--; @@ -965,7 +965,7 @@ jQuery(function($){ $.plush.histprevslots = $.plush.histnoofslots; // for the next refresh }); // end livequery - + }, // end $.plush.InitHistory() @@ -973,9 +973,9 @@ jQuery(function($){ // $.plush.Refresh() Refresh : function(force) { - + clearTimeout($.plush.timeout); // prevent back-to-back refreshes - + if (force || $.plush.refreshRate > 0) { $.plush.RefreshQueue(); $.plush.RefreshHistory(); @@ -990,9 +990,9 @@ jQuery(function($){ // *************************************************************** // $.plush.RefreshQueue() -- fetch HTML data from queue.tmpl (AHAH) - + RefreshQueue : function(page) { - + // Skip refresh if cursor hovers queue, to prevent UI annoyance if ($.plush.blockRefresh && $.plush.skipRefresh) { $.plush.pendingQueueRefresh = true; @@ -1010,7 +1010,7 @@ jQuery(function($){ // Refresh state notification $('#manual_refresh_wrapper').removeClass('refresh_skipped').addClass('refreshing'); - + // Fetch updated content from queue.tmpl $.ajax({ type: "POST", @@ -1021,7 +1021,7 @@ jQuery(function($){ $('#manual_refresh_wrapper').addClass('refresh_skipped'); // Failed refresh notification return; } - + $('.left_stats .initial-loading').hide(); $('#queue').html(result); // Replace queue contents with queue.tmpl @@ -1036,10 +1036,10 @@ jQuery(function($){ $('#manual_refresh_wrapper').removeClass('refreshing'); // Refresh state notification } }); - + }, // end $.plush.RefreshQueue() - + // *************************************************************** // $.plush.RefreshHistory() -- fetch HTML data from history.tmpl (AHAH) @@ -1048,25 +1048,25 @@ jQuery(function($){ // Skip refreshing when modal is open, which destroys colorbox rel prev/next if ($.plush.modalOpen) return; - + // no longer a need for a pending history refresh (associated with nzb deletions) $.plush.pendingHistoryRefresh = false; - + // Deal with pagination for start/limit if (typeof( page ) == 'undefined') page = $.plush.histcurpage; else if (page != $.plush.histcurpage) $.plush.histcurpage = page; - + if ($('#historySearchBox').val() && $.plush.histPerPage == "1") // history disabled var data = {failed_only: $.plush.failedOnly, start: 0, limit: 0, search: $('#historySearchBox').val() }; else if ($('#historySearchBox').val()) var data = {failed_only: $.plush.failedOnly, start: ( page * $.plush.histPerPage ), limit: $.plush.histPerPage, search: $('#historySearchBox').val() }; else var data = {failed_only: $.plush.failedOnly, start: ( page * $.plush.histPerPage ), limit: $.plush.histPerPage}; - - - + + + $.ajax({ type: "POST", url: "history/", @@ -1081,16 +1081,16 @@ jQuery(function($){ $('#history-pagination span').removeClass('loading'); // Remove spinner graphic from pagination } }); - + }, // end $.plush.RefreshHistory() - + // *************************************************************** // $.plush.SetQueueStats(str) -- called from queue.tmpl SetQueueStats : function(str) { $('#queue_stats').html(str); }, - + // *************************************************************** // $.plush.SetQueueSpeedLimit(str) -- called from queue.tmpl @@ -1103,7 +1103,7 @@ jQuery(function($){ else $('#speed-wrapper .sprite_q_menu_pausefor').removeClass('sprite_q_menu_pausefor_on'); }, - + // *************************************************************** // $.plush.SetQueueFinishAction(str) -- called from queue.tmpl @@ -1115,13 +1115,13 @@ jQuery(function($){ else $('.sprite_q_queue').removeClass('sprite_q_queue_on'); }, - + // *************************************************************** // $.plush.SetQueuePauseInfo(paused,str) -- called from queue.tmpl SetQueuePauseInfo : function(paused,str) { $.plush.paused = paused; - + // Pause/resume button state if ( paused && !$('#pause_resume').hasClass('sprite_q_pause_on') ) $('#pause_resume').removeClass('sprite_q_pause').addClass('sprite_q_pause_on'); @@ -1137,7 +1137,7 @@ jQuery(function($){ $('.queue-buttons-pause .sprite_q_menu_pausefor').removeClass('sprite_q_menu_pausefor_on'); } }, - + // *************************************************************** // $.plush.SetQueueETAStats(speed,kbpersec,timeleft,eta) -- called from queue.tmpl @@ -1151,7 +1151,7 @@ jQuery(function($){ $('#stats_speed').html(speed+"B/s"); $('#time-left').attr('title',eta); // Tooltip on "time left" }, - + // *************************************************************** // $.plush.SetWarnings(have_warnings,last_warning) -- called from queue.tmpl diff --git a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css index cacb68b..3971461 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; +} /* --------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------ @@ -249,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; } @@ -488,10 +504,16 @@ body { #page-wrap { clear:both; + margin-left: 98px; + margin-right: 98px; +} + +#master-width { + clear:both; margin: 0px auto; width: 90%; } - + .box_banner_hr { background-repeat: repeat-x; height: 4px; @@ -1837,4 +1859,4 @@ padding: 5px 10px; } .apikey { width:220px; -} \ No newline at end of file +}