diff --git a/build.gradle b/build.gradle index 2b80528..332c088 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.2.0' +version = '0.2.1' sourceCompatibility = 17 mainClassName = "de.jottyfan.camporganizer.Main" diff --git a/src/main/java/de/jottyfan/camporganizer/module/admin/AdminController.java b/src/main/java/de/jottyfan/camporganizer/module/admin/AdminController.java index a49259b..febd499 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/admin/AdminController.java +++ b/src/main/java/de/jottyfan/camporganizer/module/admin/AdminController.java @@ -1,18 +1,24 @@ package de.jottyfan.camporganizer.module.admin; +import javax.servlet.http.HttpServletRequest; + import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import de.jottyfan.camporganizer.module.common.CommonController; + /** * * @author jotty * */ @Controller -public class AdminController { +public class AdminController extends CommonController { @GetMapping("/admin") - public String getMain() { + public String getMain(Model model, HttpServletRequest request) { + super.setupSession(model, request); return "/admin/main"; } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 8d359ce..90d1f4d 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -31,8 +31,7 @@ html { } body { - background-image: linear-gradient(to bottom right, rgb(255, 255, 255), - rgb(154, 153, 150)); + background-image: url('../images/background.jpg'); } a { diff --git a/src/main/resources/static/images/background.jpg b/src/main/resources/static/images/background.jpg new file mode 100644 index 0000000..43768ae Binary files /dev/null and b/src/main/resources/static/images/background.jpg differ diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index bf5de3f..3e7a5a3 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -15,44 +15,51 @@ -
-
-
-
-
-
-   -
-
- - - - - - - - - - - - - - - - - - - - -
Ort
Alter
Zeit
Preis
jetzt anmelden
-
+
+ +
+
+   +
+
+
+
+
Ort
+
+ +
+
+
+
Jungen und Mädchen
+
+
+
+
Zeit
+
+ +
+
+
+
Preis
+
+
+
+
Ferien
+
+
+
+
\ No newline at end of file