Hide text in left menu when drawer is half-closed; improve rendering …

…of configuration dashboard (CMF-55) (#4)
COmanage · Jan 11, 2022 · 3dfee4a · 3dfee4a
1 parent d815b37
commit 3dfee4a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php
@@ -32,29 +32,35 @@
     <?php if(!empty($vv_platform_menu_items)): ?>
       <?php foreach($vv_platform_menu_items as $label => $cfg): ?>
         <li>
-          <em class="material-icons" aria-hidden="true"><?= $cfg['icon']; ?></em>
-          <?= $this->Html->link(
-            $label,
-            ['plugin'     => null,
-             'controller' => $cfg['controller'],
-             'action'     => $cfg['action']]
-          ); ?>
+          <?php 
+            $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
+              . '<span class="menu-title">' . $label . '</span>';
+            print $this->Html->link(
+              $label,
+              ['plugin'     => null,
+               'controller' => $cfg['controller'],
+               'action'     => $cfg['action']],
+              ['escape' => false]
+            ); 
+          ?>
         </li>
       <?php endforeach; // $vv_configuration_menu_items ?>
     <?php endif; // $vv_platform_menu_items ?>
 
     <?php foreach($vv_configuration_menu_items as $label => $cfg): ?>
       <li>
-        <em class="material-icons" aria-hidden="true"><?= $cfg['icon']; ?></em>
-        <?= $this->Html->link(
-          $label,
-          ['plugin'     => null,
-           'controller' => $cfg['controller'],
-           'action'     => $cfg['action'],
-           '?'          => [
-             'co_id' => $vv_cur_co->id
-           ]]
-        ); ?>
+        <?php 
+          $linkContent =  '<em class="material-icons" aria-hidden="true">' . $cfg['icon'] . '</em>'
+            . '<span class="menu-title">' . $label . '</span>';
+          print $this->Html->link(
+            $linkContent,
+            ['plugin'     => null,
+             'controller' => $cfg['controller'],
+             'action'     => $cfg['action'],
+             '?'          => ['co_id' => $vv_cur_co->id]],
+             ['escape' => false]
+            ); 
+        ?>
       </li>
     <?php endforeach; // $vv_configuration_menu_items ?>
   </ul>

diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php
@@ -64,9 +64,8 @@
 
       foreach($menuItems as $m) {
         if(!isset($m['permission']) || $vv_menu_permissions[ $m['permission'] ]) {
-          $linkContent = '<em class="material-icons" aria-hidden="true">' . $m['icon'] . '</em><span class="menuTitle">'
-            . $m['label']
-            . '</span><span class="mdl-ripple"></span>';
+          $linkContent = '<em class="material-icons" aria-hidden="true">' . $m['icon'] . '</em>'
+            . '<span class="menu-title">' . $m['label'] . '</span>';
 
           print '<li class="configMenu">'
             . $this->Html->link(

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -746,18 +746,18 @@ instead, reveal in user menu */
   margin-bottom: 2em;
   font-style: italic;
 }
-/* MATCHGRID CONFIGURATION */
-#matchgrid-config-menu {
+/* CO CONFIGURATION DASHBOARD */
+#configuration-menu {
   list-style: none;
   padding: 0;
 }
-#matchgrid-config-menu a {
+#configuration-menu a {
   display: inline-block;
   padding: 0.5em;
   text-indent: -0.9em;
   padding-left: 2em;
 }
-#matchgrid-config-menu a .material-icons {
+#configuration-menu a .material-icons {
   color: var(--cmg-color-gray-001);
   margin-right: 0.5em;
 }

diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
@@ -198,8 +198,8 @@
     margin-top: -3.5em;
     position: relative;
   }
-  /* MATCHGRID MANAGEMENT */
-  #matchgrid-config-menu {
+  /* CO CONFIGURATION DASHBOARD */
+  #configuration-menu {
     column-count: 3;
     column-gap: 1em;
     margin-bottom: 4em;