X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=994d501f2c9b58deb5a29fcaf19270c66e45a337;hb=ab46e5b1ffe45b557e21c2f81f2801034e3548f0;hp=d312029a0bd83c16e1f02342ddc0de22d42d9f2e;hpb=ace61a10afeeeb05ec7ae7facf3d636cd87f3a9b;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 d312029..994d501 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -29,14 +29,21 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.web.page.CSSPage;
+import net.pterodactylus.sone.template.PostAccessor;
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
+import net.pterodactylus.sone.web.page.StaticPage;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
+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.TemplateFactory;
 import freenet.clients.http.LinkEnabledCallback;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.ToadletContainer;
@@ -135,7 +142,13 @@ public class WebInterface extends AbstractService {
 	 * Register all toadlets.
 	 */
 	private void registerToadlets() {
-		TemplateFactory templateFactory = new SoneTemplateFactory(l10n());
+		DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
+		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
+		templateFactory.addAccessor(Sone.class, new SoneAccessor());
+		templateFactory.addAccessor(Post.class, new PostAccessor(core()));
+		templateFactory.addFilter("date", new DateFilter());
+		templateFactory.addFilter("l10n", new L10nFilter(l10n()));
+
 		String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
 
 		Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html"));
@@ -153,6 +166,12 @@ public class WebInterface extends AbstractService {
 		Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
 		editProfileTemplate.set("formPassword", formPassword);
 
+		Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
+		viewSoneTemplate.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);
 
@@ -163,10 +182,13 @@ public class WebInterface extends AbstractService {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, 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 CSSPage("css/", "/static/css/")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript")));
 
 		ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer();
 		toadletContainer.getPageMaker().addNavigationCategory("/Sone/index.html", "Navigation.Menu.Name", "Navigation.Menu.Tooltip", sonePlugin);