From dd3845313d4dc8a893afd3984302402de3c775e2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 20 Dec 2013 16:20:02 -0800
Subject: [PATCH] CRM-14015 - Cleanup ACL template

---
 CRM/ACL/Page/ACL.php           |  6 ++-
 templates/CRM/ACL/Page/ACL.tpl | 97 +++++++++++++++++-----------------
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/CRM/ACL/Page/ACL.php b/CRM/ACL/Page/ACL.php
index 9ac0c75ac7..1806602679 100644
--- a/CRM/ACL/Page/ACL.php
+++ b/CRM/ACL/Page/ACL.php
@@ -139,9 +139,11 @@ class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic {
       }
     }
 
-
     // finally browse the acl's
-    $this->browse();
+    if ($action & CRM_Core_Action::BROWSE) {
+      CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
+      $this->browse();
+    }
 
     // parent run
     return parent::run();
diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl
index bb74767aec..18cfbc587e 100644
--- a/templates/CRM/ACL/Page/ACL.tpl
+++ b/templates/CRM/ACL/Page/ACL.tpl
@@ -29,61 +29,62 @@
 
 
 {if $action eq 1 or $action eq 2 or $action eq 8}
-   {include file="CRM/ACL/Form/ACL.tpl"}
-{/if}
+  {include file="CRM/ACL/Form/ACL.tpl"}
 
-<div class="crm-block crm-content-block">
-<div id="help">
-    <p>{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, a profile or a set of custom fields), and a <strong>Role</strong> that has permission to do this operation. Refer to the %1 for more info.{/ts}</p>
-    <p>{ts 1=$erURL 2=$rolesURL}You can add or modify your ACLs below. You can create additional ACL Roles <a href='%2'>here</a>... and you can assign Roles to CiviCRM contacts who are users of your site <a href='%1'>here</a>.{/ts}</p>
-</div>
+{else}
+  <div class="crm-block crm-content-block">
+    <div id="help">
+      <p>{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, a profile or a set of custom fields), and a <strong>Role</strong> that has permission to do this operation. Refer to the %1 for more info.{/ts}</p>
+      <p>{ts 1=$erURL 2=$rolesURL}You can add or modify your ACLs below. You can create additional ACL Roles <a href='%2'>here</a>... and you can assign Roles to CiviCRM contacts who are users of your site <a href='%1'>here</a>.{/ts}</p>
+    </div>
 
-{if $rows}
-<div id="ltype">
-    {strip}
-  {* handle enable/disable actions*}
-   {include file="CRM/common/enableDisableApi.tpl"}
-    {include file="CRM/common/jsortable.tpl"}
-        <table id="options" class="display">
-        <thead>
-        <tr class="columnheader">
-            <th id="sortable">{ts}Role{/ts}</th>
-            <th>{ts}Operation{/ts}</th>
-            <th>{ts}Type of Data{/ts}</th>
-            <th>{ts}Which Data{/ts}</th>
-            <th>{ts}Description{/ts}</th>
-            <th>{ts}Enabled?{/ts}</th>
-            <th></th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach from=$rows item=row key=aclID}
-        <tr id="acl-{$aclID}" class="{cycle values="odd-row,even-row"} {$row.class} crm-acl crm-entity {if NOT $row.is_active} disabled{/if}">
-          <td class="crm-acl-entity">{$row.entity}</td>
-          <td class="crm-acl-operation" >{$row.operation}</td>
-          <td class="crm-acl-object_name">{$row.object_name}</td>
-          <td class="crm-acl-object" >{$row.object}</td>
-          <td class="crm-acl-name crm-editable" data-field="name">{$row.name}</td>
-          <td class="crm-acl-is_active" id="row_{$aclID}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td>{$row.action|replace:'xx':$aclID}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-        </table>
+    {if $rows}
+      <div id="ltype">
+        {strip}
+        {* handle enable/disable actions*}
+          {include file="CRM/common/enableDisableApi.tpl"}
+          {include file="CRM/common/jsortable.tpl"}
+          <table id="options" class="display">
+            <thead>
+            <tr class="columnheader">
+              <th id="sortable">{ts}Role{/ts}</th>
+              <th>{ts}Operation{/ts}</th>
+              <th>{ts}Type of Data{/ts}</th>
+              <th>{ts}Which Data{/ts}</th>
+              <th>{ts}Description{/ts}</th>
+              <th>{ts}Enabled?{/ts}</th>
+              <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            {foreach from=$rows item=row key=aclID}
+              <tr id="acl-{$aclID}" class="{cycle values="odd-row,even-row"} {$row.class} crm-acl crm-entity {if NOT $row.is_active} disabled{/if}">
+                <td class="crm-acl-entity">{$row.entity}</td>
+                <td class="crm-acl-operation" >{$row.operation}</td>
+                <td class="crm-acl-object_name">{$row.object_name}</td>
+                <td class="crm-acl-object" >{$row.object}</td>
+                <td class="crm-acl-name crm-editable" data-field="name">{$row.name}</td>
+                <td class="crm-acl-is_active" id="row_{$aclID}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+                <td>{$row.action|replace:'xx':$aclID}</td>
+              </tr>
+            {/foreach}
+            </tbody>
+          </table>
         {/strip}
 
         {if $action ne 1 and $action ne 2}
-      <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" id="newACL" class="button"><span><div class="icon add-icon"></div>{ts}Add ACL{/ts}</span></a>
-        </div>
+          <div class="action-link">
+            <a href="{crmURL q="action=add&reset=1"}" id="newACL" class="button"><span><div class="icon add-icon"></div>{ts}Add ACL{/ts}</span></a>
+          </div>
         {/if}
-</div>
-{include file="CRM/common/crmeditable.tpl"}
-{elseif $action ne 1 and $action ne 2 and $action ne 8}
-    <div class="messages status no-popup">
+      </div>
+      {include file="CRM/common/crmeditable.tpl"}
+    {else}
+      <div class="messages status no-popup">
         <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
         {capture assign=crmURL}{crmURL q="action=add&reset=1"}{/capture}
         {ts 1=$crmURL}There are no ACLs entered. You can <a href='%1'>add one</a>.{/ts}
-    </div>
+      </div>
+    {/if}
+  </div>
 {/if}
-</div>
-- 
2.25.1