diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php index 62999f0df..1d72baf92 100644 --- a/app/templates/Dashboards/configuration.php +++ b/app/templates/Dashboards/configuration.php @@ -32,29 +32,35 @@ $cfg): ?>
  • - - Html->link( - $label, - ['plugin' => null, - 'controller' => $cfg['controller'], - 'action' => $cfg['action']] - ); ?> + ' . $cfg['icon'] . '' + . '' . $label . ''; + print $this->Html->link( + $label, + ['plugin' => null, + 'controller' => $cfg['controller'], + 'action' => $cfg['action']], + ['escape' => false] + ); + ?>
  • $cfg): ?>
  • - - Html->link( - $label, - ['plugin' => null, - 'controller' => $cfg['controller'], - 'action' => $cfg['action'], - '?' => [ - 'co_id' => $vv_cur_co->id - ]] - ); ?> + ' . $cfg['icon'] . '' + . '' . $label . ''; + print $this->Html->link( + $linkContent, + ['plugin' => null, + 'controller' => $cfg['controller'], + 'action' => $cfg['action'], + '?' => ['co_id' => $vv_cur_co->id]], + ['escape' => false] + ); + ?>
  • diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 20598e591..a88118768 100644 --- 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 = '' - . $m['label'] - . ''; + $linkContent = '' + . '' . $m['label'] . ''; print '
  • ' . $this->Html->link( diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index d8cbf61f4..2cb2487db 100644 --- 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 index 94e44a406..077e3601c 100644 --- 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;