diff --git a/src/main/java/de/jottyfan/camporganizer/Main.java b/src/main/java/de/jottyfan/camporganizer/Main.java
index 89ae6cc..6ec7462 100644
--- a/src/main/java/de/jottyfan/camporganizer/Main.java
+++ b/src/main/java/de/jottyfan/camporganizer/Main.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class Main extends SpringBootServletInitializer {
- private static final Logger LOGGER = LogManager.getLogger(Main.class);
+ public static final Logger LOGGER = LogManager.getLogger(Main.class);
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesController.java
index b25cc65..7def4bb 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesController.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesController.java
@@ -1,6 +1,8 @@
package de.jottyfan.camporganizer.module.staticpages;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -14,6 +16,9 @@ import de.jottyfan.camporganizer.module.camplist.CommonController;
@Controller
public class StaticPagesController extends CommonController {
+ @Autowired
+ private StaticPagesService service;
+
/**
* load the index page
*
@@ -21,7 +26,7 @@ public class StaticPagesController extends CommonController {
*/
@GetMapping("/")
public String getIndex() {
- return "/allgemeines";
+ return "redirect:/allgemeines";
}
/**
@@ -70,7 +75,8 @@ public class StaticPagesController extends CommonController {
* @return the allgemeines page
*/
@GetMapping("/allgemeines")
- public String getAllgemeines() {
+ public String getAllgemeines(final Model model) {
+ model.addAttribute("title", service.getStockDescription());
return "/allgemeines";
}
diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesService.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesService.java
new file mode 100644
index 0000000..8a3a0bc
--- /dev/null
+++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/StaticPagesService.java
@@ -0,0 +1,37 @@
+package de.jottyfan.camporganizer.module.staticpages;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.stereotype.Service;
+
+import de.jottyfan.camporganizer.Main;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+@Service
+public class StaticPagesService {
+
+ @Autowired
+ private ResourceLoader resourceLoader;
+
+ public Properties getStockDescription() {
+ Resource resource = resourceLoader.getResource(
+ "classpath:/static/images/stock.properties"
+ );
+ Properties properties = new Properties();
+ try {
+ properties.load(resource.getInputStream());
+ } catch (IOException e) {
+ Main.LOGGER.error(e.getMessage());
+ }
+ return properties;
+ }
+
+}
diff --git a/src/main/resources/static/images/stock.properties b/src/main/resources/static/images/stock.properties
new file mode 100644
index 0000000..4cb91c0
--- /dev/null
+++ b/src/main/resources/static/images/stock.properties
@@ -0,0 +1,10 @@
+stock02 = Heimfreizeit - Spiele im Wertwiesenpark
+stock25 = Olfen - Gutes Essen
+stock27 = Olfen - Miniaturdorf im Wald
+stock29 = Olfen - Die Frohe Stunde am Morgen
+stock52 = Rehe 2 - Kreative Ideen
+stock63 = Schweiz - Blaue Bergseen
+stock71 = Heimfreizeit - Kreuzkirche ECG Heilbronn
+stock83 = Schweiz - Aufstieg in die Berge
+stock84 = Hohenhaslach - Mitten in den Weinbergen
+stock85 = Rehe 2 - Gemeinsame Andacht
diff --git a/src/main/resources/templates/allgemeines.html b/src/main/resources/templates/allgemeines.html
index 69615e9..c9c1dde 100644
--- a/src/main/resources/templates/allgemeines.html
+++ b/src/main/resources/templates/allgemeines.html
@@ -23,10 +23,10 @@
-