From 5ce26b2127bc9c441df69abd3058df7f73cc4c11 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 22 Mar 2021 10:32:02 -0700 Subject: [PATCH 1/2] Updated text --- Lib/lang.php | 2 +- .../GrouperGroups/groupcreatetemplateform.ctp | 2 +- View/GrouperGroups/groupfields.inc | 2 +- View/GrouperGroups/groupinfo.ctp | 4 ++-- View/GrouperGroups/templatefields.inc | 20 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Lib/lang.php b/Lib/lang.php index f4124d7..ea3a7b5 100644 --- a/Lib/lang.php +++ b/Lib/lang.php @@ -30,7 +30,7 @@ 'pl.grouperlite.title.emaillists-manage' => 'Email lists I manage', 'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes', 'pl.grouperlite.title.groupcreate' => 'Create Group', - 'pl.grouperlite.title.templatecreate' => 'Create Email List', + 'pl.grouperlite.title.templatecreate' => 'Create a Templated Group', 'pl.grouperlite.message.flash.join-group-success' => 'You have been added to the group!', 'pl.grouperlite.message.flash.join-group-failed' => 'You are unable to join the group!', diff --git a/View/GrouperGroups/groupcreatetemplateform.ctp b/View/GrouperGroups/groupcreatetemplateform.ctp index 612d982..da4eb0c 100644 --- a/View/GrouperGroups/groupcreatetemplateform.ctp +++ b/View/GrouperGroups/groupcreatetemplateform.ctp @@ -1,6 +1,6 @@ extend('/GrouperGroups/base'); -$this->Html->addCrumb('Create a Template Group'); +$this->Html->addCrumb('Create a Templated Group'); $model = $this->name; ?> diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc index b826cf9..f71859e 100644 --- a/View/GrouperGroups/groupfields.inc +++ b/View/GrouperGroups/groupfields.inc @@ -107,7 +107,7 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ'); )); */ ?> --> -
+
Form->label(false, _txt('pl.grouperlite.form.group.name.label'), array( 'for' => 'name', diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index bfc04f8..4fb0ec2 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -14,7 +14,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;

Group:

- + View in Grouper   @@ -57,7 +57,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
-
Subscribers
+
Members
diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc index f5b9524..705014c 100644 --- a/View/GrouperGroups/templatefields.inc +++ b/View/GrouperGroups/templatefields.inc @@ -1,4 +1,4 @@ -
+
Form->label(false, "Working Group Extension", array( 'for' => 'gsh_input_workingGroupExtension', @@ -43,7 +43,7 @@
- Form->label(false, "Enable Sympa for Group?", array( + Form->label(false, "Enable email list?", array( 'for' => 'gsh_input_isSympa', 'class' => "col-sm-3 col-form-label" )); ?> @@ -142,13 +142,13 @@ ); ?>
-
- Form->label(false, "Days for Attestation", array( +
- Form->label(false, "Add Confluence?", array( + Form->label(false, "Add wiki?", array( 'for' => 'gsh_input_isConfluence', 'class' => "col-sm-3 col-form-label" )); ?> @@ -186,7 +186,7 @@
- Form->label(false, "Add Jira?", array( + Form->label(false, "Add project?", array( 'for' => 'gsh_input_isJira', 'class' => "col-sm-3 col-form-label" )); ?> From 642fc1da774e9eca144c029e3d9e1a76807c26d8 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 22 Mar 2021 12:59:44 -0700 Subject: [PATCH 2/2] Updated language file --- Lib/lang.php | 40 +++++++ View/Elements/Components/groupattributes.ctp | 18 +-- View/Elements/Components/groupproperties.ctp | 14 +-- View/Elements/Components/pagination.ctp | 14 --- View/Elements/Components/search.ctp | 62 ---------- View/GrouperGroups/emaillistinfo.ctp | 117 ++++++++----------- View/GrouperGroups/emaillistsmanage.ctp | 20 ++-- View/GrouperGroups/groupfields.inc | 4 +- View/GrouperGroups/groupinfo.ctp | 23 ++-- View/GrouperGroups/groupuser.ctp | 38 ------ View/GrouperGroups/joingroup.ctp | 2 +- View/GrouperGroups/leavegroup.ctp | 2 +- View/GrouperGroups/templatefields.inc | 54 ++++----- 13 files changed, 153 insertions(+), 255 deletions(-) delete mode 100644 View/Elements/Components/pagination.ctp delete mode 100644 View/GrouperGroups/groupuser.ctp diff --git a/Lib/lang.php b/Lib/lang.php index ea3a7b5..80f2baf 100644 --- 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 index dfb6978..e23f097 100644 --- a/View/Elements/Components/groupattributes.ctp +++ b/View/Elements/Components/groupattributes.ctp @@ -1,19 +1,19 @@ - - - + + + - + @@ -21,7 +21,7 @@
Attribute nameAttribute descriptionAction
- - View + +
-
-

No attributes defined.

-
+
+

+
\ No newline at end of file diff --git a/View/Elements/Components/groupproperties.ctp b/View/Elements/Components/groupproperties.ctp index 7f78303..c21099a 100644 --- a/View/Elements/Components/groupproperties.ctp +++ b/View/Elements/Components/groupproperties.ctp @@ -1,41 +1,41 @@
-
Display Name:
+
-
Grouper Name:
+
-
Display Extension:
+
-
Extension:
+
-
Enabled:
+
-
Type of Group:
+
-
UUID:
+
diff --git a/View/Elements/Components/pagination.ctp b/View/Elements/Components/pagination.ctp deleted file mode 100644 index 8515b18..0000000 --- a/View/Elements/Components/pagination.ctp +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp index a338ef3..ca42a44 100644 --- a/View/Elements/Components/search.ctp +++ b/View/Elements/Components/search.ctp @@ -46,66 +46,4 @@ });
- Form->end(); ?> \ No newline at end of file diff --git a/View/GrouperGroups/emaillistinfo.ctp b/View/GrouperGroups/emaillistinfo.ctp index c16600a..61f6e35 100644 --- 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; ?>
-

Group:

-
-

Group Properties

-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
+
+

+ + +
+ element('Components/groupproperties', array( + 'group' => $groupergroupsdetail + )); ?>
-

Attributes

- - - - - - - - - - - - - - - - - -
Attribute nameAttribute descriptionAction
- - View - -
+

+ element('Components/groupattributes', array( + 'attributes' => $groupergroupsdetail['attributes'], + 'baseUrl' => $attrUrlBase + )); ?>
+ + + + \ No newline at end of file diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp index 04349b3..3c3c41c 100644 --- a/View/GrouperGroups/emaillistsmanage.ctp +++ b/View/GrouperGroups/emaillistsmanage.ctp @@ -16,27 +16,27 @@ Html->link( - isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name", + isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "--", array( 'controller' => 'groupergroups', 'action' => 'emaillistinfo', '?' => array('groupname' => urlencode($group['name'])) ) ) ?> - + - Subscribers (10) | - Moderators (2) | - Owners (1) + (10) | + (2) | + (1) - + - - - */ ?> + diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc index f71859e..f0b6322 100644 --- a/View/GrouperGroups/groupfields.inc +++ b/View/GrouperGroups/groupfields.inc @@ -156,12 +156,12 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ'); 'rows' => 5 )); ?> - Description contains notes about the group, which could include: what the group represents, why it was created, etc. +
- Privileges: + :
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index 4fb0ec2..80b8ae8 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -11,13 +11,13 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
-

Group:

+

- + - View in Grouper   +  
@@ -25,24 +25,21 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
-

Group Properties

- +

+ - +
- - element('Components/groupproperties', array( 'group' => $groupergroupsdetail )); ?> -
-

Attributes

+

element('Components/groupattributes', array( 'attributes' => $groupergroupsdetail['attributes'], 'baseUrl' => $attrUrlBase @@ -57,7 +54,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
-
Members
+
@@ -66,7 +63,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation; element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
- +
diff --git a/View/GrouperGroups/groupuser.ctp b/View/GrouperGroups/groupuser.ctp deleted file mode 100644 index 3e12d65..0000000 --- a/View/GrouperGroups/groupuser.ctp +++ /dev/null @@ -1,38 +0,0 @@ -extend('/GrouperGroups/base'); ?> -element('Components/navigation', array('active' => 'groupoptin')); ?> -element('Components/search'); ?> -
- - - - - - - - - - - - - - - - - - - -
NameDescriptionStatusAction
Html->link( - isset($group['name']) ? $group['name'] : "No Name", - array( - 'controller' => 'groupergroups', - 'action' => 'groupinfo', - '?' => array('groupname' => urlencode($group['name'])) - ) - ) ?> - element('Components/optAction', array( - 'member' => $group['member'], - 'action' => $group['member'] ? 'leavegroup' : 'joingroup', - 'group' => $group['name'] - )); ?> -
-
diff --git a/View/GrouperGroups/joingroup.ctp b/View/GrouperGroups/joingroup.ctp index 1e76b45..e4d9672 100644 --- a/View/GrouperGroups/joingroup.ctp +++ b/View/GrouperGroups/joingroup.ctp @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/View/GrouperGroups/leavegroup.ctp b/View/GrouperGroups/leavegroup.ctp index 611c716..2a3df51 100644 --- a/View/GrouperGroups/leavegroup.ctp +++ b/View/GrouperGroups/leavegroup.ctp @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc index 705014c..47b7d85 100644 --- a/View/GrouperGroups/templatefields.inc +++ b/View/GrouperGroups/templatefields.inc @@ -1,6 +1,6 @@
- Form->label(false, "Working Group Extension", array( + Form->label(false, _txt('pl.grouperlite.form.template.work-group-extension.label'), array( 'for' => 'gsh_input_workingGroupExtension', 'class' => "col-sm-3 col-form-label" )); ?> @@ -15,7 +15,7 @@
- Form->label(false, "Working Group Display Extension", array( + Form->label(false, _txt('pl.grouperlite.form.template.work-group-disp-extension.label'), array( 'for' => 'gsh_input_workingGroupDisplayExtension', 'class' => "col-sm-3 col-form-label" )); ?> @@ -29,7 +29,7 @@
- Form->label(false, "Working Group Description", array( + Form->label(false, _txt('pl.grouperlite.form.template.work-group-description.label'), array( 'for' => 'gsh_input_workingGroupDescription', 'class' => "col-sm-3 col-form-label" )); ?> @@ -43,11 +43,11 @@
- Form->label(false, "Enable email list?", array( + Form->label(false, _txt('pl.grouperlite.form.template.enable-email-list.label'), array( 'for' => 'gsh_input_isSympa', 'class' => "col-sm-3 col-form-label" )); ?> -
+
Form->input( 'gsh_input_isSympa', array( @@ -59,8 +59,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - true => 'Yes', - false => 'No' + true => _txt('pl.grouperlite.form.template.value.positive'), + false => _txt('pl.grouperlite.form.template.value.negative') ), 'type' => 'radio', 'default' => true @@ -69,8 +69,8 @@
- Sympa Domain: -
+ +
Form->input( 'gsh_input_sympaDomain', array( @@ -82,8 +82,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - 'internet2' => 'Internet2', - 'incommon' => 'Incommon' + 'internet2' => _txt('pl.grouperlite.form.template.value.internet2'), + 'incommon' => _txt('pl.grouperlite.form.template.value.incommon') ), 'type' => 'radio' ) @@ -91,11 +91,11 @@
- Form->label(false, "Is Sympa Moderated?", array( + Form->label(false, "Is moderated?", array( 'for' => 'gsh_input_isSympaModerated', 'class' => "col-sm-3 col-form-label" )); ?> -
+
Form->input( 'gsh_input_isSympaModerated', array( @@ -107,8 +107,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - true => 'Yes', - false => 'No' + true => _txt('pl.grouperlite.form.template.value.positive'), + false => _txt('pl.grouperlite.form.template.value.negative') ), 'type' => 'radio', 'default' => false @@ -117,11 +117,11 @@
- Form->label(false, "Is Group Optin?", array( + Form->label(false, _txt('pl.grouperlite.form.template.is-optin.label'), array( 'for' => 'gsh_input_isOptin', 'class' => "col-sm-3 col-form-label" )); ?> -
+
Form->input( 'gsh_input_isOptin', array( @@ -133,8 +133,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - true => 'Yes', - false => 'No' + true => _txt('pl.grouperlite.form.template.value.positive'), + false => _txt('pl.grouperlite.form.template.value.negative') ), 'type' => 'radio', 'default' => false @@ -160,11 +160,11 @@
-->
- Form->label(false, "Add wiki?", array( + Form->label(false, _txt('pl.grouperlite.form.template.add-wiki.label'), array( 'for' => 'gsh_input_isConfluence', 'class' => "col-sm-3 col-form-label" )); ?> -
+
Form->input( 'gsh_input_isConfluence', array( @@ -176,8 +176,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - true => 'Yes', - false => 'No' + true => _txt('pl.grouperlite.form.template.value.positive'), + false => _txt('pl.grouperlite.form.template.value.negative') ), 'type' => 'radio', 'default' => false @@ -186,11 +186,11 @@
- Form->label(false, "Add project?", array( + Form->label(false, _txt('pl.grouperlite.form.template.add-project.label'), array( 'for' => 'gsh_input_isJira', 'class' => "col-sm-3 col-form-label" )); ?> -
+
Form->input( 'gsh_input_isJira', array( @@ -202,8 +202,8 @@ 'separator' => '
', 'after' => '
', 'options' => array( - true => 'Yes', - false => 'No' + true => _txt('pl.grouperlite.form.template.value.positive'), + false => _txt('pl.grouperlite.form.template.value.negative') ), 'type' => 'radio', 'default' => false