From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 8 Aug 2019 18:00:37 +0000 (-0400)
Subject: Update the sub nav styles
X-Git-Tag: v2.13.0^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3d67d29c3672d57b85c51145472f0f300f1ced79;p=WP-Plugins%2Fglm-member-db.git

Update the sub nav styles

Set them in the main div container.
Set amenity sub nav to h3.
---

diff --git a/views/admin/settings/amenities.html b/views/admin/settings/amenities.html
index 70b27e68..ac1ed989 100644
--- a/views/admin/settings/amenities.html
+++ b/views/admin/settings/amenities.html
@@ -1,9 +1,9 @@
 {include file='admin/settings/header.html'}
 
-<h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
+<h3 class="nav-tab-wrapper" style="margin-bottom: 1em;">
     <a id="glm-amenities-list" data-show-table="glm-table-amenities" class="glm-settings-tab nav-tab nav-tab-active">Amenities List</a>
     <a id="glm-groups-list" data-show-table="glm-table-groups" class="glm-settings-tab nav-tab">Groups</a>
-</h2>
+</h3>
 
 <table id="glm-table-amenities" class="glm-admin-table glm-settings-table{if $option2!=''} glm-hidden{/if}">
     <tr><td colspan="2">
@@ -73,7 +73,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="newAmenityCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Add new Amenity" class="button button-primary">
-                
+
             </form>
         </div>
 
@@ -152,11 +152,11 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="editAmenityCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Update this Amenity">
-                
+
             </form>
         </div>
-                    
-    
+
+
         <h2>Amenities</h2>
 
         <table class="wp-list-table wideFat fixed posts glm-admin-table">
@@ -214,7 +214,7 @@
 </table>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
-        
+
         $("#newAmenityDialog").dialog({
             autoOpen: false,
             minWidth: 400,
@@ -291,14 +291,14 @@
             // Clear tabl highlights and hide all tables
             $('.glm-settings-tab').removeClass('nav-tab-active');
             $('.glm-settings-table').addClass('glm-hidden');
-            
+
             // Highlight selected tab
             $(this).addClass('nav-tab-active');
-            
+
             // Show selected table
             var table = $(this).attr('data-show-table');
             $('#' + table).removeClass('glm-hidden');
-            
+
         });
 
     });
@@ -328,7 +328,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="newGroupCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Add new Group" class="button button-primary">
-                
+
             </form>
         </div>
 
@@ -363,7 +363,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="editGroupCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Update this Group">
-                
+
             </form>
         </div>
 
@@ -379,7 +379,7 @@
             {if $haveGroups}
                 {assign var="i" value="0"}
                 {foreach $groups as $t}
-                    {if $i++ is odd by 1} 
+                    {if $i++ is odd by 1}
                         <tr>
                     {else}
                         <tr class="alternate">
@@ -402,7 +402,7 @@
 </table>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
-        
+
         $("#newGroupDialog").dialog({
             autoOpen: false,
             minWidth: 400,
@@ -451,6 +451,6 @@
 
     });
 </script>
-    
-            
+
+
 {include file='admin/footer.html'}
diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html
index 67fd83a1..795c03ba 100644
--- a/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@ -22,27 +22,28 @@
         {/foreach}
     </h2>
 
-    {* Member Sub Navigation *}
-    {if in_array( $thisAction, $memberSubActions)}
-        <h3 class="nav-tab-wrapper">
-            {if apply_filters('glm-member-db-common-members-enabled', false)}
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberTypes" class="nav-tab{if $thisAction==memberTypes} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Categories</a>
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
-            {/if}
-            <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
-            {if apply_filters('glm-member-db-common-members-enabled', false)}
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
-                {if apply_filters('glm-member-db-common-counties-enabled', false)}
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
-                {/if}
-            {/if}
-            <a href="{$thisUrl}?page={$thisPage}&glm_action=notifications" class="nav-tab{if $thisAction==notifications} nav-tab-active{/if}">Email Notifications</a>
-            <a href="{$thisUrl}?page={$thisPage}&glm_action=signupform" class="nav-tab{if $thisAction==signupform} nav-tab-active{/if}">Signup Form</a>
-        </h3>
-    {/if}
-
     {* Main member content container *}
     <div id="glm-admin-content-container">
 
+        {* Member Sub Navigation *}
+        {if in_array( $thisAction, $memberSubActions)}
+            <h3 class="nav-tab-wrapper">
+                {if apply_filters('glm-member-db-common-members-enabled', false)}
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=memberTypes" class="nav-tab{if $thisAction==memberTypes} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Categories</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
+                {/if}
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
+                {if apply_filters('glm-member-db-common-members-enabled', false)}
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
+                    {if apply_filters('glm-member-db-common-counties-enabled', false)}
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
+                    {/if}
+                {/if}
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=notifications" class="nav-tab{if $thisAction==notifications} nav-tab-active{/if}">Email Notifications</a>
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=signupform" class="nav-tab{if $thisAction==signupform} nav-tab-active{/if}">Signup Form</a>
+            </h3>
+        {/if}
+
+        <br>