Merge branch 'manage-albums-filter' into develop

This commit is contained in:
rembo10
2012-08-14 13:08:52 +05:30
3 changed files with 26 additions and 5 deletions

View File

@@ -144,6 +144,7 @@ function initConfigCheckbox(elem) {
function initActions() {
$("#subhead_menu #menu_link_refresh").button({ icons: { primary: "ui-icon-refresh" } });
$("#subhead_menu #menu_link_edit").button({ icons: { primary: "ui-icon-pencil" } });
$("#subhead_menu .menu_link_edit").button({ icons: { primary: "ui-icon-pencil" } });
$("#subhead_menu #menu_link_delete" ).button({ icons: { primary: "ui-icon-trash" } });
$("#subhead_menu #menu_link_pauze").button({ icons: { primary: "ui-icon-pause"} });
$("#subhead_menu #menu_link_resume").button({ icons: { primary: "ui-icon-play"} });

View File

@@ -6,10 +6,21 @@
<%def name="headerIncludes()">
<div id="subhead_container">
<div id="subhead_menu">
<a id="menu_link_edit" href="manageAlbums">Manage Albums</a>
<a id="menu_link_edit" href="manageArtists">Manage Artists</a>
<a class="menu_link_edit" id="manage_albums" href="#">Manage Albums</a>
<div id="dialog" title="Choose Album Filter" style="display:none" class="configtable">
<div class="links">
<a href="manageAlbums?Status=Downloaded"><span class="ui-icon ui-icon-check"></span>Manage Downloaded Albums</a><br>
<a href="manageAlbums?Status=Skipped"><span class="ui-icon ui-icon-flag"></span>Manage Skipped Albums</a><br>
<a href="manageAlbums?Status=Snatched"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span>Manage Snatched Albums</a><br>
<a href="manageAlbums?Status=Upcoming"><span class="ui-icon ui-icon-calendar"></span>Manage Upcoming Albums</a><br>
<a href="manageAlbums?Status=Wanted"><span class="ui-icon ui-icon-heart"></span>Manage Wanted Albums</a><br>
<br><br>
<a href="manageAlbums">Manage All Albums</a>
</div>
</div>
<a class="menu_link_edit" href="manageArtists">Manage Artists</a>
%if not headphones.ADD_ARTISTS:
<a id="menu_link_edit" href="manageNew">Manage New Artists</a>
<a class="menu_link_edit" href="manageNew">Manage New Artists</a>
%endif
</div>
</div>
@@ -95,6 +106,10 @@
<%def name="javascriptIncludes()">
<script>
function initThisPage() {
$('#manage_albums').click(function() {
$('#dialog').dialog();
return false;
});
jQuery( "#tabs" ).tabs();
initActions();
};

View File

@@ -229,9 +229,14 @@ class WebInterface(object):
return serve_template(templatename="manageartists.html", title="Manage Artists", artists=artists)
manageArtists.exposed = True
def manageAlbums(self):
def manageAlbums(self, Status=None):
myDB = db.DBConnection()
albums = myDB.select('SELECT * from albums')
if Status == "Upcoming":
albums = myDB.select("SELECT * from albums WHERE ReleaseDate > date('now')")
elif Status:
albums = myDB.select('SELECT * from albums WHERE Status=?', [Status])
else:
albums = myDB.select('SELECT * from albums')
return serve_template(templatename="managealbums.html", title="Manage Albums", albums=albums)
manageAlbums.exposed = True