StephanRichter
/
Widerhall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
Browse Source

Merge branch 'main' into lang_de

lang_de
Stephan Richter 4 years ago
parent
3a7e42b12d 20a81a7f60
commit
fad2c0ed52
17 changed files with 41 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pom.xml
  2. 7
      static/templates/add_list.st
  3. 7
      static/templates/admin.st
  4. 7
      static/templates/archive.st
  5. 21
      static/templates/css.st
  6. 7
      static/templates/edit_list.st
  7. 1
      static/templates/frontpage.st
  8. 7
      static/templates/head.st
  9. 7
      static/templates/index.st
  10. 7
      static/templates/inspect.st
  11. 7
      static/templates/login.st
  12. 2
      static/templates/navigation.st
  13. 7
      static/templates/post.st
  14. 7
      static/templates/register.st
  15. 7
      static/templates/subscribe.st
  16. 7
      static/templates/unsubscribe.st
  17. 6
      static/templates/userinfo.st

2
pom.xml
Unescape View File

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

7
static/templates/add_list.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body id="add_list"> <body id="add_list">
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/admin.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/archive.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

21
static/templates/css.st
Unescape View File

@ -10,6 +10,7 @@
body { body {
font-family: osans; font-family: osans;
margin-bottom: 50px;
} }
label { label {
display: block; display: block;
@ -73,17 +74,21 @@ fieldset fieldset>legend {
text-align: right text-align: right
} }
.user{ .user{
background: lime; color: #626262;
text-decoration: underline;
float: right; float: right;
padding: 0 5px;
} }
.footer{ .footer{
position: absolute; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
text-align: right; text-align: right;
margin: 5px; margin: 0;
height: 30px;
background: #83f9ff;
} }
tr:nth-child(2n), tr:nth-child(2n),
@ -140,4 +145,14 @@ pre {
background: none; background: none;
border: none; border: none;
text-decoration: underline; text-decoration: underline;
}
.logout{
position: absolute;
top: -5px;
right: 0;
}
nav {
margin: 10px 0;
} }

7
static/templates/edit_list.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

1
static/templates/frontpage.st
Unescape View File

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="web/css" /> <link rel="stylesheet" href="web/css" />
</head> </head>
<body> <body>

7
static/templates/head.st
Unescape View File

@ -0,0 +1,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>

7
static/templates/index.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/inspect.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8">
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/login.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body id="login"> <body id="login">
«navigation()» «navigation()»
«messages()» «messages()»

2
static/templates/navigation.st
Unescape View File

@ -1,6 +1,8 @@
<nav> <nav>
«if(data.user)»<a class="button logout" href="logout" />Logout</a>«endif»
<a href="index">Home</a> <a href="index">Home</a>
<a href="admin">Administration</a> <a href="admin">Administration</a>
<script type="text/javascript"> <script type="text/javascript">
if ('«data.user.permissions»'.includes('admin')){ if ('«data.user.permissions»'.includes('admin')){
$('<a/>',{class:'button',href:'reload'}).text('Templates neu laden').appendTo($('nav')); $('<a/>',{class:'button',href:'reload'}).text('Templates neu laden').appendTo($('nav'));

7
static/templates/post.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body> <body>
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/register.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body id="register"> <body id="register">
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/subscribe.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body id="subscribe"> <body id="subscribe">
«navigation()» «navigation()»
«userinfo()» «userinfo()»

7
static/templates/unsubscribe.st
Unescape View File

@ -1,11 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> «head()»
<meta charset="utf-8" />
<script src="jquery"></script>
<script src="js"></script>
<link rel="stylesheet" href="css" />
</head>
<body id="subscribe"> <body id="subscribe">
«navigation()» «navigation()»
«userinfo()» «userinfo()»

6
static/templates/userinfo.st
Unescape View File

@ -1,7 +1,3 @@
«if(data.user)» «if(data.user)»
<div class="user"> <div class="user">Als <em>«data.user.name»</em> angemeldet</em></div>
Als <em>«data.user.name»</em> angemeldet
<a class="button" href="logout" />Abmelden</a>
</div>
«endif» «endif»
Write Preview
Loading…
Cancel
Save