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

…_binaries
gateway · Dec 31, 2012 · e64aae1 · e64aae1
2 parents c3f8565 + e6dcfb3
commit e64aae1
Show file tree

Hide file tree

Showing 42 changed files with 1,052 additions and 665 deletions.
diff --git a/data/css/style.css b/data/css/style.css
@@ -9,13 +9,13 @@ browser.css
   margin: 0;
 }
 #fileBrowserDialog ul li {
-  padding: 4px 0;
-  margin: 2px;
+  margin: 2px 0;
   list-style-type: none;
   cursor: pointer;
 }
 #fileBrowserDialog ul li a {
   display: block;
+  padding: 4px 0;
 }
 #fileBrowserDialog ul li a:hover {
   color: #00f;
@@ -58,11 +58,9 @@ browser.css
 /* =======================================================================
 formWizard.css
 ========================================================================== */
-/* TODO: cleanup the fixed height issue with custom quality */
 fieldset.sectionwrap {
   width: 800px;
   padding: 5px;
-  overflow: auto;
   text-align: left;
   border-width: 0;
 }
@@ -78,7 +76,7 @@ div.stepsguide {
 }
 div.stepsguide .step {
   float: left;
-  width: 260px;
+  width: 250px;
   font: bold 24px Arial;
 }
 div.stepsguide .step p {
@@ -122,19 +120,15 @@ div.formpaginate .prev, div.formpaginate .next {
   overflow: hidden;
   clear: both;
 }
-.stepDiv > #customQualityWrapper {
-  height: 190px;
-  overflow: auto;
-}
 #customQualityWrapper div.component-group-desc {
-  float:left;
-  width:165px;
+  float: left;
+  width: 165px;
 }
 #customQualityWrapper div.component-group-desc p {
-  width:85%;
-  margin:.8em 0;
-  font-size:1.2em;
-  color:#666;
+  width: 85%;
+  margin: .8em 0;
+  font-size: 1.2em;
+  color: #666;
 }
 
 /* =======================================================================
@@ -362,7 +356,7 @@ home.tmpl
 /* =======================================================================
 home_postprocess.tmpl
 ========================================================================== */
-#episodeDir {
+#episodeDir, #newRootDir {
   margin-right: 6px;
 }
 
@@ -449,11 +443,6 @@ ul#rootDirStaticList li {
   list-style: none outside none;
   cursor: pointer;
 }
-/* for tabs: manage directories */
-#rootDirs, #rootDirsControls {
-  width: 50%;
-  min-width: 400px;
-}
 /* for tabs: customize options */
 #tabs div.field-pair,
 .stepDiv div.field-pair {

diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
@@ -26,6 +26,7 @@
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/xbmc.png" alt="" title="XBMC" />
                         <h3><a href="http://xbmc.org/" onclick="window.open(this.href, '_blank'); return false;">XBMC</a></h3>
                         <p>A free and open source cross-platform media center and home entertainment system software with a 10-foot user interface designed for the living-room TV.</p>
+                        <p>For SickBeard to communicate with XBMC you must turn on the <a href="http://wiki.xbmc.org/index.php?title=Webserver" onclick="window.open(this.href, '_blank'); return false;">XBMC Webserver</a>.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
@@ -55,14 +56,14 @@
                                 <input type="checkbox" name="xbmc_update_library" id="xbmc_update_library" #if $sickbeard.XBMC_UPDATE_LIBRARY then "checked=\"checked\"" else ""# />
                                 <label class="clearfix" for="xbmc_update_library">
                                     <span class="component-title">Update Library</span>
-                                    <span class="component-desc">Update XBMC library when we finish a download?</span>
+                                    <span class="component-desc">Update library (show's path) when we finish a download?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
                                 <input type="checkbox" name="xbmc_update_full" id="xbmc_update_full" #if $sickbeard.XBMC_UPDATE_FULL then "checked=\"checked\"" else ""# />
                                 <label class="clearfix" for="xbmc_update_full">
                                     <span class="component-title">Full Library Update</span>
-                                    <span class="component-desc">Do a full library update if per-show fails?</span>
+                                    <span class="component-desc">Fall back to a full library update if per-show fails?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
@@ -76,7 +77,7 @@
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">(multiple host strings can be separated by commas)</span>
+                                    <span class="component-desc">(multiple host strings must be separated by commas, <br/> the library updates will only be sent to the first host listed)</span>
                                 </label>
                             </div>
                             <div class="field-pair">
@@ -164,6 +165,10 @@
                                     <span class="component-title">&nbsp;</span>
                                     <span class="component-desc">Host running Plex Client (eg. 192.168.1.100:3000)</span>
                                 </label>
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">(multiple host strings must be separated by commas)</span>
+                                </label>
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
@@ -186,7 +191,7 @@
                                 </label>
                             </div>
                             <div class="testNotification" id="testPLEX-result">Click below to test.</div>
-                            <input type="button" class="btn" value="Test Plex Media Server" id="testPLEX" />
+                            <input type="button" class="btn" value="Test Plex Media Clients" id="testPLEX" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
                         </div><!-- /content_use_plex -->
 
@@ -458,7 +463,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Prowl priority:</span>
+                                    <span class="component-title">Prowl Priority:</span>
                                    <select id="prowl_priority" name="prowl_priority">
                                         <option value="-2" #if $sickbeard.PROWL_PRIORITY == "-2" then 'selected="selected"' else ""#>Very Low</option>
                                         <option value="-1" #if $sickbeard.PROWL_PRIORITY == "-1" then 'selected="selected"' else ""#>Moderate</option>
@@ -611,7 +616,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-title">Pushover User Key</span>
                                     <input type="text" name="pushover_userkey" id="pushover_userkey" value="$sickbeard.PUSHOVER_USERKEY" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
@@ -713,7 +718,7 @@
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Multiple keys must be seperated by a , (comma). Up to a maximum of 5</span>
+                                    <span class="component-desc">Multiple keys (maxium of 5) must be seperated by commas</span>
                                 </label>
                             </div>
                             <div class="field-pair">

diff --git a/data/interfaces/default/config_providers.tmpl b/data/interfaces/default/config_providers.tmpl
@@ -85,7 +85,7 @@
                                 <span class="component-title jumbo">Configure Provider:</span>
                                 <span class="component-desc">
                                     #set $provider_config_list = []
-                                    #for $cur_provider in ("nzbs_r_us", "newzbin", "nzbmatrix", "tvtorrents", "btn"):
+                                    #for $cur_provider in ("nzbs_r_us", "tvtorrents", "btn"):
                                         #set $cur_provider_obj = $sickbeard.providers.getProviderClass($cur_provider)
                                         #if $cur_provider_obj.providerType == $GenericProvider.NZB and not $sickbeard.USE_NZBS:
                                             #continue
@@ -126,51 +126,6 @@
                         </div>
                     </div><!-- /${curNewznabProvider.getID()}Div //-->
 #end for
-<!--
-                    <div class="providerDiv" id="nzbs_orgDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBs.org UID</span>
-                                <input class="component-desc" type="text" name="nzbs_org_uid" value="$sickbeard.NZBS_UID" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBs.org Hash</span>
-                                <input class="component-desc" type="text" name="nzbs_org_hash" value="$sickbeard.NZBS_HASH" size="40" />
-                            </label>
-                        </div>
-                    </div>
--->
-                    <div class="providerDiv" id="nzbmatrixDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBMatrix Username</span>
-                                <input class="component-desc" type="text" name="nzbmatrix_username" value="$sickbeard.NZBMATRIX_USERNAME" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBMatrix API Key</span>
-                                <input class="component-desc" type="text" name="nzbmatrix_apikey" value="$sickbeard.NZBMATRIX_APIKEY" size="40" />
-                            </label>
-                        </div>
-                    </div><!-- /nzbmatrixDiv //-->
-
-                    <div class="providerDiv" id="newzbinDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">Newzbin Username</span>
-                                <input class="component-desc" type="text" name="newzbin_username" value="$sickbeard.NEWZBIN_USERNAME" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">Newzbin Password</span>
-                                <input class="component-desc" type="password" name="newzbin_password" value="$sickbeard.NEWZBIN_PASSWORD" size="40" />
-                            </label>
-                        </div>
-                    </div><!-- /newzbinDiv //-->
 
                     <div class="providerDiv" id="nzbs_r_usDiv">
                         <div class="field-pair">

diff --git a/data/interfaces/default/editShow.tmpl b/data/interfaces/default/editShow.tmpl
@@ -1,35 +1,36 @@
 #import sickbeard
 #from sickbeard import common
 #from sickbeard import exceptions
-#set global $title="Edit "+$show.name
+#set global $title="Edit " + $show.name
 #set global $header=$show.name
 
 #set global $sbPath=".."
 
-#set global $topmenu="home"#
+#set global $topmenu="home"
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")
 
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){
 
-  \$.getJSON('$sbRoot/home/addShows/getTVDBLanguages', {}, function(data){
+  \$.getJSON('$sbRoot/home/addShows/getTVDBLanguages', {}, function(data) {
         var resultStr = '';
 
         if (data.results.length == 0) {
             flag = ' class="flag" style="background-image:url($sbRoot/images/flags/${show.lang}.png)"';
             resultStr = '<option value="$show.lang" selected="selected" + flag>$show.lang</option>';
         } else {
             var current_lang_added = false;
-            \$.each(data.results, function(index, obj){
+            \$.each(data.results, function(index, obj) {
 
                 if (obj == "$show.lang") {
-                        selected = ' selected="selected"';
-                        current_lang_added = true;
+                    selected = ' selected="selected"';
+                    current_lang_added = true;
                 }
                 else {
-                        selected = '';
+                    selected = '';
                 }
 
                 flag = ' class="flag" style="background-image:url($sbRoot/images/flags/' + obj + '.png);"';
@@ -41,7 +42,6 @@
         }
         \$('#tvdbLangSelect').html(resultStr)
 
-        \$('#tvdbLangSelect').change(function() { searchTvdb() });
   });
 
 });

diff --git a/data/interfaces/default/home.tmpl b/data/interfaces/default/home.tmpl
@@ -57,11 +57,14 @@
 
         var nums = match[1].split(" / ");
 
+        if (parseInt(nums[0]) === 0)
+            return parseInt(nums[1]);
+
         var finalNum = parseInt((nums[0]/nums[1])*1000)*100;
         if (finalNum > 0)
             finalNum += parseInt(nums[0]);
 
-        return finalNum
+        return finalNum;
     },
     type: 'numeric'
 });

diff --git a/data/interfaces/default/home_addExistingShow.tmpl b/data/interfaces/default/home_addExistingShow.tmpl
@@ -1,5 +1,4 @@
 #import os.path
-#import urllib
 #import sickbeard
 #from sickbeard.common import *
 #set global $title="Existing Show"
@@ -13,6 +12,7 @@
 
 <form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8">
 
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/addExistingShow.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> 

diff --git a/data/interfaces/default/home_newShow.tmpl b/data/interfaces/default/home_newShow.tmpl
@@ -1,5 +1,4 @@
 #import os.path
-#import urllib
 #import sickbeard
 #set global $title="New Show"
 
@@ -14,8 +13,8 @@
 <script type="text/javascript" src="$sbRoot/js/lib/formwizard.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/newShow.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> 
-   
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script>
+
 <div id="displayText">aoeu</div>
 <br />
 
@@ -36,13 +35,12 @@
                 <option value="en" selected="selected">en</option>
             </select><b>*</b>
             <input type="button" id="searchName" value="Search" class="btn" /><br /><br />
-    
+
             <b>*</b> 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 />
-            <div id="searchResults" style="height: 225px; overflow: auto;"></div>
+            <div id="searchResults" style="max-height: 225px; overflow: auto;"><br/></div>
         #end if
-
     </div>
 </fieldset>
 
@@ -61,9 +59,10 @@
 
 <fieldset class="sectionwrap">
     <legend class="legendStep">Customize options</legend>
-        <div class="stepDiv">
-            #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_addShowOptions.tmpl")
-        </div>
+
+    <div class="stepDiv">
+        #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_addShowOptions.tmpl")
+    </div>
 </fieldset>
 
 #for $curNextDir in $other_shows:

diff --git a/data/interfaces/default/inc_qualityChooser.tmpl b/data/interfaces/default/inc_qualityChooser.tmpl
@@ -1,8 +1,6 @@
 #import sickbeard
 #from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
 
-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-
 <div class="field-pair">
     <label for="qualityPreset" class="nocheck clearfix">
 #set $overall_quality = $Quality.combineQualities($anyQualities, $bestQualities)
@@ -21,11 +19,10 @@
 </div>
 
 <div id="customQualityWrapper">
-
-<div id="customQuality">
-    <div class="component-group-desc">
-        <p>One of the <b>Initial</b> quality selections must be obtained before Sick Beard will attempt to process the <b>Archive</b> selections.</p>
-    </div>
+    <div id="customQuality">
+        <div class="component-group-desc">
+            <p>One of the <b>Initial</b> quality selections must be obtained before Sick Beard will attempt to process the <b>Archive</b> selections.</p>
+        </div>
 
         <div style="padding-right: 40px; text-align: center;" class="float-left">
             <h4>Initial</h4>