SickBeard: update to SickBeard-e6dcfb3

This commit is contained in:
Stefan Saraev 2013-01-18 20:41:51 +02:00
parent e72f533f28
commit 3344c710f4
4 changed files with 90 additions and 75 deletions

View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="SickBeard"
PKG_VERSION="b7cf06e"
PKG_VERSION="e6dcfb3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -1,44 +0,0 @@
diff -Naur SickBeard-9b43f71/data/interfaces/default/config.tmpl SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl
--- SickBeard-9b43f71/data/interfaces/default/config.tmpl 2011-12-14 04:42:55.000000000 +0100
+++ SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl 2011-12-14 04:56:35.317466009 +0100
@@ -25,9 +25,4 @@
</table>
</div>
-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
- <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
- <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
-</tr></table>
-
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
diff -Naur SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl
--- SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl 2011-12-14 04:42:55.000000000 +0100
+++ SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl 2011-12-14 04:56:35.318466029 +0100
@@ -140,19 +140,6 @@
</head>
<body>
-#if $sickbeard.NEWEST_VERSION_STRING:
-<div id="upgrade-notification">
- <div>
- <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
- </div>
-</div>
-<div id="header-fix"></div>
-#end if
-<div id="header">
- <a name="top"></a>
- <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
- <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
-</div>
<ul id="MainMenu" class="sf-menu">
<li id="NAVsystem" class="first"><a href="#" class="navIcon" onclick="return false;"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
<ul>
@@ -194,7 +181,6 @@
<li><a href="$sbRoot/errorlogs/viewlog/"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
</ul>
</li>
- <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
</ul>
#if $varExists('submenu'):
<div id="SubMenu">

View File

@ -0,0 +1,55 @@
diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
index ec28766..fdf3e30 100644
--- a/data/interfaces/default/config.tmpl
+++ b/data/interfaces/default/config.tmpl
@@ -36,13 +36,4 @@
</table>
</div>
-<div class="container padding" style="width: 600px;">
- <table class="infoTable">
- <tr>
- <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
- <td>Sick Beard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
- </tr>
- </table>
-</div>
-
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index f791be8..fb38f17 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -108,20 +108,6 @@
<body>
<header>
-#if $sickbeard.NEWEST_VERSION_STRING:
-<div id="upgrade-notification">
- <div>
- <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
- </div>
-</div>
-<div id="header-fix"></div>
-#end if
-<div id="header">
- <a name="top"></a>
- <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard.png" width="150" height="72" /></a></span>
- <span id="versiontext">alpha <a href="https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog" onclick="window.open(this.href, '_blank'); return false;">$sickbeard.version.SICKBEARD_VERSION</a></span>
-</div>
-
<div class="navbar">
<div class="navbar-inner">
<div class="container">
@@ -208,11 +194,6 @@
</li>
<li class="divider-vertical"></li>
</ul>
- <ul class="nav pull-right">
- <li>
- <a id="navDonate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" height="26" width="92" /></a>
- </li>
- </ul>
</div><!-- /nav-collapse -->
</div><!-- /container -->

View File

@ -1,14 +1,13 @@
diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl
--- SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl 2012-03-21 04:31:18.000000000 +0100
+++ SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl 2012-03-21 06:39:45.827897872 +0100
@@ -528,45 +528,6 @@
</fieldset>
</div><!-- /notifo component-group //-->
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index 826cf0a..02f14af 100755
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -547,45 +547,6 @@
-
- <div class="component-group clearfix">
- <div class="component-group-desc">
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="" title="Libnotify" width="16" height="16" /> Libnotify </a></h3>
<div class="component-group clearfix">
<div class="component-group-desc">
- <img class="notifier-icon" src="$sbRoot/images/notifiers/libnotify.png" alt="" title="Libnotify" />
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;">Libnotify</a></h3>
- <p>The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
- </div>
- <fieldset class="component-group-list">
@ -36,32 +35,37 @@ diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl S
- </label>
- </div>
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
- <input type="button" value="Test Libnotify" id="testLibnotify" />
- <input type="submit" class="config_submitter" value="Save Changes" />
- <input type="button" class="btn" value="Test Libnotify" id="testLibnotify" />
- <input type="submit" class="btn config_submitter" value="Save Changes" />
- </div><!-- /content_use_libnotify //-->
-
- </fieldset>
- </div><!-- /libnotify component-group //-->
-
-
<div class="component-group clearfix">
<div class="component-group-desc">
<h3><a href="http://boxcar.io/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/boxcar.gif" alt="" title="Boxcar" width="16" height="16" /> Boxcar </a></h3>
diff -Naur SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl
--- SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:02.098433287 +0100
+++ SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:34.445056278 +0100
@@ -169,7 +169,6 @@
<li id="NAVconfig"><a href="$sbRoot/config/">Config</a>
<ul>
<li><a href="$sbRoot/config/"><img src="$sbRoot/images/menu/config_index16.png" alt="" width="16" height="16" />Help &amp; Info</a></li>
- <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
<li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
<li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
<li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
diff -Naur SickBeard-a24eac6/sickbeard/webserve.py SickBeard-a24eac6.patch/sickbeard/webserve.py
--- SickBeard-a24eac6/sickbeard/webserve.py 2012-03-21 04:31:18.000000000 +0100
+++ SickBeard-a24eac6.patch/sickbeard/webserve.py 2012-03-21 06:35:34.447056316 +0100
@@ -593,7 +593,6 @@
- <div class="component-group clearfix">
- <div class="component-group-desc">
<img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
<h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
<p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index fb38f17..4ead36f 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -172,8 +172,6 @@
<ul class="dropdown-menu">
<li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help &amp; Info</a></li>
<li class="divider"></li>
- <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
- <li class="divider"></li>
<li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
<li class="divider"></li>
<li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 20f0dfc..b0bf6a6 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -609,7 +609,6 @@ class History:
ConfigMenu = [