X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=b443ce7a0578fe2b42726f7a6c6380d8b50acf73;hb=3d0dbd535f8efee946c17454a22bd24d954946d6;hp=994d501f2c9b58deb5a29fcaf19270c66e45a337;hpb=8b32d7e04676888e15f04046f148f02807cfa021;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 994d501..b443ce7 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -44,6 +44,9 @@ import net.pterodactylus.util.template.DateFilter;
 import net.pterodactylus.util.template.DefaultTemplateFactory;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateException;
+import net.pterodactylus.util.template.TemplateFactory;
+import net.pterodactylus.util.template.TemplateProvider;
 import freenet.clients.http.LinkEnabledCallback;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.ToadletContainer;
@@ -148,6 +151,7 @@ public class WebInterface extends AbstractService {
 		templateFactory.addAccessor(Post.class, new PostAccessor(core()));
 		templateFactory.addFilter("date", new DateFilter());
 		templateFactory.addFilter("l10n", new L10nFilter(l10n()));
+		templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
 
 		String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
 
@@ -157,38 +161,66 @@ public class WebInterface extends AbstractService {
 		Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html"));
 		indexTemplate.set("formPassword", formPassword);
 
+		Template addSoneTemplate = templateFactory.createTemplate(createReader("/templates/addSone.html"));
+		addSoneTemplate.set("formPassword", formPassword);
+
+		Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
+		knownSonesTemplate.set("formPassword", formPassword);
+
 		Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html"));
 		createSoneTemplate.set("formPassword", formPassword);
 
 		Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
 		createPostTemplate.set("formPassword", formPassword);
 
+		Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
+		createReplyTemplate.set("formPassword", formPassword);
+
 		Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
 		editProfileTemplate.set("formPassword", formPassword);
 
+		Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
+		backupProfileTemplate.set("formPassword", formPassword);
+
 		Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
 		viewSoneTemplate.set("formPassword", formPassword);
 
+		Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
+		viewPostTemplate.set("formPassword", formPassword);
+
+		Template deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html"));
+		deletePostTemplate.set("formPassword", formPassword);
+
 		Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/followSone.html"));
 		followSoneTemplate.set("formPassword", formPassword);
 
 		Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
 		deleteSoneTemplate.set("formPassword", formPassword);
 
+		Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
+
 		Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
 
 		PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this), "AddSone"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("images/", "/static/images/", "image/png")));
 
 		ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer();
 		toadletContainer.getPageMaker().addNavigationCategory("/Sone/index.html", "Navigation.Menu.Name", "Navigation.Menu.Tooltip", sonePlugin);
@@ -247,4 +279,47 @@ public class WebInterface extends AbstractService {
 		}
 	}
 
+	/**
+	 * Template provider implementation that uses
+	 * {@link WebInterface#createReader(String)} to load templates for
+	 * inclusion.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	private class ClassPathTemplateProvider implements TemplateProvider {
+
+		/** The template factory. */
+		private final TemplateFactory templateFactory;
+
+		/**
+		 * Creates a new template provider that locates templates on the
+		 * classpath.
+		 *
+		 * @param templateFactory
+		 *            The template factory to create the templates
+		 */
+		public ClassPathTemplateProvider(TemplateFactory templateFactory) {
+			this.templateFactory = templateFactory;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		@SuppressWarnings("synthetic-access")
+		public Template getTemplate(String templateName) {
+			Reader templateReader = createReader("/templates/" + templateName);
+			if (templateReader == null) {
+				return null;
+			}
+			Template template = templateFactory.createTemplate(templateReader);
+			try {
+				template.parse();
+			} catch (TemplateException te1) {
+				logger.log(Level.WARNING, "Could not parse template “" + templateName + "” for inclusion!", te1);
+			}
+			return template;
+		}
+
+	}
 }