add basic bootstrap theme

11 files changed, 211 insertions, 377 deletions

diff --git a/templates/admin_free.html b/templates/admin_free.html
index ef1dccf0..c5ea6eba 100644
--- a/templates/admin_free.html
+++ b/templates/admin_free.html
@@ -1,26 +1,20 @@
-<form action="%link%" method="post">
+<div class="col-md-10">
+  <h1>%title%</h1>
+  <form action="%link%" method="post">
     <p>
-        Search Angel: <input type="text" name="search" value="%search%" placeholder="Name"> %angeltypes% <label><input type="checkbox" name="confirmed_only" %confirmed_only% value="1"> Nur zugelassene</label> <input type="submit" name="submit" value="Search">
+      Search Angel: <input type="text" name="search" value="%search%" placeholder="Name"> %angeltypes% <label><input type="checkbox" name="confirmed_only" %confirmed_only% value="1"> Nur zugelassene</label> <input type="submit" name="submit" value="Search">
     </p>
-</form>
-<table>
+  </form>
+  <table class="table">
     <thead>
-        <tr>
-            <th>
-                Nickname
-            </th>
-            <th>
-                DECT
-            </th>
-            <th>
-                Jabber
-            </th>
-            <th>
-                Edit
-            </th>
-        </tr>
+      <tr>
+        <th>Nickname</th>
+        <th>DECT</th>
+        <th>Jabber</th>
+        <th>Edit</th>
+      </tr>
     </thead>
-    <tbody>
-        %table%
+    <tbody>%table%
     </tbody>
-</table>
+  </table>
+</div>
\ No newline at end of file
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
index c6ae4b5c..4bbb9d52 100644
--- a/templates/admin_groups.html
+++ b/templates/admin_groups.html
@@ -1,23 +1,14 @@
 <p>
-    Hallo %nick%,
-    <br/>
-    hier hast du die Möglichkeit Gruppenrechte zu ändern:
+  Hallo %nick%, <br /> hier hast du die Möglichkeit Gruppenrechte zu ändern:
 </p>
-<table>
-    <thead>
-        <tr>
-            <th>
-                Name
-            </th>
-            <th>
-                Rechte
-            </th>
-            <th>
-                &nbsp;
-            </th>
-        </tr>
-    </thead>
-    <tbody>
-        %groups%
-    </tbody>
+<table class="table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Rechte</th>
+      <th>&nbsp;</th>
+    </tr>
+  </thead>
+  <tbody>%groups%
+  </tbody>
 </table>
diff --git a/templates/admin_groups_edit_form.html b/templates/admin_groups_edit_form.html
index 5729df64..c1f2bd84 100644
--- a/templates/admin_groups_edit_form.html
+++ b/templates/admin_groups_edit_form.html
@@ -1,21 +1,14 @@
 <form action="%link%&action=save" method="post">
-    <table>
-        <thead>
-            <tr>
-                <th>
-                    &nbsp;
-                </th>
-                <th>
-                    Name
-                </th>
-                <th>
-                    Description
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            %privileges%
-        </tbody>
-    </table>
-    <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Save" />
+  <table class="table">
+    <thead>
+      <tr>
+        <th>&nbsp;</th>
+        <th>Name</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>%privileges%
+    </tbody>
+  </table>
+  <input type="hidden" name="id" value="%id%" /><input class="btn btn-primary" type="submit" name="submit" value="Save" />
 </form>
\ No newline at end of file
diff --git a/templates/admin_question_unanswered.html b/templates/admin_question_unanswered.html
index f25c76e6..066b7dcc 100644
--- a/templates/admin_question_unanswered.html
+++ b/templates/admin_question_unanswered.html
@@ -1,14 +1,16 @@
 <tr>
-	<td> %question_nick% </td>
-	<td> %question% </td>
-	<td>
-		<form action="%link%&action=answer" method="post">
-		<textarea name="answer"></textarea>
-		<input type="hidden" name="id" value="%question_id%" />
-		<input type="submit" name="submit" value="Speichern" />
-		</form>
-	</td>
-	<td>
-		<a href="%link%&action=delete&id=%question_id%">Löschen</a>
-	</td>
+  <td>%question_nick%</td>
+  <td>%question%</td>
+  <td>
+    <form action="%link%&action=answer" method="post">
+      <div class="form-group">
+        <textarea class="form-control" name="answer"></textarea>
+      </div>
+      <input type="hidden" name="id" value="%question_id%" />
+      <div class="form-group">
+        <input class="btn btn-default" type="submit" name="submit" value="Speichern" />
+      </div>
+    </form>
+  </td>
+  <td><a href="%link%&action=delete&id=%question_id%">Löschen</a></td>
 </tr>
diff --git a/templates/admin_questions.html b/templates/admin_questions.html
index 3034a4c0..3608e232 100644
--- a/templates/admin_questions.html
+++ b/templates/admin_questions.html
@@ -1,52 +1,31 @@
-<p>
-    Unbeantwortete Fragen:
-</p>
-<table>
+<div class="col-md-10">
+  <h1>Fragen beantworten</h1>
+  <h2>Unbeantwortete Fragen:</h2>
+  <table class="table">
     <thead>
-        <tr>
-            <th>
-                Von
-            </th>
-            <th>
-                Frage
-            </th>
-            <th>
-                Antwort
-            </th>
-            <th>
-                &nbsp;
-            </th>
-        </tr>
+      <tr>
+        <th>Von</th>
+        <th>Frage</th>
+        <th>Antwort</th>
+        <th>&nbsp;</th>
+      </tr>
     </thead>
-    <tbody>
-        %open_questions%
+    <tbody>%open_questions%
     </tbody>
-</table>
-<hr/>
-<p>
-    Beantwortete Fragen:
-</p>
-<table>
+  </table>
+  <hr />
+  <h2>Beantwortete Fragen:</h2>
+  <table class="table">
     <thead>
-        <tr>
-            <th>
-                Von
-            </th>
-            <th>
-                Frage
-            </th>
-            <th>
-                Von
-            </th>
-            <th>
-                Antwort
-            </th>
-            <th>
-                &nbsp;
-            </th>
-        </tr>
+      <tr>
+        <th>Von</th>
+        <th>Frage</th>
+        <th>Von</th>
+        <th>Antwort</th>
+        <th>&nbsp;</th>
+      </tr>
     </thead>
-    <tbody>
-        %answered_questions%
+    <tbody>%answered_questions%
     </tbody>
-</table>
+  </table>
+</div>
\ No newline at end of file
diff --git a/templates/admin_shift_preview.html b/templates/admin_shift_preview.html
index e04313f6..99e6e27f 100644
--- a/templates/admin_shift_preview.html
+++ b/templates/admin_shift_preview.html
@@ -1,32 +1,20 @@
-<h3>Vorschau:</h3>
-<form action="" method="post">
-    <fieldset>
-        <table>
-            <thead>
-                <tr>
-                    <th>
-                        Timeslot
-                    </th>
-                    <th>
-                        Entries
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                %shifts_table%
-            </tbody>
-        </table>
-        <p>
-            <input type="submit" name="back" value="Zurück" /><input type="submit" name="submit" value="Erstellen" />
-        </p>
-		<input type="hidden" name="name" value="%name%" />
-		<input type="hidden" name="rid" value="%rid%" />
-		<input type="hidden" name="start" value="%start%" />
-		<input type="hidden" name="end" value="%end%" />
-		<input type="hidden" name="mode" value="%mode%" />
-		<input type="hidden" name="length" value="%length%" />
-		<input type="hidden" name="change_hours" value="%change_hours%" />
-		<input type="hidden" name="angelmode" value="%angelmode%" />
-		%needed_angel_types%
-    </fieldset>
-</form>
\ No newline at end of file
+<div class="col-md-10">
+  <h1>Vorschau:</h1>
+  <form action="" method="post">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Timeslot</th>
+          <th>Entries</th>
+        </tr>
+      </thead>
+      <tbody>%shifts_table%
+      </tbody>
+    </table>
+    <p>
+      <input type="submit" name="back" value="Zurück" /><input type="submit" name="submit" value="Erstellen" />
+    </p>
+    <input type="hidden" name="name" value="%name%" /> <input type="hidden" name="rid" value="%rid%" /> <input type="hidden" name="start" value="%start%" /> <input type="hidden" name="end" value="%end%" /> <input type="hidden" name="mode" value="%mode%" /> <input type="hidden" name="length"
+      value="%length%" /> <input type="hidden" name="change_hours" value="%change_hours%" /> <input type="hidden" name="angelmode" value="%angelmode%" /> %needed_angel_types%
+  </form>
+</div>
\ No newline at end of file
diff --git a/templates/admin_shifts.html b/templates/admin_shifts.html
deleted file mode 100644
index 3840b76e..00000000
--- a/templates/admin_shifts.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<noscript>
-    Diese Seite ist mit aktiviertem JavaScript sehr viel komfortabler.
-</noscript>
-<form action="" method="post">
-    <fieldset>
-        %msg%
-        <p>
-            <label>
-                Name/Beschreibung:
-            </label>
-            <input type="text" name="name" value="%name%" />
-        </p>
-        <p>
-            <label>
-                Ort:
-            </label>%room_select%
-        </p>
-        <p>
-            <label>
-                Beginn:
-            </label>
-            <input type="text" name="start" value="%start%" />
-        </p>
-        <p>
-            <label>
-                Ende:
-            </label>
-            <input type="text" name="end" value="%end%" />
-        </p><h2>Modus:</h2>
-        <p>
-            <label>
-                <input id="mode_single" type="radio" name="mode" value="single" %mode_single_selected%/>
-            </label>
-            <label for="mode_single">
-                Eine Schicht erstellen.
-            </label>
-        </p>
-        <p>
-            <label>
-                <input type="radio" name="mode" id="multi_shifts" value="multi" %mode_multi_selected%/>
-            </label>
-            <label for="multi_shifts">
-                Mehrere Schichten erstellen:
-            </label>
-        </p>
-        <p>
-            <label>
-                Schichtlänge in Minuten:
-            </label>
-            <input type="text" name="length" value="%mode_multi_length%" onchange="document.getElementById('multi_shifts').checked = true;"/>
-        </p>
-        <p>
-            <label>
-                <input type="radio" name="mode" id="var_multi_shifts" value="variable" %mode_variable_selected%/>
-            </label>
-            <label for="var_multi_shifts">
-                Mehrere Schichten mit variabler Länge erstellen:
-            </label>
-        </p>
-        <p>
-            <label>
-                Schichtwechsel-Stunden:
-            </label>
-            <input type="text" name="change_hours" style="width: 300px;" value="%mode_variable_hours%" onchange="document.getElementById('var_multi_shifts').checked = true;"/>
-        </p><h2>Benötigte Engel:</h2>
-        <p>
-            <label>
-                <input id="angelmode_location" type="radio" name="angelmode" value="location" %angelmode_location_selected%/>
-            </label>
-            <label for="angelmode_location">
-                Benötigte Engel vom Ort übernehmen.
-            </label>
-        </p>
-        <p>
-            <label>
-                <input type="radio" name="angelmode" id="manual_angelmode" value="manually" %angelmode_manually_selected%/>
-            </label>
-            <label for="manual_angelmode">
-                Es werden folgende Engel benötigt:
-            </label>
-        </p>%angel_types%
-        <p>
-            <input type="submit" name="preview" value="Vorschau" />
-        </p>
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/templates/admin_shifts_angel_types.html b/templates/admin_shifts_angel_types.html
deleted file mode 100644
index 9b54fb89..00000000
--- a/templates/admin_shifts_angel_types.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="form_element">
-    <label class="form_label">
-        %type%:
-    </label>
-    <div class="form_input spinner"><a id="type_%id%_down" href="#">-</a><input type="text" id="type_%id%" name="type_%id%" value="%value%" /><a id="type_%id%_up" href="#">+</a></div>
-    <script type="text/javascript">
-        document.getElementById("type_%id%_up").onclick = function(e){
-            document.getElementById("type_%id%").value = (parseInt(document.getElementById("type_%id%").value) + 101) % 100;
-            document.getElementById("manual_angelmode").checked = true;
-            return false;
-        };
-        document.getElementById("type_%id%_down").onclick = function(e){
-            document.getElementById("type_%id%").value = (parseInt(document.getElementById("type_%id%").value) +99) % 100;
-            document.getElementById("manual_angelmode").checked = true;
-            return false;
-        };
-        document.getElementById("type_%id%").onchange = function(e){
-            document.getElementById("manual_angelmode").checked = true;
-            return false;
-        };
-    </script>
-</div>
diff --git a/templates/layout.html b/templates/layout.html
index 936f5660..af412184 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,46 +1,40 @@
 <!DOCTYPE html>
 <html>
-    <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" />
-        <script type="text/javascript" src="css/forms.js"></script>
-        <link rel="stylesheet" type="text/css" href="css/base.css" />
-        <link rel="stylesheet" type="text/css" href="css/style%theme%.css" />
-        %atom_link%
-    </head>
-    <body class="background">
-        <header>
-            <a href="?" id="logo"></a>
-            %header_toolbar%
-            <div class="clear"></div>
-        </header>
-        <div id="body">
-            <div id="menu">
-                %menu%
-                <nav class="container small">
-                    <ul>
-                        <li><a href="%faq_url%">FAQ</a></li>
-                        <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li>
-                        <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li>
-                        <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li>
-                        <li><a href="?p=credits">Credits</a></li>
-                    </ul>
-                </nav>
-            </div>
-            <div id="content" class="container">
-                <h1>%title%</h1>
-                <article class="content">
-                    %content%
-                </article>
-            </div>
-            <div class="clear"></div>
-        </div>
-    </body>
+<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" />
+<script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="vendor/bootstrap-3.2.0/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="css/forms.js"></script>
+<link rel="stylesheet" type="text/css" href="vendor/bootstrap-3.2.0/css/theme%theme%.css" />
+<link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css" />
+%atom_link%
+</head>
+<body>
+  <div class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+      <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong></a> %header_toolbar%
+    </div>
+  </div>
+  <div class="container-fluid">
+    <div class="col-md-2" style="margin-top: 28px;">
+      %menu%
+      <ul>
+        <li><a href="%faq_url%">FAQ</a></li>
+        <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li>
+        <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li>
+        <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li>
+        <li><a href="?p=credits">Credits</a></li>
+      </ul>
+    </div>
+    %content%
+  </div>
+</body>
 </html>
diff --git a/templates/user_messages.html b/templates/user_messages.html
index b7bb26fb..e0c83544 100644
--- a/templates/user_messages.html
+++ b/templates/user_messages.html
@@ -1,50 +1,29 @@
-%greeting%
-<form action="%link%&action=send" method="post">
-    <table>
-        <thead>
-            <tr>
-                <th>
-                    %new_label%
-                </th>
-                <th>
-                    %date_label%
-                </th>
-                <th>
-                    %from_label%
-                </th>
-                <th>
-                    %to_label%
-                </th>
-                <th>
-                    %text_label%
-                </th>
-                <th>
-                    &nbsp;
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            %messages%
-            <tr>
-                <td>
-                    &nbsp;
-                </td>
-                <td>
-                    %date%
-                </td>
-                <td>
-                    %from%
-                </td>
-                <td>
-                    %to_select%
-                </td>
-                <td>
-                    <textarea name="text"></textarea>
-                </td>
-                <td>
-                    <input type="submit" name="submit" value="%submit_label%" />
-                </td>
-            </tr>
-        </tbody>
+<div class="col-md-10">
+  <h1>%title%</h1>
+  %greeting%
+  <form action="%link%&action=send" method="post">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>%new_label%</th>
+          <th>%date_label%</th>
+          <th>%from_label%</th>
+          <th>%to_label%</th>
+          <th>%text_label%</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        %messages%
+        <tr>
+          <td>&nbsp;</td>
+          <td>%date%</td>
+          <td>%from%</td>
+          <td>%to_select%</td>
+          <td><textarea class="form-control" name="text"></textarea></td>
+          <td><input class="btn btn-primary" type="submit" name="submit" value="%submit_label%" /></td>
+        </tr>
+      </tbody>
     </table>
-</form>
\ No newline at end of file
+  </form>
+</div>
\ No newline at end of file
diff --git a/templates/user_shifts.html b/templates/user_shifts.html
index ea73ead1..6b230d94 100644
--- a/templates/user_shifts.html
+++ b/templates/user_shifts.html
@@ -1,30 +1,52 @@
 <script type="text/javascript">
-function set_to_now(id) {
-  var now = new Date();
-  document.getElementById(id + '_time').value = now.getHours() + ':' + now.getMinutes();
-  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())
-      days[i].selected = true;
-  }
-}
+	function set_to_now(id) {
+		var now = new Date();
+		document.getElementById(id + '_time').value = now.getHours() + ':'
+				+ now.getMinutes();
+		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())
+				days[i].selected = true;
+		}
+	}
 </script>
-<form action="#shifts" method="get">
-<fieldset class="form" id="filter"><legend>%filter%</legend>
-<div>
-%start_select% <input type="time" id="start_time" name="start_time" size="5" pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"> <img src="pic/icons/clock.png" alt="Now" title="Now" style="cursor: pointer;vertical-align: middle;" onclick="set_to_now('start');">
-&#8211; %end_select% <input type="time" id="end_time" name="end_time" size="5" pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"> <img src="pic/icons/clock.png" alt="Now" title="Now" style="cursor: pointer;vertical-align: middle;" onclick="set_to_now('end');">
-</div>
-<input type="hidden" name="p" value="user_shifts">
-%room_select%
-%type_select%
-%filled_select%
-<div>%task_notice%</div>
-<div>%new_style_checkbox%</div>
-<input class="button" type="submit" style="width: 100%;" value="%filter%">
-</fieldset>
+<form class="form-inline" action="#shifts" 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="time" 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" type="time" 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 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>%task_notice%</div>
+  <div>%new_style_checkbox%</div>
+  <input class="btn btn-primary" type="submit" style="width: 100%;" value="%filter%">
 </form>
-
-%shifts_table%
-
-%ical_text%
+%shifts_table% %ical_text%