diff options
| author | Philip Häusler <msquare@notrademark.de> | 2014-09-24 15:03:41 +0200 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2014-09-24 15:03:41 +0200 |
| commit | 094715e6eea83c56891716c24b652b35f18337bd (patch) | |
| tree | 9036b4088383e9ec612b1a79855f47070de4481d | |
| parent | 086ddc2248f74b94e8f6fb94e87fded4eca56dc1 (diff) | |
optimize navbar for 1024 px width
| -rw-r--r-- | includes/helper/internationalization_helper.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_messages.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 2 | ||||
| -rw-r--r-- | includes/sys_menu.php | 1 | ||||
| -rw-r--r-- | templates/layout.html | 2 |
5 files changed, 4 insertions, 5 deletions
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(), diff --git a/templates/layout.html b/templates/layout.html index d720de49..4cbd496d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -22,7 +22,7 @@ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong></a> + <a class="navbar-brand" href="?"><span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong></a> </div> <div class="collapse navbar-collapse" id="navbar-collapse-1">%menu% %header_toolbar%</div> </div> |