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

chg: [galaxyClusters:updateCluster] Slightly improved UI

pull/6120/head
mokaddem 2020-05-04 12:21:21 +02:00
parent 49e7ec5fa9
commit 28239ba674
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/View/GalaxyClusters/update_cluster.ctp
View File

@ -1,15 +1,17 @@
<div class='form'> <div class='form'>
<h2><?= __('Update forked cluster') ?></h2>
<?php if(!$newVersionAvailable): ?> <?php if(!$newVersionAvailable): ?>
<div class="alert alert-warning"><?= __('No new version available') ?></div> <div class="alert alert-warning"><?= __('No new version available') ?></div>
<?php else: ?> <?php else: ?>
<div class="alert alert-success"> <p><?= __('This interface allows you to update the selected cluster to the latest version of its parent.') ?></p>
<div><?= sprintf(__('Current fork version: %s'), h($forkVersion)) ?></div> <p><?= __('You can pick galaxy cluster\'s elements to import from the parent to the selected cluster.') ?></p>
<div><?= sprintf(__('New version available: %s'), sprintf('<strong>%s</strong>', h($parentVersion))) ?></div>
</div>
<div class="row" style="max-height: 500px;"> <div class="row" style="max-height: 500px;">
<div class="span6"> <div class="span6">
<h4><?= __('Parent fork') ?></h4> <h4><?= __('Parent fork elements') ?></h4>
<div class="alert alert-success" style="margin-bottom: 0px">
<div><?= sprintf(__('Version: %s'), h($parentVersion)) ?></div>
</div>
<table class="table table-striped table-hover table-condensed"> <table class="table table-striped table-hover table-condensed">
<thead> <thead>
<tr> <tr>
@ -34,7 +36,10 @@
</table> </table>
</div> </div>
<div class="span6"> <div class="span6">
<h4><?= __('Current cluster') ?></h4> <h4><?= __('Current elements') ?></h4>
<div class="alert alert-warning" style="margin-bottom: 0px">
<div><?= sprintf(__('Parent version: %s'), h($forkVersion)) ?></div>
</div>
<table class="table table-striped table-hover table-condensed"> <table class="table table-striped table-hover table-condensed">
<thead> <thead>
<tr> <tr>
@ -60,7 +65,7 @@
</div> </div>
</div> </div>
<h4><?= __('Cluster Elements in original fork but not in this cluster') ?></h4> <h4><?= __('Elements in parent fork but not in this cluster') ?></h4>
<?php echo $this->Form->create('GalaxyCluster');?> <?php echo $this->Form->create('GalaxyCluster');?>
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">

2
app/View/GalaxyClusters/view.ctp
View File

@ -16,7 +16,7 @@
} }
$extendedFromHtml = sprintf('<ul>%s</ul>', implode('', $extendFromLinks)); $extendedFromHtml = sprintf('<ul>%s</ul>', implode('', $extendFromLinks));
if ($newVersionAvailable) { if ($newVersionAvailable) {
$extendedFromHtml .= sprintf('<div class="alert alert-danger">%s</div>', sprintf(__('New version available! <a href="%s">Update cluster to version <b>%s</b></a>'), $extendedFromHtml .= sprintf('<div class="alert alert-warning">%s</div>', sprintf(__('New version available! <a href="%s">Update cluster to version <b>%s</b></a>'),
'/galaxy_clusters/updateCluster/' . $cluster['GalaxyCluster']['id'], '/galaxy_clusters/updateCluster/' . $cluster['GalaxyCluster']['id'],
h($cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['version']) h($cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['version'])
)); ));