Swap configuration dashboard (NOJIRA)

arlen · Aug 23, 2024 · 896ebb6 · 896ebb6
1 parent b24f06f
commit 896ebb6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php
@@ -56,19 +56,13 @@
         </li>
       <?php endforeach; // $vv_configuration_menu_items ?>
     </ul>
-
-    <h2 class="config-subtitle mb-2"><?= __d('menu','co.configuration') ?></h2>
-    <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
   <?php endif; // $vv_platform_menu_items ?>
 
-  <?php if(empty($vv_platform_menu_items)): ?>
-    <h2 class="config-subtitle mb-2"><?= __d('menu','co.configuration') ?></h2>
-  <?php endif; ?>
-
-  <ul id="configuration-menu" class="config-menu">
-    <?php foreach($vv_configuration_menu_items as $label => $cfg): ?>
+  <h2 class="config-subtitle mb-2"><?= __d('menu','co.registries') ?></h2>
+  <ul id="registries-menu" class="config-menu">
+    <?php foreach($vv_registries_menu_items as $label => $cfg): ?>
       <li>
-        <?php 
+        <?php
           $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
             . '<span class="menu-title">' . $label . '</span>';
           print $this->Html->link(
@@ -77,16 +71,16 @@
              'controller' => $cfg['controller'],
              'action'     => $cfg['action'],
              '?'          => ['co_id' => $vv_cur_co->id]],
-             ['escape' => false]
-            ); 
+            ['escape' => false]
+          );
         ?>
       </li>
-    <?php endforeach; // $vv_configuration_menu_items ?>
+    <?php endforeach; // $vv_registries_menu_items ?>
   </ul>
-  
-  <h2 class="config-subtitle mb-2"><?= __d('menu','co.registries') ?></h2>
-  <ul id="registries-menu" class="config-menu">
-    <?php foreach($vv_registries_menu_items as $label => $cfg): ?>
+
+  <h2 class="config-subtitle mb-2"><?= __d('menu','co.artifacts') ?></h2>
+  <ul id="artifacts-menu" class="config-menu">
+    <?php foreach($vv_artifacts_menu_items as $label => $cfg): ?>
       <li>
         <?php
           $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
@@ -101,14 +95,17 @@
           );
         ?>
       </li>
-    <?php endforeach; // $vv_registries_menu_items ?>
+    <?php endforeach; // $vv_artifacts_menu_items ?>
   </ul>
 
-  <h2 class="config-subtitle mb-2"><?= __d('menu','co.artifacts') ?></h2>
-  <ul id="artifacts-menu" class="config-menu">
-    <?php foreach($vv_artifacts_menu_items as $label => $cfg): ?>
+  <h2 class="config-subtitle mb-2"><?= __d('menu','co.configuration') ?></h2>
+<!-- can we toss tihs localization?
+  <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
+  -->
+  <ul id="configuration-menu" class="config-menu">
+    <?php foreach($vv_configuration_menu_items as $label => $cfg): ?>
       <li>
-        <?php
+        <?php 
           $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
             . '<span class="menu-title">' . $label . '</span>';
           print $this->Html->link(
@@ -117,11 +114,11 @@
              'controller' => $cfg['controller'],
              'action'     => $cfg['action'],
              '?'          => ['co_id' => $vv_cur_co->id]],
-            ['escape' => false]
-          );
+             ['escape' => false]
+            ); 
         ?>
       </li>
-    <?php endforeach; // $vv_artifacts_menu_items ?>
+    <?php endforeach; // $vv_configuration_menu_items ?>
   </ul>
 </section>
 

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -1013,7 +1013,7 @@ ul.form-list li.alert-banner .co-alert {
   color: var(--cmg-color-body-txt);
   margin-right: 0.5em;
 }
-#artifacts-menu {
+#configuration-menu {
   border-bottom: none;
 }
 h2.config-subtitle {