diff --git a/data/css/default.css b/data/css/default.css index 9332a40f148ddbcdf70fd00324768bf1938734f5..4acf173b3b30affadb1073a67afd1ebeb189a736 100644 --- a/data/css/default.css +++ b/data/css/default.css @@ -170,7 +170,7 @@ color:#4e4e4e; } .sickbeardTable { -width:80%; +width:90%; margin-left:auto; margin-right:auto; } @@ -188,6 +188,7 @@ clear:left; .plotInfo { cursor:help; +padding-left:5px; float:right; } diff --git a/data/interfaces/default/comingEpisodes.tmpl b/data/interfaces/default/comingEpisodes.tmpl index a3208424029f5df388d56cafb01cffc8b239cb4e..bb6d78ccf701681e39d6fc311dadb0b09a7070ad 100644 --- a/data/interfaces/default/comingEpisodes.tmpl +++ b/data/interfaces/default/comingEpisodes.tmpl @@ -137,11 +137,12 @@ #end if <!-- start $cur_result["show_name"] --> - <tr class="$show_div"> - <td align="left"><%=str(cur_result["season"])+"x"+"%02i" % int(cur_result["episode"]) %> + <tr class="$show_div"><div> + <td align="left"><span class="float-left"><%="%02ix%02i" % (int(cur_result["season"]), int(cur_result["episode"])) %></span> #if $cur_result["description"] != "" and $cur_result["description"] != None: - <img alt="" src="$sbRoot/images/info32.png" height="16" class="plotInfo" id="plot_info_<%=str(cur_result["showid"])+"_"+str(cur_result["season"])+"_"+str(cur_result["episode"])%>" /> + <img alt="" src="$sbRoot/images/info32.png" height="16" width="16" class="plotInfo" id="plot_info_<%=str(cur_result["showid"])+"_"+str(cur_result["season"])+"_"+str(cur_result["episode"])%>" /> #end if + </div> </td> <td>$cur_result["name"]</td> <td align="center" nowrap="nowrap">$datetime.date.fromordinal(int($cur_result["airdate"]))</td> @@ -159,8 +160,8 @@ Custom #end if </td> <td align="center">$cur_result["show_status"]</td> - <td align="center"><a href="http://www.thetvdb.com/?tab=series&id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://www.thetvdb.com/?tab=series&id=${cur_result["showid"]}"><img alt="[info]" height="20" width="20" src="$sbRoot/images/search32.png" /></a></td> - <td align="center"><a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&season=$cur_result["season"]&episode=$cur_result["episode"]" title="Force Update" id="forceUpdate|${cur_result["showid"]}|$cur_result["show_name"]" class="forceUpdate"><img alt="[update]" height="20" width="20" src="$sbRoot/images/forceUpdate32.png" id="forceUpdateImage|${cur_result["showid"]}" /></a></td> + <td align="center"><a href="http://www.thetvdb.com/?tab=series&id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://www.thetvdb.com/?tab=series&id=${cur_result["showid"]}"><img alt="[info]" height="16" width="16" src="$sbRoot/images/search32.png" /></a></td> + <td align="center"><a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&season=$cur_result["season"]&episode=$cur_result["episode"]" title="Force Update" id="forceUpdate|${cur_result["showid"]}|$cur_result["show_name"]" class="forceUpdate"><img alt="[update]" height="16" width="16" src="$sbRoot/images/forceUpdate32.png" id="forceUpdateImage|${cur_result["showid"]}" /></a></td> </tr> <!-- end $cur_result["show_name"] --> #end for diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl index 05c45423bf7aa8e5f08435e41eff40608ef0a5eb..c197f96dc454c55648eec39e8b1bf3dc64b51721 100644 --- a/data/interfaces/default/inc_top.tmpl +++ b/data/interfaces/default/inc_top.tmpl @@ -52,7 +52,6 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag <script type="text/javascript" src="$sbRoot/js/jquery-ui-1.8.7.custom.min.js"></script> <script type="text/javascript" src="$sbRoot/js/superfish-1.4.8.js"></script> <script type="text/javascript" src="$sbRoot/js/supersubs-0.2b.js"></script> - <script type="text/javascript" src="$sbRoot/js/jquery.hoverIntent.min-r5.js"></script> <script type="text/javascript" src="$sbRoot/js/jquery.autocomplete.min.js"></script> <script type="text/javascript" src="$sbRoot/js/jquery.cookie.js"></script> <script type="text/javascript" src="$sbRoot/js/jquery.cookiejar.js"></script> @@ -79,7 +78,8 @@ table.tablesorter thead tr .headerSortDown { background-image: url("$sbRoot/imag extraWidth: 1 // extra width can ensure lines don't sometimes turn over // due to slight rounding differences and font-family }).superfish({ - pathClass: 'current', + delay: 150, + disableHI: true, animation: {opacity:'show',height:'show'}, speed: 'fast', dropShadows: false diff --git a/data/js/jquery.hoverIntent.min-r5.js b/data/js/jquery.hoverIntent.min-r5.js deleted file mode 100644 index f86ad8792fd7b453adfd42fb436f10cdb24e66b8..0000000000000000000000000000000000000000 --- a/data/js/jquery.hoverIntent.min-r5.js +++ /dev/null @@ -1,9 +0,0 @@ -/** -* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+ -* <http://cherne.net/brian/resources/jquery.hoverIntent.html> -* -* @param f onMouseOver function || An object with configuration options -* @param g onMouseOut function || Nothing (use configuration options object) -* @author Brian Cherne <brian@cherne.net> -*/ -(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY;};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev]);}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev]);};var handleHover=function(e){var p=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(p&&p!=this){try{p=p.parentNode;}catch(e){p=this;}}if(p==this){return false;}var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);}if(e.type=="mouseover"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob);},cfg.timeout);}}};return this.mouseover(handleHover).mouseout(handleHover);};})(jQuery); \ No newline at end of file