From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 28 Aug 2019 19:05:29 +0000 (-0400)
Subject: Updating merge tags for the edit page
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f986455b5b330d9d74d3002662d1fe4398e1bd13;p=WP-Plugins%2Fglm-member-db-messages.git

Updating merge tags for the edit page

Setup display hide of merge tag.
---

diff --git a/models/admin/messages/index.php b/models/admin/messages/index.php
index 2177f94..9c182d1 100644
--- a/models/admin/messages/index.php
+++ b/models/admin/messages/index.php
@@ -199,6 +199,7 @@ class GlmMembersAdmin_messages_index extends GlmDataEmailMessages
                     'start'   => $start,
                     'limit'   => $limit,
                     'stats'   => true,
+                    'order'   => 'send_date DESC',
                 ]
             );
             $statCount = $statsData['stats'];
diff --git a/models/admin/messages/sendMessagesEmails.php b/models/admin/messages/sendMessagesEmails.php
index 8bb1853..53cb28c 100644
--- a/models/admin/messages/sendMessagesEmails.php
+++ b/models/admin/messages/sendMessagesEmails.php
@@ -186,7 +186,7 @@ class GlmMembersAdmin_messages_sendMessagesEmails //extends GlmDataRegistrations
         // Set the From name using this wordpress hook.
         add_filter(
             'wp_mail_from_name',
-            function ( $name ) {
+            function ( $fromName ) {
                 return $fromName;
             }
         );
diff --git a/views/admin/messages/editHtmlEmail.html b/views/admin/messages/editHtmlEmail.html
index d8fe17d..259b44f 100644
--- a/views/admin/messages/editHtmlEmail.html
+++ b/views/admin/messages/editHtmlEmail.html
@@ -21,12 +21,13 @@
 
 {* Form Start *}
 {$ui = [
-    'id'               => 'edit-email-message',
-    'action'           => "{$thisUrl}?page={$thisPage}",
-    'method'           => 'post',
-    'file'             => true,
-    'validate'         => true,
-    'validateFocusMsg' => true
+    'id'                     => 'edit-email-message',
+    'action'                 => "{$thisUrl}?page={$thisPage}",
+    'method'                 => 'post',
+    'file'                   => true,
+    'validate'               => true,
+    'validateFocusMsg'       => true,
+    'leaveModifiedFormCheck' => true
 ]}
 {include file='ui/f6/form-start.html'}
 
@@ -140,6 +141,21 @@
 
     <fieldset class="fieldset cell small-12">
         <legend>Email Message</legend>
+
+        <div class="callout hide" id="merge-tags">
+            <strong>Merge Tags</strong>
+            <p>The "merge tags" listed below may be used in the email message to include certain information about the Member or Contact. Be sure to include the "{" and "}" and "$" characters exactly as shown.</p>
+
+            <div class="grid-x grid-margin-x">
+                <div class="cell small-12">
+                    {$tData = $merge_tags}
+                    {html_table loop=$tData cols=2 table_attr='border=0 style=width: 400px;' caption='Merge Tags Examples' td_attr=['align="left"','align="left"']}
+                </div>
+            </div>
+        </div>
+
+        <button class="button secondary float-right" id="glm-merge-tag-button">Merge Tags</button>
+
         {* Message Content *}
         {$ui = [
             'value'     => $data.fieldData.message_body,
@@ -192,22 +208,6 @@
 
     </div>
 
-    <fieldset class="fieldset cell small-12 medium-6">
-        <legend>Merge Tags</legend>
-
-        {assign var="tData" value=$merge_tags}
-
-        <strong>Merge Tags</strong>
-        <p>The "merge tags" listed below may be used in the email message to include certain information about the Member or Contact. Be sure to include the "{" and "}" and "$" characters exactly as shown.</p>
-
-        <div class="grid-x grid-margin-x">
-            <div class="cell small-12">
-                {html_table loop=$tData cols=2 table_attr='border=0 style=width: 400px;' caption='Merge Tags Examples' td_attr=['align="left"','align="left"']}
-            </div>
-        </div>
-
-    </fieldset>
-
 </div>
 
 {* Form End *}
@@ -216,6 +216,11 @@
 <script>
 jQuery(document).ready(function($){
     $(document).foundation();
+
+    $('#glm-merge-tag-button').on( 'click', function(e){
+        e.preventDefault();
+        $('#merge-tags').toggleClass('hide');
+    });
 });
 </script>