From 239314b7b4f6478e2ae482b6178aab6e748f6f92 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 11 Oct 2023 14:35:10 -0400
Subject: [PATCH] Improvements to the messaging and code style for platform
 admin wayfinding improvements  (CFM-296)

---
 app/resources/locales/en_US/information.po        |  6 +++---
 app/resources/locales/en_US/menu.po               | 15 ++++++---------
 .../Component/RegistryAuthComponent.php           |  7 ++-----
 app/templates/Dashboards/configuration.php        |  3 ++-
 app/templates/element/menuPanel.php               |  4 ++--
 app/templates/layout/default.php                  | 11 +----------
 6 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/app/resources/locales/en_US/information.po b/app/resources/locales/en_US/information.po
index 48ed85c46..0510e8bfc 100644
--- a/app/resources/locales/en_US/information.po
+++ b/app/resources/locales/en_US/information.po
@@ -37,10 +37,10 @@ msgid "cos.select"
 msgstr "Please select the collaboration (CO) you wish to manage."
 
 msgid "cmp.config.notice"
-msgstr "Looking for <a href="{0}">platform-wide configurations</a>? Those are found in the <a href="{1}">COmanage CO</a>."
+msgstr "<a href="{0}">Platform-wide configurations</a> are available in the <a href="{1}">COmanage CO</a>."
 
-msgid "cmp.welcome"
-msgstr "The COmanage CO provides platform-wide <a href="{0}">configurations</a>."
+msgid "cmp.co.notice"
+msgstr "You are viewing the platform-level COmanage CO."
 
 msgid "entity.id"
 msgstr "ID: {0}"
diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po
index 53b9e0115..967082c80 100644
--- a/app/resources/locales/en_US/menu.po
+++ b/app/resources/locales/en_US/menu.po
@@ -42,6 +42,9 @@ msgstr "Attributes"
 msgid "co.configuration"
 msgstr "Configuration"
 
+msgid "co.configuration.desc"
+msgstr "Configuration for the current CO"
+
 msgid "co.configuration.short"
 msgstr "Config"
 
@@ -58,19 +61,13 @@ msgid "co.configuration.panel.personalization.desc"
 msgstr "Dashboards, custom text, and theming"
 
 msgid "co.configuration.panel.platform"
-msgstr "Platform-Wide Settings"
+msgstr "Platform-Wide Configuration"
 
 msgid "co.configuration.panel.platform.desc"
 msgstr "These configurations are found only in the COmanage CO"
 
-msgid "co.configuration.panel.setup"
-msgstr "CO Setup"
-
-msgid "co.configuration.panel.setup.desc"
-msgstr "Settings for the current CO"
-
-msgid "co.configuration.title.common"
-msgstr "Common CO Settings"
+msgid "co.configuration.title"
+msgstr "CO Configuration"
 
 msgid "co.connections"
 msgstr "Connections"
diff --git a/app/src/Controller/Component/RegistryAuthComponent.php b/app/src/Controller/Component/RegistryAuthComponent.php
index 71a15017e..c88f073b5 100644
--- a/app/src/Controller/Component/RegistryAuthComponent.php
+++ b/app/src/Controller/Component/RegistryAuthComponent.php
@@ -436,7 +436,7 @@ public function getApplicationUserRoles(?int $coId): array {
     // True for platform administrator
     $appUserRoles['platform'] = $this->isPlatformAdmin();
     
-    // True for CO administrator
+    // True for administrator of the current CO
     $appUserRoles['co'] = $this->isCoAdmin($coId);
     
     // TODO: add other application roles such as 'cou' and 'support'
@@ -580,10 +580,7 @@ public function isApiUser(): bool {
    */
   
   public function isAuthenticatedUser(): bool {
-    if(!empty($this->getAuthenticatedUser())) {
-      return true;
-    }
-    return false;
+    return !empty($this->authenticatedUser);
   }
   
   /**
diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php
index 5bfae097c..cd16fba0f 100644
--- a/app/templates/Dashboards/configuration.php
+++ b/app/templates/Dashboards/configuration.php
@@ -53,7 +53,8 @@
         </li>
       <?php endforeach; // $vv_configuration_menu_items ?>
     </ul>
-    <h2 class="config-subtitle mb-2"><?= __d('menu','co.configuration.title.common') ?></h2>
+    <h2 class="config-subtitle mb-2"><?= __d('menu','co.configuration.title') ?></h2>
+    <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
   <?php endif; // $vv_platform_menu_items ?>
   <ul id="configuration-menu" class="config-menu">
     <?php foreach($vv_configuration_menu_items as $label => $cfg): ?>
diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php
index 2ae3b3d4f..879cae8f1 100644
--- a/app/templates/element/menuPanel.php
+++ b/app/templates/element/menuPanel.php
@@ -324,8 +324,8 @@
       <?php endif; // $vv_platform_menu_items ?>
       <ul class="menu-panel-links">
         <li>
-          <h3><?= __d('menu','co.configuration.panel.setup') ?></h3>
-          <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.panel.setup.desc') ?></p>
+          <h3><?= __d('menu','co.configuration.title') ?></h3>
+          <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
           <ul class="menu-panel-links-inner">
             <li>
               <?php
diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php
index 7a2fdf035..75a3e5524 100644
--- a/app/templates/layout/default.php
+++ b/app/templates/layout/default.php
@@ -166,17 +166,8 @@
       </div>
       
       <?php if($isPlatformCO): ?>
-        <?php
-        $platformConfigUrl = $this->Url->build([
-          'plugin'       => null,
-          'controller'   => 'dashboards',
-          'action'       => 'configuration',
-          '?'            => [
-            'co_id' => 1
-          ]]);
-        ?>
         <div id="platform-notice">
-          <?= __d('information','cmp.welcome', [$platformConfigUrl]) ?>
+          <?= __d('information','cmp.co.notice') ?>
         </div>
       <?php endif; ?>