iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #361 from MyIgel/master 

Added links to notifications, closes #357
This commit is contained in:
msquare 2017-11-19 16:37:37 +01:00 committed by GitHub
parent 0ee7df4883 d34b160b5c
commit e188d12ad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
includes/view/User_view.php
View File

@ -620,9 +620,32 @@ function User_groups_render($user_groups)
*/ */
function User_Nick_render($user_source) function User_Nick_render($user_source)
{ {
return '<a class="' . ($user_source['Gekommen'] ? '' : 'text-muted') . '" href="' return render_profile_link(
. page_link_to('users', ['action' => 'view', 'user_id' => $user_source['UID']]) '<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>',
. '"><span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . '</a>'; $user_source['UID'],
($user_source['Gekommen'] ? '' : 'text-muted')
);
}
/**
* @param string $text
* @param int $user_id
* @param string $class
* @return string
*/
function render_profile_link($text, $user_id = null, $class = '')
{
$profile_link = page_link_to('user-settings');
if (!is_null($user_id)) {
$profile_link = page_link_to('users', ['action' => 'view', 'user_id' => $user_id]);
}
return sprintf(
'<a class="%s" href="%s">%s</a>',
$class,
$profile_link,
$text
);
} }
/** /**
@ -633,7 +656,8 @@ function render_user_departure_date_hint()
global $user; global $user;
if (!isset($user['planned_departure_date']) || $user['planned_departure_date'] == null) { if (!isset($user['planned_departure_date']) || $user['planned_departure_date'] == null) {
return _('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.'); $text = _('Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities.');
return render_profile_link($text);
} }
return null; return null;
@ -680,7 +704,8 @@ function render_user_tshirt_hint()
global $user; global $user;
if (config('enable_tshirt_size') && $user['Size'] == '') { if (config('enable_tshirt_size') && $user['Size'] == '') {
return _('You need to specify a tshirt size in your settings!'); $text = _('You need to specify a tshirt size in your settings!');
return render_profile_link($text);
} }
return null; return null;
@ -694,7 +719,8 @@ function render_user_dect_hint()
global $user; global $user;
if ($user['DECT'] == '') { if ($user['DECT'] == '') {
return _('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.'); $text = _('You need to specify a DECT phone number in your settings! If you don\'t have a DECT phone, just enter \'-\'.');
return render_profile_link($text);
} }
return null; return null;