From 094715e6eea83c56891716c24b652b35f18337bd Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 24 Sep 2014 15:03:41 +0200
Subject: optimize navbar for 1024 px width

---
 includes/helper/internationalization_helper.php | 2 +-
 includes/pages/user_messages.php                | 2 +-
 includes/pages/user_shifts.php                  | 2 +-
 includes/sys_menu.php                           | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'includes')

diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php
index 7598dc2f..6a1f172d 100644
--- a/includes/helper/internationalization_helper.php
+++ b/includes/helper/internationalization_helper.php
@@ -48,7 +48,7 @@ function make_langselect() {
   $items = array();
   foreach ($locales as $locale => $name)
     $items[] = toolbar_item_link(htmlspecialchars($URL) . $locale, '', '<img src="pic/flag/' . $locale . '.png" alt="' . $name . '" title="' . $name . '"> ' . $name);
-  return toolbar_dropdown('', '<img src="pic/flag/' . $_SESSION['locale'] . '.png" alt="' . $locales[$_SESSION['locale']] . '" title="' . $locales[$_SESSION['locale']] . '"> ' . $locales[$_SESSION['locale']], $items);
+  return toolbar_dropdown('', '<img src="pic/flag/' . $_SESSION['locale'] . '.png" alt="' . $locales[$_SESSION['locale']] . '" title="' . $locales[$_SESSION['locale']] . '">', $items);
 }
 
 ?>
\ No newline at end of file
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index d6879b5e..2a5fb917 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 pull-right">' . $new_messages . '</span>';
+      return ' <span class="badge">' . $new_messages . '</span>';
   }
   return '';
 }
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 3b5c57e9..370544a1 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -1,6 +1,6 @@
 <?php
 function shifts_title() {
-  return _("All Shifts");
+  return _("Shifts");
 }
 
 function user_shifts() {
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 4841dd52..8b3e7f5e 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -52,7 +52,6 @@ function make_navigation() {
   $pages = array(
       "news" => news_title(),
       "user_meetings" => meetings_title(),
-      "user_myshifts" => myshifts_title(),
       "user_shifts" => shifts_title(),
       "angeltypes" => angeltypes_title(),
       "user_messages" => messages_title() . ' ' . user_unread_messages(),
-- 
cgit v1.2.3-54-g00ecf