Updated language file

internet2 · Mar 22, 2021 · 642fc1d · 642fc1d
1 parent a7352bc
commit 642fc1d
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 255 deletions.
diff --git a/Lib/lang.php b/Lib/lang.php
@@ -52,6 +52,28 @@
   'pl.grouperlite.table.action'  => 'Action',
   'pl.grouperlite.table.open' => 'Access',
   'pl.grouperlite.table.groups' => 'Groups',
+  'pl.grouperlite.table.attribute-name' => 'Attribute name',
+  'pl.grouperlite.table.attribute-description' => 'Attribute description',
+
+  'pl.grouperlite.table.display-name' => 'Display Name:',
+  'pl.grouperlite.table.grouper-name' => 'Grouper Name:',
+  'pl.grouperlite.table.display-extension' => 'Display Extension:',
+  'pl.grouperlite.table.extension' => 'Extension:',
+  'pl.grouperlite.table.enabled' => 'Enabled:',
+  'pl.grouperlite.table.type-of-group' => 'Type of Group:',
+  'pl.grouperlite.table.uuid' => 'UUID:',
+
+  'pl.grouperlite.table.status-open' => 'Open',
+  'pl.grouperlite.table.status-moderated' => 'Moderated',
+  'pl.grouperlite.table.user-type-members' => 'Subscribers',
+  'pl.grouperlite.table.user-type-moderators' => 'Moderators',
+  'pl.grouperlite.table.user-type-owners' => 'Owners',
+
+  'pl.grouperlite.group.info.attributes-zero-state' => 'No attributes defined.',
+  'pl.grouperlite.group.info.attributes-heading' => 'Attributes',
+  'pl.grouperlite.group.info.properties-heading' => 'Properties',
+  'pl.grouperlite.group.info.page-heading' => 'Group:',
+  'pl.grouperlite.group.info.members-heading' => 'Members',
 
   'pl.grouperlite.value.descr.zerostate' => 'No Description',
   'pl.grouperlite.value.enabled' => 'Enabled',
@@ -65,6 +87,11 @@
   'pl.grouperlite.action.unsubscribe' => 'Unsubscribe',
   'pl.grouperlite.action.search' => 'Search',
   'pl.grouperlite.action.remove' => 'Remove',
+  'pl.grouperlite.action.view' => 'View',
+  'pl.grouperlite.action.edit' => 'Edit',
+  'pl.grouperlite.action.view-in-grouper' => 'View in Grouper',
+  'pl.grouperlite.action.view-members' => 'View members',
+  'pl.grouperlite.action.close' => 'Close',
 
   'pl.grouperlite.form.group.template.label' => 'Select a template',
   'pl.grouperlite.form.group.template.empty' => '(choose one)',
@@ -85,6 +112,19 @@
   'pl.grouperlite.form.group.subs.placeholder' => 'Search subscribers',
   'pl.grouperlite.form.group.action.save' => 'Save Group',
 
+  'pl.grouperlite.form.template.work-group-extension.label' => 'Working Group Extension',
+  'pl.grouperlite.form.template.work-group-disp-extension.label' => 'Working Group Display Extension',
+  'pl.grouperlite.form.template.work-group-description.label' => 'Working Group Description',
+  'pl.grouperlite.form.template.enable-email-list.label' => 'Enable email list?',
+  'pl.grouperlite.form.template.domain.label' => 'Domain:',
+  'pl.grouperlite.form.template.value.internet2' => 'Internet2',
+  'pl.grouperlite.form.template.value.incommon' => 'Incommon',
+  'pl.grouperlite.form.template.is-optin.label' => 'Is optin?',
+  'pl.grouperlite.form.template.add-wiki.label' => 'Add wiki?',
+  'pl.grouperlite.form.template.add-project.label' => 'Add project?',
+  'pl.grouperlite.form.template.value.positive' => 'Yes',
+  'pl.grouperlite.form.template.value.negative' => 'No',
+
   'pl.grouperlite.search.tags.text' => 'Search',
 
   'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}'

diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
@@ -1,27 +1,27 @@
 <table class="table table-striped w-100">
     <thead>
         <tr>
-            <th class="attr">Attribute name</th>
-            <th class="attr definition">Attribute description</th>
-            <th class="attr action">Action</th>
+            <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
+            <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
+            <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
         </tr>
     </thead>
     <tbody>
-        <?php foreach ($attributes as $attr): ?>
+        <?php foreach ($attributes as $attr) : ?>
             <tr>
                 <td><?php echo $attr['displayName']; ?></td>
                 <td><?php echo $attr['description'] ?></td>
                 <td>
-                    <a href="<?php echo $baseUrl.$attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                        View <i class="fa fa-external-link"></i>
+                    <a href="<?php echo $baseUrl . $attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
+                        <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
                     </a>
                 </td>
             </tr>
         <?php endforeach; ?>
     </tbody>
 </table>
 <?php if (count($attr) < 1) : ?>
-<div class="alert alert-info">
-    <p class="lead mb-0 text-center">No attributes defined.</p>
-</div>
+    <div class="alert alert-info">
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
+    </div>
 <?php endif; ?>
diff --git a/View/Elements/Components/groupproperties.ctp b/View/Elements/Components/groupproperties.ctp
@@ -1,41 +1,41 @@
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Display Name:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-name'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['displayName']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Grouper Name:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.grouper-name'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['name']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Display Extension:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-extension'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['displayExtension']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Extension:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.extension'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['extension']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Enabled:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.enabled'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['enabled']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">Type of Group:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.type-of-group'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['typeOfGroup']; ?>
     </div>
 </div>
 <div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold">UUID:</div>
+    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.uuid'); ?></div>
     <div class="col-sm-9 form-control-plaintext">
         <?php echo $group['uuid']; ?>
     </div>

diff --git a/View/Elements/Components/pagination.ctp b/View/Elements/Components/pagination.ctp
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
@@ -46,66 +46,4 @@
         });
     </script>
 </div>
-<!--
-    <div id class="my-2 collapse bg-light border-light py-3 px-4">
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-name">Display Name</label>
-                <input type="text" name="" class="form-control" id="adv-search-name" />
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-open">Open</label>
-                <select class="custom-select" id="adv-search-open">
-                    <option>Open</option>
-                    <option>Closed</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-descr">Description</label>
-                <input type="text" class="form-control" id="adv-search-descr" />
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-auto">Automatic</label>
-                <select class="custom-select" id="adv-search-auto">
-                    <option>True</option>
-                    <option>False</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-status">Status</label>
-                <select class="custom-select" id="adv-search-status">
-                    <option>All</option>
-                    <option>Active</option>
-                    <option>Inactive</option>
-                </select>
-            </div>
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-type">Type</label>
-                <select class="custom-select" id="adv-search-type">
-                    <option>All</option>
-                    <option>Other</option>
-                </select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-lg-6 col-12">
-                <label for="adv-search-users">User</label>
-                <input type="text" name="" class="form-control" id="adv-search-users" />
-            </div>
-            <div class="col col-lg-6 col-12 d-flex justify-content-end align-items-end">
-                <button class="btn btn-grouper btn btn-primary btn btn-raised">Filter Groups</button>
-            </div>
-        </div>
-    </div>
-    <div class="d-flex justify-content-end align-items-end my-2">
-        <button class="btn btn-grouper btn btn-link adv-search-link">
-            <i class="fa fa-caret-down"></i>
-            &nbsp;advanced search
-        </button>
-    </div>
-    -->
 <?php echo $this->Form->end(); ?>
diff --git a/View/GrouperGroups/emaillistinfo.ctp b/View/GrouperGroups/emaillistinfo.ctp
@@ -3,93 +3,68 @@
 $baseUrl = 'https://grouper.staging.at.internet2.edu/grouper/';
 $path = 'grouperUi/app/UiV2Main.index';
 $groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
-$groupUrlBase = $baseUrl.$path.$groupOperation;
+$groupUrlBase = $baseUrl . $path . $groupOperation;
 $attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
-$attrUrlBase = $baseUrl.$path.$attrOperation;
+$attrUrlBase = $baseUrl . $path . $attrOperation;
 ?>
 
 <div>
     <div class="border-bottom py-4 mb-4 d-flex justify-content-between">
-        <h2><strong>Group: </strong><?php echo $groupergroupsdetail['displayName']; ?></h2>
-        <div>
-            <a href="<?php echo $groupUrlBase.$groupergroupsdetail['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised" target="_blank" role="button">
-                View Group in Grouper &nbsp;
+        <h2><strong><?php echo _txt('pl.grouperlite.group.info.page-heading'); ?></strong> <?php echo $groupergroupsdetail['displayName']; ?></h2>
+        <div class="d-flex align-items-center">
+            <?php if ($isuserowner === 'T') : ?>
+                <button class="btn btn-grouper btn btn-primary mr-2" data-toggle="modal" data-target="#subscribers"><?php echo _txt('pl.grouperlite.action.view-members'); ?> <i class="fa fa-group"></i></button>
+            <?php endif ?>
+            <a href="<?php echo $groupUrlBase . $groupergroupsdetail['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised" target="_blank" role="button">
+                <?php echo _txt('pl.grouperlite.action.view-in-grouper'); ?> &nbsp;
                 <i class="fa fa-external-link"></i>
             </a>
         </div>
     </div>
     <div class="row">
         <div class="col-xl-6 col-xs-12 group-details">
-            <h3>Group Properties</h3>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Display Name:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['displayName']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Grouper Name:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['name']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Display Extension:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['displayExtension']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Extension:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['extension']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="name" class="col-sm-3 col-form-label font-weight-bold">Enabled:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['enabled']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-light">
-                <label for="folder" class="col-sm-3 col-form-label font-weight-bold">Type of Group:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['typeOfGroup']; ?>
-                </div>
-            </div>
-            <div class="form-group row no-gutters bg-lighter">
-                <label for="name" class="col-sm-3 col-form-label font-weight-bold">UUID:</label>
-                <div class="col-sm-9 form-control-plaintext">
-                    <?php echo $groupergroupsdetail['uuid']; ?>
-                </div>
+            <div class="d-flex align-items-center mb-3">
+                <h3 class="mb-1"><?php echo _txt('pl.grouperlite.group.info.properties-heading'); ?></h3>
+                <?php if ($isuserowner === 'T') : ?>
+                    <button class="btn btn-grouper btn btn-primary btn btn-sm ml-4">
+                        <?php echo _txt('pl.grouperlite.action.edit'); ?>
+                        <i class="fa fa-pencil fa-sm"></i>
+                    </button>
+                <?php endif; ?>
             </div>
+            <?php echo $this->element('Components/groupproperties', array(
+                'group' => $groupergroupsdetail
+            )); ?>
         </div>
         <div class="col-xl-6 col-xs-12">
             <div class="table-responsive">
-                <h3>Attributes</h3>
-                <table class="table table-striped w-100">
-                    <thead>
-                        <tr>
-                            <th class="attr descr">Attribute name</th>
-                            <th class="attr definition">Attribute description</th>
-                            <th class="attr action">Action</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php foreach ($groupergroupsdetail['attributes'] as $attr): ?>
-                            <tr>
-                                <td><a href="/"><?php echo $attr['displayName']; ?></a></td>
-                                <td><?php echo $attr['description'] ?></td>
-                                <td>
-                                    <a href="<?php echo $attrUrlBase.$attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                                        View <i class="fa fa-external-link"></i>
-                                    </a>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                    </tbody>
-                </table>
+                <h3><?php echo _txt('pl.grouperlite.group.info.attributes-heading'); ?></h3>
+                <?php echo $this->element('Components/groupattributes', array(
+                    'attributes' => $groupergroupsdetail['attributes'],
+                    'baseUrl' => $attrUrlBase
+                )); ?>
             </div>
         </div>
     </div>
 </div>
+
+<?php if ($isuserowner === 'T') : ?>
+    <div class="modal modal-primary fade" tabindex="-1" id="subscribers">
+        <div class="modal-dialog modal-dialog-scrollable">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <?php echo $this->element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo ('pl.grouperlite.action.close'); ?></button>
+                </div>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>