X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePage.kt;h=3122c64648e363f81e0a523089324a035986c43d;hb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0;hp=ac1e15f11677eba2a9ec3785ac23151b5e417982;hpb=c28013c8a4bcb9776a1e2d82ffd6c4c8297ffb62;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
index ac1e15f..3122c64 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -1,17 +1,15 @@
 package net.pterodactylus.sone.web.pages
 
 import freenet.clients.http.*
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.main.SonePlugin
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.web.SessionProvider
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.util.notify.*
+import net.pterodactylus.util.template.*
 import net.pterodactylus.util.web.*
-import java.net.URLEncoder
+import java.net.*
 
 /**
  * Base page for the Sone web interface.
@@ -19,11 +17,12 @@ import java.net.URLEncoder
 open class SoneTemplatePage @JvmOverloads constructor(
 		path: String,
 		private val webInterface: WebInterface,
-		template: Template,
+		loaders: Loaders,
+		templateRenderer: TemplateRenderer,
 		private val pageTitleKey: String? = null,
 		private val requiresLogin: Boolean = false,
 		private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
-) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
+) : FreenetTemplatePage(path, templateRenderer, loaders, "noPermission.html") {
 
 	private val core = webInterface.core
 	private val sessionProvider: SessionProvider = webInterface
@@ -40,10 +39,9 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
-	override public fun getStyleSheets() =
-			listOf("css/sone.css")
+	override val styleSheets = listOf("css/sone.css")
 
-	override public fun getShortcutIcon() = "images/icon.png"
+	override val shortcutIcon = "images/icon.png"
 
 	override public fun getAdditionalLinkNodes(request: FreenetRequest) =
 			listOf(mapOf(