mirror of https://github.com/MISP/MISP
chg: [event:view] Make `Related *` scrollable
parent
0e65668f83
commit
4ab4318eb2
|
@ -46,7 +46,7 @@ class AppController extends Controller
|
|||
|
||||
public $helpers = array('Utility', 'OrgImg', 'FontAwesome');
|
||||
|
||||
private $__queryVersion = '77';
|
||||
private $__queryVersion = '78';
|
||||
public $pyMispVersion = '2.4.106';
|
||||
public $phpmin = '7.0';
|
||||
public $phprec = '7.2';
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
$hide = isset($hide) ? $hide : false;
|
||||
?>
|
||||
<span class="<?php echo $hide ? 'hidden correlation-expanded-area' : '' ?>">
|
||||
<span style="display: inline-block; border: 1px solid #ddd; border-radius: 5px; padding: 3px;">
|
||||
<span style="display: inline-block; border: 1px solid #ddd; border-radius: 5px; padding: 3px; background-color: white;">
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
|
|
|
@ -334,7 +334,7 @@
|
|||
if (!empty($event['RelatedEvent'])):
|
||||
?>
|
||||
<h3><?php echo __('Related Events');?></h3>
|
||||
<span class="inline">
|
||||
<div class="inline correlation-container">
|
||||
<?php
|
||||
$count = 0;
|
||||
$display_threshold = 10;
|
||||
|
@ -363,7 +363,7 @@
|
|||
<?php
|
||||
endif;
|
||||
?>
|
||||
</span>
|
||||
</div>
|
||||
<?php
|
||||
endif;
|
||||
if (!empty($event['Feed']) || !empty($event['Event']['FeedCount'])):
|
||||
|
@ -371,6 +371,9 @@
|
|||
<h3>Related Feeds</h3>
|
||||
<?php
|
||||
if (!empty($event['Feed'])):
|
||||
?>
|
||||
<div class="correlation-container">
|
||||
<?php
|
||||
foreach ($event['Feed'] as $relatedFeed):
|
||||
$relatedData = array('Name' => $relatedFeed['name'], 'URL' => $relatedFeed['url'], 'Provider' => $relatedFeed['provider'], 'Source Format' => $relatedFeed['source_format'] == 'misp' ? 'MISP' : $relatedFeed['source_format']);
|
||||
$popover = '';
|
||||
|
@ -394,8 +397,9 @@
|
|||
endif;
|
||||
?>
|
||||
</span>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php
|
||||
endforeach;
|
||||
elseif (!empty($event['Event']['FeedCount'])):
|
||||
?>
|
||||
<span>
|
||||
|
@ -410,6 +414,9 @@
|
|||
<h3>Related Server</h3>
|
||||
<?php
|
||||
if (!empty($event['Server'])):
|
||||
?>
|
||||
<div class="correlation-container" style="margin-bottom: 15px;">
|
||||
<?php
|
||||
foreach ($event['Server'] as $relatedServer):
|
||||
if (empty($relatedServer['id'])) {
|
||||
continue;
|
||||
|
@ -420,11 +427,14 @@
|
|||
$popover .= '<span class=\'bold\'>' . h($k) . '</span>: <span class="blue">' . h($v) . '</span><br />';
|
||||
}
|
||||
?>
|
||||
<span style="white-space: nowrap;">
|
||||
<span style="white-space: nowrap; display: inline-block">
|
||||
<a href="<?php echo $baseurl; ?>/servers/previewIndex/<?php echo h($relatedServer['id']); ?>" class="linkButton useCursorPointer" data-toggle="popover" data-content="<?php echo h($popover); ?>" data-trigger="hover"><?php echo h($relatedServer['name']) . ' (' . $relatedServer['id'] . ')'; ?></a>
|
||||
</span>
|
||||
<?php
|
||||
endforeach;
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
elseif (!empty($event['Event']['FeedCount'])):
|
||||
?>
|
||||
<span>
|
||||
|
|
|
@ -1090,6 +1090,14 @@ li .generic-picker-item-element-check {
|
|||
width:665px;
|
||||
}
|
||||
|
||||
.correlation-container {
|
||||
max-height: 500px;
|
||||
overflow-y: auto;
|
||||
background-color: #f9f9f9;
|
||||
padding: 5px;
|
||||
border: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.inline-input {
|
||||
width:100% !important;
|
||||
margin-bottom:0px !important;
|
||||
|
|
Loading…
Reference in New Issue