Merge branch 'twig-templates'

3 files changed, 48 insertions, 40 deletions

diff --git a/resources/views/pages/credits.html b/resources/views/pages/credits.html
deleted file mode 100644
index 4e247113..00000000
--- a/resources/views/pages/credits.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<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 enhanced by
-                <a href="https://notrademark.de">msquare</a> (maintainer),
-                <a href="https://myigel.name">MyIgel</a>,
-                <a href="https://mortzu.de">mortzu</a>,
-                <a href="https://jplitza.de">jplitza</a> and
-                <a href="https://github.com/gnomus">gnomus</a>.
-            </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="https://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>
diff --git a/resources/views/pages/credits.twig b/resources/views/pages/credits.twig
new file mode 100644
index 00000000..ff2bf873
--- /dev/null
+++ b/resources/views/pages/credits.twig
@@ -0,0 +1,42 @@
+{% extends "layouts/app.twig" %}
+
+{% block title %}{{ __('Credits') }}{% endblock %}
+
+{% block content %}
+    <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 enhanced by
+                    <a href="https://notrademark.de">msquare</a> (maintainer),
+                    <a href="https://myigel.name">MyIgel</a>,
+                    <a href="https://mortzu.de">mortzu</a>,
+                    <a href="https://jplitza.de">jplitza</a> and
+                    <a href="https://github.com/gnomus">gnomus</a>.
+                </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="https://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>
+{% endblock %}
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index b1b7ac1a..2278cc07 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -61,21 +61,23 @@
             </div>
         </div>
         <div class="col-md-6">
-            <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button" data-toggle="collapse" 
-              data-target="#collapseRoomSelect" aria-expanded="false"
-              aria-controls="collapseRoomSelect">
+            <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button"
+                    data-toggle="collapse"
+                    data-target="#collapseRoomSelect" aria-expanded="false"
+                    aria-controls="collapseRoomSelect"
+            >
                 collapse/show filters
             </button>
             <div class="collapse in row" id="collapseRoomSelect">
                 <div class="col-xs-4 col-xxs-12">%room_select%</div>
                 <div class="col-xs-4 col-xxs-12">%type_select%</div>
                 <div class="col-xs-4 col-xxs-12">%filled_select%</div>
-                <div class="col-sm-12"><p>%task_notice%</p></div>
             </div>
         </div>
     </div>
     <div class="row">
         <div class="col-md-12">
+            <div><p>%task_notice%</p></div>
             <input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%">
         </div>
     </div>