Commit 3b1c318e authored by jcfp's avatar jcfp

Patches: refresh 04, 09.

parent a40bdf43
......@@ -6,6 +6,7 @@ sabnzbdplus (2.3.4+dfsg-1) UNRELEASED; urgency=medium
* Desktop: append %F field code to Exec key.
* Manpage: document option to add nzb files via cli.
* Rules: exclude example scripts from compression.
* Patches: refresh 04, 09.
[ Ondřej Nový ]
* d/control: Remove ancient X-Python-Version field
......
# Use the normal configuration when run as a daemon
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -324,20 +324,7 @@
@@ -328,20 +328,7 @@
def GetProfileInfo(vista_plus):
""" Get the default data locations """
ok = False
......
......@@ -2,24 +2,9 @@
# - remove an iframe from the setup wizard, link instead
# - use locally installed icon
# - only run ipv6 test, ip address discovery functions when debugging
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
@@ -87,7 +87,11 @@
</div>
<div class="col-md-5">
<div class="clearfix"></div>
- <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$language"></iframe>
+ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
+ <b>Help</b>
+ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
+ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://sabnzbd.org/wizard#$language" target="_blank">sabnzbd.org</a>.<br/>
+ </div>
</div>
</div>
<input type="hidden" name="session" value="$session" />
--- a/sabnzbd/__init__.py
+++ b/sabnzbd/__init__.py
@@ -1163,6 +1163,8 @@
@@ -1174,6 +1174,8 @@
logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
return False
......@@ -70,3 +55,18 @@
<!--#end if#-->
</td>
</tr>
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
@@ -87,7 +87,11 @@
</div>
<div class="col-md-5">
<div class="clearfix"></div>
- <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$active_lang"></iframe>
+ <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
+ <b>Help</b>
+ <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
+ <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://sabnzbd.org/wizard#$active_lang" target="_blank">sabnzbd.org</a>.<br/>
+ </div>
</div>
</div>
<input type="hidden" name="session" value="$session" />
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment