Move code at sidebar.ctp file

internet2 · Apr 3, 2024 · 8bd174c · 8bd174c
1 parent 864a2aa
commit 8bd174c
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 35 deletions.
diff --git a/Lib/lang.php b/Lib/lang.php
@@ -126,8 +126,10 @@
   'pl.grouperlite.action.close' => 'Close',
   'pl.grouperlite.action.clear' => 'Clear',
   'pl.grouperlite.action.add-user' => 'Add',
+  'pl.grouperlite.action.act-as' => 'Act As',
   'pl.grouperlite.action.remove-user' => 'Remove',
-  'pl.grouperlite.action.enable-act-as' => 'Enable',
+  'pl.grouperlite.action.enable' => 'Enable',
+  'pl.grouperlite.action.find' => 'Find',
   'pl.grouperlite.message.user-not-found-error' => 'Error: User not found.',
   'pl.grouperlite.message.user-not-added-error' => 'Error: Unable to add user.',
   'pl.grouperlite.message.user-not-removed-error' => 'Error: Unable to remove user.',

diff --git a/View/Elements/ActAsPeopleAutocomplete.ctp b/View/Elements/ActAsPeopleAutocomplete.ctp
@@ -21,6 +21,9 @@ $suffix = Configure::read('debug') > 0 ? '?time=' . time() : '';
     url: "<?= $actionUrl ?? 'null' ?>",
     grouperUrl: "<?= $grouperUrlBase ?>",
     view: "<?= $this->action ?>",
+    hasActAs: <?= (int)!empty($vv_act_as_people) ?>,
+    actAsPerson: <?= json_encode($vv_act_as_people ?? []) ?>,
+    permissions: <?= json_encode($permissions, JSON_THROW_ON_ERROR) ?>,
     txt: {
       adhocHeading: "<?= $vv_config['CoGrouperLiteWidget']['adhoc_heading'] ?? 'Ad-hoc groups' ?>",
       wgHeading: "<?= $vv_config['CoGrouperLiteWidget']['wg_heading'] ?? 'Working groups' ?>",

diff --git a/View/Elements/ActionSideBar.ctp b/View/Elements/ActionSideBar.ctp
@@ -1,2 +1,33 @@
-<?php
+<div id="right-sidebar">
+  <div class="sidebar-content">
+    <div class="font-weight-bold d-inline-flex align-items-center w-100">
+      <em class="material-icons lg" aria-hidden="true">transfer_within_a_station</em>
+      <span class="ml-1"><?= _txt('pl.grouperlite.action.act-as')?></span>
+      <a data-toggle="collapse"
+         href="#people-picker-container"
+         role="button"
+         aria-expanded="false"
+         aria-controls="people-picker-container"
+         class="ignore-invalid ml-auto order-2">
+        <span class="ui-icon ui-icon-search"></span><?= _txt('pl.grouperlite.action.find')?>
+      </a>
+    </div>
+    <div class="collapse mb-1 mt-2" id="people-picker-container">
+      <?= $this->element('ActAsPeopleAutocomplete',
+                         compact('vv_config',
+                                 'vv_coid',
+                                 'vv_is_user_owner',
+                                 'htmlId')
+      )?>
+    </div>
+    <?php if(!empty($vv_act_as_people)):?>
+      <hr style="border-top: dotted 1px;" />
+      <?php foreach($vv_act_as_people as $person): ?>
+        <?= $this->element('ActionItem', compact('person')) ?>
+      <?php endforeach; ?>
+    <?php endif; ?>
+    <hr>
+  </div>
+</div>
+
 
diff --git a/View/GrouperGroups/index.ctp b/View/GrouperGroups/index.ctp
@@ -71,6 +71,9 @@ $suffix = Configure::read('debug') > 0 ? '?time=' . time() : '';
             url: "<?= $actionUrl ?? 'null' ?>",
             grouperUrl: "<?= $grouperUrlBase ?>",
             view: "<?= $this->action ?>",
+            hasActAs: <?= (int)!empty($vv_act_as_people) ?>,
+            actAsPerson: <?= json_encode($vv_act_as_people ?? []) ?>,
+            permissions: <?= json_encode($permissions, JSON_THROW_ON_ERROR) ?>,
             txt: {
                 adhocHeading: "<?= $vv_config['CoGrouperLiteWidget']['adhoc_heading'] ?? 'Ad-hoc groups' ?>",
                 wgHeading: "<?= $vv_config['CoGrouperLiteWidget']['wg_heading'] ?? 'Working groups' ?>",
@@ -124,7 +127,6 @@ $suffix = Configure::read('debug') > 0 ? '?time=' . time() : '';
                                          JSON_THROW_ON_ERROR) ?>,
             },
             api: {
-                permissions: <?= json_encode($permissions, JSON_THROW_ON_ERROR) ?>,
                 co: <?= $vv_coid ?>,
                 glid: <?= $vv_config['CoGrouperLiteWidget']['id'] ?>,
                 mode: "<?= PeoplePickerModeEnum::All ?>",
@@ -158,37 +160,12 @@ $suffix = Configure::read('debug') > 0 ? '?time=' . time() : '';
         <router-view></router-view>
     </div>
     <?php if(isset($permissions['actAsAction']) && $permissions['actAsAction']): ?>
-    <div id="right-sidebar">
-      <div class="sidebar-content">
-        <div class="font-weight-bold d-inline-flex align-items-center w-100">
-          <em class="material-icons lg" aria-hidden="true">transfer_within_a_station</em>
-          <span class="ml-1">Act As</span>
-          <a data-toggle="collapse"
-             href="#people-picker-container"
-             role="button"
-             aria-expanded="false"
-             aria-controls="people-picker-container"
-             class="ignore-invalid ml-auto order-2">
-            <span class="ui-icon ui-icon-search"></span>Find
-          </a>
-        </div>
-        <div class="collapse mb-1 mt-2" id="people-picker-container">
-          <?= $this->element('ActAsPeopleAutocomplete',
-                             compact('vv_config',
-                                     'vv_coid',
-                                     'vv_is_user_owner',
-                                     'htmlId')
-          )?>
-        </div>
-        <!--    Current choices we got from the database    -->
-        <?php if(!empty($vv_act_as_people)):?>
-          <hr style="border-top: dotted 1px;" />
-          <?php foreach($vv_act_as_people as $person): ?>
-             <?= $this->element('ActionItem', compact('person')) ?>
-          <?php endforeach; ?>
-        <?php endif; ?>
-        <hr>
-      </div>
-    </div>
+      <?= $this->element('ActionSideBar',
+                         compact('vv_config',
+                                 'vv_act_as_people',
+                                 'vv_coid',
+                                 'vv_is_user_owner',
+                                 'htmlId')
+      ) ?>
     <?php endif; ?>
 </div>