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

… api
fgreg · Nov 29, 2011 · 8c2b34d · 8c2b34d
2 parents 913030d + eaf7ea0
commit 8c2b34d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/data/interfaces/default/displayShow.tmpl b/data/interfaces/default/displayShow.tmpl
@@ -85,7 +85,7 @@ replace with: <b><%=", ".join([Quality.qualityStrings[x] for x in bestQualities]
     </td></tr>
     <tr><td class="showLegend">Language:</td><td><img src="$sbRoot/images/flags/${show.lang}.png" width="16" height="11" alt="" /> $show.lang</td></tr>
     <tr><td class="showLegend">Season Folders: </td><td><img src="$sbRoot/images/#if $show.seasonfolders == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
-    <tr><td class="showLegend">Paused: </td><td><img src="$sbRoot/images/#if int($show.paused) == 0 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
+    <tr><td class="showLegend">Paused: </td><td><img src="$sbRoot/images/#if int($show.paused) == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
     <tr><td class="showLegend">Air-by-Date: </td><td><img src="$sbRoot/images/#if int($show.air_by_date) == 1 then "yes16.png\" alt=\"Y" else "no16.png\" alt=\"N"#" width="16" height="16" /></td></tr>
 </table>
 </div>

diff --git a/data/interfaces/default/viewlogs.tmpl b/data/interfaces/default/viewlogs.tmpl
@@ -14,7 +14,7 @@
 <!--
 \$(document).ready(function(){
     \$('#minLevel').change(function(){
-        url = 'viewlog?minLevel='+\$(this).val()
+        url = '$sbRoot/errorlogs/viewlog/?minLevel='+\$(this).val()
         window.location.href = url
     });
 });

diff --git a/sickbeard/sab.py b/sickbeard/sab.py
@@ -24,7 +24,11 @@
 import sickbeard
 
 from lib import MultipartPostHandler
-import urllib2, cookielib, json
+import urllib2, cookielib
+try:
+    import json
+except ImportError:
+    from lib import simplejson as json
 
 from sickbeard.common import USER_AGENT
 from sickbeard import logger