From 53a10de5cf9b97b3a5fb1bf0726eb697c13e5ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 24 Aug 2014 16:36:10 +0200
Subject: [PATCH 1/3] move json and ical export buttons

---
 includes/view/User_view.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 8077d0af..b71f99cf 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -134,8 +134,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
       buttons(array(
           $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")) : '',
           ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
-          button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-calendar"></span> ' . _("iCal Export")),
-          button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-export"></span> ' . _("JSON Export")) 
+          $its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-calendar"></span> ' . _("iCal Export")) : '',
+          $its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-export"></span> ' . _("JSON Export")) : '' 
       )),
       ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
       ($its_me || $admin_user_privilege) ? table(array(
@@ -146,13 +146,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
           'comment' => _("Comment"),
           'actions' => _("Action") 
       ), $myshifts_table) : '',
-      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '',
-      ($its_me || $admin_user_privilege) ? '<h2>' . _("Exports") . '</h2>' : '',
-      $its_me ? (sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], page_link_to('user_myshifts') . '&reset')) : '',
-      (! $its_me && $admin_user_privilege) ? buttons(array(
-          button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-calendar"></span> ' . _("iCal Export")),
-          button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-export"></span> ' . _("JSON Export")) 
-      )) : '' 
+      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '' 
   ));
 }
 

From fbdb8ae472fac193fef06b15d78dfd1c988c6b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 24 Aug 2014 16:46:30 +0200
Subject: [PATCH 2/3] move new messages badge

---
 includes/pages/user_messages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index d1c51d56..d6879b5e 100644
--- a/includes/pages/user_messages.php
+++ b/includes/pages/user_messages.php
@@ -9,7 +9,7 @@ function user_unread_messages() {
   if (isset($user)) {
     $new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
     if ($new_messages > 0)
-      return '<span class="badge">' . $new_messages . '</span>';
+      return '<span class="badge pull-right">' . $new_messages . '</span>';
   }
   return '';
 }

From 9adaeaa97a36067ee718b2530d57e90f31eb92e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 24 Aug 2014 16:48:12 +0200
Subject: [PATCH 3/3] shift state text update

---
 includes/view/User_view.php               |   4 +--
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 27469 -> 27394 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po |  36 ++++++++++------------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index b71f99cf..4c783644 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -36,9 +36,9 @@ function User_shift_state_render($user) {
   $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2;
   
   if (time() < $halfway)
-    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift start %c") . '</span>';
+    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift starts %c") . '</span>';
   else
-    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift end %c") . '</span>';
+    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends %c") . '</span>';
 }
 
 function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) {
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index efd75c752e751da045bc959ba5ab8a1592037031..b643964aeee00326bfc4411ef74c57053c14c101 100644
GIT binary patch
delta 7591
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
UQ+Ot*EMZ`V$EflF1Ah<xKWD@#umAu6

delta 7654
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
NM+USi2_0A#@_%6CF#rGn

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index ec6e2aaa..ec86d098 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: 2014-08-24 16:21+0100\n"
-"PO-Revision-Date: 2014-08-24 16:22+0100\n"
+"POT-Creation-Date: 2014-08-24 16:47+0100\n"
+"PO-Revision-Date: 2014-08-24 16:47+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -555,7 +555,7 @@ msgstr "Jabber"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -598,7 +598,7 @@ msgstr "Privilegien"
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:55
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
 msgid "Save"
 msgstr "Speichern"
 
@@ -938,12 +938,12 @@ msgstr "T-Shirt Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:159
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
 msgid "Password"
 msgstr "Passwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1433,7 +1433,6 @@ msgid "iCal export"
 msgstr "iCal Export"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:747
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:151
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1643,12 +1642,12 @@ msgstr "Nächste Schicht %c"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
 #, php-format
-msgid "Shift start %c"
-msgstr "Schicht start %c"
+msgid "Shift starts %c"
+msgstr "Schicht startet %c"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
-#, php-format
-msgid "Shift end %c"
+#, fuzzy, php-format
+msgid "Shift ends %c"
 msgstr "Schicht endet %c"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
@@ -1684,13 +1683,11 @@ msgid "Rights"
 msgstr "Rechte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
 #, fuzzy
 msgid "iCal Export"
 msgstr "iCal Export"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:154
 msgid "JSON Export"
 msgstr "JSON Export"
 
@@ -1719,11 +1716,7 @@ msgstr ""
 "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
 "einzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:150
-msgid "Exports"
-msgstr "Exporte"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:159
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -1732,11 +1725,11 @@ msgstr ""
 "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
 "verwendet hast."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:162
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -1824,6 +1817,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Exports"
+#~ msgstr "Exporte"
+
 #~ msgid "Current ends in %s min"
 #~ msgstr "Ende in %s min"