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

chg: [UI] Less code for generic picker

pull/8396/head
Jakub Onderka 2022-05-22 13:43:52 +02:00
parent 39a19c5f62
commit e9f0d43716
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/View/Elements/genericPickerElements/info_extra.ctp
View File

@ -2,7 +2,7 @@
<?php if (strlen($infoExtra) < 50 && !(isset($forceIcon) && $forceIcon)): ?>
<i style="float:right; font-size: smaller;margin-right: 5px;"><?php echo h($infoExtra); ?></i>
<?php else: ?>
<it class="fa fa-info-circle generic-picker-item-element-info" style="float:right;margin-left: 5px;line-height:13px;" title="<?php echo h($infoExtra); ?>"></it>
<i class="fa fa-info-circle generic-picker-item-element-info" title="<?php echo h($infoExtra); ?>"></i>
<?php endif; ?>
<?php elseif (isset($infoExtra['type'])): // same as if infoExtra is not an array ?>
@ -10,7 +10,7 @@
<?php if (strlen($infoExtra) < 50 && !(isset($forceIcon) && $forceIcon)): ?>
<i style="float:right;font-size: smaller;margin-right: 5px;"><?php echo h($infoExtra); ?></i>
<?php else: ?>
<it class="fa fa-info-circle generic-picker-item-element-info" style="float:right;line-height:13px;margin-left: 5px;" title="<?php echo h($infoExtra); ?>"></it>
<i class="fa fa-info-circle generic-picker-item-element-info" title="<?php echo h($infoExtra); ?>"></i>
<?php endif; ?>
<?php elseif ($infoExtra['type'] === 'check'): ?>
@ -22,8 +22,5 @@
</it>
<it style="margin-right: 0px;line-height:13px;" class="fa <?php echo $checkType; ?>"></it>
</it>
<?php elseif ($infoExtra['type'] === 'table'): ?>
<?php endif; ?>
<?php endif; ?>

8
app/webroot/css/main.css
View File

@ -1193,11 +1193,17 @@ li .generic-picker-item-element-check {
margin-right: 5px;
}
.generic-picker-item-element-info {
float: right;
line-height: 13px;
margin-left: 5px;
}
.chosen-single .generic-picker-item-element-info {
margin-top: 5px;
}
.chosen-single .apply_css_arrow{
.chosen-single .apply_css_arrow {
display: none !important;
}