Browse Source

Merge branch 'main' into lang_de

lang_de
Stephan Richter 3 years ago
parent
commit
4d2fea5083
  1. 2
      pom.xml
  2. 6
      src/main/java/de/srsoftware/widerhall/web/Web.java
  3. 2
      static/templates/add_list.st
  4. 1
      static/templates/css.st

2
pom.xml

@ -6,7 +6,7 @@
<groupId>org.example</groupId> <groupId>org.example</groupId>
<artifactId>Widerhall</artifactId> <artifactId>Widerhall</artifactId>
<version>0.2.20</version> <version>0.2.21</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

6
src/main/java/de/srsoftware/widerhall/web/Web.java

@ -197,8 +197,6 @@ public class Web extends TemplateServlet {
loadTemplates(); loadTemplates();
data.put(NOTES,t("Vorlagen wurden neu geladen")); data.put(NOTES,t("Vorlagen wurden neu geladen"));
path = INDEX; path = INDEX;
case UNSUBSCRIBE:
data.put(LIST,list.email());
case CSS: case CSS:
case INDEX: case INDEX:
return loadTemplate(path,data,resp); return loadTemplate(path,data,resp);
@ -224,6 +222,10 @@ public class Web extends TemplateServlet {
case "jquery": case "jquery":
resp.setContentType("text/javascript"); resp.setContentType("text/javascript");
return loadFile("jquery-3.6.0.min.js",resp); return loadFile("jquery-3.6.0.min.js",resp);
case UNSUBSCRIBE:
data.put(LIST,list.email());
return loadTemplate(path,data,resp);
} }
if (user != null){ if (user != null){

2
static/templates/add_list.st

@ -6,7 +6,7 @@
<script src="js"></script> <script src="js"></script>
<link rel="stylesheet" href="css" /> <link rel="stylesheet" href="css" />
</head> </head>
<body> <body id="add_list">
«navigation()» «navigation()»
«userinfo()» «userinfo()»
<h1>Widerhall Listen-Erzeugung</h1> <h1>Widerhall Listen-Erzeugung</h1>

1
static/templates/css.st

@ -3,6 +3,7 @@ label {
margin: 5px 0; margin: 5px 0;
} }
#add_list form,
#login form, #login form,
#register form, #register form,
#subscribe form{ #subscribe form{

Loading…
Cancel
Save