Disabling the unused theme settings tab in the settings

diff --git a/views/admin/management/header.html b/views/admin/management/header.html
index f076300..60d365d 100644 (file)
--- a/views/admin/management/header.html
+++ b/views/admin/management/header.html
@@ -5,7 +5,7 @@
     <h2 class="nav-tab-wrapper">
         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">General Settings</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms} nav-tab-active{/if}">Terms and Phrases</a>
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=theme" class="nav-tab{if $thisAction==theme} nav-tab-active{/if}">Theme Settings</a>
+<!--        <a href="{$thisUrl}?page={$thisPage}&glm_action=theme" class="nav-tab{if $thisAction==theme} nav-tab-active{/if}">Theme Settings</a>-->
         <a href="{$thisUrl}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development} nav-tab-active{/if}">Development</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import} nav-tab-active{/if}">Members</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons} nav-tab-active{/if}">Add-Ons</a>

diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index f9726a7..8772b01 100644 (file)
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -217,13 +217,8 @@
                         </tr>
                             <tr>
                             <th>Address Options:</th>
-<<<<<<< HEAD
                             <td>  
                                 <table class="glm-admin-table glm-admin-inner-table">
-=======
-                            <td>
-                                <table class="glm-admin-table">
->>>>>>> develop
                                     <tr><th>Show Street:</th><td><input type="checkbox" name="list_show_street"{if $genSettings.fieldData.list_show_street.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_show_citystatezip"{if $genSettings.fieldData.list_show_citystatezip.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $genSettings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>
@@ -340,13 +335,8 @@
                         </tr>
                             <tr>
                             <th>Address Options:</th>
-<<<<<<< HEAD
                             <td>  
                                 <table class="glm-admin-table glm-admin-inner-table">
-=======
-                            <td>
-                                <table class="glm-admin-table">
->>>>>>> develop
                                     <tr><th>Show Street:</th><td><input type="checkbox" name="detail_show_street"{if $genSettings.fieldData.detail_show_street.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_show_citystatezip"{if $genSettings.fieldData.detail_show_citystatezip.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $genSettings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>

diff --git a/views/admin/management/theme.html b/views/admin/management/theme.html
index 90fc4c0..a74850c 100644 (file)
--- a/views/admin/management/theme.html
+++ b/views/admin/management/theme.html
@@ -1,6 +1,6 @@
 {include file='admin/management/header.html'}
         
-        
+<!--        
     <p>
         <b>NOTE:</b> 
         There are no actual theme settings added to the database yet. This tab has been setup as
@@ -17,7 +17,7 @@
         
         <table class="glm-admin-table">
         
-            <!-- Admin Menus -->
+             Admin Menus 
         
             <tr><td colspan="2"><h2>Theme Settings</h2></td></tr>
             <tr>
@@ -29,5 +29,5 @@
             </tr>
         </table>
         <input type="submit" value="Update Settings" class="button button-primary">
-    </form>
+    </form>-->
 {include file='admin/footer.html'}