X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FAdmin%2FPage%2FOptions.tpl;h=104760f65ed7b2c331f27b1e5cc9bca9aaed2055;hb=80bc28208fbcfe886024d6fb1c2b38adf063dd92;hp=163c7c69a168850d1a1326ab2612f5daeb9deaa7;hpb=c4e78d43477c0da45c0137d2b7a638c17d0e4c11;p=civicrm-core.git

diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index 163c7c69a1..104760f65e 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}
 
-<div id="help">
+{if $gName eq "acl_role"}
+  {include file="CRM/ACL/Header.tpl" step=1}
+{else}
+<div class="help">
   {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}<br /><br />
     {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 <strong>Operation</strong> (e.g. 'View' or 'Edit'), a <strong>set of data</strong> that the operation can be performed on (e.g. a group of contacts), and a <strong>Role</strong> that has permission to do this operation. Refer to the %1 for more info.{/ts}<br /><br />
-    {ts 1=$aclURL 2=$erURL}You can add or modify your ACL Roles below. You can create ACL&rsquo;s and grant permission to roles <a href='%1'>here</a>... and you can assign role(s) to CiviCRM contacts who are users of your site <a href='%2'>here</a>.{/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,12 +66,13 @@
     {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}
 </div>
+{/if}
 
 <div class="crm-content-block crm-block">
 {if $rows}
 {if $isLocked ne 1}
     <div class="action-link">
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
     </div>
 {/if}
 <div id={$gName}>
@@ -160,9 +158,9 @@
 {/if}
     <div class="action-link">
       {if $isLocked ne 1}
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
       {/if}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 </div>
 {/if}