X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=e18e1a418e6b429a0db56b4863dfa45cf8697ac5;hb=e1b8776c14874e9ae59b614b542255f72290dff1;hp=a04873dfd1ec3f1ce188d49c55da84214853a67a;hpb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index a04873d..e18e1a4 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -1,5 +1,5 @@
/*
- * Freetalk - FreetalkTemplatePage.java - Copyright © 2010 David Roden
+ * Sone - SoneTemplatePage.java - Copyright © 2010â2013 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
@@ -21,33 +21,59 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.web.page.Page;
-import net.pterodactylus.sone.web.page.TemplatePage;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.sone.web.page.FreenetTemplatePage;
+import net.pterodactylus.util.notify.Notification;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
-import freenet.clients.http.SessionManager.Session;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
import freenet.clients.http.ToadletContext;
import freenet.support.api.HTTPRequest;
/**
- * Base page for the Freetalk web interface.
+ * Base page for the Sone web interface.
*
* @author David âBombeâ Roden
*/
-public class SoneTemplatePage extends TemplatePage {
+public class SoneTemplatePage extends FreenetTemplatePage {
/** The Sone core. */
protected final WebInterface webInterface;
+ /** The page title l10n key. */
+ private final String pageTitleKey;
+
/** Whether to require a login. */
private final boolean requireLogin;
/**
- * Creates a new template page for Freetalk that does not require the user
- * to be logged in.
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
+ *
+ * @param path
+ * The path of the page
+ * @param template
+ * The template to render
+ * @param webInterface
+ * The Sone web interface
+ */
+ public SoneTemplatePage(String path, Template template, WebInterface webInterface) {
+ this(path, template, null, webInterface, false);
+ }
+
+ /**
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -63,7 +89,23 @@ public class SoneTemplatePage extends TemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone.
+ *
+ * @param path
+ * The path of the page
+ * @param template
+ * The template to render
+ * @param webInterface
+ * The Sone web interface
+ * @param requireLogin
+ * Whether this page requires a login
+ */
+ public SoneTemplatePage(String path, Template template, WebInterface webInterface, boolean requireLogin) {
+ this(path, template, null, webInterface, requireLogin);
+ }
+
+ /**
+ * Creates a new template page for Sone.
*
* @param path
* The path of the page
@@ -77,10 +119,10 @@ public class SoneTemplatePage extends TemplatePage {
* Whether this page requires a login
*/
public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface, boolean requireLogin) {
- super(path, webInterface.getTemplateContextFactory(), template, webInterface.getL10n(), pageTitleKey, "noPermission.html");
+ super(path, webInterface.getTemplateContextFactory(), template, "noPermission.html");
+ this.pageTitleKey = pageTitleKey;
this.webInterface = webInterface;
this.requireLogin = requireLogin;
- template.getInitialContext().set("webInterface", webInterface);
}
//
@@ -88,35 +130,6 @@ public class SoneTemplatePage extends TemplatePage {
//
/**
- * Returns the current session, creating a new session if there is no
- * current session.
- *
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return webInterface.getCurrentSession(toadletContenxt);
- }
-
- /**
- * Returns the current session, creating a new session if there is no
- * current session and {@code create} is {@code true}.
- *
- * @param toadletContenxt
- * The toadlet context
- * @param create
- * {@code true} to create a new session if there is no current
- * session, {@code false} otherwise
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- return webInterface.getCurrentSession(toadletContenxt, create);
- }
-
- /**
* Returns the currently logged in Sone.
*
* @param toadletContext
@@ -163,6 +176,25 @@ public class SoneTemplatePage extends TemplatePage {
* {@inheritDoc}
*/
@Override
+ protected String getPageTitle(FreenetRequest request) {
+ if (pageTitleKey != null) {
+ return webInterface.getL10n().getString(pageTitleKey);
+ }
+ return "";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected List