Merge branch 'master' of github.com:planetcyborg/engelsystem

Conflicts:
	themes/theme1.scss

13 files changed, 0 insertions, 334 deletions

diff --git a/templates/admin_free.html b/templates/admin_free.html
deleted file mode 100644
index c5ea6eba..00000000
--- a/templates/admin_free.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<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">
-    </p>
-  </form>
-  <table class="table">
-    <thead>
-      <tr>
-        <th>Nickname</th>
-        <th>DECT</th>
-        <th>Jabber</th>
-        <th>Edit</th>
-      </tr>
-    </thead>
-    <tbody>%table%
-    </tbody>
-  </table>
-</div>
\ No newline at end of file
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
deleted file mode 100644
index 4bbb9d52..00000000
--- a/templates/admin_groups.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>
-  Hallo %nick%, <br /> hier hast du die Möglichkeit Gruppenrechte zu ändern:
-</p>
-<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
deleted file mode 100644
index c1f2bd84..00000000
--- a/templates/admin_groups_edit_form.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<form action="%link%&action=save" method="post">
-  <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_answered.html b/templates/admin_question_answered.html
deleted file mode 100644
index 8801d58f..00000000
--- a/templates/admin_question_answered.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<tr>
-	<td> %question_nick% </td>
-	<td> %question% </td>
-	<td> %answer_nick% </td>
-	<td> %answer% </td>
-	<td>
-		<a href="%link%&action=delete&id=%question_id%">Löschen</a>
-	</td>
-</tr>
diff --git a/templates/admin_question_unanswered.html b/templates/admin_question_unanswered.html
deleted file mode 100644
index 066b7dcc..00000000
--- a/templates/admin_question_unanswered.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<tr>
-  <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
deleted file mode 100644
index 3608e232..00000000
--- a/templates/admin_questions.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<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>
-    </thead>
-    <tbody>%open_questions%
-    </tbody>
-  </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>
-    </thead>
-    <tbody>%answered_questions%
-    </tbody>
-  </table>
-</div>
\ No newline at end of file
diff --git a/templates/admin_rooms_edit_form.html b/templates/admin_rooms_edit_form.html
deleted file mode 100644
index cd1506fa..00000000
--- a/templates/admin_rooms_edit_form.html
+++ /dev/null
@@ -1,59 +0,0 @@
-Raum und dafür benötigte Engel bearbeiten: 
-<br/>
-<form action="%link%&action=changesave" method="post">
-    <table>
-        <tr>
-            <td>
-                Name
-            </td>
-            <td>
-                <input type="text" name="Name" value="%name%" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Man
-            </td>
-            <td>
-                <input type="text" name="Man" value="%man%" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                From Pentabarf
-            </td>
-            <td>
-                %from_pentabarf_options%
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Show
-            </td>
-            <td>
-                %show_options%
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Number
-            </td>
-            <td>
-                <input type="text" name="Number" value="%number%" />
-            </td>
-        </tr>
-        <tr>
-            <th>
-                Angle Type
-            </th>
-            <th>
-                Needed for this room
-            </th>
-        </tr>
-        %angel_types%
-    </table>
-    <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Save" />
-</form>
-<form action="%link%&action=delete" method="post">
-    <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Delete" />
-</form>
\ No newline at end of file
diff --git a/templates/admin_rooms_new_form.html b/templates/admin_rooms_new_form.html
deleted file mode 100644
index f386259c..00000000
--- a/templates/admin_rooms_new_form.html
+++ /dev/null
@@ -1,46 +0,0 @@
-Neuen Raum einrichten: 
-<br/>
-<form action="%link%&action=newsave" method="post">
-    <table>
-        <tr>
-            <td>
-                Name
-            </td>
-            <td>
-                <input type="text" name="Name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Man
-            </td>
-            <td>
-                <input type="text" name="Man" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                From Pentabarf
-            </td>
-            <td>
-                <input type="radio" name="FromPentabarf" value="Y" /> Yes <input type="radio" name="FromPentabarf" value="N" />No
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Show
-            </td>
-            <td>
-                <input type="radio" name="Show" value="Y" /> Yes<input type="radio" name="Show" value="N" /> No
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Number
-            </td>
-            <td>
-                <input type="text" name="Number" value="" />
-            </td>
-        </tr>
-    </table><input type="submit" value="Create" />
-</form>
\ No newline at end of file
diff --git a/templates/admin_shift_preview.html b/templates/admin_shift_preview.html
deleted file mode 100644
index 99e6e27f..00000000
--- a/templates/admin_shift_preview.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<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/user_messages.html b/templates/user_messages.html
deleted file mode 100644
index e0c83544..00000000
--- a/templates/user_messages.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<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>
-</div>
\ No newline at end of file
diff --git a/templates/user_myshifts_reset.html b/templates/user_myshifts_reset.html
deleted file mode 100644
index 5e28b74a..00000000
--- a/templates/user_myshifts_reset.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p class="error">
-    Wenn Du Deinen Key zurück setzt, ändert sich der Link zu Deinem iCal- und JSON-Export, sowie zu dem Atom Feed! Du musst diesen dann an allen Stellen, wo Du ihn verwendest aktualisieren.
-</p>
-<p>
-    <a href="?p=user_myshifts&reset=ack">Fortfahren &raquo;</a>
-</p>
diff --git a/templates/user_questions.html b/templates/user_questions.html
deleted file mode 100644
index 466d0c48..00000000
--- a/templates/user_questions.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<p>
-    Beantwortete Fragen:
-</p>
-<table>
-    <thead>
-        <tr>
-            <th>
-                Frage
-            </th>
-            <th>
-                Von
-            </th>
-            <th>
-                Antwort
-            </th>
-            <th>
-                &nbsp;
-            </th>
-        </tr>
-    </thead>
-    <tbody>
-        %answered_questions%
-    </tbody>
-</table>
-<hr/>
-<p>
-    Frage einen Erzengel:
-</p>
-<form action="%link%&action=ask" method="post">
-    <table>
-        <tr>
-            <td>
-                Frage:
-            </td>
-            <td>
-                <textarea name="question"></textarea>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" name="submit" value="Fragen" />
-</form>
\ No newline at end of file
diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html
deleted file mode 100644
index bf2d5531..00000000
--- a/templates/user_wakeup.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<form action="%wakeup_link%&amp;action=create" method="post">
-    <table>
-        <tr>
-            <td align="right">
-                %date_text%: 
-            </td>
-            <td>
-                <input type="text" name="Date" value="%date_value%">
-            </td>
-        </tr>
-        <tr>
-            <td align="right">
-                %place_text% 
-            </td>
-            <td>
-                <input type="text" name="Ort" value="">
-            </td>
-        </tr>
-        <tr>
-            <td align="right">
-                %comment_text% 
-            </td>
-            <td>
-                <textarea name="Bemerkung" rows="5" cols="40">%comment_value%</textarea>
-            </td>
-        </tr>
-    </table>
-    <input type="submit" name="submit" value="%submit_text%" />
-</form>
\ No newline at end of file