From ebe19cc29153ccdc9a63061dd613f20aaa2fb390 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 21 Feb 2012 20:16:17 +0100 Subject: [PATCH] Add page that displays all new posts and replies. --- .../java/net/pterodactylus/sone/web/NewPage.java | 82 ++++++++++++++++++++++ .../net/pterodactylus/sone/web/WebInterface.java | 2 + src/main/resources/i18n/sone.en.properties | 6 ++ src/main/resources/templates/new.html | 20 ++++++ 4 files changed, 110 insertions(+) create mode 100644 src/main/java/net/pterodactylus/sone/web/NewPage.java create mode 100644 src/main/resources/templates/new.html diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java new file mode 100644 index 0000000..c7281e3 --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/web/NewPage.java @@ -0,0 +1,82 @@ +/* + * Sone - NewPage.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.sone.web; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import net.pterodactylus.sone.data.Post; +import net.pterodactylus.sone.data.PostReply; +import net.pterodactylus.sone.notify.ListNotificationFilters; +import net.pterodactylus.sone.web.page.FreenetRequest; +import net.pterodactylus.util.collection.Pagination; +import net.pterodactylus.util.number.Numbers; +import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; + +/** + * Page that displays all new posts and replies. The posts are filtered using + * {@link ListNotificationFilters#filterPosts(java.util.Collection, net.pterodactylus.sone.data.Sone)} + * and sorted by time. + * + * @author David ‘Bombe’ Roden + */ +public class NewPage extends SoneTemplatePage { + + /** + * Creates a new “new posts and replies” page. + * + * @param template + * The template to render + * @param webInterface + * The Sone web interface + */ + public NewPage(Template template, WebInterface webInterface) { + super("new.html", template, "Page.New.Title", webInterface); + } + + // + // SONETEMPLATEPAGE METHODS + // + + /** + * {@inherit} + */ + @Override + protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { + super.processTemplate(request, templateContext); + + /* collect new elements from notifications. */ + Set posts = webInterface.getNewPosts(); + for (PostReply reply : webInterface.getNewReplies()) { + posts.add(reply.getPost()); + } + + /* filter and sort them. */ + List sortedPosts = ListNotificationFilters.filterPosts(new ArrayList(posts), webInterface.getCurrentSone(request.getToadletContext(), false)); + Collections.sort(sortedPosts, Post.TIME_COMPARATOR); + + /* paginate them. */ + Pagination pagination = new Pagination(sortedPosts, webInterface.getCore().getPreferences().getPostsPerPage()).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0)); + templateContext.set("pagination", pagination); + templateContext.set("posts", pagination.getItems()); + } + +} diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index ba12765..109a972 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -583,6 +583,7 @@ public class WebInterface implements CoreListener { Template emptyTemplate = TemplateParser.parse(new StringReader("")); Template loginTemplate = TemplateParser.parse(createReader("/templates/login.html")); Template indexTemplate = TemplateParser.parse(createReader("/templates/index.html")); + Template newTemplate = TemplateParser.parse(createReader("/templates/new.html")); Template knownSonesTemplate = TemplateParser.parse(createReader("/templates/knownSones.html")); Template createSoneTemplate = TemplateParser.parse(createReader("/templates/createSone.html")); Template createPostTemplate = TemplateParser.parse(createReader("/templates/createPost.html")); @@ -613,6 +614,7 @@ public class WebInterface implements CoreListener { PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/"); pageToadlets.add(pageToadletFactory.createPageToadlet(new RedirectPage("", "index.html"))); pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index")); + pageToadlets.add(pageToadletFactory.createPageToadlet(new NewPage(newTemplate, this), "New")); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone")); pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones")); pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile")); diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index 18171c8..b8fb463 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -4,6 +4,8 @@ Navigation.Menu.Sone.Item.Login.Name=Login Navigation.Menu.Sone.Item.Login.Tooltip=Login to your Sone Navigation.Menu.Sone.Item.Index.Name=Your Sone Navigation.Menu.Sone.Item.Index.Tooltip=Show your Sone +Navigation.Menu.Sone.Item.New.Name=New Posts and Replies +Navigation.Menu.Sone.Item.New.Tooltip=Shows new posts and replies Navigation.Menu.Sone.Item.CreateSone.Name=Create Sone Navigation.Menu.Sone.Item.CreateSone.Tooltip=Create a new Sone Navigation.Menu.Sone.Item.KnownSones.Name=Known Sones @@ -94,6 +96,10 @@ Page.Index.Button.Post=Post! Page.Index.PostList.Title=Post Feed Page.Index.PostList.Text.NoPostYet=Nobody has written any posts yet. You should probably start it right now! +Page.New.Title=New Posts and Replies - Sone +Page.New.Page.Title=New Posts and Replies +Page.New.NothingNew=At the moment there’s nothing new. + Page.KnownSones.Title=Known Sones - Sone Page.KnownSones.Page.Title=Known Sones Page.KnownSones.Text.NoKnownSones=There are currently no known Sones that match the given filter. diff --git a/src/main/resources/templates/new.html b/src/main/resources/templates/new.html new file mode 100644 index 0000000..8e9adf6 --- /dev/null +++ b/src/main/resources/templates/new.html @@ -0,0 +1,20 @@ +<%include include/head.html> + + + +

<%= Page.New.Page.Title|l10n|html>

+ + <%include include/updateStatus.html> + +
+ <%= page|store key=pageParameter> + <%include include/pagination.html paginationName==pagination-index> + <%foreach pagination.items post> + <%include include/viewPost.html> + <%foreachelse> +
<%= Page.New.NothingNew|l10n|html>
+ <%/foreach> + <%include include/pagination.html> +
+ +<%include include/tail.html> -- 2.7.4