gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-04-05 04:29:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'AdeHub/master' into develop

Browse Source
This commit is contained in:
rembo10
2012-10-02 22:19:52 +01:00
parent 8de0750240 31eaf1e416
commit e555943fc7
135 changed files with 91597 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/base.html
View File

@@ -36,7 +36,7 @@
</div>
% elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.INSTALL_TYPE != 'win':
<div id="updatebar">
A <a href="http://github.com/rembo10/headphones/compare/${headphones.CURRENT_VERSION}...${headphones.LATEST_VERSION}"> newer version</a> is available. You're ${headphones.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
A <a href="https://github.com/AdeHub/headphones/compare/${headphones.CURRENT_VERSION}...${headphones.LATEST_VERSION}"> newer version</a> is available. You're ${headphones.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
</div>
% endif

14
data/interfaces/default/config.html
View File

@@ -302,6 +302,19 @@ m<%inherit file="base.html"/>
<input type="text" name="waffles_passkey" value="${config['waffles_passkey']}" size="36">
</div>
</div>
<div class="row checkbox">
<input id="userutracker" type="checkbox" name="rutracker" onclick="initConfigCheckbox($(this));" value="1" ${config['use_rutracker']} /><label>rutracker.org</label>
</div>
<div class="config">
<div class="row">
<label>rutracker User Name: </label>
<input type="text" name="rutracker_user" value="${config['rutracker_user']}" size="36">
</div>
<div class="row">
<label>rutracker Password: </label>
<input type="password" name="rutracker_password" value="${config['rutracker_password']}" size="36">
</div>
</div>
</fieldset>
</td>
@@ -926,6 +939,7 @@ m<%inherit file="base.html"/>
initConfigCheckbox("#usenewzbin");
initConfigCheckbox("#usenzbsorg");
initConfigCheckbox("#usewaffles");
initConfigCheckbox("#userutracker");
initConfigCheckbox("#useblackhole");
initConfigCheckbox("#useapi");
}

2
data/interfaces/default/history.html
View File

@@ -45,6 +45,8 @@
fileid = 'nzb'
if item['URL'].find('torrent') != -1:
fileid = 'torrent'
if item['URL'].find('rutracker') != -1:
fileid = 'torrent'
%>
<tr class="grade${grade}">
<td id="dateadded">${item['DateAdded']}</td>