From bb33ac58a1cbd27b7c28b00562a5c5ce9e1e6136 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 31 Jul 2012 07:21:33 +0200 Subject: [PATCH] Rename artist list admin page. --- .../page/admin/ArtistsAdminPage.java | 75 ---------------------- .../demoscenemusic/page/admin/ListArtistsPage.java | 75 ++++++++++++++++++++++ src/main/resources/templates/admin.artists | 15 ----- src/main/resources/templates/admin.list-artists | 15 +++++ src/main/resources/templates/include/footer | 2 +- src/main/webapp/WEB-INF/web.xml.template | 8 +-- 6 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/demoscenemusic/page/admin/ArtistsAdminPage.java create mode 100644 src/main/java/net/pterodactylus/demoscenemusic/page/admin/ListArtistsPage.java delete mode 100644 src/main/resources/templates/admin.artists create mode 100644 src/main/resources/templates/admin.list-artists diff --git a/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ArtistsAdminPage.java b/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ArtistsAdminPage.java deleted file mode 100644 index ff93e8f..0000000 --- a/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ArtistsAdminPage.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * DemosceneMusic - ArtistAdminPage.java - Copyright © 2012 David Roden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.demoscenemusic.page.admin; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.pterodactylus.demoscenemusic.core.Core; -import net.pterodactylus.demoscenemusic.data.Artist; -import net.pterodactylus.demoscenemusic.data.DefaultArtist; -import net.pterodactylus.demoscenemusic.page.ServletRequest; -import net.pterodactylus.util.database.DatabaseException; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; -import net.pterodactylus.util.template.TemplateContextFactory; -import net.pterodactylus.util.web.RedirectException; - -/** - * Administration page for managing artists. This page actually allows you to - * delete artists, the template, however, will allow you to edit and add - * artists, too. - * - * @author David ‘Bombe’ Roden - */ -public class ArtistsAdminPage extends AdminBasePage { - - /** - * @param core - * The core - * @param templateContextFactory - * The template context factory - * @param template - * The template to render - */ - public ArtistsAdminPage(Core core, TemplateContextFactory templateContextFactory, Template template) { - super(core, templateContextFactory, template, "admin/artists"); - } - - // - // BASEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException { - super.processTemplate(templateContext, request); - try { - List allArtists = new ArrayList(getCore().getDataManager().getAllArtists()); - Collections.sort(allArtists, DefaultArtist.NAME_COMPARATOR); - /* TODO - pagination. */ - templateContext.set("artists", allArtists); - } catch (DatabaseException de1) { - throw new RuntimeException("Could not load artists from database.", de1); - } - } - -} diff --git a/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ListArtistsPage.java b/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ListArtistsPage.java new file mode 100644 index 0000000..9b76db9 --- /dev/null +++ b/src/main/java/net/pterodactylus/demoscenemusic/page/admin/ListArtistsPage.java @@ -0,0 +1,75 @@ +/* + * DemosceneMusic - ListArtistsPage.java - Copyright © 2012 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.demoscenemusic.page.admin; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.pterodactylus.demoscenemusic.core.Core; +import net.pterodactylus.demoscenemusic.data.Artist; +import net.pterodactylus.demoscenemusic.data.DefaultArtist; +import net.pterodactylus.demoscenemusic.page.ServletRequest; +import net.pterodactylus.util.database.DatabaseException; +import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; +import net.pterodactylus.util.template.TemplateContextFactory; +import net.pterodactylus.util.web.RedirectException; + +/** + * Administration page for managing artists. This page actually allows you to + * delete artists, the template, however, will allow you to edit and add + * artists, too. + * + * @author David ‘Bombe’ Roden + */ +public class ListArtistsPage extends AdminBasePage { + + /** + * @param core + * The core + * @param templateContextFactory + * The template context factory + * @param template + * The template to render + */ + public ListArtistsPage(Core core, TemplateContextFactory templateContextFactory, Template template) { + super(core, templateContextFactory, template, "admin/artists"); + } + + // + // BASEPAGE METHODS + // + + /** + * {@inheritDoc} + */ + @Override + protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException { + super.processTemplate(templateContext, request); + try { + List allArtists = new ArrayList(getCore().getDataManager().getAllArtists()); + Collections.sort(allArtists, DefaultArtist.NAME_COMPARATOR); + /* TODO - pagination. */ + templateContext.set("artists", allArtists); + } catch (DatabaseException de1) { + throw new RuntimeException("Could not load artists from database.", de1); + } + } + +} diff --git a/src/main/resources/templates/admin.artists b/src/main/resources/templates/admin.artists deleted file mode 100644 index 40aea01..0000000 --- a/src/main/resources/templates/admin.artists +++ /dev/null @@ -1,15 +0,0 @@ -<%include include/header title=="Manage Artist"> - -

Manage <% artist.name|html>

- -<%foreach artists artist> - <%first>
    <%/first> -
  • <% artist.name|html> edit
    • - <%last>
<%/last> -<%/foreach> - -

Add a New Artist

- -<%include include/admin.add-artist> - -<%include include/footer> \ No newline at end of file diff --git a/src/main/resources/templates/admin.list-artists b/src/main/resources/templates/admin.list-artists new file mode 100644 index 0000000..a418166 --- /dev/null +++ b/src/main/resources/templates/admin.list-artists @@ -0,0 +1,15 @@ +<%include include/header title=="Manage Artist"> + +

Manage <% artist.name|html>

+ +<%foreach artists artist> + <%first>
    <%/first> +
  • <% artist.name|html><%foreach artist.groups group><%first> / <%/first><%notfirst> ^ <%/notfirst><%group.name|html><%/foreach> edit
    • + <%last>
<%/last> +<%/foreach> + +

Add a New Artist

+ +<%include include/admin.add-artist> + +<%include include/footer> \ No newline at end of file diff --git a/src/main/resources/templates/include/footer b/src/main/resources/templates/include/footer index 3f77f6f..2d07014 100644 --- a/src/main/resources/templates/include/footer +++ b/src/main/resources/templates/include/footer @@ -3,7 +3,7 @@ <%if currentUser.god> admin: ( -artists +artists | parties ) diff --git a/src/main/webapp/WEB-INF/web.xml.template b/src/main/webapp/WEB-INF/web.xml.template index dca8af2..5eb733b 100644 --- a/src/main/webapp/WEB-INF/web.xml.template +++ b/src/main/webapp/WEB-INF/web.xml.template @@ -79,10 +79,6 @@ net.pterodactylus.demoscenemusic.page.admin.AddTrackDerivativePage - admin.artists - net.pterodactylus.demoscenemusic.page.admin.ArtistsAdminPage - - admin.edit-artist net.pterodactylus.demoscenemusic.page.admin.EditArtistPage @@ -99,6 +95,10 @@ net.pterodactylus.demoscenemusic.page.admin.EditTrackPage + admin.list-artists + net.pterodactylus.demoscenemusic.page.admin.ListArtistsPage + + admin.list-parties net.pterodactylus.demoscenemusic.page.admin.ListPartiesPage -- 2.7.4