From cfb06b6f3f037ce44848c8782831c3fc87a8fd32 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Fri, 21 Jun 2013 15:57:58 -0700
Subject: [PATCH] CRM-12880 and CRM-11784 help text improvements.

----------------------------------------
* CRM-12880: ACL help text could be slightly clearer?
  http://issues.civicrm.org/jira/browse/CRM-12880
* CRM-11784: user text for civicrm/event/manage
  http://issues.civicrm.org/jira/browse/CRM-11784
---
 templates/CRM/Admin/Page/Access.tpl      | 7 ++++---
 templates/CRM/Event/Page/ManageEvent.tpl | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Admin/Page/Access.tpl b/templates/CRM/Admin/Page/Access.tpl
index 703e2ad79b..6736c8c311 100644
--- a/templates/CRM/Admin/Page/Access.tpl
+++ b/templates/CRM/Admin/Page/Access.tpl
@@ -29,12 +29,13 @@
     {if $config->userSystem->is_drupal EQ '1'}{ts}Note that a CiviCRM ACL Role is not related to the Drupal Role.{/ts}{/if}</p>
     <p>{ts}<strong>EXAMPLE:</strong> 'Team Leaders' (<em>ACL Role</em>) can 'Edit' (<em>Operation</em>) all contacts in the 'Active Volunteers Group' (<em>Data</em>).{/ts}</p>
     {if $config->userSystem->is_drupal EQ '1'}
-        <p>{ts 1=$ufAccessURL}Use <a href='%1'>Drupal Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Profiles, and/or Custom Data Fields.{/ts}</p>
+        <p>{ts 1=$ufAccessURL}Use <a href='%1'>Drupal Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Events Profiles, and/or Custom Data Fields.{/ts}</p>
     {elseif $config->userFramework EQ 'Joomla'}
-        <p>{ts 1=$ufAccessURL 2=$jAccessParams}Use <a href='%1' %2>Joomla Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Profiles, and/or Custom Data Fields.{/ts}</p>
+        <p>{ts 1=$ufAccessURL 2=$jAccessParams}Use <a href='%1' %2>Joomla Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Events, Profiles, and/or Custom Data Fields.{/ts}</p>
    {elseif $config->userFramework EQ 'WordPress'}
-        <p>{ts 1=$ufAccessURL}Use <a href='%1'>WordPress Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Profiles, and/or Custom Data Fields.{/ts}</p>
+        <p>{ts 1=$ufAccessURL}Use <a href='%1'>WordPress Access Control</a> to manage basic access to CiviCRM components and menu items. Use CiviCRM ACLs to control access to specific CiviCRM contact groups. You can also configure ACLs to grant or deny access to specific Events, Profiles, and/or Custom Data Fields.{/ts}</p>
    {/if}
+   <p>{ts 1=$config->userFramework}Note that %1 Access Control permissions take precedence over CiviCRM ACLs. If you wish to use CiviCRM ACLs, first disable the related permission in %1 Access control for a user role, and then gradually add ACLs to replace that permission for certain groups of contacts.{/ts}
 </div>
 
     <table class="report">
diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl
index f44ec0ed18..fe1d9ee894 100644
--- a/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/templates/CRM/Event/Page/ManageEvent.tpl
@@ -224,6 +224,9 @@
     </table>
   {include file="CRM/common/pager.tpl" location="bottom"}
   {/strip}
+  {if $isSearch eq 0}
+    <div class="status messages">{ts}Don't see your event listed? Try "Search All or by Date Range" above.{/ts}</div>
+  {/if}
 </div>
 {else}
   {if $isSearch eq 1}
@@ -234,6 +237,7 @@
     <div class="spacer"></div>
     <ul>
       <li>{ts}Check your spelling.{/ts}</li>
+      <li>{ts}Try "Search All or by Date Range".{/ts}</li>
       <li>{ts}Try a different spelling or use fewer letters.{/ts}</li>
       <li>{ts}Make sure you have enough privileges in the access control system.{/ts}</li>
     </ul>
-- 
2.25.1