From: Coleman Watts Date: Fri, 28 Aug 2015 01:50:52 +0000 (-0400) Subject: CRM-17102 - Better navigation for ACL screens X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ebbeaead4108aa82c1ec9b5c16df27fff7b86c3f;p=civicrm-core.git CRM-17102 - Better navigation for ACL screens --- diff --git a/templates/CRM/ACL/Header.tpl b/templates/CRM/ACL/Header.tpl new file mode 100644 index 0000000000..bb2448f887 --- /dev/null +++ b/templates/CRM/ACL/Header.tpl @@ -0,0 +1,61 @@ +{* + +--------------------------------------------------------------------+ + | CiviCRM version 4.7 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2015 | + +--------------------------------------------------------------------+ + | This file is a part of CiviCRM. | + | | + | CiviCRM is free software; you can copy, modify, and distribute it | + | under the terms of the GNU Affero General Public License | + | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | + | | + | CiviCRM is distributed in the hope that it will be useful, but | + | WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | + | See the GNU Affero General Public License for more details. | + | | + | You should have received a copy of the GNU Affero General Public | + | License and the CiviCRM Licensing Exception along | + | with this program; if not, contact CiviCRM LLC | + | at info[AT]civicrm[DOT]org. If you have questions about the | + | GNU Affero General Public License or the licensing of CiviCRM, | + | see the CiviCRM license FAQ at http://civicrm.org/licensing | + +--------------------------------------------------------------------+ +*} +{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} + +
+

{ts 1=$docLink}ACLs allow you to control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

+
+ +{php} + $currentStep = $this->get_template_vars('step'); + $wizard = array( + 'style' => array(), + 'currentStepNumber' => $currentStep, + 'steps' => array( + array( + 'title' => ts('Manage Roles'), + 'link' => CRM_Utils_System::url('civicrm/admin/options/acl_role', 'reset=1'), + ), + array( + 'title' => ts('Assign Users'), + 'link' => CRM_Utils_System::url('civicrm/acl/entityrole', 'reset=1'), + ), + array( + 'title' => ts('Manage ACLs'), + 'link' => CRM_Utils_System::url('civicrm/acl', 'reset=1'), + ), + ), + ); + foreach ($wizard['steps'] as $num => &$step) { + $step['step'] = $step['valid'] = $step['stepNumber'] = $num + 1; + if ($step['stepNumber'] == $currentStep) { + $step['link'] = NULL; + } + } + $this->assign('wizard', $wizard); +{/php} + +{include file="CRM/common/WizardHeader.tpl"} \ No newline at end of file diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl index d7c66dd401..9957bd29bb 100644 --- a/templates/CRM/ACL/Page/ACL.tpl +++ b/templates/CRM/ACL/Page/ACL.tpl @@ -23,20 +23,13 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} -{capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} - {if $action eq 1 or $action eq 2 or $action eq 8} {include file="CRM/ACL/Form/ACL.tpl"} {else}
-
-

{ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts, a profile or a set of custom fields), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

-

{ts 1=$erURL 2=$rolesURL}You can add or modify your ACLs below. You can create additional ACL Roles here... and you can assign Roles to CiviCRM contacts who are users of your site here.{/ts}

-
+ {include file="CRM/ACL/Header.tpl" step=3} {if $rows}
diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl index 8ccb0e099c..fc0cede753 100644 --- a/templates/CRM/ACL/Page/ACLBasic.tpl +++ b/templates/CRM/ACL/Page/ACLBasic.tpl @@ -23,15 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} -{capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} - -
-

{ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts, a profile or a set of custom fields), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

-

{ts 1=$erURL 2=$rolesURL}You can add or modify your ACLs below. You can create additional ACL Roles here... and you can assign Roles to CiviCRM contacts who are users of your site here.{/ts}

-
- +{include file="CRM/ACL/Header.tpl" step=3} {if $action eq 1 or $action eq 2 or $action eq 8}
diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl index 2d67aa03a7..2d4226fec2 100644 --- a/templates/CRM/ACL/Page/EntityRole.tpl +++ b/templates/CRM/ACL/Page/EntityRole.tpl @@ -23,14 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{capture assign=aclURL}{crmURL p='civicrm/acl' q='reset=1'}{/capture} -{capture assign=rolesURL}{crmURL p='civicrm/admin/options/acl_role' q='reset=1'}{/capture} -{capture assign=docLink}{docURL page='user/current/initial-set-up/permissions-and-access-control/' text='Access Control Documentation'}{/capture} - -
-

{ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

-

{ts 1=$aclURL 2=$rolesURL}An ACL Role represents a collection ACL’s (permissions). You can assign roles to groups of CiviCRM contacts who are users of your site below. You can add or modify ACLs here. You can create additional ACL Roles here.{/ts}

-
+{include file="CRM/ACL/Header.tpl" step=2} {if $action eq 1 or $action eq 2 or $action eq 8} {include file="CRM/ACL/Form/EntityRole.tpl"} diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index 163c7c69a1..4b0d4db38e 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -31,7 +31,10 @@ {include file="CRM/Admin/Form/Options.tpl"} {else} -
+{if $gName eq "acl_role"} + {include file="CRM/ACL/Header.tpl" step=1} +{else} +
{if $gName eq "gender"} {ts}CiviCRM is pre-configured with standard options for individual gender (Male, Female, Transgender). Modify these options as needed for your installation.{/ts} {elseif $gName eq "individual_prefix"} @@ -49,12 +52,6 @@ {elseif $gName eq "accept_creditcard"} {ts}The following credit card options will be offered to contributors using Online Contribution pages. You will need to verify which cards are accepted by your chosen Payment Processor and update these entries accordingly.{/ts}

{ts}IMPORTANT: This page does NOT control credit card/payment method choices for sites and/or contributors using the PayPal Express service (e.g. where billing information is collected on the Payment Processor's website).{/ts} - {elseif $gName eq "acl_role"} - {capture assign=docLink}{docURL page="user/current/initial-set-up/permissions-and-access-control/" text="Access Control Documentation"}{/capture} - {capture assign=aclURL}{crmURL p='civicrm/acl' q='reset=1'}{/capture} - {capture assign=erURL}{crmURL p='civicrm/acl/entityrole' q='reset=1'}{/capture} - {ts 1=$docLink}ACLs allow you control access to CiviCRM data. An ACL consists of an Operation (e.g. 'View' or 'Edit'), a set of data that the operation can be performed on (e.g. a group of contacts), and a Role that has permission to do this operation. Refer to the %1 for more info.{/ts}

- {ts 1=$aclURL 2=$erURL}You can add or modify your ACL Roles below. You can create ACL’s and grant permission to roles here... and you can assign role(s) to CiviCRM contacts who are users of your site here.{/ts} {elseif $gName eq 'event_type'} {ts}Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.{/ts} {elseif $gName eq 'participant_role'} @@ -69,6 +66,7 @@ {ts 1=$gLabel}The existing option choices for %1 group are listed below. You can add, edit or delete them from this screen.{/ts} {/if}
+{/if}
{if $rows}