Skip to content

Commit

Permalink
Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…
Browse files Browse the repository at this point in the history
…_binaries
  • Loading branch information
midgetspy committed Jun 29, 2012
2 parents 4cb75ce + b7cf06e commit 72b23c9
Show file tree
Hide file tree
Showing 62 changed files with 1,531 additions and 218 deletions.
8 changes: 7 additions & 1 deletion autoProcessTV/autoProcessTV.py
Expand Up @@ -51,7 +51,13 @@ def processEpisode(dirName, nzbName=None):
print "ERROR: You need an autoProcessTV.cfg file - did you rename and edit the .sample?" print "ERROR: You need an autoProcessTV.cfg file - did you rename and edit the .sample?"
sys.exit(-1) sys.exit(-1)


config.read(configFilename) try:
fp = open(configFilename, "r")
config.readfp(fp)
fp.close()
except IOError, e:
print "Could not read configuration file: ", str(e)
sys.exit(1)


host = config.get("SickBeard", "host") host = config.get("SickBeard", "host")
port = config.get("SickBeard", "port") port = config.get("SickBeard", "port")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion data/interfaces/default/apiBuilder.tmpl
Expand Up @@ -8,7 +8,7 @@
sbRoot = "$sbRoot"; sbRoot = "$sbRoot";
//--> //-->
</script> </script>
<script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/apibuilder.js"></script> <script type="text/javascript" src="$sbRoot/js/apibuilder.js"></script>


<style type="text/css"> <style type="text/css">
Expand Down
22 changes: 2 additions & 20 deletions data/interfaces/default/config_providers.tmpl
Expand Up @@ -198,26 +198,8 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#;
<div class="providerDiv" id="btnDiv"> <div class="providerDiv" id="btnDiv">
<div class="field-pair"> <div class="field-pair">
<label class="clearfix"> <label class="clearfix">
<span class="component-title">BTN User ID:</span> <span class="component-title">BTN API KEY:</span>
<input class="component-desc" type="text" name="btn_user_id" value="$sickbeard.BTN_USER_ID" /> <input class="component-desc" type="text" name="btn_api_key" value="$sickbeard.BTN_API_KEY" size="40" />
</label>
</div>
<div class="field-pair">
<label class="clearfix">
<span class="component-title">BTN Auth Token:</span>
<input class="component-desc" type="text" name="btn_auth_token" value="$sickbeard.BTN_AUTH_TOKEN" size="32" />
</label>
</div>
<div class="field-pair">
<label class="clearfix">
<span class="component-title">BTN Passkey:</span>
<input class="component-desc" type="text" name="btn_passkey" value="$sickbeard.BTN_PASSKEY" size="32" />
</label>
</div>
<div class="field-pair">
<label class="clearfix">
<span class="component-title">BTN Authkey:</span>
<input class="component-desc" type="text" name="btn_authkey" value="$sickbeard.BTN_AUTHKEY" size="32" />
</label> </label>
</div> </div>
</div> </div>
Expand Down
2 changes: 1 addition & 1 deletion data/interfaces/default/displayShow.tmpl
Expand Up @@ -9,7 +9,7 @@
#set global $topmenu="manageShows"# #set global $topmenu="manageShows"#
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl") #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")


<script type="text/javascript" src="$sbRoot/js/jquery.bookmarkscroll.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.bookmarkscroll.js"></script>




<div class="h2footer align-right"> <div class="h2footer align-right">
Expand Down
4 changes: 2 additions & 2 deletions data/interfaces/default/home_newShow.tmpl
Expand Up @@ -11,8 +11,8 @@


#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl") #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")


<link rel="stylesheet" type="text/css" href="$sbRoot/css/formwizard.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/formwizard.css" />
<script type="text/javascript" src="$sbRoot/js/formwizard.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/formwizard.js"></script>
<script type="text/javascript" src="$sbRoot/js/qualityChooser.js"></script> <script type="text/javascript" src="$sbRoot/js/qualityChooser.js"></script>
<script type="text/javascript" src="$sbRoot/js/newShow.js"></script> <script type="text/javascript" src="$sbRoot/js/newShow.js"></script>
<script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script> <script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script>
Expand Down
74 changes: 37 additions & 37 deletions data/interfaces/default/inc_top.tmpl
Expand Up @@ -14,11 +14,11 @@
<link rel="stylesheet" type="text/css" href="$sbRoot/css/browser.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/browser.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/comingEpisodes.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/comingEpisodes.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/config.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/config.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/jquery.pnotify.default.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.pnotify.default.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/smooth-grinder/jquery-ui-1.8.17.custom.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/smooth-grinder/jquery-ui-1.8.17.custom.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/superfish.css" /> <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/superfish.css" />
<link rel="stylesheet" type="text/css" href="$sbRoot/css/tablesorter.css"/> <link rel="stylesheet" type="text/css" href="$sbRoot/css/tablesorter.css"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/jquery.qtip2.css"/> <link rel="stylesheet" type="text/css" href="$sbRoot/css/lib/jquery.qtip2.css"/>
<link rel="stylesheet" type="text/css" media="only screen and (max-device-width: 480px)" href="$sbRoot/css/iphone.css" /> <link rel="stylesheet" type="text/css" media="only screen and (max-device-width: 480px)" href="$sbRoot/css/iphone.css" />


<style type="text/css"> <style type="text/css">
Expand All @@ -33,51 +33,51 @@ th.tablesorter-headerSortDown { background-image: url("$sbRoot/images/tablesorte


.ui-autocomplete-loading { background: white url("$sbRoot/images/loading16.gif") right center no-repeat; } .ui-autocomplete-loading { background: white url("$sbRoot/images/loading16.gif") right center no-repeat; }
.browserDialog.busy .ui-dialog-buttonpane { background: url("$sbRoot/images/loading.gif") 10px 50% no-repeat !important; } .browserDialog.busy .ui-dialog-buttonpane { background: url("$sbRoot/images/loading.gif") 10px 50% no-repeat !important; }
.ui-dialog, .ui-dialog-buttonpane { background: #eceadf url("$sbRoot/css/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png") 50% 50% repeat !important; } .ui-dialog, .ui-dialog-buttonpane { background: #eceadf url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png") 50% 50% repeat !important; }
.ui-accordion-content, .ui-tabs-panel { background: #ededed !important; background-image: none !important; } .ui-accordion-content, .ui-tabs-panel { background: #ededed !important; background-image: none !important; }


.ui-widget-content { border: 1px solid #aaaaaa; background: #dcdcdc url("$sbRoot/css/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x; color: #222222; } .ui-widget-content { border: 1px solid #aaaaaa; background: #dcdcdc url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dcdcdc_1x100.png") 50% top repeat-x; color: #222222; }
.ui-widget-header { border: 1px solid #aaaaaa; background: #ffffff url("$sbRoot/css/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; color: #222222; font-weight: bold; } .ui-widget-header { border: 1px solid #aaaaaa; background: #ffffff url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_flat_0_ffffff_40x100.png") 50% 50% repeat-x; color: #222222; font-weight: bold; }


.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #aaaaaa; background: #efefef url("$sbRoot/css/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #aaaaaa; background: #efefef url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_efefef_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dddddd url("$sbRoot/css/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; } .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dddddd url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_highlight-soft_75_dddddd_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #222222; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #dfdfdf url("$sbRoot/css/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #140f06; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #dfdfdf url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_inset-soft_75_dfdfdf_1x100.png") 50% 50% repeat-x; font-weight: bold; color: #140f06; }


.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #aaaaaa; background: #fbf9ee url("$sbRoot/css/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; color: #363636; } .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #aaaaaa; background: #fbf9ee url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; color: #363636; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #aaaaaa; background: #fef1ec url("$sbRoot/css/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; color: #8c291d; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #aaaaaa; background: #fef1ec url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; color: #8c291d; }


.ui-icon { width: 16px; height: 16px; background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_222222_256x240.png"); } .ui-icon { width: 16px; height: 16px; background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png"); }
.ui-widget-content .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_222222_256x240.png"); } .ui-widget-content .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png"); }
.ui-widget-header .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_222222_256x240.png"); } .ui-widget-header .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png"); }
.ui-state-default .ui-icon { background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_8c291d_256x240.png"); } .ui-state-default .ui-icon { background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_8c291d_256x240.png"); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_222222_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_222222_256x240.png"); }
.ui-state-active .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_8c291d_256x240.png"); } .ui-state-active .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_8c291d_256x240.png"); }
.ui-state-highlight .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_2e83ff_256x240.png"); } .ui-state-highlight .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_2e83ff_256x240.png"); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url("$sbRoot/css/smooth-grinder/images/ui-icons_cd0a0a_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url("$sbRoot/css/lib/smooth-grinder/images/ui-icons_cd0a0a_256x240.png"); }


.ui-widget-overlay { background: #aaaaaa url("$sbRoot/css/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat; opacity: .35;filter:Alpha(Opacity=35); } .ui-widget-overlay { background: #aaaaaa url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat; opacity: .35;filter:Alpha(Opacity=35); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000 url("$sbRoot/css/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; opacity: .35;filter:Alpha(Opacity=35); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000 url("$sbRoot/css/lib/smooth-grinder/images/ui-bg_flat_0_000000_40x100.png") 50% 50% repeat-x; opacity: .35;filter:Alpha(Opacity=35); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }


#if $sickbeard.NEWEST_VERSION_STRING: #if $sickbeard.NEWEST_VERSION_STRING:
.ui-pnotify { top: 30px !important; } .ui-pnotify { top: 30px !important; }
#end if #end if
//--> //-->
</style> </style>


<script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery-ui-1.8.17.custom.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.8.17.custom.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/superfish-1.4.8.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/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/lib/supersubs-0.2b.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.cookie.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.cookiejar.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookiejar.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.json-2.2.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.json-2.2.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.selectboxes.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.tablesorter-2.1.10.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.1.10.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.tablesorter.widgets.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.qtip-2011-11-14.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2011-11-14.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.pnotify-1.0.2.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.0.2.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.expand-1.3.8.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.expand-1.3.8.js"></script>
<script type="text/javascript" src="$sbRoot/js/jquery.form-2.92.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-2.92.js"></script>


<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
<!-- <!--
Expand All @@ -86,7 +86,7 @@ th.tablesorter-headerSortDown { background-image: url("$sbRoot/images/tablesorte
top_image_html = '<img src="$sbRoot/images/top.gif" style="width:31px; height:11px" alt="Jump to top" />'; top_image_html = '<img src="$sbRoot/images/top.gif" style="width:31px; height:11px" alt="Jump to top" />';
//--> //-->
</script> </script>
<script type="text/javascript" src="$sbRoot/js/jquery.scrolltopcontrol-1.1.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery.scrolltopcontrol-1.1.js"></script>
<script type="text/javascript" src="$sbRoot/js/browser.js"></script> <script type="text/javascript" src="$sbRoot/js/browser.js"></script>
<script type="text/javascript" src="$sbRoot/js/ajaxNotifications.js"></script> <script type="text/javascript" src="$sbRoot/js/ajaxNotifications.js"></script>


Expand Down
2 changes: 1 addition & 1 deletion data/interfaces/default/restart_bare.tmpl
Expand Up @@ -16,7 +16,7 @@ sbHost = "$curSBHost";
//--> //-->
</script> </script>


<script type="text/javascript" src="$sbRoot/js/jquery-1.7.1.min.js"></script> <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="$sbRoot/js/restart.js"></script> <script type="text/javascript" src="$sbRoot/js/restart.js"></script>


<h2>Performing Restart</h2> <h2>Performing Restart</h2>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 72b23c9

Please sign in to comment.