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

chg: [event:view] Collapse related event in preview[Feed/Event]. Fix #4561

pull/4577/head
mokaddem 2019-05-03 10:43:02 +02:00
parent 9b1b5a6896
commit d1a83a833f
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/View/Feeds/preview_event.ctp
View File

@ -72,12 +72,24 @@
<div class="related span4">
<h3><?php echo __('Related Events');?></h3>
<ul class="inline">
<?php foreach ($event['RelatedEvent'] as $relatedEvent): ?>
<li>
<?php
$total = count($event['RelatedEvent']);
$display_threshold = 10;
?>
<?php foreach ($event['RelatedEvent'] as $i => $relatedEvent): ?>
<li class="<?php echo $i > $display_threshold ? 'correlation-expanded-area' : ''; ?>" style="<?php echo $i > $display_threshold ? 'display: none;' : ''; ?>">
<div title="<?php echo h($relatedEvent['Event'][0]['info']); ?>">
<a href = "<?php echo '/feeds/previewEvent/' . $feed['Feed']['id'] . '/' . $relatedEvent['Event'][0]['uuid']; ?>"><?php echo h($relatedEvent['Event'][0]['date']) . ' (' . h($relatedEvent['Event'][0]['uuid']) . ')'; ?></a>
<a href = "<?php echo '/feeds/previewEvent/' . $feed['Feed']['id'] . '/' . $relatedEvent['Event'][0]['uuid']; ?>">
<?php echo h($relatedEvent['Event'][0]['date']) . ' (' . h($relatedEvent['Event'][0]['uuid']) . ')'; ?>
</a>
</div></li>
<?php if ($i == $display_threshold+1 && $total > $display_threshold): ?>
<div class="no-side-padding correlation-expand-button useCursorPointer linkButton blue"><?php echo __('Show (%s more)', $total - $i);?></div>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($total > $display_threshold): ?>
<div class="no-side-padding correlation-collapse-button useCursorPointer linkButton blue" style="display:none;"><?php echo __('Collapse…');?></div>
<?php endif; ?>
</ul>
</div>
<?php endif; ?>

18
app/View/Servers/preview_event.ctp
View File

@ -94,14 +94,26 @@
<div class="related span4">
<h3><?php echo __('Related Events');?></h3>
<ul class="inline">
<?php foreach ($event['RelatedEvent'] as $relatedEvent):
<?php
$total = count($event['RelatedEvent']);
$display_threshold = 10;
?>
<?php foreach ($event['RelatedEvent'] as $i => $relatedEvent):
if (isset($relatedEvent['Event'][0])) $relatedEvent['Event'] = $relatedEvent['Event'][0];
?>
<li>
<li class="<?php echo $i > $display_threshold ? 'correlation-expanded-area' : ''; ?>" style="<?php echo $i > $display_threshold ? 'display: none;' : ''; ?>">
<div title="<?php echo h($relatedEvent['Event']['info']); ?>">
<a href = "<?php echo '/servers/previewEvent/' . $server['Server']['id'] . '/' . $relatedEvent['Event']['id']; ?>"><?php echo h($relatedEvent['Event']['date']) . ' (' . h($relatedEvent['Event']['id']) . ')'; ?></a>
<a href = "<?php echo '/servers/previewEvent/' . $server['Server']['id'] . '/' . $relatedEvent['Event']['id']; ?>">
<?php echo h($relatedEvent['Event']['date']) . ' (' . h($relatedEvent['Event']['id']) . ')'; ?>
</a>
</div></li>
<?php if ($i == $display_threshold+1 && $total > $display_threshold): ?>
<div class="no-side-padding correlation-expand-button useCursorPointer linkButton blue"><?php echo __('Show (%s more)', $total - $i);?></div>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($total > $display_threshold): ?>
<div class="no-side-padding correlation-collapse-button useCursorPointer linkButton blue" style="display:none;"><?php echo __('Collapse…');?></div>
<?php endif; ?>
</ul>
</div>
<?php endif; ?>