summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/guest_credits.html2
-rw-r--r--templates/layout.html22
-rw-r--r--templates/user_shifts.html7
3 files changed, 13 insertions, 18 deletions
diff --git a/templates/guest_credits.html b/templates/guest_credits.html
index afcc6f38..5d000f8b 100644
--- a/templates/guest_credits.html
+++ b/templates/guest_credits.html
@@ -1,3 +1,4 @@
+<div style="margin: 5px;">
<h2>Source code</h2>
<p>The original system was written by <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>. It was then completely rewritten and greatly enhanced by <a href="http://notrademark.de/">msquare</a> and <a href="http://mortzu.de/">mortzu</a> of <a href="http://planetcyborg.de">planet cyborg</a> and <a href="http://jplitza.de/">jplitza</a>.</p>
@@ -10,3 +11,4 @@ and adminstrated by <a href="http://mortzu.de/">mortzu</a>, <a href="http://derf
<h2>Icons</h2>
<p>Some icons from the <a href="http://www.famfamfam.com/lab/icons/silk/">famfamfam.com silk iconset</a> have been used. They are licensed under the <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.</p>
+</div>
diff --git a/templates/layout.html b/templates/layout.html
index dba4753d..e1a884f6 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -3,15 +3,10 @@
<head>
<title>%title% - Engelsystem</title>
<meta charset="UTF-8" />
-<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-<meta name="content-style-type" content="text/css" />
-<meta name="keywords" content="Engel, Himmelsverwaltung" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="expires" content="0" />
-<meta name="robots" content="index" />
-<meta name="revisit-after" content="1 days" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/theme%theme%.css" />
<link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css" />
+<link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.4.0/css/bootstrap-datepicker3.min.css" />
<script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="vendor/jquery-ui.min.js"></script>
%atom_link%
@@ -29,20 +24,21 @@
</div>
</div>
<div class="container-fluid">
- <div class="row">
- %content%
- </div>
+ <div class="row">%content%</div>
<div class="row">
<div class="col-md-12">
<hr />
- <div class="text-center footer">
- <a href="%faq_url%">FAQ</a> · <a href="mailto:erzengel@lists.ccc.de"><span class="glyphicon glyphicon-envelope"></span> Contact</a> · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a
- href="https://github.com/engelsystem/engelsystem/">Development Platform</a> · <a href="?p=credits">Credits</a>
+ <div class="text-center footer" style="margin-bottom: 10px;">
+ <a href="%faq_url%">FAQ</a> · <a href="mailto:erzengel@lists.ccc.de"><span class="glyphicon glyphicon-envelope"></span> Contact</a> · <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a> · <a href="https://github.com/engelsystem/engelsystem/">Development
+ Platform</a> · <a href="?p=credits">Credits</a>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/js/bootstrap-datepicker.min.js"></script>
+ <script type="text/javascript" src="vendor/bootstrap-datepicker-1.4.0/locales/bootstrap-datepicker.de.min.js"></script>
+ <script type="text/javascript" src="vendor/Chart.min.js"></script>
<script type="text/javascript" src="js/forms.js"></script>
<script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
<script type="text/javascript">
diff --git a/templates/user_shifts.html b/templates/user_shifts.html
index 153af7ee..b5762271 100644
--- a/templates/user_shifts.html
+++ b/templates/user_shifts.html
@@ -1,13 +1,10 @@
<script type="text/javascript">
function set_to_now(id) {
- var now = new Date();
- document.getElementById(id + '_time').value = now.getHours() + ':'
- + now.getMinutes();
+ document.getElementById(id + '_time').value = moment().format('HH:mm');
var days = document.getElementById(id + '_day').getElementsByTagName(
'option');
for ( var i = 0; i < days.length; i++) {
- if (days[i].value == (1900 + now.getYear()) + '-'
- + (1 + now.getMonth()) + '-' + now.getDate())
+ if (days[i].value == moment().format('YYYY-MM-DD'))
days[i].selected = true;
}
}