From 28239ba67426500266ab3b99c5bde96113c131de Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 4 May 2020 12:21:21 +0200
Subject: [PATCH] chg: [galaxyClusters:updateCluster] Slightly improved UI

---
 app/View/GalaxyClusters/update_cluster.ctp | 19 ++++++++++++-------
 app/View/GalaxyClusters/view.ctp           |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/View/GalaxyClusters/update_cluster.ctp b/app/View/GalaxyClusters/update_cluster.ctp
index 0332f35e6..e5c271b58 100644
--- a/app/View/GalaxyClusters/update_cluster.ctp
+++ b/app/View/GalaxyClusters/update_cluster.ctp
@@ -1,15 +1,17 @@
 <div class='form'>
+    <h2><?= __('Update forked cluster') ?></h2>
     <?php if(!$newVersionAvailable): ?>
         <div class="alert alert-warning"><?= __('No new version available') ?></div>
     <?php else: ?>
-        <div class="alert alert-success">
-            <div><?= sprintf(__('Current fork version: %s'), h($forkVersion)) ?></div>
-            <div><?= sprintf(__('New version available: %s'), sprintf('<strong>%s</strong>', h($parentVersion))) ?></div>
-        </div>
+        <p><?= __('This interface allows you to update the selected cluster to the latest version of its parent.') ?></p>
+        <p><?= __('You can pick galaxy cluster\'s elements to import from the parent to the selected cluster.') ?></p>
 
         <div class="row" style="max-height: 500px;">
             <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">
                     <thead>
                         <tr>
@@ -34,7 +36,10 @@
                 </table>
             </div>
             <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">
                     <thead>
                         <tr>
@@ -60,7 +65,7 @@
             </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');?>
         <div class="row">
             <div class="span8">
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index 39e782f75..11eeb7672 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -16,7 +16,7 @@
     }
     $extendedFromHtml = sprintf('<ul>%s</ul>', implode('', $extendFromLinks));
         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'],
                 h($cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['version'])
             ));