From 74647e16d37fac9425a4561b49618b52cdc3e75c Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 22 Aug 2014 22:34:13 +0200 Subject: add basic bootstrap theme --- templates/admin_free.html | 36 ++++++------- templates/admin_groups.html | 31 ++++-------- templates/admin_groups_edit_form.html | 31 +++++------- templates/admin_question_unanswered.html | 26 +++++----- templates/admin_questions.html | 71 ++++++++++---------------- templates/admin_shift_preview.html | 52 ++++++++----------- templates/admin_shifts.html | 86 -------------------------------- templates/admin_shifts_angel_types.html | 22 -------- templates/layout.html | 80 ++++++++++++++--------------- templates/user_messages.html | 77 +++++++++++----------------- templates/user_shifts.html | 76 ++++++++++++++++++---------- 11 files changed, 211 insertions(+), 377 deletions(-) delete mode 100644 templates/admin_shifts.html delete mode 100644 templates/admin_shifts_angel_types.html (limited to 'templates') 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 @@ -
+
+

%title%

+

- Search Angel: %angeltypes% + Search Angel: %angeltypes%

- - + +
- - - - - - + + + + + + - - %table% + %table% -
- Nickname - - DECT - - Jabber - - Edit -
NicknameDECTJabberEdit
+ +
\ 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 @@

- Hallo %nick%, -
- hier hast du die Möglichkeit Gruppenrechte zu ändern: + Hallo %nick%,
hier hast du die Möglichkeit Gruppenrechte zu ändern:

- - - - - - - - - - %groups% - +
- Name - - Rechte - -   -
+ + + + + + + + %groups% +
NameRechte 
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 @@
- - - - - - - - - - %privileges% - -
-   - - Name - - Description -
- + + + + + + + + + %privileges% + +
 NameDescription
+
\ 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 @@ - %question_nick% - %question% - -
- - - -
- - - Löschen - + %question_nick% + %question% + +
+
+ +
+ +
+ +
+
+ + Löschen 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 @@ -

- Unbeantwortete Fragen: -

- +
+

Fragen beantworten

+

Unbeantwortete Fragen:

+
- - - - - - + + + + + + - - %open_questions% + %open_questions% -
- Von - - Frage - - Antwort - -   -
VonFrageAntwort 
-
-

- Beantwortete Fragen: -

- +
+
+

Beantwortete Fragen:

+ - - - - - - - + + + + + + + - - %answered_questions% + %answered_questions% -
- Von - - Frage - - Von - - Antwort - -   -
VonFrageVonAntwort 
+ + \ 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 @@ -

Vorschau:

-
-
- - - - - - - - - %shifts_table% - -
- Timeslot - - Entries -
-

- -

- - - - - - - - - %needed_angel_types% -
-
\ No newline at end of file +
+

Vorschau:

+
+ + + + + + + + %shifts_table% + +
TimeslotEntries
+

+ +

+ %needed_angel_types% +
+
\ 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 @@ - -
-
- %msg% -

- - -

-

- %room_select% -

-

- - -

-

- - -

Modus:

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

Benötigte Engel:

-

- - -

-

- - -

%angel_types% -

- -

-
-
\ 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 @@ -
- - - -
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 @@ - - %title% - Engelsystem - - - - - - - - - - - - %atom_link% - - -
- - %header_toolbar% -
-
-
- -
-

%title%

-
- %content% -
-
-
-
- + +%title% - Engelsystem + + + + + + + + + + + + + +%atom_link% + + +
+
+ ENGELSYSTEM %header_toolbar% +
+
+
+
+ %menu% + +
+ %content% +
+ 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% -
- - - - - - - - - - - - - %messages% - - - - - - - - - +
+

%title%

+ %greeting% + +
- %new_label% - - %date_label% - - %from_label% - - %to_label% - - %text_label% - -   -
-   - - %date% - - %from% - - %to_select% - - - - -
+ + + + + + + + + + + + %messages% + + + + + + + + +
%new_label%%date_label%%from_label%%to_label%%text_label% 
 %date%%from%%to_select%
-
\ No newline at end of file + + \ 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 @@ -
-
%filter% -
-%start_select% Now -– %end_select% Now -
- -%room_select% -%type_select% -%filled_select% -
%task_notice%
-
%new_style_checkbox%
- -
+ + +
+
+

%title%

+
%start_select%
+
+
+ +
+ +
+
+
+ – +
%end_select%
+
+
+ +
+ +
+
+
+
+
%room_select%
+
%type_select%
+
%filled_select%
+
+
%task_notice%
+
%new_style_checkbox%
+
- -%shifts_table% - -%ical_text% +%shifts_table% %ical_text% -- cgit v1.2.3-54-g00ecf