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

chg: [generic_picker] improved layout

pull/4041/head
mokaddem 2019-01-22 16:40:40 +01:00
parent ac913bbe82
commit 605e68c6ba
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
<?php if (!is_array($infoExtra)): ?>
<?php if (strlen($infoExtra) < 50): ?>
<i style="float:right; font-size: smaller;margin: 5px;"><?php echo h($infoExtra); ?></i>
<?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" style="float:right;margin:5px;margin:5px;line-height:13px;" title="<?php echo h($infoExtra); ?>"></it>
<it class="fa fa-info-circle" style="float:right;margin-right: 5px;line-height:13px;" title="<?php echo h($infoExtra); ?>"></it>
<?php endif; ?>
<?php elseif (isset($infoExtra['type'])): // same as if infoExtra is not an array ?>
<?php if ($infoExtra['type'] === 'text'): ?>
<?php if (strlen($infoExtra) < 50): ?>
<i style="float:right;font-size: smaller;margin: 5px;"><?php echo h($infoExtra); ?></i>
<?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" style="float:right;margin:5px;line-height:13px; margin-right: 5px;" title="<?php echo h($infoExtra); ?>"></it>
<it class="fa fa-info-circle" style="float:right;line-height:13px;margin-top:5px;margin-right: 5px;" title="<?php echo h($infoExtra); ?>"></it>
<?php endif; ?>
<?php elseif ($infoExtra['type'] === 'check'): ?>

2
app/View/Helper/GenericPickerHelper.php
View File

@ -92,7 +92,7 @@ class GenericPickerHelper extends AppHelper {
}
$pill_html .= h($param['name']);
if (isset($param['template']['infoExtra'])) {
$pill_html .= $this->_View->element('genericPickerElements/info_extra', array('infoExtra' => $param['template']['infoExtra']));
$pill_html .= $this->_View->element('genericPickerElements/info_extra', array('infoExtra' => $param['template']['infoExtra'], 'forceIcon' => true));
}
$pill_html .= '</a>';
$pill_html .= '</li>';