Merge branch 'zog_comingep-listview' of git://github.com/thezoggy/Sic…

…k-Beard into image_cache_ui_tweaks

data/css/default.css

@@ -30,11 +30,15 @@ legend {
 color:#000;
 font-weight:700;
 }
+div.EntryBlock,div.EntryBlock form {
+display:inline;
+}
 /* --------------------------------------------- */
 
 /* these are for incl_top.tmpl */
 #header {
 padding-top:3px;
+z-index:2;
 }
 
 #header a:hover {
@@ -67,43 +71,8 @@ text-transform:lowercase;
 color:#57442B;
 }
 
-.MainMenu {
-display:block;
-background-color:#F5F1E4;
-padding:5px;
-}
-
-.MainMenu a {
-font-weight:700;
-text-decoration:none;
-color:#4e4e4e;
-padding:3px 12px 7px;
-}
-
-.SubMenu {
-display:block;
-padding:5px;
-}
-
-.SubMenu a {
-font-weight:700;
-text-decoration:none;
-color:#f5f5f5;
-padding:3px 12px 7px;
-}
 /* --------------------------------------------- */
 
-a.current {
-border:none;
-color:#ccc;
-background-color:#000;
-padding:3px 12px 7px;
-}
-
-a.current:hover {
-border:none;
-}
-
 table {
 font-size:9pt;
 margin:0;
@@ -304,44 +273,65 @@ background-color:#FFB0B0;
 padding:2px;
 }
 
-#progressBar {
-background-color:#cdf;
-border:1px solid blue;
-}
-
-#percentageBar {
-background-color:#9bf;
-}
-
-.SubMenu,a.current {
-background-color:#57442B;
-color:#FFF;
+a,a.remove {
+color:#000;
 }
 
-a.current:hover,a:hover {
+h1 a:hover, h2 a:hover, span a:hover, div.h2footer a:hover {
 background-color:#000;
 color:#FFF;
 }
 
-a.imgLink:hover {
-background-color:transparent;
-}
-
-div.EntryBlock,div.EntryBlock form {
-display:inline;
-}
-
 .message p,.message ul {
 margin:0;
 }
 
-a,.queuelink,td > a,td > a,a.remove {
-color:#000;
-}
-
 div#summary {
 background-color:#efefef;
 padding:10px;
 border:1px solid #DFDEDE;
 margin:10px;
+}
+
+#MainMenu {
+background-color:#57442B;
+color:#F5F5F5;
+line-height:1;
+/*margin-bottom:1em;*/
+width:100%;
+border-bottom: 1px solid #333;
+}
+#SubMenu {
+background-color:#F5F1E4;
+color:#333;
+border-bottom: 1px solid #333;
+padding-left:5px;
+}
+#SubMenu span a {
+line-height:24px;
+font-weight:700;
+text-decoration:none;
+color:#333;
+padding:2px 12px 2px;
+}
+#SubMenu span a:hover {
+background-color:#000;
+color:#fff;
+}
+#donate {
+line-height:2px;
+background: none;
+float: right;
+}
+#donate a,#donate a:hover {
+background-color:#57442B;
+border:0;
+padding:3px 15px 0px;
+}
+#content {
+padding: 10px 15px 15px;
+_text-align: center;
+min-width:500px;
+z-index:1;
+clear:both;
 }

data/css/superfish.css

@@ -0,0 +1,150 @@
+/*** ESSENTIAL STYLES ***/
+.sf-menu, .sf-menu * {
+    margin:			0;
+    padding:		0;
+    list-style:		none;
+}
+.sf-menu ul {
+border:	1px solid #57442B;
+    position:		absolute;
+    top:			-999em;
+    width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li a {padding-left: 28px;} 
+.sf-menu ul li a img {position:absolute;margin-top:-2px;margin-left:-22px;z-index:99;} 
+
+.sf-menu ul li {
+    width:			100%;
+}
+.sf-menu li.spacer,.sf-menu li.spacer:hover {
+    background-color:#57442B;
+    width:15px;
+}
+.sf-menu li:hover {
+    visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+    float:			left;
+    position:		relative;
+}
+.sf-menu a {
+    display:		block;
+    position:		relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+    left:			0;
+    top:			2.5em; /* match top ul list item height */
+    z-index:		99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+    top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+    left:			10em; /* match ul width */
+    top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+    top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+    left:			10em; /* match ul width */
+    top:			0;
+}
+
+.sf-menu li.current {
+    background-color: #000;
+}
+
+.sf-menu {
+    float:			left;
+    /*margin-bottom:	1em;*/
+    line-height:	1.0;
+}
+.sf-menu a {
+    border-right:	1px solid #fff;
+    padding: 		.75em 1em;
+    text-decoration:none;
+}
+.sf-menu a, .sf-menu a:visited { /* visited pseudo selector so IE6 applies text colour*/
+    color:			#F5F5F5;
+}
+.sf-menu li { background:		#57442B; /*brown*/ }
+.sf-menu li li { background:		#DFDACF; /* alt row light brown */ }
+.sf-menu li li li { background:		#F5F1E4; /* even row tan */ }
+
+.sf-menu li li a,.sf-menu li li a:visited { color:			#000; }
+.sf-menu li li a:hover { color:			#F5F5F5; }
+.sf-menu li li a,.sf-menu li li a:visited,.sf-menu li li a:focus,.sf-menu li li a:active {
+    border-top:		1px solid #F5F1E4;
+}
+.sf-menu li li li a,.sf-menu li li li a:visited { color:			#000; }
+.sf-menu li li li a:hover { color:			#F5F5F5; }
+.sf-menu li li li a,.sf-menu li li li a:visited,.sf-menu li li li a:focus,.sf-menu li li li a:active {
+    border-top:		1px solid #DFDACF;
+}
+
+.sf-menu li:hover, .sf-menu li.sfHover,
+.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
+    background:		#333;
+    color:#F5F5F5;
+    outline:		0;
+}
+
+/*** arrows **/
+.sf-menu a.sf-with-ul {
+    padding-right: 	2.25em;
+    min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
+}
+.sf-sub-indicator {
+    position:		absolute;
+    display:		block;
+    right:			.75em;
+    top:			1.05em; /* IE6 only */
+    width:			10px;
+    height:			10px;
+    text-indent: 	-999em;
+    overflow:		hidden;
+    background:		url('/images/arrows.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+    top:			.8em;
+    background-position: 0 -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+    background-position: -10px -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
+.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
+/* apply hovers to modern browsers */
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+    background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+/*** shadows for all but IE6 ***/
+.sf-shadow ul {
+    background:	url('/images/shadow.png') no-repeat bottom right;
+    padding: 0 8px 9px 0;
+    -moz-border-radius-bottomleft: 17px;
+    -moz-border-radius-topright: 17px;
+    -webkit-border-top-right-radius: 17px;
+    -webkit-border-bottom-left-radius: 17px;
+}
+.sf-shadow ul.sf-shadow-off {
+    background: transparent;
+}

data/interfaces/default/displayShow.tmpl

@@ -56,16 +56,16 @@ replace with: <b><%=", ".join([Quality.qualityStrings[x] for x in bestQualities]
 #end if
 <br />
 
-<b>Season Folders:</b> <img src="$sbRoot/images/#if $show.seasonfolders == 1 then "yes.gif\" alt=\"Y" else "no.gif\" alt=\"N"#" width="16" height="16"><br />
+<b>Season Folders:</b> <img src="$sbRoot/images/#if $show.seasonfolders == 1 then "yes32.png\" alt=\"Y" else "no32.png\" alt=\"N"#" width="16" height="16"><br />
 
-<b>Active:</b> <img src="$sbRoot/images/#if int($show.paused) == 0 then "yes.gif\" alt=\"Y" else "no.gif\" alt=\"N"#" width="16" height="16"><br />
+<b>Active:</b> <img src="$sbRoot/images/#if int($show.paused) == 0 then "yes32.png\" alt=\"Y" else "no32.png\" alt=\"N"#" width="16" height="16"><br />
 
 #if $show.air_by_date or ($show.genre and "Talk Show" in $show.genre):
 #set $air_by_date = True
 #else
 #set $air_by_date = False
 #end if
-<b>Air by date:</b> <img src="$sbRoot/images/#if int($air_by_date) == 1 then "yes.gif\" alt=\"Y" else "no.gif\" alt=\"N"#" width="16" height="16"><br />
+<b>Air-by-Date:</b> <img src="$sbRoot/images/#if int($air_by_date) == 1 then "yes32.png\" alt=\"Y" else "no32.png\" alt=\"N"#" width="16" height="16"><br />
 </div>
 <br />
 
@@ -91,16 +91,16 @@ All other statuses will automatically update to the appropriate "Downloaded ..."
 #set $odd = 0
 
 <div class="float-right" id="checkboxControls">
-<span class="wanted">Wanted: <b>$epCounts[$Overview.WANTED]</b> <input type="checkbox" id="wanted" CHECKED></span>
-<span class="qual">Low Quality: <b>$epCounts[$Overview.QUAL]</b> <input type="checkbox" id="qual" CHECKED></span>
-<span class="good">Downloaded: <b>$epCounts[$Overview.GOOD]</b> <input type="checkbox" id="good" CHECKED></span>
-<span class="skipped">Skipped: <b>$epCounts[$Overview.SKIPPED]</b> <input type="checkbox" id="skipped" CHECKED></span>
+<span class="wanted" style="white-space:nowrap;">Wanted: <b>$epCounts[$Overview.WANTED]</b> <input type="checkbox" id="wanted" CHECKED></span>
+<span class="qual" style="white-space:nowrap;">Low Quality: <b>$epCounts[$Overview.QUAL]</b> <input type="checkbox" id="qual" CHECKED></span>
+<span class="good" style="white-space:nowrap;">Downloaded: <b>$epCounts[$Overview.GOOD]</b> <input type="checkbox" id="good" CHECKED></span>
+<span class="skipped" style="white-space:nowrap;">Skipped: <b>$epCounts[$Overview.SKIPPED]</b> <input type="checkbox" id="skipped" CHECKED></span>
 <br />
 <span class="selectAll"><a href="#" onClick="return false" class="seriesCheck">Select Filtered Episodes</a> </span> 
 <span class="clearAll"><a href="#" onClick="return false" class="clearAll">Clear All</a></span>
 </div>
 
-<div style="clear:both;" class="clearfix"><br /></div>
+<div style="clear:both;" class="clearfix"></div>
 
 <table class="sickbeardTable" cellspacing="1" border="0" cellpadding="0">
 
@@ -125,8 +125,8 @@ All other statuses will automatically update to the appropriate "Downloaded ..."
       <input type="checkbox" class="epCheck" id="<%=str(epResult["season"])+'x'+str(epResult["episode"])%>" name="<%=str(epResult["season"]) +"x"+str(epResult["episode"]) %>">
 #end if
     </td>
-    <td align="center"><a name="<%=str(epResult["season"])+"x"+str(epResult["episode"])%>"></a><img src="$sbRoot/images/#if $epResult["hasnfo"] == 1 then "yes.gif\" alt=\"Y" else "no.gif\" alt=\"N"#" width="16" height="16"></td>
-    <td align="center"><img src="$sbRoot/images/#if $epResult["hastbn"] == 1 then "yes.gif\" alt=\"Y" else "no.gif\" alt=\"N"#" width="16" height="16"></td>
+    <td align="center"><a name="<%=str(epResult["season"])+"x"+str(epResult["episode"])%>"></a><img src="$sbRoot/images/#if $epResult["hasnfo"] == 1 then "nfo.gif\" alt=\"Y" else "nfo-no.gif\" alt=\"N"#" width="23" height="11"></td>
+    <td align="center"><img src="$sbRoot/images/#if $epResult["hastbn"] == 1 then "tbn.gif\" alt=\"Y" else "tbn-no.gif\" alt=\"N"#" width="23" height="11"></td>
     <td align="center">$epResult["episode"]</td>
     <td>
         $epResult["name"]

data/interfaces/default/home.tmpl

@@ -200,7 +200,7 @@ Custom
 #end if
     </td>
     <td align="center"><!--$dlStat--><div id="progressbar$curShow.tvdbid" style="position:relative;"></div></td>
-    <td align="center"><img src="$sbRoot/images/#if int($curShow.paused) == 0 and $curShow.status != "Ended" then "yes.gif\" alt=\"Y\"" else "no.gif\" alt=\"N\""# width="16" height="16" /></td>
+    <td align="center"><img src="$sbRoot/images/#if int($curShow.paused) == 0 and $curShow.status != "Ended" then "yes32.png\" alt=\"Y\"" else "no32.png\" alt=\"N\""# width="16" height="16" /></td>
     <td align="center">$curShow.status</td>
   </tr>
 

data/interfaces/default/home_addRootDir.tmpl

@@ -65,7 +65,7 @@
   <tr>
     <td><input type="checkbox" id="$curDir" class="dirCheck" CHECKED></td>
     <td><label for="$curDir"><%=os.path.normpath(urllib.unquote_plus(curDir).decode('utf-8')).split(os.sep)[-1]%></label></td>
-    <td align="center"><img src="$sbRoot/images/#if $hasNFO then "yes.gif\" alt=\"Y\"" else "no.gif\" alt=\"N\""# width="16" height="16"></td>
+    <td align="center"><img src="$sbRoot/images/#if $hasNFO then "yes32.png\" alt=\"Y\"" else "no32.png\" alt=\"N\""# width="16" height="16"></td>
   </tr>
 #end for
   </tbody>