From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 11 Sep 2017 17:23:03 +0000 (-0400)
Subject: Standardized appearance of pages in the Registrations admin areas.
X-Git-Tag: v1.0.0^2~418
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=072809b0d9714699f10710bdfdfcefe1e06dc2e4;p=WP-Plugins%2Fglm-member-db-registrations.git

Standardized appearance of pages in the Registrations admin areas.
Changed First and Last name for Accounts to be required.
---

diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php
index 9eb2d92..3ed0ac6 100644
--- a/classes/data/dataAccount.php
+++ b/classes/data/dataAccount.php
@@ -169,7 +169,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
             'fname' => array (
                 'field'     => 'fname',
                 'type'      => 'text',
-                'required'  => false,
+                'required'  => true,
                 'use'       => 'a'
             ),
 
@@ -177,7 +177,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
             'lname' => array (
                 'field'     => 'lname',
                 'type'      => 'text',
-                'required'  => false,
+                'required'  => true,
                 'use'       => 'a'
             ),
 
diff --git a/views/admin/registrations/accountEdit.html b/views/admin/registrations/accountEdit.html
index e817197..176ed4d 100644
--- a/views/admin/registrations/accountEdit.html
+++ b/views/admin/registrations/accountEdit.html
@@ -1,20 +1,20 @@
 {include file='admin/registrations/accountHeader.html'}
 
-    <a href="{$thisUrl}?page={$thisPage}&glm_action=accounts&option=accountDashboard&account={$accountID}" class="button button-secondary glm-button glm-right">Return to Account</a>
-
   {if $option == 'edit' || $option == 'update'}
-    <h2>Edit Account
+    <h1>Edit Account
   {else}
-    <h2>Add new Account
+    <h1>Add new Account
   {/if}
-        &nbsp;&nbsp;&nbsp;
+        &nbsp;&nbsp;&nbsp;&nbsp;
         {if $accountUpdated}<span class="glm-notice glm-flash-updated">Account Updated</span>{/if}
         {if $accountUpdateError}<span class="glm-error glm-flash-updated">Account Update Error</span>{/if}
         {if $accountAdded}<span class="glm-notice glm-flash-updated">Account Added</span>{/if}
         {if $accountAddError}<span class="glm-error glm-flash-updated">Account Add Error</span>{/if}
-    </h2>
+    </h1>
 
-    <p> </p>
+<div class="glm-admin-table-inner glm-admin-table">
+
+    <a href="{$thisUrl}?page={$thisPage}&glm_action=accounts&option=accountDashboard&account={$accountID}" class="button button-secondary glm-button glm-right">Return to Account</a>
 
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
         <input type="hidden" name="glm_action" value="accounts">
@@ -60,7 +60,7 @@
             </td>
         </tr>
 
-        <tr><th colspan="2"><h3>General Information</h3></th></tr>
+        <tr><th colspan="2"><p><h3>General Information</h3></p></th></tr>
 
         <tr>
             <th {if $account.fieldRequired.fname} class="glm-required"}{/if}>First Name</th>
@@ -158,7 +158,7 @@
             </td>
         </tr>
 
-        <tr><th colspan="2"><h3>Billing Information</h3></th></tr>
+        <tr><th colspan="2"><p><h3>Billing Information</h3></p></th></tr>
 
         <tr>
             <th {if $account.fieldRequired.bill_fname} class="glm-required"}{/if}>First Name</th>
@@ -298,7 +298,7 @@
             </td>
         </tr>
 
-        <tr><th colspan="2"><h3>Contact Information</h3></th></tr>
+        <tr><th colspan="2"><p><h3>Contact Information</h3></p></th></tr>
 
         <tr>
             <th {if $account.fieldRequired.contact_fname} class="glm-required"}{/if}>First Name</th>
@@ -420,7 +420,7 @@
             </td>
         </tr>
 
-        <tr><th colspan="2"><h3>Emergency Contact Information</h3></th></tr>
+        <tr><th colspan="2"><p><h3>Emergency Contact Information</h3></p></th></tr>
 
 
         <tr>
@@ -470,28 +470,29 @@
         <input id="updateAccount" type="submit" value="{if $haveAccount}Update Account{else}Save New Account{/if}">
 
     </form>
-    <script>
-        jQuery(document).ready(function($) {
-
-            // Delete Account dialog
-            $("#deleteAccountDialog").dialog({
-                autoOpen: false,
-                minWidth: 400,
-                dialogClass: "glm-dialog-no-close"
-            });
-            $('#deleteAccountButton').click( function() {
-                $('#deleteAccountDialog').dialog('open');
-            });
-            $('#deleteAccountCancel').click( function() {
-                $("#deleteAccountDialog").dialog("close");
-            });
-            $('#deleteAccountSubmit').click( function() {
-                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=accounts&option=delete&account={$account.fieldData.id}");
-            });
-
-            $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
+</div>
+<script>
+    jQuery(document).ready(function($) {
+
+        // Delete Account dialog
+        $("#deleteAccountDialog").dialog({
+            autoOpen: false,
+            minWidth: 400,
+            dialogClass: "glm-dialog-no-close"
         });
+        $('#deleteAccountButton').click( function() {
+            $('#deleteAccountDialog').dialog('open');
+        });
+        $('#deleteAccountCancel').click( function() {
+            $("#deleteAccountDialog").dialog("close");
+        });
+        $('#deleteAccountSubmit').click( function() {
+            window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=accounts&option=delete&account={$accountID}");
+        });
+
+        $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
+    });
 
-    </script>
+</script>
 
 {include file='admin/footer.html'}
diff --git a/views/admin/registrations/eventEdit.html b/views/admin/registrations/eventEdit.html
index 7577698..af9f5af 100644
--- a/views/admin/registrations/eventEdit.html
+++ b/views/admin/registrations/eventEdit.html
@@ -1,14 +1,14 @@
 {include file='admin/registrations/eventHeader.html'}
     
-	<h2>
+	<h1>
 		Registrations Event Edit
-		
 		&nbsp;&nbsp;&nbsp;
         {if $regEventUpdated}<span class="glm-notice glm-flash-updated">Registration Event Updated</span>{/if}
         {if $regEventUpdateError}<span class="glm-error glm-flash-updated">Registration Event Update Error</span>{/if}
         {if $regEventAdded}<span class="glm-notice glm-flash-updated">Registration Event Added</span>{/if}
-		
-	</h2>
+	</h1>
+
+<div class="glm-admin-table-inner glm-admin-table">
 
 {if $reason}
 	<p class="glm-error">{$reason}</p>
@@ -202,17 +202,18 @@ NEED TO ADD TESTS FOR CHANGES IN INPUT<br>
         <p><input id="updateRegEvent" type="submit" value="Update This Event"></p>
         
     </form>
+</div>
 
 {/if} <!-- no problem reasons -->
 
-	<script type="text/javascript">
-		jQuery(document).ready(function($) {
-           
-			// Flash certain elements for a short time after display
-            $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
-			
-		});
-	</script>
-    
+<script type="text/javascript">
+	jQuery(document).ready(function($) {
+       
+		// Flash certain elements for a short time after display
+        $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
+		
+	});
+</script>
+
 {include file='admin/footer.html'}
 
diff --git a/views/admin/registrations/eventEditLevels.html b/views/admin/registrations/eventEditLevels.html
index 6351cb2..f2756a0 100644
--- a/views/admin/registrations/eventEditLevels.html
+++ b/views/admin/registrations/eventEditLevels.html
@@ -1,6 +1,6 @@
 {include file='admin/registrations/eventHeader.html'}
 
-    <h2>
+    <h1>
         Registrations Event Edit
 
         &nbsp;&nbsp;&nbsp;
@@ -8,7 +8,10 @@
         {if $regEventUpdateError}<span class="glm-error glm-flash-updated">Registration Event Update Error</span>{/if}
         {if $regEventAdded}<span class="glm-notice glm-flash-updated">Registration Event Added</span>{/if}
 
-    </h2>
+    </h1>
+
+<div class="glm-admin-table-inner glm-admin-table">
+
 
 {if $reason}
     <p class="glm-error">{$reason}</p>
@@ -84,6 +87,7 @@
 
 {/if} <!-- no problem reasons -->
 
+</div>
 
 {include file='admin/footer.html'}
 
diff --git a/views/admin/registrations/requestEdit.html b/views/admin/registrations/requestEdit.html
index 57529d7..dd79c17 100644
--- a/views/admin/registrations/requestEdit.html
+++ b/views/admin/registrations/requestEdit.html
@@ -3,8 +3,10 @@
 
 <h1>Selected Request Edit</h1>
 
+<div class="glm-admin-table-inner glm-admin-table">
+
     <div class="glm-right">
-        <p><a href="{$thisUrl}?page={$thisPage}&glm_action=requests&option=check&requestID={$cart.request.id}" class="button button-secondary glm-button">Check Reguest & Update Holds</a></p>
+        <p><a href="{$thisUrl}?page={$thisPage}&glm_action=requests&option=requestDashboard&requestID={$cart.request.id}" class="button button-secondary glm-button">Return to Selected Request</a></p>
     </div>
 
   {if $option == 'edit' || $option == 'update'}
@@ -76,6 +78,7 @@
             </td>
     {/if}            
         </tr>
+    </table>
     <table class="glm-admin-table glm-account-table glm-admin-table-border glm-admin-table-close-spaced">
         <tr><th><center>Registrations Selected</center></th></tr>
         <tr>
@@ -110,4 +113,6 @@
     
   {/if}
 
+</div>
+
 {include file='admin/footer.html'}
diff --git a/views/admin/registrations/requestsDashboard.html b/views/admin/registrations/requestsDashboard.html
index 7016f2b..d74eb93 100644
--- a/views/admin/registrations/requestsDashboard.html
+++ b/views/admin/registrations/requestsDashboard.html
@@ -4,7 +4,11 @@
     <h3 class="glm-error">{$errorMsg}</h3>
 {/if}
     
-<h3>Registrations Requests List</h3>
+<h1>Registrations Requests List</h1>
+
+<div class="glm-admin-table-inner glm-admin-table">
+
+    <p><a href="{$thisUrl}?page={$thisPage}&glm_action=requests&option=check&requestID={$cart.request.id}" class="button button-secondary glm-button">Check Reguest & Update Holds</a></p>
 
         <table class="wp-list-table striped glm-admin-table">
             <thead>
@@ -35,6 +39,7 @@
             </tbody>
         </table>
 
+</div>
     
 {include file='admin/footer.html'}