Browse Source

Merge in Plush improvements.

tags/0.6.0
ShyPike 14 years ago
parent
commit
f7a853ccb8
  1. 2
      interfaces/Plush/README.txt
  2. 8
      interfaces/Plush/templates/_inc_footer.tmpl
  3. 26
      interfaces/Plush/templates/_inc_header.tmpl
  4. 12
      interfaces/Plush/templates/_inc_modals.tmpl
  5. 30
      interfaces/Plush/templates/config_cat.tmpl
  6. 66
      interfaces/Plush/templates/config_rss.tmpl
  7. 45
      interfaces/Plush/templates/history.tmpl
  8. 47
      interfaces/Plush/templates/static/javascripts/config.js
  9. 28
      interfaces/Plush/templates/static/javascripts/plush.js
  10. 26
      interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css

2
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 assembled by pairofdimes - see LICENSE-CC.txt
http://forums.sabnzbd.org contributions welcome http://forums.sabnzbd.org contributions welcome

8
interfaces/Plush/templates/_inc_footer.tmpl

@ -1,4 +1,9 @@
#if $pane!="Main"# #if $pane=="Main"#
<!-- start Main footer-->
#else if $pane=="Nzo"
<!-- start Nzo footer -->
#else#
<!-- start other footer -->
#if $pane!="Connections" and $pane !="RSS"#</div>#end if# #if $pane!="Connections" and $pane !="RSS"#</div>#end if#
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -8,5 +13,6 @@
#include $webdir + "/_inc_modals.tmpl"# #include $webdir + "/_inc_modals.tmpl"#
</div> <!-- close for the master-width div -->
</body> </body>
</html> </html>

26
interfaces/Plush/templates/_inc_header.tmpl

@ -43,6 +43,18 @@
var config_pane = "NZO"; // re-uses config's js/css var config_pane = "NZO"; // re-uses config's js/css
var confirmWithoutSavingPrompt = "$T('Plush-confirmWithoutSavingPrompt')"; var confirmWithoutSavingPrompt = "$T('Plush-confirmWithoutSavingPrompt')";
</script> </script>
<script type="text/javascript" src="${path}static/javascripts/plush.js?$version"></script>
<script type="text/javascript">
jQuery(function($){
$.plush.apikey = "$session";
$.plush.Tprev = "$T('Plush-prev')"; // translations for pagination
$.plush.Tnext = "$T('Plush-next')";
$.plush.Tconfirmation = "$T('Plush-confirm')";
$.plush.TconfirmPurgeH = "$T('Plush-confirmPurgeH')";
$.plush.Init(); // Initialize Plush UI
$.plush.Refresh(); // Initiate Plush refresh cycle
});
</script>
#else# #else#
<script type="text/javascript" src="${path}static/javascripts/config.js?$version"></script> <script type="text/javascript" src="${path}static/javascripts/config.js?$version"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -51,11 +63,23 @@
var apikey = "$session"; var apikey = "$session";
var confirmWithoutSavingPrompt = "$T('Plush-confirmWithoutSavingPrompt')"; var confirmWithoutSavingPrompt = "$T('Plush-confirmWithoutSavingPrompt')";
</script> </script>
<script type="text/javascript" src="${path}static/javascripts/plush.js?$version"></script>
<script type="text/javascript">
jQuery(function($){
$.plush.apikey = "$session";
$.plush.Tprev = "$T('Plush-prev')"; // translations for pagination
$.plush.Tnext = "$T('Plush-next')";
$.plush.Tconfirmation = "$T('Plush-confirm')";
$.plush.TconfirmPurgeH = "$T('Plush-confirmPurgeH')";
$.plush.Init(); // Initialize Plush UI
$.plush.Refresh(); // Initiate Plush refresh cycle
});
</script>
#end if# #end if#
</head> </head>
<body#if $pane=="Nzo"# class="nzo"#else if $pane!="Main"# class="config_body"#end if#> <body#if $pane=="Nzo"# class="nzo"#else if $pane!="Main"# class="config_body"#end if#>
<div id="master-width">
<div class="wrapper"> <div class="wrapper">
<div class="navigation"> <div class="navigation">
<ul class="menu" id="navigation_menu_right"> <ul class="menu" id="navigation_menu_right">

12
interfaces/Plush/templates/_inc_modals.tmpl

@ -14,7 +14,6 @@
<p><small>$T('yourRights')</small></p> <p><small>$T('yourRights')</small></p>
</div> </div>
#if $pane=="Main"#
<div id="plush_options_modal"> <div id="plush_options_modal">
<p><a href="connections/disconnect?session=$session" class="juiButton">$T('link-forceDisc')</a></p> <p><a href="connections/disconnect?session=$session" class="juiButton">$T('link-forceDisc')</a></p>
@ -51,10 +50,12 @@
<span id="explain-blockRefresh" title="$T("Plush-explain-blockRefresh")"><input type="checkbox" id="blockRefresh" checked="checked" /> $T("Plush-blockRefresh")</span> <span id="explain-blockRefresh" title="$T("Plush-explain-blockRefresh")"><input type="checkbox" id="blockRefresh" checked="checked" /> $T("Plush-blockRefresh")</span>
</div> </div>
#if $pane=="Main"#
<div id="add_nzb_modal"> <div id="add_nzb_modal">
<input type="text" id="addID_input" size="31" /> <input type="text" id="addID_input" size="31" />
<input type="submit" id="addID" value="$T('Plush-fetch')" class="juiButton" /> <input type="submit" id="addID" value="$T('Plush-fetch')" class="juiButton" />
<br/><br/> <div id="add_nzb_hr"><hr></div>
<form action="tapi" id="uploadNZBForm" method="post" enctype="multipart/form-data"> <form action="tapi" id="uploadNZBForm" method="post" enctype="multipart/form-data">
<input type="hidden" name="apikey" value="$session" /> <input type="hidden" name="apikey" value="$session" />
<input type="hidden" name="mode" value="addfile" /> <input type="hidden" name="mode" value="addfile" />
@ -62,9 +63,9 @@
<input type="submit" value="Upload" class="juiButton" /> <input type="submit" value="Upload" class="juiButton" />
<span id="uploadingSpinner" class="loading" style="display:none">&nbsp;</span> <span id="uploadingSpinner" class="loading" style="display:none">&nbsp;</span>
<br/><i>$T('Plush-uploadTip')</i> <br/><i>$T('Plush-uploadTip')</i>
<br/><br/> <div id="add_nzb_hr"><hr></div>
<i>$T('pp'):</i> <i>$T('pp'):</i>
<table> <table id="add_nzb_pp">
#if $cat_list# #if $cat_list#
<tr><td style="text-align:right">$T('category'):</td> <tr><td style="text-align:right">$T('category'):</td>
<td><select id="addID_cat" name="cat"> <td><select id="addID_cat" name="cat">
@ -102,8 +103,7 @@
</td></tr> </td></tr>
#end if# #end if#
</table> </table>
<div id="add_nzb_hr"><hr></div>
<br/>
<i>$T('Plush-addnzb-filename'):</i><br/> <i>$T('Plush-addnzb-filename'):</i><br/>
<input type="text" name="nzbname" id="addID_nzbname" size="38" /> <input type="text" name="nzbname" id="addID_nzbname" size="38" />

30
interfaces/Plush/templates/config_cat.tmpl

@ -24,8 +24,8 @@
<!--#if $cur == 1#--> <!--#if $cur == 1#-->
<tr> <tr>
<th align="center">$T('category')</th> <th align="center">$T('category')</th>
<th align="center">$T('mode')</th>
<th align="center">$T('priority')</th> <th align="center">$T('priority')</th>
<th align="center">$T('mode')</th>
<!--#if $script_list#--><th align="center">$T('script')</th><!--#end if#--> <!--#if $script_list#--><th align="center">$T('script')</th><!--#end if#-->
<th align="center">$T('catFolderPath')</th> <th align="center">$T('catFolderPath')</th>
<th align="center">$T('catTags')</th> <th align="center">$T('catTags')</th>
@ -47,18 +47,6 @@
</td> </td>
<td> <td>
<select name="pp">
<!--#if $slot.name != '*'#-->
<option value="" <!--#if $slot.pp == "" then "selected" else ""#-->>$T('default')</option>
<!--#end if#-->
<option value="0" <!--#if $slot.pp == "0" then "selected" else ""#-->>$T('pp-none')</option>
<option value="1" <!--#if $slot.pp == "1" then "selected" else ""#-->>$T('pp-repair')</option>
<option value="2" <!--#if $slot.pp == "2" then "selected" else ""#-->>$T('pp-unpack')</option>
<option value="3" <!--#if $slot.pp == "3" then "selected" else ""#-->>$T('pp-delete')</option>
</select>
</td>
<td>
<select name="priority"> <select name="priority">
<!--#if $slot.name != '*'#--> <!--#if $slot.name != '*'#-->
<option value="-100" <!--#if $slot.priority == -100 then 'selected' else ''#-->>$T('default')</option> <option value="-100" <!--#if $slot.priority == -100 then 'selected' else ''#-->>$T('default')</option>
@ -70,13 +58,23 @@
</select> </select>
</td> </td>
<td>
<select name="pp">
<!--#if $slot.name != '*'#-->
<option value="" <!--#if $slot.pp == "" then "selected" else ""#-->>$T('default')</option>
<!--#end if#-->
<option value="0" <!--#if $slot.pp == "0" then "selected" else ""#-->>$T('pp-none')</option>
<option value="1" <!--#if $slot.pp == "1" then "selected" else ""#-->>$T('pp-repair')</option>
<option value="2" <!--#if $slot.pp == "2" then "selected" else ""#-->>$T('pp-unpack')</option>
<option value="3" <!--#if $slot.pp == "3" then "selected" else ""#-->>$T('pp-delete')</option>
</select>
</td>
<!--#if $script_list#--> <!--#if $script_list#-->
<td> <td>
<select name="script"> <select name="script">
<!--#for $sc in $script_list#--> <!--#for $sc in $script_list#-->
<!--#if not ($sc == 'Default' and $slot.name == '*')#--> <option value="$sc" <!--#if $cur == 1 and $sc.lower() != "none"#-->disabled<!--#else if $cur == 1 or $slot.script.lower() == $sc.lower()#-->selected<!--#end if#-->>$sc</option>
<option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$sc</option>
<!--#end if#-->
<!--#end for#--> <!--#end for#-->
</select> </select>
</td> </td>

66
interfaces/Plush/templates/config_rss.tmpl

@ -36,7 +36,7 @@
<input type="hidden" name="session" value="$session"> <input type="hidden" name="session" value="$session">
<input type="hidden" value="$feed_item" name="feed"> <input type="hidden" value="$feed_item" name="feed">
<input type="hidden" value="1" name="table"> <input type="hidden" value="1" name="table">
<input type="checkbox" onclick="this.form.action='toggle_rss_feed?session=$session'; this.form.submit(); return false;" name="enable" <!--#if $rss[$feed_item]['enable'] then "CHECKED" else "" #-->/> <input type="checkbox" class="toggleFeedCheckbox" name="enable" <!--#if $rss[$feed_item]['enable'] then "CHECKED" else "" #-->/>
</form> </form>
</td> </td>
<td><strong><a class="juiButton" href="?feed=$rss[$feed_item]['link']#tabs-settings" <!--#if $active_feed == $feed_item#-->id="activeFeedLink"<!--#end if#-->>$feed_item</a></strong></td> <td><strong><a class="juiButton" href="?feed=$rss[$feed_item]['link']#tabs-settings" <!--#if $active_feed == $feed_item#-->id="activeFeedLink"<!--#end if#-->>$feed_item</a></strong></td>
@ -49,19 +49,18 @@
</td> </td>
</tr> </tr>
<!--#end for#--> <!--#end for#-->
<tfoot><tr><th colspan="4">
<input type="submit" class="juiButton" value="$T('addFeed')" onclick="jQuery('#pane-rss-details').hide(); jQuery('#pane-add-feed').toggle();"/>
</th></tr></tfoot>
</table> </table>
<!--#else#--> <!--#else#-->
<p>$T('none')</p> <h2><strong>$T('addFeed'):</strong></h2>
<!--#end if#--> <!--#end if#-->
<p>
<br/> <br/>
<input type="submit" class="juiButton" value="$T('addFeed')" onclick="jQuery('#pane-rss-details').hide(); jQuery('#pane-add-feed').toggle();"/>
<input type="submit" class="juiButton" value="RSS Details" onclick="jQuery('#pane-add-feed').hide(); jQuery('#pane-rss-details').toggle();"/>
</p>
<div id="pane-add-feed" style="display:none"> <div id="pane-add-feed" <!--#if $feeds#-->style="display:none"<!--#end if#-->>
<form action="add_rss_feed" method="post"> <form action="add_rss_feed" method="post">
<table> <table>
<tr><td>$T('name')</td><td><input type="text" size="10" name="feed" value="$feed"/></td></tr> <tr><td>$T('name')</td><td><input type="text" size="10" name="feed" value="$feed"/></td></tr>
@ -70,9 +69,9 @@
</table> </table>
<input type="hidden" name="session" value="$session"> <input type="hidden" name="session" value="$session">
</form> </form>
<br/><hr/>&nbsp;
</div> </div>
<div id="pane-rss-details" style="display:none">
<p>$T('explain-RSS')</p> <p>$T('explain-RSS')</p>
<form action="save_rss_rate" method="post"> <form action="save_rss_rate" method="post">
<strong>$T('opt-rss_rate'):</strong><br/> <strong>$T('opt-rss_rate'):</strong><br/>
@ -81,7 +80,6 @@
<input type="hidden" name="session" value="$session"/> <input type="hidden" name="session" value="$session"/>
<input type="submit" class="juiButton" value="$T('button-save')"/> <input type="submit" class="juiButton" value="$T('button-save')"/>
</form> </form>
</div>
</div> </div>
@ -94,7 +92,7 @@
<table> <table>
<tr><td></td><td><input type="checkbox" onclick="this.form.action='toggle_rss_feed?session=$session'; this.form.submit(); return false;" name="enable" <!--#if $rss[$feed]['enable'] then "CHECKED" else "" #-->/>$T('enabled').capitalize()</td></tr> <tr><td></td><td><input type="checkbox" class="toggleFeedCheckbox" name="enable" <!--#if $rss[$feed]['enable'] then "CHECKED" else "" #-->/>$T('enabled').capitalize()</td></tr>
<tr><td>$T('feed')</td><td><textarea rows="3" cols="80" name="uri">$rss[$feed]['uri']</textarea></td></tr> <tr><td>$T('feed')</td><td><textarea rows="3" cols="80" name="uri">$rss[$feed]['uri']</textarea></td></tr>
@ -173,9 +171,9 @@
<th>$T('rss-type')</th> <th>$T('rss-type')</th>
<th>$T('rss-filter')</th> <th>$T('rss-filter')</th>
<!--#if $rss[$feed]['pick_cat']#--><th>$T('category')</th><!--#end if#--> <!--#if $rss[$feed]['pick_cat']#--><th>$T('category')</th><!--#end if#-->
<th>$T('priority')</th>
<th>Mode</th> <th>Mode</th>
<!--#if $rss[$feed]['pick_script']#--><th>$T('script')</th><!--#end if#--> <!--#if $rss[$feed]['pick_script']#--><th>$T('script')</th><!--#end if#-->
<th>$T('priority')</th>
<th></th> <th></th>
</tr> </tr>
@ -196,12 +194,22 @@
<td> <td>
<select name="cat"> <select name="cat">
<!--#for $ct in $cat_list#--> <!--#for $ct in $cat_list#-->
<option value="$ct" <!--#if $ct == "Default" then "selected" else ""#-->>$Tspec($ct)</option> <option value="$ct" <!--#if $ct == 'Default' then "selected" else ""#-->>$Tspec($ct)</option>
<!--#end for#--> <!--#end for#-->
</select> </select>
</td> </td>
<!--#end if#--> <!--#end if#-->
<td> <td>
<select name="priority">
<option value="-100" selected>$T('default')</option>
<option value="2" >$T('pr-force')</option>
<option value="1" >$T('pr-high')</option>
<option value="0" >$T('pr-normal')</option>
<option value="-1">$T('pr-low')</option>
<option value="-2">$T('pr-paused')</option>
</select>
</td>
<td>
<select name="pp"> <select name="pp">
<option value="" selected>$T('default')</option> <option value="" selected>$T('default')</option>
<option value="0">$T('pp-none')</option> <option value="0">$T('pp-none')</option>
@ -219,20 +227,10 @@
</select> </select>
</td> </td>
<!--#end if#--> <!--#end if#-->
<td>
<select name="priority">
<option value="-100" selected'>$T('default')</option>
<option value="2" >$T('pr-force')</option>
<option value="1" >$T('pr-high')</option>
<option value="0" >$T('pr-normal')</option>
<option value="-1">$T('pr-low')</option>
<option value="-2">$T('pr-paused')</option>
</select>
</td>
<input type="hidden" value="$rss[$feed]['filtercount']" name="index"> <input type="hidden" value="$rss[$feed]['filtercount']" name="index">
<input type="hidden" value="$feed" name="feed"> <input type="hidden" value="$feed" name="feed">
<input type="hidden" name="session" value="$session"> <input type="hidden" name="session" value="$session">
<td><input type="submit" class="juiButton" value="$T('button-save')"></td> <td><input type="submit" class="juiButton" value="$T('button-add')"></td>
</tr> </tr>
</form> </form>
@ -249,7 +247,7 @@
<input type="submit" class="juiButton" value="$T('rss-delFilter')"></form> <input type="submit" class="juiButton" value="$T('rss-delFilter')"></form>
</td> </td>
<td><form><select onchange="location = this.options[this.selectedIndex].value;"> <td><form><select class="rssOrderSelect">
<!--#for $i in xrange($rss[$feed]['filtercount'])#--> <!--#for $i in xrange($rss[$feed]['filtercount'])#-->
<option value="pos_rss_filter?session=$session&feed=$feed&current=$fnum&new=$i" <!--#if int($i) == int($fnum) then "selected" else ""#-->>$i</option> <option value="pos_rss_filter?session=$session&feed=$feed&current=$fnum&new=$i" <!--#if int($i) == int($fnum) then "selected" else ""#-->>$i</option>
<!--#end for#--> <!--#end for#-->
@ -278,6 +276,16 @@
</td> </td>
<!--#end if#--> <!--#end if#-->
<td> <td>
<select name="priority">
<option value="-100" <!--#if $filter[5] == "-100" then 'selected' else ''#-->>$T('default')</option>
<option value="2" <!--#if $filter[5] == "2" then "selected" else ""#-->>$T('pr-force')</option>
<option value="1" <!--#if $filter[5] == "1" then "selected" else ""#-->>$T('pr-high')</option>
<option value="0" <!--#if $filter[5] == "0" then "selected" else ""#-->>$T('pr-normal')</option>
<option value="-1" <!--#if $filter[5] == "-1" then "selected" else ""#-->>$T('pr-low')</option>
<option value="-2" <!--#if $filter[5] == "-2" then "selected" else ""#-->>$T('pr-paused')</option>
</select>
</td>
<td>
<select name="pp"> <select name="pp">
<option value="" <!--#if $filter[1] == "0" then 'selected' else ''#-->>$T('default')</option> <option value="" <!--#if $filter[1] == "0" then 'selected' else ''#-->>$T('default')</option>
<option value="0" <!--#if $filter[1] == "0" then 'selected' else ''#-->>$T('pp-none')</option> <option value="0" <!--#if $filter[1] == "0" then 'selected' else ''#-->>$T('pp-none')</option>
@ -296,16 +304,6 @@
</td> </td>
<!--#end if#--> <!--#end if#-->
<td> <td>
<select name="priority">
<option value="-100" <!--#if $filter[5] == "-100" then 'selected' else ''#-->>$T('default')</option>
<option value="2" <!--#if $filter[5] == "2" then "selected" else ""#-->>$T('pr-force')</option>
<option value="1" <!--#if $filter[5] == "1" then "selected" else ""#-->>$T('pr-high')</option>
<option value="0" <!--#if $filter[5] == "0" then "selected" else ""#-->>$T('pr-normal')</option>
<option value="-1" <!--#if $filter[5] == "-1" then "selected" else ""#-->>$T('pr-low')</option>
<option value="-2" <!--#if $filter[5] == "-2" then "selected" else ""#-->>$T('pr-paused')</option>
</select>
</td>
<td>
<input type="hidden" name="index" value="$fnum"/> <input type="hidden" name="index" value="$fnum"/>
<input type="hidden" name="feed" value="$feed"/> <input type="hidden" name="feed" value="$feed"/>
<input type="hidden" name="session" value="$session"> <input type="hidden" name="session" value="$session">

45
interfaces/Plush/templates/history.tmpl

@ -29,39 +29,32 @@
<div style="display:none"> <div style="display:none">
<div id="details-$line.nzo_id"> <div id="details-$line.nzo_id">
<table width="100%">
<tr><th>$T('completed')</th><th>$T('name')</th><th>$T('size')</th><th>$T('status')</th></tr>
<%
compl = datetime.datetime.fromtimestamp(float(line['completed'])).strftime(time_format('%Y-%m-%d %H:%M:%S'))
%>
<tr>
<td>$compl</td>
<td>$line.name<!--#if $line.action_line#--> - $line.action_line<!--#else if $line.fail_message#--> - <span class="fail_message">$line.fail_message</span><!--#end if#--></td>
<td>$line.size</td><td>$Tx('post-'+$line.status)</td>
</tr> <table width="100%" class="rssTable">
</table> <% compl = datetime.datetime.fromtimestamp(float(line['completed'])).strftime(time_format('%Y-%m-%d %H:%M:%S')) %>
<br/><br/> <tr><td><strong>$T('completed')</strong></td><td>$compl</td></tr>
<tr class="odd"><td><strong>$T('name')</strong></td><td>$line.name<!--#if $line.action_line#--> - $line.action_line<!--#else if $line.fail_message#--> - <span class="fail_message">$line.fail_message</span><!--#end if#--></td></tr>
<tr><td><strong>$T('size')</strong></td><td>$line.size</td></tr>
<tr class="odd"><td><strong>$T('status')</strong></td><td>$Tx('post-'+$line.status)</td></tr>
<!--#set $oddLine = not False#--> <!--#set $oddLine = not False#-->
<!--#if $line.category#-->
<!--#set $oddLine = not $oddLine#-->
<tr <!--#if $oddLine#-->class="odd"<!--#end if#-->><td><b>$T('category')</b></td><td>$line.category</td></tr>
<!--#end if#-->
<!--#if $line.storage#-->
<!--#set $oddLine = not $oddLine#-->
<tr <!--#if $oddLine#-->class="odd"<!--#end if#-->><td><b>$T('msg-path')</b></td><td>$line.storage</td></tr>
<!--#end if#-->
<!--#for $stage in $line.stage_log#--> <!--#for $stage in $line.stage_log#-->
<!--#set $oddLine = not $oddLine#--> <!--#set $oddLine = not $oddLine#-->
<dt><b>$Tx('stage-'+$stage.name.title.lower())</b></dt> <tr <!--#if $oddLine#-->class="odd"<!--#end if#-->><td><b>$Tx('stage-'+$stage.name.title.lower())</b></td><td>
<!--#for $action in $stage.actions#--> <!--#for $action in $stage.actions#-->
<dd>$action</dd> $action<br/>
<!--#end for#--> <!--#end for#-->
<br /> </td></tr>
<!--#end for#--> <!--#end for#-->
<!--#if $line.category#--> </table>
<dt><b>$T('category')</b></dt>
<dd>$line.category</dd>
<br />
<!--#end if#-->
<!--#if $line.storage#-->
<dt><b>$T('msg-path')</b></dt>
<dd>$line.storage</dd>
<br />
<!--#end if#-->
</div> </div>
</div> </div>
@ -82,7 +75,7 @@
<div class="icon_history_verbose main_sprite_container sprite_hv_star hvFaded">&nbsp;</div> <div class="icon_history_verbose main_sprite_container sprite_hv_star hvFaded">&nbsp;</div>
<!--#end if#--> <!--#end if#-->
<!--#if $line.size or $line.category or $line.path or $line.storage#--> <!--#if $line.size or $line.category or $line.path or $line.storage#-->
<div class="icon_history_verbose main_sprite_container sprite_hv_stats" title='<!--#if $line.size#-->$T('size'): $line.size<br><br><!--#end if#--><!--#if $line.category#-->$T('category'): $line.category<br><br><!--#end if#--><!--#if $line.path#-->$T('Plush-path'):<br><!--#echo $line.path.replace("'","&rsquo;") #--><br><br><!--#end if#--><!--#if $line.storage#-->$T('Plush-storage'):<br><!--#echo $line.storage.replace("'","&rsquo;") #--><!--#end if#-->'>&nbsp;</div> <div class="icon_history_verbose main_sprite_container sprite_hv_stats" title='<!--#if $line.size#-->$T('size'): $line.size<!--#end if#--><!--#if $line.category#--><br>$T('category'): $line.category<!--#end if#-->'>&nbsp;</div>
<!--#else#--> <!--#else#-->
<div class="icon_history_verbose main_sprite_container sprite_hv_stats hvFaded">&nbsp;</div> <div class="icon_history_verbose main_sprite_container sprite_hv_stats hvFaded">&nbsp;</div>
<!--#end if#--> <!--#end if#-->

47
interfaces/Plush/templates/static/javascripts/config.js

@ -179,48 +179,17 @@ jQuery(document).ready(function($){
break; break;
case 'RSS': case 'RSS':
/*
$(':checkbox').click(function(event){ // toggle feed $('.toggleFeedCheckbox').click(function(){ // enable/disable feed
$(event.target).parents('form:first').attr('action','toggle_rss_feed').submit(); window.onbeforeunload = null; // lose data?
return false; this.form.action='toggle_rss_feed?session=$session';
}); this.form.submit();
$('#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; return false;
}); });
$('#config_content .EntryFieldSet .filter_order').change(function(event){ // update filter order $('.rssOrderSelect').change(function(){ // change filter order
window.onbeforeunload = null; window.onbeforeunload = null; // lose data?
window.location = $(event.target).val()+'&session='+apikey; location = this.options[this.selectedIndex].value;
}); });
*/
break; break;
case 'Email': case 'Email':

28
interfaces/Plush/templates/static/javascripts/plush.js

@ -9,7 +9,7 @@ jQuery(function($){
// Plush defaults // Plush defaults
refreshRate: $.cookie('refreshRate') ? $.cookie('refreshRate') : 30, // refresh rate in seconds 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 queuePerPage: $.cookie('queuePerPage') ? $.cookie('queuePerPage') : 5, // pagination - nzbs per page
histPerPage: $.cookie('histPerPage') ? $.cookie('histPerPage') : 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 confirmDeleteQueue: $.cookie('confirmDeleteQueue') == 0 ? false : true, // confirm queue nzb removal
@ -120,7 +120,7 @@ jQuery(function($){
innerWidth:"375px", innerHeight:"350px", initialWidth:"375px", initialHeight:"350px", speed:0, opacity:0.7 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(), $("#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(), $("#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 innerWidth:"375px", innerHeight:"350px", initialWidth:"375px", initialHeight:"350px", speed:0, opacity:0.7
@ -148,33 +148,33 @@ jQuery(function($){
// Refresh rate // Refresh rate
$("#refreshRate-option").val($.plush.refreshRate).change( function() { $("#refreshRate-option").val($.plush.refreshRate).change( function() {
$.plush.refreshRate = $("#refreshRate-option").val(); $.plush.refreshRate = $("#refreshRate-option").val();
$.cookie('refreshRate', $.plush.refreshRate, { expires: 365 }); $.cookie('refreshRate', $.plush.refreshRate, { expires: 365, path: '/' });
$.plush.Refresh(); $.plush.Refresh();
}); });
// Refresh rate // Container width
$("#containerWidth-option").val($.plush.containerWidth).change( function() { $("#containerWidth-option").val($.plush.containerWidth).change( function() {
$.plush.containerWidth = $("#containerWidth-option").val(); $.plush.containerWidth = $("#containerWidth-option").val();
$.cookie('containerWidth', $.plush.containerWidth, { expires: 365 }); $.cookie('containerWidth', $.plush.containerWidth, { expires: 365, path: '/' });
$('#page-wrap').css('width',$.plush.containerWidth); $('#master-width').css('width',$.plush.containerWidth);
}).trigger('change'); }).trigger('change');
// Confirm Queue Deletions toggle // Confirm Queue Deletions toggle
$("#confirmDeleteQueue").attr('checked', $.plush.confirmDeleteQueue ).change( function() { $("#confirmDeleteQueue").attr('checked', $.plush.confirmDeleteQueue ).change( function() {
$.plush.confirmDeleteQueue = $("#confirmDeleteQueue").attr('checked'); $.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 // Confirm History Deletions toggle
$("#confirmDeleteHistory").attr('checked', $.plush.confirmDeleteHistory ).change( function() { $("#confirmDeleteHistory").attr('checked', $.plush.confirmDeleteHistory ).change( function() {
$.plush.confirmDeleteHistory = $("#confirmDeleteHistory").attr('checked'); $.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 // Block Refreshes on Hover toggle
$("#blockRefresh").attr('checked', $.plush.blockRefresh ).change( function() { $("#blockRefresh").attr('checked', $.plush.blockRefresh ).change( function() {
$.plush.blockRefresh = $("#blockRefresh").attr('checked'); $.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
@ -272,7 +272,7 @@ jQuery(function($){
$.plush.multiOpsChecks = new Array(); $.plush.multiOpsChecks = new Array();
$('<input type="checkbox" class="multiops" />').appendTo('#queue tr td.nzb_status_col'); $('<input type="checkbox" class="multiops" />').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) if ($.plush.multiOps)
$('#multiops_toggle').trigger('click'); $('#multiops_toggle').trigger('click');
@ -426,7 +426,7 @@ jQuery(function($){
$("#queue-pagination-perpage").change(function(event){ $("#queue-pagination-perpage").change(function(event){
$.plush.queuecurpage = Math.floor($.plush.queuecurpage * $.plush.queuePerPage / $(event.target).val() ); $.plush.queuecurpage = Math.floor($.plush.queuecurpage * $.plush.queuePerPage / $(event.target).val() );
$.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.queueforcerepagination = true;
$.plush.RefreshQueue(); $.plush.RefreshQueue();
}); });
@ -842,7 +842,7 @@ jQuery(function($){
$("#history-pagination-perpage").change(function(event){ $("#history-pagination-perpage").change(function(event){
$.plush.histcurpage = Math.floor($.plush.histcurpage * $.plush.histPerPage / $(event.target).val() ); $.plush.histcurpage = Math.floor($.plush.histcurpage * $.plush.histPerPage / $(event.target).val() );
$.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; $.plush.histforcerepagination = true;
if ($.plush.histPerPage=="1") if ($.plush.histPerPage=="1")
$("#history-pagination").html(''); // pagination rebuild not triggered on blank history (disabled) $("#history-pagination").html(''); // pagination rebuild not triggered on blank history (disabled)
@ -926,7 +926,7 @@ jQuery(function($){
// show all / show failed // show all / show failed
$('#failed_only').change(function(){ $('#failed_only').change(function(){
$.plush.failedOnly = $("#failed_only").val(); $.plush.failedOnly = $("#failed_only").val();
$.cookie('failedOnly', $.plush.failedOnly, { expires: 365 }); $.cookie('failedOnly', $.plush.failedOnly, { expires: 365, path: '/' });
$.plush.RefreshHistory(); $.plush.RefreshHistory();
}).val($.plush.failedOnly); }).val($.plush.failedOnly);
@ -938,7 +938,7 @@ jQuery(function($){
$("#historyTable .modal-detail").colorbox({ inline:true, $("#historyTable .modal-detail").colorbox({ inline:true,
href: function(){return "#details-"+$(this).parent().parent().attr('id');}, href: function(){return "#details-"+$(this).parent().parent().attr('id');},
title:function(){return $(this).text();}, 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 // Build pagination only when needed
if ($.plush.histPerPage=="1") // disabled history if ($.plush.histPerPage=="1") // disabled history

26
interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css

@ -219,8 +219,24 @@ body {
width:190px; 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; height: 30px;
} }
.navigation ul#navigation_menu_left { .navigation ul#navigation_menu_left {
margin-left:110px; margin-left:108px;
float:left; float:left;
} }
.navigation ul#navigation_menu_right { .navigation ul#navigation_menu_right {
margin-right:110px; margin-right:108px;
float:right; float:right;
} }
@ -488,6 +504,12 @@ body {
#page-wrap { #page-wrap {
clear:both; clear:both;
margin-left: 98px;
margin-right: 98px;
}
#master-width {
clear:both;
margin: 0px auto; margin: 0px auto;
width: 90%; width: 90%;
} }

Loading…
Cancel
Save