gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-21 00:14:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rembo10
2012-10-02 22:30:48 +01:00
parent 0fb4987c87 fba9695863
commit 02f00b9ed6
11 changed files with 334 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/interfaces/brink/Images/no-artist-art.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

data/interfaces/brink/artist.html
+34 -20
View File
@@ -8,22 +8,23 @@
<%def name="body()"> <%def name="body()">
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#menu_link_getextra').click(function() { $('#getExtras').click(function() {
$('#dialog').dialog(); $('#extras-dialog').dialog();
return false; return false;
}); });
$('#menu_link_modifyextra').click(function() { $('#modifyExtras').click(function() {
$('#dialog').dialog(); $('#extras-dialog').dialog();
}); });
}); });
</script> </script>
<div id="dialog" title="Choose Which Extras to Fetch" style="display:none" class="configtable"> <div id="extras-dialog" title="Choose Which Extras to Fetch" style="display:none" class="configtable">
<form action="getExtras" method="get" class="ajax"> <form action="getExtras" method="get" class="ajax">
<input type="hidden" name="ArtistID" value="${artist['ArtistID']}"> <input type="hidden" name="ArtistID" value="${artist['ArtistID']}">
<input type="hidden" name="newstyle" value="true"> <input type="hidden" name="newstyle" value="true">
%for extra in extras: %for extra in extras:
<input type="checkbox" id="${extra}" name="${extra}" value="1" ${extras[extra]} />${string.capwords(extra)}<br> <input type="checkbox" id="${extra}" name="${extra}" value="1" ${extras[extra]} />
<label for="${extra}">${string.capwords(extra)}</label><br />
%endfor %endfor
<br> <br>
<input id="submit" type="submit" value="Fetch Extras"> <input id="submit" type="submit" value="Fetch Extras">
@@ -41,9 +42,9 @@
%endif %endif
%if artist['IncludeExtras']: %if artist['IncludeExtras']:
<li><a href="removeExtras?ArtistID=${artist['ArtistID']}">Remove Extras</a></li> <li><a href="removeExtras?ArtistID=${artist['ArtistID']}">Remove Extras</a></li>
<li><a class="menu_link_edit" href="#">Modify Extras</a></li> <li><a id="modifyExtras" href="#">Modify Extras</a></li>
%else: %else:
<li><a id="menu_link_getextra" href="#">Get Extras</a></li> <li><a id="getExtras" href="#">Get Extras</a></li>
%endif %endif
</ul> </ul>
<ul id="nav-view"> <ul id="nav-view">
@@ -74,12 +75,13 @@
</select> </select>
<input type="submit" value="GO"> <input type="submit" value="GO">
</p> </p>
<small><span class="wsr Tag"></span> Click CTRL + LMOUSE on albums to select them in grid view.</small>
<div id="gridView"> <div id="gridView">
%for album in albums: %for album in albums:
<% <%
%> %>
<div class="image-container"> <div class="image-container">
<div class="image-box ${album['Status']}"> <div class="image-box">
<div class="image-tag ${album['Status']}"></div> <div class="image-tag ${album['Status']}"></div>
<img /> <img />
<div class="image-actions"> <div class="image-actions">
@@ -98,7 +100,7 @@
<div class="image-info"> <div class="image-info">
<b style="display: none;">${artist['ArtistName']}</b> <b style="display: none;">${artist['ArtistName']}</b>
<span><a href="albumPage?AlbumID=${album['AlbumID']}" title="${album['AlbumID']}">${album['AlbumTitle']}</a></span> <span><a class="image-url" href="albumPage?AlbumID=${album['AlbumID']}" title="${album['AlbumID']}">${album['AlbumTitle']}</a></span>
</div> </div>
</div> </div>
%endfor %endfor
@@ -152,16 +154,7 @@
<td id="albumart"> <td id="albumart">
<div class="album-art-small"> <div class="album-art-small">
<a href="albumPage?AlbumID=${album['AlbumID']}" title="${album['AlbumID']}"> <a href="albumPage?AlbumID=${album['AlbumID']}" title="${album['AlbumID']}">
<div class="status"> <img />
%if album['Status'] == 'Skipped':
<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Mark Wanted"><span>O</span></a>
%elif album['Status'] == 'Wanted':
<a class="wsr" href="unqueueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Unmark Wanted"><span>N</span></a>
%else:
<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Retry"><span>*</span></a>
<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&new=True" title="Try new"><span>J</span></a>
%endif
</div>
</a> </a>
</div> </div>
</td> </td>
@@ -194,6 +187,19 @@
<%def name="javascriptIncludes()"> <%def name="javascriptIncludes()">
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$(".image-box").click(function(evt) {
if (evt.ctrlKey)
{
var input = $(this).find('.image-select');
if( $(input).is(':checked') ){
$(input).attr('checked', false);
}
else{
$(input).attr('checked', true);
}
}
});
//Load Art //Load Art
getAlbumArt(); getAlbumArt();
getArtistArt(); getArtistArt();
@@ -257,6 +263,14 @@
getAlbumInfo(artistname,albumname,element,2); getAlbumInfo(artistname,albumname,element,2);
}); });
}); });
$("table#album_table").each(function() {
$(this).fadeIn("slow", function(){
var element = $(this).find("img");
var artistname = $(".artist-art img").attr("alt");
var albumname = $(this).find("#albumname").text();
getAlbumInfo(artistname,albumname,element,2);
});
});
} }
</script> </script>
</%def> </%def>
data/interfaces/brink/base.html
+12 -6
View File
@@ -42,6 +42,7 @@
<!--Global Script--> <!--Global Script-->
<script src="interfaces/brink/js/script.js"></script> <script src="interfaces/brink/js/script.js"></script>
<script src="interfaces/brink/js/plugins.js"></script>
<!--Datatables--> <!--Datatables-->
<script type="text/javascript" src="/js/libs/jquery.dataTables.min.js"></script> <script type="text/javascript" src="/js/libs/jquery.dataTables.min.js"></script>
@@ -61,11 +62,17 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
% if not headphones.CURRENT_VERSION: % if not headphones.CURRENT_VERSION:
$("#commits-behind").fadeIn('slow').text("${headphones.COMMITS_BEHIND}"); var noty_id = noty({
text:'<span class="wsr">V</span> <strong>Headpones Update Available!</strong><br />A new version is ready to be installed.',
layout: 'bottomRight',
type:'information
});
% elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.INSTALL_TYPE != 'win': % elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.INSTALL_TYPE != 'win':
$("#commits-behind").fadeIn('slow').text("(${headphones.COMMITS_BEHIND})"); var noty_id = noty({
% else: text:'<span class="wsr">V</span> You are ${headphones.COMMITS_BEHIND} commits behind',
$("#commits-behind").hide() layout: 'bottomRight',
type:'information'
});
% endif % endif
}); });
</script> </script>
@@ -128,8 +135,7 @@
<a href="forceSearch"><span class="wsr">I</span> Wanted Albums</a> <a href="forceSearch"><span class="wsr">I</span> Wanted Albums</a>
<a href="forceUpdate"><span class="wsr">U</span> Active Artists</a> <a href="forceUpdate"><span class="wsr">U</span> Active Artists</a>
<a href="forcePostProcess"><span class="wsr">J</span> Post-Process</a> <a href="forcePostProcess"><span class="wsr">J</span> Post-Process</a>
<a href="checkGithub" onclick="javascript:return confirm('Do you wish to Update Headphones now?')"><span class="wsr">V</span> Update <a href="update" onclick="javascript:return confirm('Do you wish to Update Headphones now?')"><span class="wsr">V</span> Update
<span id="commits-behind"></span>
</a> </a>
</div> </div>
<div class="btn right"> <div class="btn right">
data/interfaces/brink/config.html
+197 -124
View File
@@ -1,6 +1,7 @@
<%inherit file="base.html"/> <%inherit file="base.html"/>
<%! <%!
import headphones import headphones
import string
%> %>
<%def name="headIncludes()"> <%def name="headIncludes()">
@@ -77,7 +78,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="launch_browser">Launch browser:</label><br /> <label for="launch_browser">Launch browser:</label>
<br /><small>Enabling this feature will open Headphones at startup.</small> <br /><small>Enabling this feature will open Headphones at startup.</small>
</td> </td>
<td> <td>
@@ -111,15 +112,19 @@
<!--API--> <!--API-->
<tr> <tr>
<td><h2>API:</h2> <td><h2>API:</h2>
<small><label for="api_switch">Enabled/Disabled</label></small></td> <small><label for="api_enabled">Enabled/Disabled</label></small></td>
<td><input class="switch" type="checkbox" name="api_switch" id="api_enabled" value="1" ${config['api_enabled']} /></td> <td><input class="switch" type="checkbox" name="api_enabled" id="api_enabled" value="1" ${config['api_enabled']} /></td>
</tr> </tr>
<tr id="api_switch"> <tr id="api_enabled_switch">
<td> <td>
<small>Visit <a href="https://github.com/rembo10/headphones/tree/" target="_blank"><span>D</span>repo</a> for more information.</small> <table>
</td> <tr>
<td> <td colspan="2">
<input type="text" name="api_key" value="${config['api_key']}" size="30"><input class="submit" type="button" value="Generate" id="generate_api"> <small>Current API:<strong id="api_key">${config['api_key']}</strong></small>
<input class="submit" type="button" value="Generate" id="generate_api" />
</td>
</tr>
</table>
</td> </td>
</tr> </tr>
<!--end API--> <!--end API-->
@@ -289,123 +294,146 @@
<small>"We provide you with a automated search service to locate binary files/secgments that can be found on the public access network called Usenet."</small> <small>"We provide you with a automated search service to locate binary files/secgments that can be found on the public access network called Usenet."</small>
<!--NZB Matrix--> <!--NZB Matrix-->
<div class="group">
<table id="nzbmatrix"> <table id="nzbmatrix">
<tr> <tr>
<td><input class="switch" type="checkbox" name="nzbmatrix" value="1" ${config['use_nzbmatrix']} /></td>
<td> <td>
<h2><a href="http://www.nzbmatrix.com" target="_blank"><span class="wsr">D</span>NZBMatrix</a></h2> <h2><a href="http://www.nzbmatrix.com" target="_blank"><span class="wsr">D</span>NZBMatrix</a></h2>
<br /><small><label for="nzbmatrix_switch">Enabled/Disabled</label></small> <small><label for="nzbmatrix">Enabled/Disabled</label></small>
</td> </td>
<td><input class="switch" type="checkbox" name="nzbmatrix_switch" value="1" ${config['use_nzbmatrix']} /></td>
</tr>
</table>
<table id="nzbmatrix_switch">
<tr>
<td><label for="nzbmatrix_username">Username:</label></td>
<td><input type="text" name="nzbmatrix_username" value="${config['nzbmatrix_user']}" size="30" maxlength="40" /></td>
</tr>
<tr>
<td><label for="nzbmatrix_apikey">API:</label></td>
<td><input type="text" name="nzbmatrix_apikey" value="${config['nzbmatrix_api']}" size="36" maxlength="40" /></td>
</tr> </tr>
</table> </table>
<div class="group" id="nzbmatrix_switch">
<table>
<tr>
<td><label for="nzbmatrix_username">Username:</label></td>
<td><input type="text" name="nzbmatrix_username" value="${config['nzbmatrix_user']}" size="30" maxlength="40" /></td>
</tr>
<tr>
<td><label for="nzbmatrix_apikey">API:</label></td>
<td><input type="text" name="nzbmatrix_apikey" value="${config['nzbmatrix_api']}" size="36" maxlength="40" /></td>
</tr>
</table>
</div>
</div>
<!--end NZB Matrix--> <!--end NZB Matrix-->
<!--Newznab--> <!--Newznab-->
<table id="newznab" class="configtable"> <div class="group">
<tr> <table class="configtable">
<td> <tr>
<h2><a href="http://www.newznab.com/" target="_blank"><span class="wsr">D</span>Newznab</a></h2> <td><input class="switch" type="checkbox" name="newznab" value="1" ${config['use_newznab']} /></td>
<br /><small><label for="newznab">Enabled/Disabled</label></small> <td>
</td> <h2><a href="http://www.newznab.com/" target="_blank"><span class="wsr">D</span>Newznab Providers</a></h2>
<td><input class="switch" type="checkbox" name="newznab" value="1" ${config['use_newznab']} /></td> <small><label for="newznab">Enabled/Disabled</label></small>
</tr> </td>
<tr> </tr>
<div id="newznab"> </table>
<div class="config" id="newznab1"> <div class="group" id="newznab_switch">
<div class="row"> <div>
<label>Newznab Host</label> <table id="newznab1">
<input type="text" name="newznab_host" value="${config['newznab_host']}" size="30"> <tr><td>
<br /><small>e.g. http://nzb.su</small> <label>Host:</label>
</div> <input type="text" name="newznab_host" value="${config['newznab_host']}" size="30">
<div class="row"> <br /><small>e.g. http://nzb.su</small>
<label>Newznab API</label> </td>
<input type="text" name="newznab_apikey" value="${config['newznab_api']}" size="36"> </tr>
</div> <tr>
<div class="row checkbox"> <td>
<input id="newznab_enabled" type="checkbox" name="newznab_enabled" onclick="initConfigCheckbox($(this));" value="1" ${config['newznab_enabled']} /> <label>API</label>
<label>Enabled</label> <input type="text" name="newznab_apikey" value="${config['newznab_api']}" size="36">
</div> </td>
</div> </tr>
<% <tr>
newznab_number = 1 <td>
%> <input id="newznab_enabled" type="checkbox" name="newznab_enabled" value="1" ${config['newznab_enabled']} />
<label>Enabled</label>
</td>
</tr>
<tr>
<td><input class="newznab-edit-extras" type="button" value ="Edit Extras"/></td>
</tr>
</table>
</div>
<div id="newznab-dialog">
%for newznab in config['extra_newznabs']: %for newznab in config['extra_newznabs']:
<div class="config" id="newznab${newznab_number}"> <table id="newznab${newznab_number}">
<div class="row"> <tr>
<label>Newznab Host:</label> <td>
<input type="text" name="newznab_host${newznab_number}" value="${newznab[0]}" size="30"> <label>Newznab Host:</label>
</div> <input type="text" name="newznab_host${newznab_number}" value="${newznab[0]}" size="30">
<div class="row"> </td>
<label>Newznab API:</label> </tr>
<input type="text" name="newznab_api${newznab_number}" value="${newznab[1]}" size="36"> <tr>
</div> <td>
<div class="row checkbox"> <label>Newznab API:</label>
<input id="newznab_enabled" type="checkbox" name="newznab_enabled${newznab_number}" value="1" ${newznab_enabled} /><label>Enabled</label> <input type="text" name="newznab_api${newznab_number}" value="${newznab[1]}" size="36">
</div> </td>
<div class="row"> </tr>
<input type="button" class="remove" id="newznab${newznab_number}" value="Remove ${newznab[0]}"> <tr>
</div> <td>
</div> <input id="newznab_enabled" type="checkbox" name="newznab_enabled${newznab_number}" value="1" ${newznab_enabled} /><label>Enabled/Disabled</label>
<% </td>
newznab_number += 1 </tr>
%> <tr>
<td>
<input type="button" class="remove" id="newznab${newznab_number}" value="Remove ${newznab[0]}">
</td>
</tr>
</table>
%endfor %endfor
<input type="button" value="Add Newznab" class="add_newznab" id="add_newznab" /> <input type="button" value="Add Newznab" class="add_newznab" id="add_newznab" />
</div> </div>
</tr> </div>
</table> </div>
<!--end Newznab--> <!--end Newznab-->
<!--NZBs.org--> <!--NZBs.org-->
<table> <div class="group">
<tr> <table>
<td> <tr>
<h2><a href="http://nzbs.org/" target="_blank"><span class="wsr">D</span>Nzbs</a></h2> <td><input class="switch" type="checkbox" name="nzbsorg" value="1" ${config['use_nzbsorg']} /></td>
<small></small> <td><h2><a href="http://nzbs.org/" target="_blank"><span class="wsr">D</span>Nzbs.org</a></h2>
</td> <small><label for="nzbsorg"></label></small>
<td><input class="switch" type="checkbox" name="nzbsorg" value="1" ${config['use_nzbsorg']} /><small><label for="nzbsorg"></label></small></td> </td>
</tr> </tr>
</table> </table>
<table id="nzbsorg"> <div class="group" id="nzbsorg_switch">
<tr> <table>
<td><label for="nzbsorg_hash">API Key:</label></td> <tr>
<td><input type="text" name="nzbsorg_hash" value="${config['nzbsorg_hash']}" size="30" maxlength="40"></td> <td><label for="nzbsorg_hash">API Key:</label></td>
</tr> <td><input type="text" name="nzbsorg_hash" value="${config['nzbsorg_hash']}" size="30" maxlength="40"></td>
</table> </tr>
</table>
</div>
</div>
<!--end NZBs.org--> <!--end NZBs.org-->
<!--Newzbin--> <!--Newzbin-->
<div class="group">
<table> <table>
<tr> <tr>
<td><input class="switch" type="checkbox" name="newzbin" value="1" ${config['use_newzbin']} /></td>
<td> <td>
<h2><a href="http://www.newsbin.com/" target="_blank"><span class="wsr">D</span>Newzbin</a></h2> <h2><a href="http://www.newsbin.com/" target="_blank"><span class="wsr">D</span>Newzbin</a></h2>
<small><label for="newzbin">Enabled/Disabled</label></small> <small><label for="newzbin">Enabled/Disabled</label></small>
</td> </td>
<td>
<input class="switch" type="checkbox" name="newzbin" value="1" ${config['use_newzbin']} />
</td>
</tr>
</table>
<table id="newsbin" class="configtable">
<tr>
<td><label for="newzbin_uid">UID:</label></td>
<td><input type="text" name="newzbin_uid" value="${config['newzbin_uid']}" size="30" maxlength="40" /></td>
</tr>
<tr>
<td><label for="newzbin_password">Password:</label></td>
<td><input type="text" name="newzbin_password" value="${config['newzbin_pass']}" size="36" maxlength="40" /></td>
</tr> </tr>
</table> </table>
<div class="group" id="newzbin_switch">
<table>
<tr>
<td><label for="newzbin_uid">UID:</label></td>
<td><input type="text" name="newzbin_uid" value="${config['newzbin_uid']}" size="30" maxlength="40" /></td>
</tr>
<tr>
<td><label for="newzbin_password">Password:</label></td>
<td><input type="text" name="newzbin_password" value="${config['newzbin_pass']}" size="36" maxlength="40" /></td>
</tr>
</table>
</div>
</div>
<!--end Newzbin--> <!--end Newzbin-->
<!--Torrents--> <!--Torrents-->
@@ -578,7 +606,7 @@
<div><!--Encoder Options--> <div><!--Encoder Options-->
<table id="encoderoptions"> <table id="encoderoptions">
<tr> <tr>
<td><h2>Encoder Options</h2></td> <td colspan="2"><h2>Encoder Options</h2></td>
</tr> </tr>
<tr> <tr>
<td><label for="encoderlossless">Only re-encode lossless files (.flac)</label></td> <td><label for="encoderlossless">Only re-encode lossless files (.flac)</label></td>
@@ -711,15 +739,17 @@
<h1><span class="wsr">W</span> Notifications</h1> <h1><span class="wsr">W</span> Notifications</h1>
<small></small> <small></small>
<!--Prowl--> <!--Prowl-->
<div class="group">
<table> <table>
<tr> <tr>
<td><input class="switch" type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} /></td>
<td><h2>Prowl Options</h2> <td><h2>Prowl Options</h2>
<small><label for="prowl_enabled">Enabled/Disabled</label></small> <small><label for="prowl_enabled">Enabled/Disabled</label></small>
</td> </td>
<td><input class="switch" type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} /></td>
</tr> </tr>
</table> </table>
<table id="prowloptions"> <div class="group" id="prowl_enabled_switch">
<table>
<tr> <tr>
<td><label for="prowl_keys">API key:</label></td> <td><label for="prowl_keys">API key:</label></td>
@@ -732,17 +762,22 @@
<tr><td><label for="prowl_priority">Priority (-2,-1,0,1 or 2):</label></td> <tr><td><label for="prowl_priority">Priority (-2,-1,0,1 or 2):</label></td>
<td><input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2"></td> <td><input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2"></td>
</tr> </tr>
</table><!--end Prowl--> </table>
</div>
</div>
<!--end Prowl-->
<!--XBMC--> <!--XBMC-->
<div class="group">
<table> <table>
<tr> <tr>
<td><input class="switch" type="checkbox" name="xbmc_enabled" id="xbmc" value="1" ${config['xbmc_enabled']} /></td>
<td><h2>XBMC</h2> <td><h2>XBMC</h2>
<small><label for="xbmc_enabled">Enabled/Disabled</label></small> <small><label for="xbmc_enabled">Enabled/Disabled</label></small>
</td> </td>
<td><input class="switch" type="checkbox" name="xbmc_enabled" id="xbmc" value="1" ${config['xbmc_enabled']} /></td>
</tr> </tr>
</table> </table>
<table id="xbmcoptions"> <div class="group" id="xbmc_enabled_switch">
<table>
<tr> <tr>
<td><label for="xbmc_host">XBMC Host:</label> <td><label for="xbmc_host">XBMC Host:</label>
<small>e.g. http://localhost:8080. Separate hosts with commas</small> <small>e.g. http://localhost:8080. Separate hosts with commas</small>
@@ -766,19 +801,24 @@
<td><label>Send Notification to XBMC:</label></td> <td><label>Send Notification to XBMC:</label></td>
<td><input type="checkbox" name="xbmc_notify" value="1" ${config['xbmc_notify']} /></td> <td><input type="checkbox" name="xbmc_notify" value="1" ${config['xbmc_notify']} /></td>
</tr> </tr>
</table><!--end XBMC--> </table>
</div>
</div>
<!--end XBMC-->
<!--NMA Options--> <!--NMA Options-->
<div class="group">
<table> <table>
<tr> <tr>
<td><input class="switch" type="checkbox" name="nma_enabled" id="nma" value="1" ${config['nma_enabled']} /></td>
<td> <td>
<h2>Notify My Android</h2> <h2>Notify My Android</h2>
<small><label for="nma_enabled">Enabled/Disabled</label></small> <small><label for="nma_enabled">Enabled/Disabled</label></small>
</td> </td>
<td><input class="switch" type="checkbox" name="nma_enabled" id="nma" value="1" ${config['nma_enabled']} /></td>
</tr> </tr>
</table> </table>
<table id="nmaoptions"> <div class="group" id="nma_enabled_switch">
<table>
<tr> <tr>
<td><label for="nma_apikey">NotifyMyAndroid API Key:</label> <td><label for="nma_apikey">NotifyMyAndroid API Key:</label>
<small>Separate multiple api keys with ",".</small> <small>Separate multiple api keys with ",".</small>
@@ -789,6 +829,11 @@
<td><a href="https://play.google.com/store/apps/details?id=com.usk.app.notifymyandroid">Get NotifyMyAndroid</a></td> <td><a href="https://play.google.com/store/apps/details?id=com.usk.app.notifymyandroid">Get NotifyMyAndroid</a></td>
</tr> </tr>
<tr>
<td><label for="nma_onsnatch">Notify on snatch?</label></td>
<td><input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /></td>
</tr>
<!--Priority--> <!--Priority-->
<tr> <tr>
<td><label for="nma_priority">Priority:</label></td> <td><label for="nma_priority">Priority:</label></td>
@@ -818,10 +863,18 @@
</td> </td>
</tr><!--end Priority--> </tr><!--end Priority-->
</table><!--end NMA Options--> </table><!--end NMA Options-->
</div>
</div><!--end Notifications--> </div><!--end Notifications-->
<div id="NAS"> <div id="NAS">
<h2>Synology NAS</h2> <h2>Synology NAS</h2>
<input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label> <table>
<tr>
<td>
<input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label>
</td>
</tr>
</table>
</div> </div>
<!--Mirror--> <!--Mirror-->
<div id="Mirror"> <div id="Mirror">
@@ -894,20 +947,26 @@
<%def name="javascriptIncludes()"> <%def name="javascriptIncludes()">
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#api_key').click(function(){ $('#api_key').select() });
$("#generate_api").click(function(){
$.get('generateAPI',
function(data){
if (data.error != undefined) {
alert(data.error);
return;
}
$('#api_key').val(data);
});
});
$("#newznab-dialog").hide();
$(".newznab-edit-extras").click(function(){
$("#newznab-dialog").dialog();
});
$(".submitForm").click(function(){ $(".submitForm").click(function(){
$("#config").submit(); $("#config").submit();
}); });
//Newznab //Newznab
function newznab(){
if( $('input[name="newznab"]').is(":checked") ){
$("table#newznab-group").show();
enit();
}
else {
$("table#newznab-group").hide();
enit();
}
}
var deletedNewznabs = 0; var deletedNewznabs = 0;
$(".remove").click(function() { $(".remove").click(function() {
$(this).parent().parent().remove(); $(this).parent().parent().remove();
@@ -915,17 +974,31 @@
}); });
$("#add_newznab").click(function() { $("#add_newznab").click(function() {
var intId = $("#newznab_providers > div").size() + deletedNewznabs + 1; var intId = $("#newznab-dialog > table").size() + deletedNewznabs + 1;
var formfields = $("<div class=\"config\" id=\"newznab" + intId + "\"><div class=\"row\"><label>Newznab Host</label><input type=\"text\" name=\"newznab_host" + intId + "\" size=\"30\"></div><div class=\"row\"><label>Newznab API</label><input type=\"text\" name=\"newznab_api" + intId + "\" size=\"36\"></div><div class=\"row checkbox\"><input type=\"checkbox\" name=\"newznab_enabled" + intId + "\" value=\"1\" checked /><label>Enabled</label></div>"); alert(intId);
var removeButton = $("<div class=\"row\"><input type=\"button\" class=\"remove\" value=\"Remove\" /></div>"); var rowStart = "<tr><td>";
var rowEnd = "</td></tr>";
var formfields = $("<table id='newznab" + intId + "'>" +
rowStart +
"<label>Newznab Host</label>" +
"<input type='text' name='newznab_host" + intId + "' size='30'>" +
rowEnd +
rowStart +
"<label>Newznab API</label>" +
"<input type='text' name='newznab_api" + intId + "' size='36'>" +
rowEnd +
rowStart +
"<input type='checkbox' name='newznab_enabled" + intId + "' value='1' checked />" +
"<label>Enabled</label>" +
rowEnd);
var removeButton = $(rowStart + "<input type='button' class='remove' value='Remove' />" + rowEnd);
removeButton.click(function() { removeButton.click(function() {
$(this).parent().remove(); $(this).parent().remove();
deletedNewznabs = deletedNewznabs + 1; deletedNewznabs = deletedNewznabs - 1;
}); });
formfields.append(removeButton); formfields.append(removeButton);
formfields.append("</div>"); formfields.append("</table>");
$("#add_newznab").after(formfields); $("#add_newznab").before(formfields);
}); });
//Mirrors //Mirrors
data/interfaces/brink/css/style.css
+39 -17
View File
@@ -159,6 +159,7 @@ ul#nav li a{
color: rgba(0,0,0,0.9); color: rgba(0,0,0,0.9);
text-shadow: 1px 1px rgba(0,145,255,0.2); text-shadow: 1px 1px rgba(0,145,255,0.2);
} }
/* * /* *
* Sub navigation * Sub navigation
*/ */
@@ -223,6 +224,11 @@ ul#nav-sub > li:hover > a {
border-bottom: 2px solid rgb(0,145,255); border-bottom: 2px solid rgb(0,145,255);
cursor: pointer; cursor: pointer;
} }
ul#nav-sub > li > a.active {
color: rgb(0,145,255);
border-bottom: 2px solid rgb(0,145,255);
cursor: pointer;
}
ul#content-container{ ul#content-container{
overflow: hidden; overflow: hidden;
@@ -248,11 +254,12 @@ input, textarea, select, option {
appearance:none; appearance:none;
-moz-appearance:none; /* Firefox */ -moz-appearance:none; /* Firefox */
-webkit-appearance:none; /* Safari and Chrome */ -webkit-appearance:none; /* Safari and Chrome */
-0-appearance:none; /* Safari and Chrome */
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
font-size: .8em; font-size: .8em;
color: rgba(255,255,255,0.6); color: rgba(255,255,255,0.6);
line-height: 25px; line-height: 2em;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
} }
@@ -279,6 +286,8 @@ input[type="button"],
input[type="submit"]{ input[type="submit"]{
background-color: rgba(0,0,0,.1); background-color: rgba(0,0,0,.1);
border: 1px solid rgba(0,0,0,.3); border: 1px solid rgba(0,0,0,.3);
height: 2.3em;
display: inline;
} }
select:hover, select:hover,
input[type="button"]:hover, input[type="button"]:hover,
@@ -288,6 +297,7 @@ input[type="submit"]:hover{
} }
select option{ select option{
background: rgb(31,31,31); background: rgb(31,31,31);
border: 0;
} }
select option:hover{ select option:hover{
background: rgb(255,255,255); background: rgb(255,255,255);
@@ -335,8 +345,17 @@ input[type="checkbox"]:checked:after{
/*config*/ /*config*/
div#config_wrapper { margin: auto; width: 640px;} div#config_wrapper { margin: auto; width: 640px;}
div#config_wrapper div table { width: 100%; border-collapse:separate; border-spacing: 10px; } div#config_wrapper div table { width: 100%; border-collapse:separate; border-spacing: 10px; }
div#config_wrapper div table tr td:first-child{ width: 240px; } div#config_wrapper div table tr td:first-child{ width: 50%; }
div#config_wrapper div table tr td{ vertical-align: middle; } div#config_wrapper div table tr td{ vertical-align: middle; }
div.group {
padding: 5px;
background-color: rgba(0,0,0,0.1);
border-top: 1px solid rgba(0,0,0,0.1);
border-left: 1px solid rgba(0,0,0,0.1);
border-bottom: 1px solid rgba(255,255,255,0.1);
border-right: 1px solid rgba(255,255,255,0.1);
display: block;
}
/*end config*/ /*end config*/
/* Artist Table Style*/ /* Artist Table Style*/
@@ -424,35 +443,38 @@ table#album_table td#albumart { vertical-align: middle; text-align: left; }
height: 126px; height: 126px;
width: 126px; width: 126px;
position: relative; position: relative;
box-shadow: 0 0 6px #000;
-moz-box-shadow: 0 0 6px #000;
-webkit-box-shadow: 0 0 6px #000;
overflow: hidden;
} }
.image-container .image-box img { .image-container .image-box img {
width: 100%; width: 100%;
min-height: 100%; height: 100%;
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
z-index: 1; z-index: 1;
border: 0; border: 0;
box-shadow: 0px 0px 10px rgb(0,0,0);
-moz-box-shadow: 0px 0px 10px rgb(0,0,0);
-webkit-box-shadow: 0px 0px 10px rgb(0,0,0);
-o-box-shadow: 0px 0px 10px rgb(0,0,0);
} }
.image-container input { .image-container .image-box input {
position: absolute; position: absolute;
top: 0px; top: 0px;
z-index: 2;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: right; text-align: center;
} }
.image-container input:checked { .image-container .image-box input:checked {
content: ""; box-shadow: 0px 0px 10px rgb(0,145,255);
background: rgba(0,0,0,0.1); -moz-box-shadow: 0px 0px 10px rgb(0,145,255);
box-shadow: 0 0 10px rgb(0,145,255); -webkit-box-shadow: 0px 0px 10px rgb(0,145,255);
-moz-box-shadow: 0 0 10px rgb(0,145,255); -0-box-shadow: 0px 0px 10px rgb(0,145,255);
-webkit-box-shadow: 0 0 10px rgb(0,145,255); }
.image-container .image-box .image-count {
width: 100%;
height: 100%;
font-size: 10em;
} }
.image-container .image-actions { .image-container .image-actions {
display: none; display: none;
data/interfaces/brink/extras.html
+17 -5
View File
@@ -2,12 +2,24 @@
<%def name="body()"> <%def name="body()">
<div class="table_wrapper"> <div class="table_wrapper">
<h1>Suggestions</h1> <h1>Suggestions</h1>
<div class="cloudtag">
<ul id="cloud">
%for artist in cloudlist: %for artist in cloudlist:
<li><a href="addArtist?artistid=${artist['ArtistID']}" class="tag${artist['Count']}">${artist['ArtistName']}</a></li> <div class="image-container">
<div class="image-box">
<div class="image-count">${artist['Count']}</div>
<img />
<div class="image-actions">
%if artist['Status'] == 'Loading':
<a href="addArtist?artistid=${artist['ArtistID']}"><span class="wsr Like"></span></a>
%else:
${havetracks}/${totaltracks}
%endif
</div>
</div>
<div class="image-info">
<b title="${artist['ArtistID']}"><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></b>
</div>
</div>
%endfor %endfor
</ul>
</div>
</div> </div>
</%def> </%def>
data/interfaces/brink/js/configscript.js
+5 -5
View File
@@ -43,15 +43,15 @@ $(document).ready(function(){
$( '.switch' ).each(function(){ $( '.switch' ).each(function(){
//set Label name to current active state //set Label name to current active state
var labelName = 'label[for="' + $( this ).attr( "name" ) + '"]'; var labelName = 'label[for="' + $( this ).attr( "name" ) + '"]';
var switchId = $( this ).attr( "name" ); var switchId = $( this ).attr( "name" ) + "_switch";
if ( $( this ).is(':checked') ){ if ( $( this ).is(':checked') ){
$( labelName ).text( 'Enabled' ); $( labelName ).text( 'Enabled' );
$("#" + switchId ).show(); $("#" + switchId ).slideDown();
enit(); enit();
} }
else { else {
$( labelName ).text( 'Disabled' ); $( labelName ).text( 'Disabled' );
$("#" + switchId ).hide(); $("#" + switchId ).slideUp();
enit(); enit();
} }
//Change label //Change label
@@ -59,12 +59,12 @@ $(document).ready(function(){
if ( $( this ).is( ':checked' ) ){ if ( $( this ).is( ':checked' ) ){
$( labelName ).text( 'Enabled' ); $( labelName ).text( 'Enabled' );
$("#" + switchId ).show(); $("#" + switchId ).slideDown();
enit(); enit();
} }
else{ else{
$( labelName ).text( 'Disabled' ); $( labelName ).text( 'Disabled' );
$("#" + switchId ).hide(); $("#" + switchId ).slideUp();
enit(); enit();
} }
}); });
data/interfaces/brink/js/script.js
+3 -3
View File
@@ -15,7 +15,7 @@ function getArtistInfo(name,imgElem,size,artistID) {
} else { } else {
if ( data.artist === undefined || imageUrl == "" || imageUrl == undefined ) { if ( data.artist === undefined || imageUrl == "" || imageUrl == undefined ) {
var imageLarge = "#"; var imageLarge = "#";
var imageUrl = "interfaces/brink/images/no-cover-artist.png"; var imageUrl = "interfaces/brink/images/no-artist-art.png";
} else { } else {
var artist = data.artist.mbid; var artist = data.artist.mbid;
var artistBio = data.artist.bio.summary; var artistBio = data.artist.bio.summary;
@@ -42,7 +42,7 @@ function getArtistInfo(name,imgElem,size,artistID) {
} }
if ( data.artist === undefined || imageUrl == "" ) { if ( data.artist === undefined || imageUrl == "" ) {
var imageLarge = "#"; var imageLarge = "#";
var imageUrl = "interfaces/brink/images/no-cover-artist.png"; var imageUrl = "interfaces/brink/images/no-artist-art.png";
} else { } else {
var artist = data.artist.name; var artist = data.artist.name;
var artistBio = data.artist.bio.summary; var artistBio = data.artist.bio.summary;
@@ -101,7 +101,7 @@ function getAlbumInfo(name, album, elem,size) {
$(elem).css("background", "url("+ imageUrl+")"); $(elem).css("background", "url("+ imageUrl+")");
} }
$(elem).css("background", "url("+ imageUrl+") center top no-repeat"); $(elem).css("background", "url("+ imageUrl+") center top no-repeat");
$(elem).wrap('<a href="'+ imageLarge +'" rel="dialog" title="' + name + '"></a>'); //$(elem).wrap('<a href="'+ imageLarge +'" rel="dialog" title="' + name + '"></a>');
} }
}); });
} }
data/interfaces/brink/manage.html
+1 -1
View File
@@ -7,7 +7,7 @@
<%def name="body()"> <%def name="body()">
<div id="nav-sub-container"> <div id="nav-sub-container">
<ul id="nav-sub"> <ul id="nav-sub">
<li>Manage: </li> <li><a class="active" href="manage">Manage</a></li>
<li><a href="manageAlbums">Albums</a></li> <li><a href="manageAlbums">Albums</a></li>
<li><a href="manageArtists">Artists</a></li> <li><a href="manageArtists">Artists</a></li>
%if not headphones.ADD_ARTISTS: %if not headphones.ADD_ARTISTS:
data/interfaces/brink/managealbums.html
+10 -3
View File
@@ -6,10 +6,17 @@
<%def name="body()"> <%def name="body()">
<div class="table_wrapper"> <div id="nav-sub-container">
<div id="manageheader" class="title"> <ul id="nav-sub">
<h1 class="clearfix"><img src="interfaces/default/images/icon_manage.png" alt="manage"/>Manage Albums</h1> <li><a href="manage">Manage</a></li>
<li><a class="active" href="manageAlbums">Albums</a></li>
<li><a href="manageArtists">Artists</a></li>
%if not headphones.ADD_ARTISTS:
<li><a href="manageNew">New Artists</a></li>
%endif
</ul>
</div> </div>
<div class="table_wrapper">
<form action="markAlbums" method="get" id="markAlbums"> <form action="markAlbums" method="get" id="markAlbums">
<div id="markalbum">Mark selected albums as <div id="markalbum">Mark selected albums as
<select name="action" onChange="doAjaxCall('markAlbums',$(this),'table',true);" data-error="You didn't select any albums"> <select name="action" onChange="doAjaxCall('markAlbums',$(this),'table',true);" data-error="You didn't select any albums">
data/interfaces/brink/manageartists.html
+16 -3
View File
@@ -1,8 +1,19 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%!
from headphones import db
import headphones
%>
<%def name="body()"> <%def name="body()">
<div id="nav-sub-container"> <div id="nav-sub-container">
<h1>Manage Artists<h1> <ul id="nav-sub">
<li><a href="manage">Manage</a></li>
<li><a href="manageAlbums">Albums</a></li>
<li><a class="active" href="manageArtists">Artists</a></li>
%if not headphones.ADD_ARTISTS:
<li><a href="manageNew">New Artists</a></li>
%endif
</ul>
</div> </div>
<form action="markArtists" method="get"> <form action="markArtists" method="get">
<p class="indented"> <p class="indented">
@@ -52,10 +63,12 @@
<span class="wsr Clock"></span> <span class="wsr Clock"></span>
%elif artist['Status'] == 'Loading': %elif artist['Status'] == 'Loading':
<span class="wsr Loading loader"></span> <span class="wsr Loading loader"></span>
%else: %elif artist['Status'] == 'Active':
<span class="wsr Approved"></span> <span class="wsr Approved"></span>
%else:
<span class="wsr Alert"></span>
%endif %endif
${artist['Status']}
</td> </td>
<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td> <td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td>
<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td> <td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>