Plush: misc. tidying up

main/interfaces/Plush/templates/config_inc_header.tmpl

@@ -11,6 +11,7 @@
     <title>SABnzbd+ $version - $T('queued'): $mbleft $T('MB')</title>
     <link rel="shortcut icon" type="image/ico" href="$path/static/images/plush-default/sabnzbdplus.ico"/>
     
+    <script type="text/javascript" src="$path/static/javascripts/lib.js?$version"></script>
     <script type="text/javascript" src="$path/static/javascripts/plush-config.js?$version"></script>
     
     <link rel="stylesheet" type="text/css" href="$path/static/stylesheets/plush-default.css?$version"/>

main/interfaces/Plush/templates/history.tmpl

@@ -14,12 +14,9 @@
 
 <table class="queueTable" id="historyTable" cellspacing="0">
 <!--#set $cur = 0#-->
-<!--#set $odd = False#-->
-<!--#if $lines#-->
 <!--#for $line in $lines #-->
-    <!--#if $limit == 0 or ($limit == -1 and ($line.status=="Failed" or $line.action_line) ) or ($limit == -2 and ($cur < 5 or $line.status=="Failed" or $line.action_line) ) or $cur < $limit#-->
+    <!--#set $cur = $cur + 1#-->
-    <!--#set $odd = not $odd#-->
+    <tr id="$line.nzo_id" class="<!--#if $cur%2#-->alt<!--#end if#--> <!--#if $line.action_line #-->active<!--#end if#-->">
-    <tr id="$line.nzo_id" class="<!--#if $odd#-->alt<!--#end if#--> <!--#if $line.action_line #-->active<!--#end if#-->">
 
 	<td class="nzb_status_col">
 		&nbsp;<div class="nzb_status <!--#if $line.action_line or $line.status=="Queued"#-->Loaded<!--#else if $line.status=="Failed"#-->main_sprite_container sprite_hv_error<!--#else#-->main_sprite_container sprite_hv_star<!--#end if#-->">&nbsp;</div>
@@ -79,8 +76,5 @@
     </td>
     
     </tr>
-    <!--#end if#-->
-    <!--#set $cur = $cur + 1#-->
 <!--#end for#-->
-<!--#end if#-->
 </table>

main/interfaces/Plush/templates/main.tmpl

@@ -14,6 +14,7 @@
     <link rel="stylesheet" type="text/css" href="static/stylesheets/colorschemes/$color_scheme?$version"/>
     <!--#end if#-->
 
+    <script type="text/javascript" src="static/javascripts/lib.js?$version"></script>
     <script type="text/javascript" src="static/javascripts/plush.js?$version"></script>
 
 	<script type="text/javascript">
@@ -222,11 +223,11 @@
         </div>
 
         <div id="queue-wrap" class="tiley_sprite_container sprite_tile_page_wrap">
+			<div class="box_banner_hr main_sprite_container sprite_tile_qh_seperator"></div>
 
             <!-- Queue ( queue.tmpl )-->
             <div id="queue">
                 <br/><p class="loading">&nbsp;</p>
-                <input type="hidden" id="queue_view_preference" value="" />
             </div>
 			<div class="box_fatbottom tilex_sprite_container sprite_tile_qh_bottom" id="box_fatbottom_queue">
 			    <div class="right_stats nowrap" id="queue_stats"></div>
@@ -258,7 +259,6 @@
             <!-- History ( history.tmpl ) -->
             <div id="history">
                 <br/><p class="loading">&nbsp;</p>
-                <input type="hidden" id="history_view_preference" value="" />
             </div>
 			<div class="box_fatbottom history_stats tilex_sprite_container sprite_tile_qh_bottom">
 			    <div class="right_stats nowrap" id="history_stats"></div>

main/interfaces/Plush/templates/nzo.tmpl

@@ -4,6 +4,7 @@
     <title>SABnzbd+ $version - $T('queued'): $mbleft $T('MB')</title>
     <link rel="shortcut icon" type="image/ico" href="../../static/images/plush-default/sabnzbdplus.ico"/>
 
+    <script type="text/javascript" src="../../static/javascripts/lib.js?$version"></script>
     <script type="text/javascript" src="../../static/javascripts/plush-config.js?$version"></script>
 
     <link rel="stylesheet" type="text/css" href="../../static/stylesheets/plush-default.css?$version"/>

main/interfaces/Plush/templates/queue.tmpl

@@ -45,19 +45,12 @@
 
 </script>
 
-<div class="box_banner_hr main_sprite_container sprite_tile_qh_seperator"></div>
-
-<span id="stats_noofslots">$noofslots</span>
 
 <table class="queueTable" id="queueTable" cellspacing="0">
 <!--#set $cur = 0#-->
-<!--#set $odd = False#-->
-<!--#if $varExists('slots')#-->
 <!--#for $slot in $slots#-->
-    <!--#if $limit == 0 or $cur < $limit#-->
     <!--#set $cur = $cur + 1#-->
-    <!--#set $odd = not $odd#-->
+    <tr id="$slot.nzo_id"<!--#if $cur%2#--> class="alt"<!--#end if#-->>
-    <tr id="$slot.nzo_id"<!--#if $odd#--> class="alt"<!--#end if#-->>
 
 	<td class="nzb_status_col">
 		&nbsp;<div class="nzb_status <!--#if $slot.status == "Paused"#-->main_sprite_container sprite_ql_grip_paused<!--#else if $slot.status == "Downloading"#-->main_sprite_container sprite_ql_grip_active<!--#else#-->main_sprite_container sprite_ql_grip_queued<!--#end if#-->">&nbsp;</div>
@@ -115,7 +108,5 @@
     </td>
 
     </tr>
-    <!--#end if#-->
 <!--#end for#-->
-<!--#end if#-->
 </table>