From f99928156031b3739f4bee965c36756498b8a7d1 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 18 Dec 2024 16:24:23 -0500
Subject: [PATCH 1/4] Fix resume page top menu unique id (CFM-31)

---
 app/templates/Petitions/resume.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/templates/Petitions/resume.php b/app/templates/Petitions/resume.php
index a3cb65ef..65e0b09b 100644
--- a/app/templates/Petitions/resume.php
+++ b/app/templates/Petitions/resume.php
@@ -32,6 +32,7 @@
 
 $action_args = [];
 if(!empty($vv_cur_co) && $vv_user_roles['authuser']) {
+  $action_args['vv_attr_id'] = $vv_primary_link_obj->name;
   if($vv_user_roles['co'] || $vv_user_roles['platform']) {
     $action_args['vv_actions'][] = [
       'order' => $this->Menu->getMenuOrder('Default'),

From 145396f1858ec08188f26af95f7bba4a39a25582 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 18 Dec 2024 19:36:58 -0500
Subject: [PATCH 2/4] Fix javascript i18n text references in people picker post
 rebase (CFM-31)

---
 .../components/autocomplete/cm-autocomplete-people.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
index e1a2272a..c52fcb50 100644
--- a/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
+++ b/app/webroot/js/comanage/components/autocomplete/cm-autocomplete-people.js
@@ -269,7 +269,7 @@ export default {
         return this.options.label;
       }
       // Otherwise return the default
-      return this.txt['autocomplete.people.label'];
+      return this.txt['operation.autocomplete.people.label'];
     },
     hasAutoCompleteLabel: function() {
       // Check to see if a label has been passed in
@@ -312,7 +312,7 @@ export default {
               <!-- XXX The input field will be updated with the option.label value. Here we only need the full name -->
               <span class="cm-ac-name-value" v-if="slotProps.option.isMember" v-html="slotProps.option.fullName"></span>
               <span class="cm-ac-name-value" v-else v-html="this.highlightedquery(slotProps.option.fullName, query)"></span>
-              <span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['GroupMembers'] }}</span>
+              <span class="mr-1 badge bg-success" v-if="slotProps.option.isMember">{{ this.txt['controller.GroupMembers'] }}</span>
             </div>
             <div class="cm-ac-item-id">
               ID: {{ slotProps.option.itemId }}

From 7ff79dbea3737c2c93680a06f11dc0065c192814 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 18 Dec 2024 19:47:33 -0500
Subject: [PATCH 3/4] Fix JavaScript "Global visit link" text reference in URL
 MVEA post rebase (CFM-31)

---
 app/src/View/Helper/VueHelper.php                    | 1 +
 app/webroot/js/comanage/components/mvea/mvea-item.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/View/Helper/VueHelper.php b/app/src/View/Helper/VueHelper.php
index 74c55a22..dde16546 100644
--- a/app/src/View/Helper/VueHelper.php
+++ b/app/src/View/Helper/VueHelper.php
@@ -63,6 +63,7 @@ class VueHelper extends Helper {
     'information' => [
       'global.attributes.none',
       'global.value.none',
+      'global.visit.link',
       'record',
       'report.for',
       'value.copied'
diff --git a/app/webroot/js/comanage/components/mvea/mvea-item.js b/app/webroot/js/comanage/components/mvea/mvea-item.js
index 2d7df65c..985740b3 100644
--- a/app/webroot/js/comanage/components/mvea/mvea-item.js
+++ b/app/webroot/js/comanage/components/mvea/mvea-item.js
@@ -202,7 +202,7 @@ export default {
     <li class="field-data-container linked-row" v-if="this.core.mveaType == 'urls'" @click="followRowLink">
       <div class="field-data force-wrap with-hover-button">
         <a :href="mveaLink" class="row-link" @click.prevent>{{ this.mvea.description != '' && this.mvea.description != null ? this.mvea.description : this.mvea.url }}</a>   
-        <a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['global.visit.link']"><span class="material-symbols">north_east</span></a>
+        <a :href="this.mvea.url" class="canvas-url-link" :title="this.txt['information.global.visit.link']"><span class="material-symbols">north_east</span></a>
         <copy-value-button 
           :txt="this.txt" 
           :valueToCopy="this.mvea.url">

From a13948774dfd1fdaf95ccb690650caa3c5e0f95e Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 18 Dec 2024 20:55:10 -0500
Subject: [PATCH 4/4] Update "deleted" action post-rebase (CFM-31)

---
 app/src/Lib/Traits/LayoutTrait.php | 1 +
 app/templates/Standard/deleted.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/Lib/Traits/LayoutTrait.php b/app/src/Lib/Traits/LayoutTrait.php
index b178b507..1294d2b1 100644
--- a/app/src/Lib/Traits/LayoutTrait.php
+++ b/app/src/Lib/Traits/LayoutTrait.php
@@ -55,6 +55,7 @@ public function getLayout(string $action = ''): string
       'add',
       'view',
       'edit' => 'iframe',
+      'deleted' => 'iframe',
       default => 'default'
     };
   }
diff --git a/app/templates/Standard/deleted.php b/app/templates/Standard/deleted.php
index d8cf635b..1642d95c 100644
--- a/app/templates/Standard/deleted.php
+++ b/app/templates/Standard/deleted.php
@@ -73,7 +73,7 @@
   <button 
     class="btn btn-primary cm-deleted-close-button" 
     onclick="window.parent.hideCmModal()">
-    <em class="material-icons" aria-hidden="true">cancel</em>
+    <em class="material-symbols-outlined" aria-hidden="true">cancel</em>
     <?= __d('operation','close') ?>
   </button>