tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RoleForm: Don't let privilege labels break on dashes

This commit is contained in:
Johannes Meyer 2021-03-26 14:25:48 +01:00
parent be227fd61d
commit 68f101b015
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
application/forms/Security/RoleForm.php
View File

@ -171,16 +171,24 @@ class RoleForm extends RepositoryForm
'autosubmit' => isset($spec['isFullPerm']),
'disabled' => $hasFullPerm || $hasAdminPerm ?: null,
'value' => $hasFullPerm || $hasAdminPerm,
'label' => preg_replace(
// Adds a zero-width char after each slash to help browsers break onto newlines
'~(?<!<)/~',
'/&#8203;',
isset($spec['label']) ? $spec['label'] : preg_replace(
'~^(\w+)(/.*)~',
'<em>$1</em>$2',
$name
)
),
'label' => isset($spec['label'])
? $spec['label']
: join('', iterator_to_array(call_user_func(function ($segments) {
foreach ($segments as $segment) {
if ($segment[0] === '/') {
// Adds a zero-width char after each slash to help browsers break onto newlines
yield '/&#8203;';
yield '<span class="no-wrap">' . substr($segment, 1) . '</span>';
} else {
yield '<em>' . $segment . '</em>';
}
}
}, preg_split(
'~(/[^/]+)~',
$name,
-1,
PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
)))),
'description' => isset($spec['description']) ? $spec['description'] : $name,
'decorators' => array_merge(
array_slice(self::$defaultElementDecorators, 0, 3),
@ -220,16 +228,24 @@ class RoleForm extends RepositoryForm
'text',
$elementName,
[
'label' => preg_replace(
// Adds a zero-width char after each slash to help browsers break onto newlines
'~(?<!<)/~',
'/&#8203;',
isset($spec['label']) ? $spec['label'] : preg_replace(
'~^(\w+)(/.*)~',
'<em>$1</em>$2',
$name
)
),
'label' => isset($spec['label'])
? $spec['label']
: join('', iterator_to_array(call_user_func(function ($segments) {
foreach ($segments as $segment) {
if ($segment[0] === '/') {
// Add zero-width char after each slash to help browsers break onto newlines
yield '/&#8203;';
yield '<span class="no-wrap">' . substr($segment, 1) . '</span>';
} else {
yield '<em>' . $segment . '</em>';
}
}
}, preg_split(
'~(/[^/]+)~',
$name,
-1,
PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
)))),
'description' => $spec['description'],
'style' => $isUnrestricted ? 'text-decoration:line-through;' : '',
'readonly' => $isUnrestricted ?: null

4
public/css/icinga/main.less
View File

@ -45,6 +45,10 @@
}
}
.no-wrap {
white-space: nowrap;
}
.pull-right {
float: right;
}