summaryrefslogtreecommitdiff
path: root/includes/view
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2014-08-23 02:16:12 +0200
committerPhilip Häusler <msquare@notrademark.de>2014-08-23 02:16:12 +0200
commitc5331c44fd5f0251e7ec572c3bfc50a9f52c86bf (patch)
treecb8afcbac9fcf611f518f7eb44cc8f5d6d22ccaf /includes/view
parentf5a094fd8b32d44767f7fc30a65f407f4e1d9945 (diff)
move language select to the top
Diffstat (limited to 'includes/view')
-rw-r--r--includes/view/User_view.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index f7011ffd..04a0fa3f 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -57,7 +57,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_shift
if ($its_me || in_array('user_shifts_admin', $privileges))
$myshift['actions'] .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $user_source['UID'], 'pencil', _("edit"));
if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
- $myshift['actions'] .= img_button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', _("sign off"));
+ $myshift['actions'] .= img_button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], 'cross', _("sign off"));
if ($shift['freeloaded'])
$timesum += - 2 * ($shift['end'] - $shift['start']);
@@ -102,7 +102,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_shift
))
)),
$admin_user_privilege ? buttons(array(
- button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit"))
+ 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")) : ''
)) : '',
($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
($its_me || $admin_user_privilege) ? table(array(
@@ -212,11 +213,7 @@ function User_Avatar_render($user) {
* @return string
*/
function User_Nick_render($user_source) {
- global $user, $privileges;
- if ($user['UID'] == $user_source['UID'] || in_array('user_shifts_admin', $privileges))
- return '<a href="' . page_link_to('users') . '&amp;action=view&amp;user_id=' . $user_source['UID'] . '"><span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>';
- else
- return htmlspecialchars($user_source['Nick']);
+ return '<a href="' . page_link_to('users') . '&amp;action=view&amp;user_id=' . $user_source['UID'] . '"><span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>';
}
?> \ No newline at end of file