Merge pull request #365 from engelsystem/feature-igel-rewrite

Feature igel rewrite
author: msquare <msquare@notrademark.de> 2017-11-28 15:43:51 +0100
committer: GitHub <noreply@github.com> 2017-11-28 15:43:51 +0100
commit: 599f2fd264bfc7b1b6826fe206442806e317340f (patch)
tree: 50cf84d7d07d11bd65b45c2c17f37632f6cd8eff /templates
parent: a5fc5bd0979e8de1fce8a8addd351a6e7bd6aeb8 (diff)
parent: eda7f7788ea8012bd8be46405c56a666c11f3fa5 (diff)
4 files changed, 221 insertions, 110 deletions
diff --git a/templates/guest_credits.html b/templates/guest_credits.html
index 472676db..db7fac57 100644
--- a/templates/guest_credits.html
+++ b/templates/guest_credits.html
@@ -1,27 +1,36 @@
 <div class="container">
-<h1>Credits</h1>
-  <div class="row">
-    <div class="col-md-4">
-      <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>, <a href="http://jplitza.de/">jplitza</a> and gnomus.
-      </p>
-      <p>
-        Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors">contributor list on github</a> for a more complete version.
-      </p>
+    <h1>Credits</h1>
+    <div class="row">
+        <div class="col-md-4">
+            <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 enhanced by
+                <a href="http://notrademark.de/">msquare</a> (maintainer),
+                <a href="http://myigel.name/">MyIgel</a>,
+                <a href="http://mortzu.de/">mortzu</a>,
+                <a href="http://jplitza.de/">jplitza</a> and
+                gnomus.
+            </p>
+            <p>
+                Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors">contributor
+                list on github</a> for a more complete version.
+            </p>
+        </div>
+        <div class="col-md-4">
+            <h2>Hosting</h2>
+            <p>
+                Webspace, development platform and domain on <a href="https://engelsystem.de">engelsystem.de</a>
+                is currently provided by <a href="https://www.wybt.net/">would you buy this?</a> (ichdasich)
+                and adminstrated by <a href="http://mortzu.de/">mortzu</a>,
+                <a href="http://derf.homelinux.org/">derf</a> and ichdasich.
+            </p>
+        </div>
+        <div class="col-md-4">
+            <h2>Translation</h2>
+            <p>
+                Many thanks for the german translation: <a href="http://e7p.de">e7p</a>
+            </p>
+        </div>
     </div>
-    <div class="col-md-4">
-      <h2>Hosting</h2>
-      <p>
-        Webspace, development platform and domain is currently provided by <a href="https://www.wybt.net/">would you buy this?</a> (ichdasich)<br /> and adminstrated by <a href="http://mortzu.de/">mortzu</a>, <a href="http://derf.homelinux.org/">derf</a> and ichdasich.
-      </p>
-    </div>
-    <div class="col-md-4">
-      <h2>Translation</h2>
-      <p>
-        Many thanks for the german translation: <a href="http://e7p.de">e7p</a>
-      </p>
-    </div>
-  </div>
-</div>
-\ No newline at end of file
+</div>
diff --git a/templates/layout.html b/templates/layout.html
index 6a1ddb5d..4b9aa06e 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,53 +1,62 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>%title% - Engelsystem</title>
-<meta charset="UTF-8" />
-<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%
+    <title>%title% - Engelsystem</title>
+    <meta charset="UTF-8"/>
+    <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%
 </head>
 <body>
-  <div class="navbar navbar-default navbar-fixed-top">
+<div class="navbar navbar-default navbar-fixed-top">
     <div class="container-fluid">
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
-          <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong></a>
-      </div>
-      <div class="collapse navbar-collapse" id="navbar-collapse-1">%menu% %header_toolbar%</div>
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed"
+                    data-toggle="collapse" data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="%start_page_url%">
+                <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
+            </a>
+        </div>
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">%menu% %header_toolbar%</div>
     </div>
-  </div>
-  <div class="container-fluid">
+</div>
+<div class="container-fluid">
     <div class="row">%content%</div>
     <div class="row">
-      <div class="col-md-12">
-        <hr />
-        <div class="text-center footer" style="margin-bottom: 10px;">
-          %event_info%
-          <a href="%faq_url%">FAQ</a> · <a href="%contact_email%"><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="col-md-12">
+            <hr/>
+            <div class="text-center footer" style="margin-bottom: 10px;">
+                %event_info%
+                <a href="%faq_url%">FAQ</a>
+                · <a href="%contact_email%"><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="%credits_url%">Credits</a>
+            </div>
         </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">
-			$(function() {
-				moment.locale("%locale%");
-			});
-		</script>
-  <script type="text/javascript" src="js/moment-countdown.js"></script>
-  <script type="text/javascript" src="js/sticky-headers.js"></script>
+</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">
+    $(function () {
+        moment.locale("%locale%");
+    });
+</script>
+<script type="text/javascript" src="js/moment-countdown.js"></script>
+<script type="text/javascript" src="js/sticky-headers.js"></script>
 </body>
 </html>
diff --git a/templates/maintenance.html b/templates/maintenance.html
new file mode 100644
index 00000000..bd73bd74
--- /dev/null
+++ b/templates/maintenance.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Maintenance - Engelsystem</title>
+    <meta charset="UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" type="text/css" href="css/theme0.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>
+</head>
+<body>
+<div class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed"
+                    data-toggle="collapse" data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">
+                <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
+            </a>
+        </div>
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav"></ul>
+            <ul class="nav navbar-nav navbar-right">
+            </ul>
+        </div>
+    </div>
+</div>
+<div class="container-fluid">
+    <div class="row">
+        <div class="jumbotron">
+            <div class="container text-center">
+                <h1>
+                    <span class="glyphicon glyphicon-scissors"></span>
+                    <span class="glyphicon glyphicon-wrench"></span>
+                    <span class="glyphicon glyphicon-fire"></span>
+                </h1>
+                <div class="col-md-6">
+                    <h2>
+                        The <span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong> is in maintenance mode.
+                    </h2>
+                    <p>This may be due to...</p>
+                    <p>
+                        ...archangels closing the gates of heaven. <br>
+                        ...somebody's stolen the power chord and now the battery is empty. <br>
+                        ...DHCP decided to give me another ip address.
+                    </p>
+                </div>
+                <div class="col-md-6">
+                    <iframe width="560" height="315"
+                            src="https://www.youtube.com/embed/0aV_vHcunSQ?rel=0"
+                            frameborder="0" allowfullscreen>
+                    </iframe>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="text-center footer">
+                <a href="https://github.com/engelsystem/engelsystem/issues">Bugs / Features</a>
+                · <a href="https://github.com/engelsystem/engelsystem/">Development Platform</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">
+    $(function () {
+        moment.locale("en_US.UTF-8");
+    });
+</script>
+<script type="text/javascript" src="js/moment-countdown.js"></script>
+</body>
+</html>
diff --git a/templates/user_shifts.html b/templates/user_shifts.html
index e4aba6ce..c3fb7718 100644
--- a/templates/user_shifts.html
+++ b/templates/user_shifts.html
@@ -1,52 +1,59 @@
 <script type="text/javascript">
-	function set_to_now(id) {
-		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 == moment().format('YYYY-MM-DD'))
-				days[i].selected = true;
-		}
-	}
+    function set_to_now(id) {
+        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 === moment().format('YYYY-MM-DD')) {
+                days[i].selected = true;
+            }
+        }
+    }
 </script>
-<form class="form-inline" action="" method="get">
-  <input type="hidden" name="p" value="user_shifts">
-  <div class="row">
-    <div class="col-md-6">
-      <h1>%title%</h1>
-      <div class="form-group">%start_select%</div>
-      <div class="form-group">
-        <div class="input-group">
-          <input class="form-control" type="text" id="start_time" name="start_time" size="5" pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%">
-          <div class="input-group-btn">
-            <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('start');">
-              <span class="glyphicon glyphicon-time"></span>
-            </button>
-          </div>
+
+<form class="form-inline" action="">
+    <input type="hidden" name="p" value="user_shifts">
+    <div class="row">
+        <div class="col-md-6">
+            <h1>%title%</h1>
+            <div class="form-group">%start_select%</div>
+            <div class="form-group">
+                <div class="input-group">
+                    <input class="form-control" id="start_time" name="start_time" size="5"
+                           pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%">
+                    <div class="input-group-btn">
+                        <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('start');">
+                            <span class="glyphicon glyphicon-time"></span>
+                        </button>
+                    </div>
+                </div>
+            </div>
+            &#8211;
+            <div class="form-group">%end_select%</div>
+            <div class="form-group">
+                <div class="input-group">
+                    <input class="form-control" id="end_time" name="end_time" size="5"
+                           pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%">
+                    <div class="input-group-btn">
+                        <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('end');">
+                            <span class="glyphicon glyphicon-time"></span>
+                        </button>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-      &#8211;
-      <div class="form-group">%end_select%</div>
-      <div class="form-group">
-        <div class="input-group">
-          <input class="form-control" type="text" id="end_time" name="end_time" size="5" pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%">
-          <div class="input-group-btn">
-            <button class="btn btn-default" title="Now" type="button" onclick="set_to_now('end');">
-              <span class="glyphicon glyphicon-time"></span>
-            </button>
-          </div>
+        <div class="col-md-2">%room_select%</div>
+        <div class="col-md-2">%type_select%</div>
+        <div class="col-md-2">%filled_select%</div>
+    </div>
+    <div class="row">
+        <div class="col-md-6">
+            <div>%assign_notice%</div>
+        </div>
+        <div class="col-md-6">
+            <div><p>%task_notice%</p></div>
+            <input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%">
         </div>
-      </div>
     </div>
-    <div class="col-md-2">%room_select%</div>
-    <div class="col-md-2">%type_select%</div>
-    <div class="col-md-2">%filled_select%</div>
-  </div>
-	<div class="row">
-		<div class="col-md-6">
-  		<div>%task_notice%</div>
-  		<input class="btn btn-primary" type="submit" style="width: 75%; margin-bottom: 20px" value="%filter%">
-		</div>
-	</div>
 </form>
 %shifts_table% %ical_text%
author	msquare <msquare@notrademark.de>	2017-11-28 15:43:51 +0100
committer	GitHub <noreply@github.com>	2017-11-28 15:43:51 +0100
commit	599f2fd264bfc7b1b6826fe206442806e317340f (patch)
tree	50cf84d7d07d11bd65b45c2c17f37632f6cd8eff /templates
parent	a5fc5bd0979e8de1fce8a8addd351a6e7bd6aeb8 (diff)
parent	eda7f7788ea8012bd8be46405c56a666c11f3fa5 (diff)