diff --git a/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt b/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt index 85dc864..0b8c308 100644 --- a/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt +++ b/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt @@ -57,7 +57,7 @@ class FilemureApp(repository: SqliteRepository) { Frame( modifiers = modifiers, title = "unauthorized", - isTarget = false, + target = "", content = Unauthorized() ) ) diff --git a/app/src/main/kotlin/net/h34t/filemure/controller/DocumentController.kt b/app/src/main/kotlin/net/h34t/filemure/controller/DocumentController.kt index cc31206..6411389 100644 --- a/app/src/main/kotlin/net/h34t/filemure/controller/DocumentController.kt +++ b/app/src/main/kotlin/net/h34t/filemure/controller/DocumentController.kt @@ -27,7 +27,7 @@ class DocumentController(val modifiers: TemplateModifiers, val repository: Sqlit Frame( modifiers = modifiers, title = document.title, - isTarget = true, + target = "document-${document.extId}", content = Document( modifiers = modifiers, extId = document.extId.value, @@ -81,7 +81,8 @@ class DocumentController(val modifiers: TemplateModifiers, val repository: Sqlit Frame( modifiers = modifiers, title = "new document", - isTarget = true, + // TODO enable target for new documents in form + target = "", content = DocumentCreateForm( modifiers = modifiers, title = title, @@ -170,7 +171,7 @@ class DocumentController(val modifiers: TemplateModifiers, val repository: Sqlit Frame( modifiers = modifiers, title = document.title, - isTarget = false, + target = "", content = DocumentEditForm( modifiers = modifiers, extId = extId, diff --git a/app/src/main/kotlin/net/h34t/filemure/controller/LimboController.kt b/app/src/main/kotlin/net/h34t/filemure/controller/LimboController.kt index d7d2b98..cb5230c 100644 --- a/app/src/main/kotlin/net/h34t/filemure/controller/LimboController.kt +++ b/app/src/main/kotlin/net/h34t/filemure/controller/LimboController.kt @@ -5,8 +5,6 @@ import net.h34t.filemure.* import net.h34t.filemure.repository.SqliteRepository import net.h34t.filemure.tpl.Frame import net.h34t.filemure.tpl.Limbo -import java.time.format.DateTimeFormatter -import java.time.format.FormatStyle class LimboController(val modifiers: TemplateModifiers, val repository: SqliteRepository) { @@ -17,7 +15,10 @@ class LimboController(val modifiers: TemplateModifiers, val repository: SqliteRe ctx.tempolin( Frame( - modifiers = modifiers, title = "Filemure Limbo", isTarget = true, content = Limbo( + modifiers = modifiers, + title = "Filemure Limbo", + target = "limbo", + content = Limbo( modifiers = modifiers, limboFileCount = files.size.toString(), file = { files.map { f -> FileBlock( diff --git a/app/src/main/kotlin/net/h34t/filemure/controller/LoginController.kt b/app/src/main/kotlin/net/h34t/filemure/controller/LoginController.kt index 6f543b7..ead11ab 100644 --- a/app/src/main/kotlin/net/h34t/filemure/controller/LoginController.kt +++ b/app/src/main/kotlin/net/h34t/filemure/controller/LoginController.kt @@ -13,7 +13,7 @@ class LoginController(val modifiers: TemplateModifiers, val repository: SqliteRe Frame( modifiers = modifiers, title = "Hello to Filemure", - isTarget = false, + target = "", content = Login( ) diff --git a/app/src/main/kotlin/net/h34t/filemure/controller/OverviewController.kt b/app/src/main/kotlin/net/h34t/filemure/controller/OverviewController.kt index 16f5975..e652b56 100644 --- a/app/src/main/kotlin/net/h34t/filemure/controller/OverviewController.kt +++ b/app/src/main/kotlin/net/h34t/filemure/controller/OverviewController.kt @@ -22,7 +22,7 @@ class OverviewController(val modifiers: TemplateModifiers, val repository: Sqlit Frame( modifiers = modifiers, title = "Overview", - isTarget = true, + target = "document", content = Overview( modifiers = modifiers, limboFileCount = limboFileCount.toString(), @@ -59,7 +59,7 @@ class OverviewController(val modifiers: TemplateModifiers, val repository: Sqlit Frame( modifiers = modifiers, title = "Overview", - isTarget = true, + target = "document", content = OverviewDocuments( modifiers = modifiers, category = "$year-$month", diff --git a/app/src/main/kotlin/net/h34t/filemure/controller/SearchController.kt b/app/src/main/kotlin/net/h34t/filemure/controller/SearchController.kt index 9225b5e..656a36b 100644 --- a/app/src/main/kotlin/net/h34t/filemure/controller/SearchController.kt +++ b/app/src/main/kotlin/net/h34t/filemure/controller/SearchController.kt @@ -22,7 +22,7 @@ class SearchController(val modifiers: TemplateModifiers, val repository: SqliteR Frame( modifiers = modifiers, title = "Overview", - isTarget = true, + target = "document", content = Search( modifiers = modifiers, search = q ?: "", diff --git a/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html b/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html index 7d10c94..6764ac5 100644 --- a/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html +++ b/app/src/main/tpl/net.h34t.filemure.tpl/Frame.tpl.html @@ -8,8 +8,8 @@
-{if $isTarget} - +{if $target} +