MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [UI] Use same UI for adding tags

pull/8248/head
Jakub Onderka 2022-03-30 09:15:29 +02:00
parent e589f8be93
commit cb643b4b89
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/View/Elements/ajaxTags.ctp
View File

@ -88,7 +88,7 @@
$span_delete = '';
if ($full || ($fullLocal && $tag['Tag']['local'])) {
$span_delete = sprintf(
'<span class="%s" title="%s" role="%s" tabindex="%s" aria-label="%s" onClick="%s">x</span>',
'<span class="%s" title="%s" role="%s" tabindex="%s" aria-label="%s" onclick="%s">x</span>',
'black-white tag useCursorPointer noPrint',
__('Remove tag'),
"button",
@ -126,10 +126,7 @@
);
}
if (!empty($buttonData)) {
$tagData .= sprintf(
'<span style="white-space:nowrap;">%s</span>',
implode(' ', $buttonData)
);
$tagData .= implode('', $buttonData);
}
echo sprintf(
'<span class="tag-list-container">%s</span>',
@ -142,11 +139,11 @@
$tagConflictData .= '<div class="text-container">';
foreach ($tagConflicts['global'] as $tagConflict) {
$tagConflictData .= sprintf(
'<strong>%s</strong></br>',
'<strong>%s</strong><br>',
h($tagConflict['conflict'])
);
foreach ($tagConflict['tags'] as $tag) {
$tagConflictData .= sprintf('<span class="apply_css_arrow nowrap">%s</span></br>', h($tag));
$tagConflictData .= sprintf('<span class="apply_css_arrow nowrap">%s</span><br>', h($tag));
}
}
$tagConflictData .= '</div></div></span>';
@ -157,11 +154,11 @@
$tagConflictData .= '<div class="text-container">';
foreach ($tagConflicts['local'] as $tagConflict) {
$tagConflictData .= sprintf(
'<strong>%s</strong></br>',
'<strong>%s</strong><br>',
h($tagConflict['conflict'])
);
foreach ($tagConflict['tags'] as $tag) {
$tagConflictData .= sprintf('<span class="apply_css_arrow nowrap">%s</span></br>', h($tag));
$tagConflictData .= sprintf('<span class="apply_css_arrow nowrap">%s</span><br>', h($tag));
}
}
$tagConflictData .= '</div></div></span>';