From 044fc18f4a8afdcfd2ef1a552d05be09a6f3b1b6 Mon Sep 17 00:00:00 2001
From: Lars SG <lars@wildsight.ca>
Date: Sat, 24 Apr 2021 16:14:02 -0600
Subject: [PATCH] Add settings button to group page (smog)

add permission check

Revert "add permission check"

This reverts commit 7d2ce4f653d31e6746979b4b025321a44d54aa83.

Revert "Revert "add permission check""

This reverts commit 0a2eecd9dba031046760371668dbf7cbc644ef29.

fix div closing tag
---
 css/civicrm.css                             |  5 +++++
 templates/CRM/Contact/Form/Search/Intro.tpl | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 775346a855..c2cfd3f519 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2087,6 +2087,11 @@ a.crm-i:hover {
   opacity: .8;
 }
 
+.crm-submit-buttons .helpicon {
+    float: left;
+    padding-right: 6px;
+}
+
 .crm-container  a.helpicon:hover,
 .crm-container  a.helpicon:focus {
   opacity: 1;
diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl
index 8cbfb012cf..9b95ef688b 100644
--- a/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -10,19 +10,24 @@
 {* $context indicates where we are searching, values = "search,advanced,smog,amtg" *}
 {* smog = 'show members of group'; amtg = 'add members to group' *}
 {if $context EQ 'smog'}
+  <div class="crm-submit-buttons">
+
   {* Provide link to modify smart group search criteria if we are viewing a smart group (ssID = saved search ID) *}
   {if $permissionEditSmartGroup && !empty($editSmartGroupURL)}
-      <div class="crm-submit-buttons">
-        <a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
-        {help id="id-edit-smartGroup"}
-      </div>
+      <a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
+      {help id="id-edit-smartGroup"}
   {/if}
 
   {if $permissionedForGroup}
     {capture assign=addMembersURL}{crmURL q="context=amtg&amtgID=`$group.id`&reset=1"}{/capture}
-    <div class="crm-submit-buttons">
       <a href="{$addMembersURL}" class="button no-popup"><span><i class="crm-i fa-user-plus" aria-hidden="true"></i> {ts 1=$group.title}Add Contacts to %1{/ts}</span></a>
       {if $ssID}{help id="id-add-to-smartGroup"}{/if}
-    </div>
   {/if}
+  {if $permissionEditSmartGroup}
+    {capture assign=groupSettingsURL}{crmURL p='civicrm/group' q="action=update&id=`$group.id`&reset=1"}{/capture}
+        <a href="{$groupSettingsURL}" class="action-item button"><span><i class="crm-i fa-wrench" aria-hidden="true"></i> {ts}Edit Group Settings{/ts}</span></a>
+  {/if}
+  </div>
 {/if}
+
+
-- 
2.25.1