Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries

data/css/style.css

@@ -206,6 +206,9 @@ thead.tablesorter-stickyHeader {
   background-color: #dfdacf;
 }
 /* filter widget */
+.tablesorter .filtered {
+  display: none;
+}
 .tablesorter input.tablesorter-filter {
   width: 98%;
   height: auto;
@@ -981,7 +984,6 @@ td.tvShow a {
   text-decoration: none;
   display: block;
   width: 100%;
-  height: 100%;
 }
 td.tvShow:hover a {
   color:#000;

data/interfaces/default/config.tmpl

@@ -31,7 +31,8 @@
         <tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage </td><td><a href="http://www.sickbeard.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://www.sickbeard.com/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums </td><td><a href="http://sickbeard.com/forums/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://sickbeard.com/forums/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-github"></i> Source </td><td><a href="https://github.com/midgetspy/Sick-Beard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/</a></td></tr>
-        <tr><td class="infoTableHeader"><i class="icon16-win"></i> Bug Tracker &amp;<br/> Windows Builds </td><td><a href="http://code.google.com/p/sickbeard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/</a></td></tr>
+        <tr><td class="infoTableHeader"><i class="icon16-win"></i> Windows Builds </td><td><a href="https://github.com/midgetspy/Sick-Beard/releases/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/releases/</a></td></tr>
+        <tr><td class="infoTableHeader"><i class="icon16-web"></i> Bug Tracker </td><td><a href="http://code.google.com/p/sickbeard/issues/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/issues/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat </td><td><a href="irc://irc.freenode.net/#sickbeard" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
     </table>
 </div>

data/interfaces/default/config_postProcessing.tmpl

@@ -21,7 +21,7 @@
 <div id="config-content">
 <h5>All non-absolute folder locations are relative to <span class="path">$sickbeard.DATA_DIR</span></h5>
 
-<form id="configForms" action="savePostProcessing" method="post">
+<form id="configForm" action="savePostProcessing" method="post">
 
             <div id="config-components">
 

data/interfaces/default/displayShow.tmpl

@@ -130,15 +130,15 @@ Change selected episodes to
 #for $epResult in $sqlResults:
 
     #if int($epResult["season"]) != $curSeason:
-  <tr><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
+  <tr class="seasonheader"><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
   <tr class="seasonheader" id="season-$epResult["season"]">
     <td colspan="9">
         <h2>#if int($epResult["season"]) == 0 then "Specials" else "Season "+str($epResult["season"])#</h2>
     </td>
   </tr>
   <tr id="season-$epResult["season"]-cols"><th width="1%"><input type="checkbox" class="seasonCheck" id="$epResult["season"]" /></th><th>NFO</th><th>TBN</th><th>Episode</th><th>Name</th><th class="nowrap">Airdate</th><th>Filename</th><th>Status</th><th>Search</th></tr>
         #set $curSeason = int($epResult["season"])
-    #end if    
+    #end if
 
   #set $epStr = str($epResult["season"]) + "x" + str($epResult["episode"])
   #set $epLoc = $epResult["location"]

data/interfaces/default/editShow.tmpl

@@ -51,39 +51,42 @@
 
 <form action="editShow" method="post">
 <input type="hidden" name="show" value="$show.tvdbid" />
-Location: <input type="text" name="location" id="location" value="$show._location" size="50" /><br />
+<span class="showLegend">Location:</span><input type="text" name="location" id="location" value="$show._location" size="50" /><br />
 <br />
-Quality:
+<span class="showLegend">Quality:</span>
 #set $qualities = $common.Quality.splitQuality(int($show.quality))
 #set global $anyQualities = $qualities[0]
 #set global $bestQualities = $qualities[1]
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_qualityChooser.tmpl")
 <br />
-<br />
-Language: <select name="tvdbLang" id="tvdbLangSelect"></select><br />
+<span class="showLegend">Language:</span><select name="tvdbLang" id="tvdbLangSelect"></select><br />
 Note: This will only affect the language of the retrieved metadata file contents and episode filenames.<br />
 This <b>DOES NOT</b> allow Sick Beard to download non-english TV episodes!<br />
 <br />
+
+<span class="showLegend">Flatten files (no folders):</span><input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br />
+<br />
+
+<span class="showLegend">Paused:</span><input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br />
 <br />
-Flatten files (no folders): <input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br /><br />
-Paused: <input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br /><br />
 
-Air by date: 
-<input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
-(check this if the show is released as Show.03.02.2010 rather than Show.S02E03) 
-<br /><br />
+<span class="showLegend">Air by date:</span><input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
+(check this if the show is released as Show.03.02.2010 rather than Show.S02E03)<br />
+<br />
 
-Ignored Words (all shows): $sickbeard.IGNORE_WORDS<br /><br />
+<span class="showLegend">Ignored Words (all shows):</span>$sickbeard.IGNORE_WORDS<br />
+<br />
 
-Separate words with a comma, e.g. "word1,word2,word3"<br/><br/>
+<span class="showLegend">Ignored Words (this show):</span><input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
+Results <b>with any</b> of these words in the title will be filtered out<br />
+Separate words with a comma, e.g. "word1,word2,word3"<br />
+<br />
 
-Ignored Words (this show): <input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
-Results with any of these words in the title will be filtered out
-<br /><br />
+<span class="showLegend">Required Words (this show):</span><input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
+Results <b>without one</b> of these words in the title will be filtered out<br />
+Separate words with a comma, e.g. "word1,word2,word3"<br />
+<br />
 
-Required Words (this show): <input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
-Results without one of these words in the title will be filtered out 
-<br /><br />
 <input class="btn" type="submit" value="Submit" />
 </form>
 

data/interfaces/default/inc_top.tmpl

@@ -69,11 +69,11 @@
     <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.10.4.custom.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.14.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.14.min.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.16.3.min.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.16.3.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2012-04-26.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.2.2.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.35.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.50.js?$sbPID"></script>
 
     <script type="text/javascript" charset="utf-8">
     <!--

data/js/addExistingShow.js

@@ -1,15 +1,15 @@
 $(document).ready(function() { 
 
-    $('#checkAll').live('click', function(){
+    $('#tableDiv').on('click', '#checkAll', function() {
 
         var seasCheck = this;
 
-        $('.dirCheck').each(function(){
+        $('.dirCheck').each(function() {
             this.checked = seasCheck.checked;
         });
     });
 
-    $('#submitShowDirs').click(function(){
+    $('#submitShowDirs').click(function() {
 
         var dirArr = new Array();
 
@@ -35,7 +35,7 @@ $(document).ready(function() {
 
     function loadContent() {
         var url = '';
-        $('.dir_check').each(function(i,w){
+        $('.dir_check').each(function(i,w) {
             if ($(w).is(':checked')) {
                 if (url.length) {
                     url += '&';
@@ -72,10 +72,12 @@ $(document).ready(function() {
         loadContent();
     });
 
-    $('.dir_check').live('click', loadContent);
+    $('#rootDirStaticList').on('click', '.dir_check', loadContent);
 
-    $('.showManage').live('click', function() {
-        $("#tabs").tabs( 'select', 0);
+    $('#tableDiv').on('click', '.showManage', function(event) {
+        event.preventDefault();
+        $("#tabs").tabs('option', 'active', 0);
+        $('html,body').animate({scrollTop:0}, 1000);
     });
 
 });

data/js/browser.js

@@ -34,6 +34,8 @@
                 return i++ != 0;
             });
             $('<h2>').text(first_val.current_path).appendTo(fileBrowserDialog);
+            // set current path to what we path we actually did load (in case the previous dir is no longer there)
+            currentBrowserPath = first_val.current_path;
             list = $('<ul>').appendTo(fileBrowserDialog);
             $.each(data, function (i, entry) {
                 link = $("<a href='javascript:void(0)' />").click(function () { browse(entry.path, endpoint); }).text(entry.name);
@@ -93,6 +95,10 @@
         if (options.initialDir) {
             initialDir = options.initialDir;
         }
+        // HACK to allow users to specify \\server\path to override use of stored values
+        if (options.field && options.field.val().indexOf('\\') == 0) {
+            initialDir = options.field.val()
+        }
         browse(initialDir, options.url);
         fileBrowserDialog.dialog('open');