monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-03 18:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #130 from adam111316/feature/deluge_labels

Browse source 
Change Search Settings/Torrent/Deluge option texts for improved understa...
This commit is contained in:
adam111316 2014-12-27 21:07:53 +08:00
commit fe1bd3c428
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -9,6 +9,7 @@
* Change General Config/Interface/Trim zero padding to Trim date and time, now handles 2:00 pm > 2 pm * Change General Config/Interface/Trim zero padding to Trim date and time, now handles 2:00 pm > 2 pm
* Fix trim zero of military time hour to not use 12 hr time * Fix trim zero of military time hour to not use 12 hr time
* Change ThePirateBay to use oldpiratebay as a temporary fix * Change ThePirateBay to use oldpiratebay as a temporary fix
* Change Search Settings/Torrent/Deluge option texts for improved understanding
[develop changelog] [develop changelog]

3
gui/slick/interfaces/default/config_search.tmpl
View file

@ -421,6 +421,7 @@
<div class="clear-left"> <div class="clear-left">
<p id="host_desc_torrent">URL to your torrent client (e.g. http://localhost:8000/)</p> <p id="host_desc_torrent">URL to your torrent client (e.g. http://localhost:8000/)</p>
<p id="host_desc_rtorrent" style="display:none"><b>Note:</b> <i>rTorrent</i> client URLs use e.g. scgi://localhost:5000/</p> <p id="host_desc_rtorrent" style="display:none"><b>Note:</b> <i>rTorrent</i> client URLs use e.g. scgi://localhost:5000/</p>
<p id="host_desc_deluge" style="display:none">URL to your Deluge WebUI (e.g. http://localhost:8112/)</p>
</div> </div>
</span> </span>
</label> </label>
@ -436,7 +437,7 @@
</label> </label>
</div> </div>
<div class="field-pair"> <div class="field-pair" id="torrent_username_option">
<label> <label>
<span class="component-title" id="username_title">Client username</span> <span class="component-title" id="username_title">Client username</span>
<span class="component-desc"> <span class="component-desc">

5
gui/slick/js/configSearch.js
View file

@ -62,7 +62,9 @@ $(document).ready(function(){
$(label_warning_deluge).hide(); $(label_warning_deluge).hide();
$(host_desc_rtorrent).hide(); $(host_desc_rtorrent).hide();
$(host_desc_deluge).hide();
$(host_desc_torrent).show(); $(host_desc_torrent).show();
$(torrent_username_option).show();
$(torrent_verify_cert_option).hide(); $(torrent_verify_cert_option).hide();
$(torrent_path_option).show(); $(torrent_path_option).show();
$(torrent_path_option).find('.fileBrowser').show(); $(torrent_path_option).find('.fileBrowser').show();
@ -86,6 +88,9 @@ $(document).ready(function(){
client = 'Deluge'; client = 'Deluge';
$(torrent_verify_cert_option).show(); $(torrent_verify_cert_option).show();
$(label_warning_deluge).show(); $(label_warning_deluge).show();
$(host_desc_torrent).hide();
$(host_desc_deluge).show();
$(torrent_username_option).hide();
//$('#directory_title').text(client + directory); //$('#directory_title').text(client + directory);
} else if ('download_station' == selectedProvider){ } else if ('download_station' == selectedProvider){
client = 'Synology DS'; client = 'Synology DS';