From 93f5a64c97e36f9142dc7e7c9463cad4dea62ad2 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 12 Mar 2020 11:51:24 +0100
Subject: [PATCH] chg: [galaxyCluster:view] Migrated to use the genericElement
 factory

---
 app/View/Galaxies/view.ctp       |  2 -
 app/View/GalaxyClusters/view.ctp | 66 +++++++++++---------------------
 2 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/app/View/Galaxies/view.ctp b/app/View/Galaxies/view.ctp
index 0609e3fa6..ac6a8fece 100644
--- a/app/View/Galaxies/view.ctp
+++ b/app/View/Galaxies/view.ctp
@@ -1,8 +1,6 @@
 <?php
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view'));
-?>
 
-<?php
     $table_data = array();
     $table_data[] = array('key' => __('Galaxy ID'), 'value' => $galaxy['Galaxy']['id']);
     $table_data[] = array('key' => __('Name'), 'value' => $galaxy['Galaxy']['name']);
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index a2d9021da..693ee8abe 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -1,53 +1,33 @@
 <?php
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view_cluster'));
+
+    $table_data = array();
+    $table_data[] = array('key' => __('Cluster ID'), 'value' => $cluster['GalaxyCluster']['id']);
+    $table_data[] = array('key' => __('Name'), 'value' => $cluster['GalaxyCluster']['value']);
+    $table_data[] = array('key' => __('Parent Galaxy'), 'value' => $cluster['Galaxy']['name'] ? $cluster['Galaxy']['name'] : $cluster['Galaxy']['type']);
+    $table_data[] = array('key' => __('Description'), 'value' => $cluster['GalaxyCluster']['description']);
+    $table_data[] = array('key' => __('UUID'), 'value' => $cluster['GalaxyCluster']['uuid']);
+    $table_data[] = array('key' => __('Collection UUID'), 'value' => $cluster['GalaxyCluster']['collection_uuid']);
+    $table_data[] = array('key' => __('Source'), 'value' => $cluster['GalaxyCluster']['source']);
+    $table_data[] = array('key' => __('Authors'), 'value' => !empty($cluster['GalaxyCluster']['authors']) ? implode(', ', $cluster['GalaxyCluster']['authors']) : __('N/A'));
+    $table_data[] = array('key' => __('Connector tag'), 'value' => $cluster['GalaxyCluster']['tag_name']);
+    $table_data[] = array('key' => __('Events'), 'html' => isset($cluster['GalaxyCluster']['tag_count']) ? 
+                        sprintf('<a href="%s">%s %s</a>', 
+                            sprintf('%s/events/index/searchtag:%s', $baseurl, h($cluster['GalaxyCluster']['tag_id'])),
+                            h($cluster['GalaxyCluster']['tag_count']),
+                            __('event(s)')
+                        ):
+                        '<span>0</span>'
+                    );
 ?>
-<div class="galaxy view">
+
+<div class='view'>
     <div class="row-fluid">
         <div class="span8">
             <h2>
-                <?php echo isset($cluster['Galax']['name']) ? h($cluster['Galaxy']['name']) : h($cluster['GalaxyCluster']['type']) . ': ' . $cluster['GalaxyCluster']['value']; ?>
+                <?php echo isset($cluster['Galaxy']['name']) ? h($cluster['Galaxy']['name']) : h($cluster['GalaxyCluster']['type']) . ': ' . $cluster['GalaxyCluster']['value']; ?>
             </h2>
-            <dl>
-                <dt><?php echo __('Cluster ID');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['id']); ?></dd>
-                <dt><?php echo __('Name');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['value']); ?></dd>
-                <dt><?php echo __('Parent Galaxy');?></dt>
-                <dd><?php echo $cluster['Galaxy']['name'] ? h($cluster['Galaxy']['name']) : h($cluster['Galaxy']['type']); ?></dd>
-                <dt><?php echo __('Description');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['description']); ?>&nbsp;</dd>
-                <dt><?php echo __('UUID');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['uuid']); ?>&nbsp;</dd>
-                <dt><?php echo __('Collection UUID');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['collection_uuid']); ?>&nbsp;</dd>
-                <dt><?php echo __('Source');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['source']); ?>&nbsp;</dd>
-                <dt><?php echo __('Authors');?></dt>
-                <dd>
-                    <?php
-                        $authors = $cluster['GalaxyCluster']['authors'];
-                        if (!empty($authors)) {
-                            echo implode(', ', $authors);
-                        } else {
-                            echo __('N/A');
-                        }
-                    ?>
-                </dd>
-                <dt><?php echo __('Connector tag');?></dt>
-                <dd><?php echo h($cluster['GalaxyCluster']['tag_name']); ?></dd>
-                <dt><?php echo __('Events');?></dt>
-                <dd>
-                    <?php
-                        if (isset($cluster['GalaxyCluster']['tag_count'])):
-                    ?>
-                        <a href="<?php echo $baseurl; ?>/events/index/searchtag:<?php echo h($cluster['GalaxyCluster']['tag_id']); ?>"><?php echo h($cluster['GalaxyCluster']['tag_count']); ?> event(s)</a>
-                    <?php
-                        else:
-                            echo '0';
-                        endif;
-                    ?>
-                </dd>
-            </dl>
+            <?php echo $this->element('genericElements/viewMetaTable', array('table_data' => $table_data)); ?>
         </div>
     </div>
     <div class="row-fuild">