From 55561dc53f7ebf33443c172fd421b707ad56f4a6 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 14 Feb 2018 10:26:27 -0500
Subject: [PATCH] Move admin contact setting for the events form to first
 section.

Moving the admin contact fields to the status section (first)
---
 views/admin/events/edit.html             |  8 ++---
 views/admin/events/editAdminContact.html | 44 +-----------------------
 views/admin/events/editStatus.html       | 41 ++++++++++++++++++++--
 3 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html
index 4dd70d6..21716a4 100644
--- a/views/admin/events/edit.html
+++ b/views/admin/events/edit.html
@@ -38,7 +38,7 @@
 	</div>
     {/if}
   {/if}
-  
+
   {if $eventUpdateError || $eventAddError}
     <h1 class="glm-error">NOTICE: Your event has not yet been submitted.<br>Please select the tabs indicating a problem, correct the indicated fields and resubmit.</h1>
   {else}
@@ -77,7 +77,7 @@
             <a id="glm-event-location" data-show-table="glm-table-location" class="glm-event-tab nav-tab{if $currentTab == 'glm-table-location'} nav-tab-active{/if}">Location</a>
             <a id="glm-event-recurrence" data-show-table="glm-table-recurrence" class="glm-event-tab nav-tab{if $currentTab == 'glm-table-recurrence'} nav-tab-active{/if}">Dates</a>
             <a id="glm-event-calendar" data-show-table="glm-table-calendar" class="glm-event-tab nav-tab{if $currentTab == 'glm-table-calendar'} nav-tab-active{/if}">Summary Calendar</a>
-            <a id="glm-event-admin" data-show-table="glm-table-settings" class="glm-event-tab nav-tab{if $currentTab == 'glm-table-settings'} nav-tab-active{/if}">Administrative Contact</a>
+            <!-- <a id="glm&#45;event&#45;admin" data&#45;show&#45;table="glm&#45;table&#45;settings" class="glm&#45;event&#45;tab nav&#45;tab{if $currentTab == 'glm&#45;table&#45;settings'} nav&#45;tab&#45;active{/if}">Administrative Contact</a> -->
             <a id="glm-event-files" data-show-table="glm-table-files" class="glm-event-tab nav-tab{if $currentTab == 'glm-table-files'} nav-tab-active{/if}">Attach Files</a>
         </h2>
 
@@ -110,10 +110,6 @@
 
         {include file='admin/events/editFiles.html'}
 
-        <!-- Admin Contact -->
-
-        {include file='admin/events/editAdminContact.html'}
-
         <input id="updateEvent" type="submit" value="{if $haveEvent}Update Event{else}Save New Event{/if}">
 
     </form>
diff --git a/views/admin/events/editAdminContact.html b/views/admin/events/editAdminContact.html
index 0f37afa..8f60b38 100644
--- a/views/admin/events/editAdminContact.html
+++ b/views/admin/events/editAdminContact.html
@@ -1,43 +1 @@
-
-<!-- Options and Settings -->
-
-    <table id="glm-table-settings" class="glm-admin-table glm-event-table{if $currentTab != 'glm-table-settings'} glm-hidden{/if}">
-        <tr>
-            <td>
-                <table>
-                    <tr><td>&nbsp;</td><th>Administrative Contact Information</th></tr>
-                    <tr>
-                        <th {if $event.fieldRequired.admin_name}class="glm-required"{/if}>Admin Contact Name:</th>
-                        <td {if $event.fieldFail.admin_name}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
-                            <input type="text" name="admin_name" value="{$event.fieldData.admin_name}" class="glm-form-text-input-medium">
-                            {if $event.fieldFail.admin_name}<p>{$event.fieldFail.admin_name}</p>{/if}<br>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>Admin Contact Organization:</th>
-                        <td>
-                            <input type="text" name="admin_org" value="{$event.fieldData.admin_org}" class="glm-form-text-input-medium">
-                        </td>
-                    </tr>
-                    <tr>
-                        <th {if $event.fieldRequired.admin_email}class="glm-required"{/if}>Admin Contact E-Mail:</th>
-                        <td {if $event.fieldFail.admin_email}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
-                            <input type="text" name="admin_email" value="{$event.fieldData.admin_email}" class="glm-form-text-input-medium">
-                            {if $event.fieldFail.admin_email}<p>{$event.fieldFail.admin_name}</p>{/if}<br>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th {if $event.fieldRequired.admin_phone}class="glm-required"{/if}>Admin Contact Phone:</th>
-                        <td {if $event.fieldFail.admin_phone}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
-                            <input type="text" name="admin_phone" value="{$event.fieldData.admin_phone}" class="glm-form-text-input-medium glm-phone-input">
-                            {if $event.fieldFail.admin_phone}<p>{$event.fieldFail.admin_phone}</p>{/if}<br>
-                        </td>
-                    </tr>
-                    </tr>
-                </table>
-            </td>
-            <td width="50%">
-                &nbsp;
-            </td>
-        </tr>
-    </table>
+<!-- Admin Contact setting moved to the status section -->
diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index 4ba8933..600783a 100644
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -97,7 +97,7 @@
                 </div>
                 <input id="declinedMsg" type="hidden" name="deniedText">
                 <!--  Add new category dialog -->
-                
+
                 <div id="newCategoryButton" class="button button-secondary glm-right">Add a new Category</div>
                 <div id="newCategoryDialog" class="glm-dialog-box" title="Enter a New Category">
                         <table class="glm-admin-table">
@@ -342,5 +342,42 @@
                 {if $event.fieldFail.notes}<p>{$event.fieldFail.notes}</p>{/if}
             </td>
         </tr>
-
+        <tr>
+            <td colspan="2">
+                <table>
+                    <tr><td>&nbsp;</td><th>Administrative Contact Information</th></tr>
+                    <tr>
+                        <th {if $event.fieldRequired.admin_name}class="glm-required"{/if}>Admin Contact Name:</th>
+                        <td {if $event.fieldFail.admin_name}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
+                            <input type="text" name="admin_name" value="{$event.fieldData.admin_name}" class="glm-form-text-input-medium">
+                            {if $event.fieldFail.admin_name}<p>{$event.fieldFail.admin_name}</p>{/if}<br>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>Admin Contact Organization:</th>
+                        <td>
+                            <input type="text" name="admin_org" value="{$event.fieldData.admin_org}" class="glm-form-text-input-medium">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $event.fieldRequired.admin_email}class="glm-required"{/if}>Admin Contact E-Mail:</th>
+                        <td {if $event.fieldFail.admin_email}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
+                            <input type="text" name="admin_email" value="{$event.fieldData.admin_email}" class="glm-form-text-input-medium">
+                            {if $event.fieldFail.admin_email}<p>{$event.fieldFail.admin_name}</p>{/if}<br>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $event.fieldRequired.admin_phone}class="glm-required"{/if}>Admin Contact Phone:</th>
+                        <td {if $event.fieldFail.admin_phone}class="glm-form-bad-input" data-tabid="glm-event-admin"{/if}>
+                            <input type="text" name="admin_phone" value="{$event.fieldData.admin_phone}" class="glm-form-text-input-medium glm-phone-input">
+                            {if $event.fieldFail.admin_phone}<p>{$event.fieldFail.admin_phone}</p>{/if}<br>
+                        </td>
+                    </tr>
+                    </tr>
+                </table>
+            </td>
+            <td width="50%">
+                &nbsp;
+            </td>
+        </tr>
     </table>
-- 
2.17.1