Merge branch 'main' into lang_de

3 years ago · 4d2fea5083
4 changed files with 7 additions and 4 deletions
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@
				@@ -6,7 +6,7 @@

    <groupId>org.example</groupId>
    <artifactId>Widerhall</artifactId>
-    <version>0.2.20</version>
+    <version>0.2.21</version>
    <build>
        <plugins>
            <plugin>
--- a/src/main/java/de/srsoftware/widerhall/web/Web.java
+++ b/src/main/java/de/srsoftware/widerhall/web/Web.java
@ -197,8 +197,6 @@ public class Web extends TemplateServlet {
				@@ -197,8 +197,6 @@ public class Web extends TemplateServlet {
                loadTemplates();
                data.put(NOTES,t("Vorlagen wurden neu geladen"));
                path = INDEX;
-            case UNSUBSCRIBE:
-                data.put(LIST,list.email());
            case CSS:
            case INDEX:
                return loadTemplate(path,data,resp);
@ -224,6 +222,10 @@ public class Web extends TemplateServlet {
				@@ -224,6 +222,10 @@ public class Web extends TemplateServlet {
            case "jquery":
                resp.setContentType("text/javascript");
                return loadFile("jquery-3.6.0.min.js",resp);
+            case UNSUBSCRIBE:
+                data.put(LIST,list.email());
+                return loadTemplate(path,data,resp);
+
        }

        if (user != null){
--- a/static/templates/add_list.st
+++ b/static/templates/add_list.st
@ -6,7 +6,7 @@
				@@ -6,7 +6,7 @@
        <script src="js"></script>
        <link rel="stylesheet" href="css" />
    </head>
-    <body>
+    <body id="add_list">
        «navigation()»
        «userinfo()»
        <h1>Widerhall Listen-Erzeugung</h1>
--- a/static/templates/css.st
+++ b/static/templates/css.st
@ -3,6 +3,7 @@ label {
				@@ -3,6 +3,7 @@ label {
    margin: 5px 0;
 }

+#add_list form,
 #login form,
 #register form,
 #subscribe form{