summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-13 17:50:52 +0100
committermsquare <msquare@notrademark.de>2017-12-13 17:50:52 +0100
commitc70e268a2e25855391a53240a9ca783c3a7a94dd (patch)
tree8e8386044cf6d0baadaf55882538da603c6628ec
parenta8cf4b9ddf1b9ac68866db97372c14f6ceca1b12 (diff)
add fullscreen button to dashboard and update translation to german
-rw-r--r--includes/controller/public_dashboard_controller.php2
-rw-r--r--includes/sys_template.php13
-rw-r--r--includes/view/PublicDashboard_view.php17
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.mobin41462 -> 42067 bytes
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.po274
-rw-r--r--templates/layout.html2
6 files changed, 185 insertions, 123 deletions
diff --git a/includes/controller/public_dashboard_controller.php b/includes/controller/public_dashboard_controller.php
index 311db22d..3cd85a50 100644
--- a/includes/controller/public_dashboard_controller.php
+++ b/includes/controller/public_dashboard_controller.php
@@ -15,7 +15,7 @@ function public_dashboard_controller()
$free_shifts = Shifts_free(time(), time() + 12 * 60 * 60);
return [
- _('Engelsystem Public Dashboard'),
+ _('Public Dashboard'),
public_dashboard_view($stats, $free_shifts)
];
}
diff --git a/includes/sys_template.php b/includes/sys_template.php
index b5846e9b..48ec7e8c 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -355,6 +355,19 @@ function button($href, $label, $class = '')
}
/**
+ * Rendert einen Knopf mit JavaScript onclick Handler
+ *
+ * @param string $javascript
+ * @param string $label
+ * @param string $class
+ * @return string
+ */
+function button_js($javascript, $label, $class = '')
+{
+ return '<a onclick="' . $javascript . '" href="#" class="btn btn-default ' . $class . '">' . $label . '</a>';
+}
+
+/**
* Rendert einen Knopf mit Glyph
*
* @param string $href
diff --git a/includes/view/PublicDashboard_view.php b/includes/view/PublicDashboard_view.php
index fc639ce9..c49f3715 100644
--- a/includes/view/PublicDashboard_view.php
+++ b/includes/view/PublicDashboard_view.php
@@ -11,7 +11,7 @@ function public_dashboard_view($stats, $free_shifts)
foreach ($free_shifts as $shift) {
$shift_panels[] = public_dashborad_shift_render($shift);
}
- $needed_angels = div('container-fluid first', [
+ $needed_angels = div('first', [
div('col-md-12', [
heading(_('Needed angels:'), 1)
]),
@@ -20,7 +20,7 @@ function public_dashboard_view($stats, $free_shifts)
}
return page([
div('public-dashboard', [
- div('first container-fluid', [
+ div('first', [
stats(_('Angels needed in the next 3 hrs'), $stats['needed-3-hours']),
stats(_('Angels needed for nightshifts'), $stats['needed-night']),
stats(_('Angels currently working'), $stats['angels-working'], 'default'),
@@ -33,10 +33,17 @@ function public_dashboard_view($stats, $free_shifts)
})
</script>'
], 'statistics'),
- $needed_angels
+ $needed_angels,
+ div('col-md-12', [
+ buttons([
+ button_js('
+ $(\'#navbar-collapse-1,#footer,#fullscreen-button\').remove();
+ $(\'.navbar-brand\').append(\' ' . _('Public Dashboard') . '\');
+ ', glyph('fullscreen') . _('Fullscreen'))
+ ])
+ ], 'fullscreen-button')
], 'public-dashboard')
- ]
- );
+ ]);
}
/**
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index dad5ce74..f1ae7dd9 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
Binary files differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 535485f3..a1de2624 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2017-11-24 11:59+0100\n"
-"PO-Revision-Date: 2017-11-30 13:59+0100\n"
+"POT-Creation-Date: 2017-12-13 17:48+0100\n"
+"PO-Revision-Date: 2017-12-13 17:50+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
"X-Poedit-SearchPath-1: .\n"
-#: /Users/msquare/workspace/projects/engelsystem/config/config.default.php:111
+#: /Users/msquare/workspace/projects/engelsystem/config/config.default.php:113
msgid "Please select..."
msgstr "Bitte auswählen..."
@@ -31,8 +31,8 @@ msgstr "Engeltypen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:66
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:503
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:486
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:586
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:490
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:590
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
msgid "Teams/Job description"
msgstr "Team-/Aufgabenbeschreibung"
@@ -58,21 +58,21 @@ msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben."
msgid "Edit %s"
msgstr "%s bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:333
#, php-format
msgid "Team %s"
msgstr "Team %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:285
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:353
msgid "view"
msgstr "ansehen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:287
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:293
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:97
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:43
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:25
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:92
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:124
@@ -82,11 +82,11 @@ msgstr "ansehen"
msgid "edit"
msgstr "bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:298
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:239
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:58
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:26
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:174
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
@@ -99,19 +99,19 @@ msgstr "bearbeiten"
msgid "delete"
msgstr "löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:309
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:522
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:526
msgid "leave"
msgstr "verlassen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:315
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:528
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:532
msgid "join"
msgstr "mitmachen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:352
msgid "Angeltype doesn't exist . "
msgstr "Engeltyp existiert nicht."
@@ -156,6 +156,12 @@ msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen."
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:253
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:41
+msgid "Public Dashboard"
+msgstr "Public Dashboard"
+
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:96
msgid ""
"You are not allowed to sign up for this shift. Maybe shift is full or "
@@ -221,7 +227,7 @@ msgstr "Diese Seite ist mit JavaScript viel komfortabler."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:181
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:371
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:373
msgid "Shifttype"
msgstr "Schichttyp"
@@ -229,7 +235,7 @@ msgstr "Schichttyp"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:189
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:372
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:374
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:105
msgid "Title"
msgstr "Titel"
@@ -248,7 +254,7 @@ msgstr "Ende:"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:186
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:297
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:395
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:397
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:131
msgid "Needed angels"
msgstr "Benötigte Engel"
@@ -257,7 +263,7 @@ msgstr "Benötigte Engel"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:96
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:40
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:54
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:299
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:168
@@ -306,7 +312,7 @@ msgid "Shifttype not found."
msgstr "Schichttyp nicht gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:80
msgid "Please enter a name."
msgstr "Gib bitte einen Namen an."
@@ -706,8 +712,8 @@ msgid "Marked angels."
msgstr "Engel wurden markiert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:180
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:293
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:167
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:148
@@ -763,8 +769,8 @@ msgstr "entferne t-shirt"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:210
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:407
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:415
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:411
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:419
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218
msgid "Sum"
msgstr "Summe"
@@ -793,7 +799,7 @@ msgstr "Wie viele Engel sollten aktiv sein?"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:272
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:281
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:408
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:410
msgid "Preview"
msgstr "Vorschau"
@@ -810,13 +816,14 @@ msgstr "Größe"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:278
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:11
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:344
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:33
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:528
msgid "Shifts"
msgstr "Schichten"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:279
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:381
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:383
msgid "Length"
msgstr "Länge"
@@ -956,7 +963,7 @@ msgstr "Nick"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:109
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:286
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:466
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:470
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
msgid "DECT"
@@ -971,7 +978,7 @@ msgstr "Jabber"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:123
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:467
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:471
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:559
msgid "E-Mail"
@@ -984,13 +991,13 @@ msgstr "Gruppenrechte"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:51
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:180
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:200
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:82
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:83
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:108
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:465
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:489
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:469
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:493
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:61
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:141
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:236
@@ -1005,17 +1012,17 @@ msgstr "Privilegien"
msgid "Edit group"
msgstr "Gruppe bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:194
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:201
msgid "Frab import"
msgstr "Frab Import"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:38
msgid "Webserver has no write-permission on import directory."
msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:63
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:234
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:58
@@ -1023,7 +1030,7 @@ msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
msgid "Please select a shift type."
msgstr "Bitte einen Schichttyp wählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:70
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:145
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:241
msgid "Please enter an amount of minutes to add to a talk's begin."
@@ -1031,7 +1038,7 @@ msgstr ""
"Bitte gib eine Anzahl Minuten ein, die vor dem Talk-Beginn hinzugefügt "
"werden sollen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:77
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:152
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:248
msgid "Please enter an amount of minutes to add to a talk's end."
@@ -1053,13 +1060,13 @@ msgstr "Bitte lade eine Datei hoch."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:285
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:284
msgid "File Upload"
msgstr "Datei hochladen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:287
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:286
msgid "Validation"
msgstr "Überprüfen"
@@ -1067,7 +1074,7 @@ msgstr "Überprüfen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:210
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:288
msgid "Import"
msgstr "Importieren"
@@ -1118,7 +1125,7 @@ msgstr "Tag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:186
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:376
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:378
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:109
msgid "Start"
msgstr "Beginn"
@@ -1126,7 +1133,7 @@ msgstr "Beginn"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:379
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:117
msgid "End"
msgstr "Ende"
@@ -1140,7 +1147,7 @@ msgstr "Schichttyp"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:190
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:199
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:373
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:375
msgid "Room"
msgstr "Raum"
@@ -1152,7 +1159,7 @@ msgstr "Zu aktualisierende Schichten"
msgid "Shifts to delete"
msgstr "Zu löschende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:289
msgid "It's done!"
msgstr "Erledigt!"
@@ -1186,7 +1193,7 @@ msgid "Meeting"
msgstr "Treffen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:186
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
msgid "Delete"
msgstr "löschen"
@@ -1239,52 +1246,74 @@ msgstr "Beantwortete Fragen"
msgid "Answered by"
msgstr "Antwort von"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:7
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:201
msgid "Rooms"
msgstr "Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:74
msgid "This name is already in use."
msgstr "Dieser Name ist bereits vergeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:104
#, php-format
msgid "Please enter needed angels for type %s."
msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:131
msgid "Room saved."
msgstr "Raum gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:243
-msgid "Public"
-msgstr "Öffentlich"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:152
+msgid "Map URL"
+msgstr "Karten URL"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:196
-msgid "Room number"
-msgstr "Raumnummer"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:153
+msgid "The map url is used to display an iframe on the room page."
+msgstr ""
+"Die Karten URL wird benutzt um auf der Raum-Seite ein iframe anzuzeigen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:390
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:135
+msgid "Description"
+msgstr "Beschreibung"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+msgid "Please use markdown for the description."
+msgstr "Bitte benutze Markdown für die Beschreibung."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:16
msgid "Needed angels:"
msgstr "Benötigte Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
#, php-format
msgid "Room %s deleted."
msgstr "Raum %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:182
#, php-format
msgid "Do you want to delete room %s?"
msgstr "Möchest Du den Raum %s wirklich löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:196
msgid "add"
msgstr "Neu"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:30
+msgid "Map"
+msgstr "Karte"
+
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:10
msgid "Create shifts"
msgstr "Schichten erstellen"
@@ -1342,31 +1371,31 @@ msgstr "Zeit und Ort"
msgid "Type and title"
msgstr "Typ und Titel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:378
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:380
msgid "Mode"
msgstr "Modus"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:379
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:381
msgid "Create one shift"
msgstr "Eine Schicht erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:380
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:382
msgid "Create multiple shifts"
msgstr "Mehrere Schichten erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:384
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:386
msgid "Create multiple shifts with variable length"
msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:390
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:392
msgid "Shift change hours"
msgstr "Schichtwechsel-Stunden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:398
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:400
msgid "Take needed angels from room settings"
msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:402
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:404
msgid "The following angels are needed"
msgstr "Die folgenden Engel werden benötigt"
@@ -1837,40 +1866,40 @@ msgstr ""
msgid "Filter"
msgstr "Filter"
-#: engelsystem/includes/pages/user_shifts.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:246
msgid "Yesterday"
msgstr "Gestern"
-#: engelsystem/includes/pages/user_shifts.php:247
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:247
msgid "Today"
msgstr "Heute"
-#: engelsystem/includes/pages/user_shifts.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:248
msgid "Tomorrow"
msgstr "Morgen"
-#: engelsystem/includes/pages/user_shifts.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
msgid "last 8h"
msgstr "letzte 8h"
-#: engelsystem/includes/pages/user_shifts.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:250
msgid "last 4h"
msgstr "letzte 4h"
-#: engelsystem/includes/pages/user_shifts.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251
msgid "next 4h"
msgstr "nächste 4h"
-#: engelsystem/includes/pages/user_shifts.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
msgid "next 8h"
msgstr "nächste 8h"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:286
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
msgid "All"
msgstr "Alle"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:287
msgid "None"
msgstr "Keine"
@@ -1882,12 +1911,12 @@ msgstr "Admin"
msgid "Manage rooms"
msgstr "Verwalte Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:318
msgid "No data found."
msgstr "Nichts gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:437
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:441
msgid "Unconfirmed"
msgstr "Unbestätigt"
@@ -1919,7 +1948,7 @@ msgstr "abbrechen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:490
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:494
msgid "Restricted"
msgstr "Beschränkt"
@@ -1941,21 +1970,8 @@ msgstr ""
"Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden "
"(double-opt-in)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:386
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:135
-msgid "Description"
-msgstr "Beschreibung"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
-msgid "Please use markdown for the description."
-msgstr "Bitte benutze Markdown für die Beschreibung."
-
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:464
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:468
msgid "Contact"
msgstr "Kontakt"
@@ -2026,44 +2042,44 @@ msgstr "12,5t LKW"
msgid "Forklift"
msgstr "Gabelstapler"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:333
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:337
msgid "Info"
msgstr "Info"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:405
msgid "Supporters"
msgstr "Supporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:421
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:425
msgid "Members"
msgstr "Mitglieder"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:429
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:433
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:174
msgid "Add"
msgstr "Hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:441
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:445
msgid "confirm all"
msgstr "Alle bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:446
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:450
msgid "deny all"
msgstr "Alle ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:484
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:488
msgid "New angeltype"
msgstr "Neuer Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:491
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:495
msgid "Self Sign Up Allowed"
msgstr "Selbst-Eintragen erlaubt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:492
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:496
msgid "Membership"
msgstr "Mitgliedschaft"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:537
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:541
msgid ""
"This angeltype is restricted by double-opt-in by a team supporter. Please "
"show up at the according introduction meetings."
@@ -2071,11 +2087,11 @@ msgstr ""
"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet "
"werden. Bitte komme zu den entsprechenden Einführungstreffen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:574
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:578
msgid "FAQ"
msgstr "FAQ"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:579
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:583
msgid ""
"Here is the list of teams and their tasks. If you have questions, read the "
"FAQ."
@@ -2169,6 +2185,26 @@ msgstr "Abbau Ende Datum"
msgid "Event end date"
msgstr "Event Ende Datum"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:24
+msgid "Angels needed in the next 3 hrs"
+msgstr "Benötigte Engel in den nächsten 3 Stunden"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:25
+msgid "Angels needed for nightshifts"
+msgstr "Benötigte Engel für Nachtschichten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:26
+msgid "Angels currently working"
+msgstr "Aktuell arbeitende Engel"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:27
+msgid "Hours to be worked"
+msgstr "Noch zu schaffende Stunden"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:42
+msgid "Fullscreen"
+msgstr "Vollbild"
+
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
msgid "Open questions"
msgstr "Offene Fragen"
@@ -2643,7 +2679,7 @@ msgstr ""
"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:693
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:697
msgid ""
"You are not marked as arrived. Please go to heaven's desk, get your angel "
"badge and/or tell them that you arrived already."
@@ -2651,11 +2687,11 @@ msgstr ""
"Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
"hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:707
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:712
msgid "You need to specify a tshirt size in your settings!"
msgstr "Bitte eine T-Shirt-Größe auswählen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:722
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:727
msgid ""
"You need to specify a DECT phone number in your settings! If you don't have "
"a DECT phone, just enter '-'."
@@ -2663,11 +2699,11 @@ msgstr ""
"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
"keine Nummer hast, bitte einfach \"-\" angeben."
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:206
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:210
msgid "No Access"
msgstr "Kein Zugriff"
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:207
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:211
msgid ""
"You don't have permission to view this page . You probably have to sign in "
"or register in order to gain access!"
@@ -2675,6 +2711,12 @@ msgstr ""
"Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
"bitte ein, um Zugriff zu erhalten!"
+#~ msgid "Public"
+#~ msgstr "Öffentlich"
+
+#~ msgid "Room number"
+#~ msgstr "Raumnummer"
+
#~ msgid "Unable to save question."
#~ msgstr "Konnte Frage nicht speichern."
diff --git a/templates/layout.html b/templates/layout.html
index 2ff097a5..12a91086 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -31,7 +31,7 @@
</div>
<div class="container-fluid">
<div class="row">%content%</div>
- <div class="row">
+ <div class="row" id="footer">
<div class="col-md-12">
<hr/>
<div class="text-center footer" style="margin-bottom: 10px;">