From ff8f11091a530358ef600eedf00c21e90efe62d3 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 17 Apr 2019 22:51:05 +0200 Subject: Fixed and improved frontend Co-authored-by: LarsVomMars --- src/main/resources/views/index.rocker.html | 24 +++++++-------- src/main/resources/views/layout.rocker.html | 5 +-- src/main/resources/views/login.rocker.html | 42 +++++++++++++++----------- src/main/resources/views/setup.rocker.html | 47 +++++++++++++++++------------ 4 files changed, 66 insertions(+), 52 deletions(-) (limited to 'src/main/resources/views') diff --git a/src/main/resources/views/index.rocker.html b/src/main/resources/views/index.rocker.html index a0b4035..72ec4d2 100644 --- a/src/main/resources/views/index.rocker.html +++ b/src/main/resources/views/index.rocker.html @@ -1,19 +1,17 @@ @args (String username) @layout.template("Index", RockerContent.NONE, RockerContent.NONE) -> { -

Welcome to Kloud @username!

+
+

Welcome to Kloud @username!

-@if(username.length() > 0) { - - - -} else { - - - -} +
+ @if(username.length() > 0) { + Logout + } else { + Login + } - - - + Files +
+
} diff --git a/src/main/resources/views/layout.rocker.html b/src/main/resources/views/layout.rocker.html index f292e24..3e3fb5e 100644 --- a/src/main/resources/views/layout.rocker.html +++ b/src/main/resources/views/layout.rocker.html @@ -13,8 +13,9 @@ @title -@content - +
+ @content +
@js diff --git a/src/main/resources/views/login.rocker.html b/src/main/resources/views/login.rocker.html index 6cd28f2..feddbbc 100644 --- a/src/main/resources/views/login.rocker.html +++ b/src/main/resources/views/login.rocker.html @@ -6,24 +6,32 @@ } @layout.template("Login", RockerContent.NONE, js) -> { -
-
- - -
-
- - -
+
+

Login

- + +
+ + +
+
+ + +
- @if(message.length() > 0) { - @message - } +
+ @if(message.length() > 0) { + @message + } - @if(counter > 0) { - Please try again in @counter seconds. - } - + @if(counter > 0) { + Please try again in @counter seconds. + } +
+ +
+ +
+ +
} diff --git a/src/main/resources/views/setup.rocker.html b/src/main/resources/views/setup.rocker.html index f9c8357..595f84a 100644 --- a/src/main/resources/views/setup.rocker.html +++ b/src/main/resources/views/setup.rocker.html @@ -1,25 +1,32 @@ @args (String message) @layout.template("Setup", RockerContent.NONE, RockerContent.NONE) -> { -
-
- - -
-
- - -
-
- - -
-
- -
-
+
+

Setup

-@if (message.length() > 0) { -@message -} +
+
+ + +
+
+ + +
+
+ + +
+ +
+ @if (message.length() > 0) { + @message + } +
+ +
+ +
+
+
} -- cgit v1.2.3