From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 24 May 2016 19:20:06 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
X-Git-Tag: v2.0.0^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5f4de4d042b7712e042524c3937fc45b5c9283be;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
	views/admin/management/index.html
---

5f4de4d042b7712e042524c3937fc45b5c9283be
diff --cc views/admin/management/index.html
index 2aeaaf3c,df56697b..8edcb0cb
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@@ -16,39 -16,11 +16,41 @@@
          </h2>
          
          
 +            <!-- Debug Settings -->
 +                   
 +        <table id="glm-table-debug" class="glm-admin-table glm-settings-table">
 +            <tr><td colspan="2"><h2>Debug Settings</h2></td></tr>
 +            <tr>
 +                <th>Admin Debug Information:</th>
 +                <td>
 +                    <input type="checkbox" name="admin_debug"{if $genSettings.fieldData.admin_debug.value} checked="checked"{/if}>
 +                </td>
 +            </tr>
 +            <tr>
 +                <th>Admin Debug Verbose:</th>
 +                <td>
 +                    <input type="checkbox" name="admin_debug_verbose"{if $genSettings.fieldData.admin_debug_verbose.value} checked="checked"{/if}>
 +                </td>
 +            </tr>
 +            <tr>
 +                <th>Front-End Debug Information:</th>
 +                <td>
 +                    <input type="checkbox" name="front_debug"{if $genSettings.fieldData.front_debug.value} checked="checked"{/if}>
 +                </td>
 +            </tr>
 +            <tr>
 +                <th>Front-End Debug Verbose:</th>
 +                <td>
 +                    <input type="checkbox" name="front_debug_verbose"{if $genSettings.fieldData.front_debug_verbose.value} checked="checked"{/if}>
 +                </td>
 +            </tr>
 +        </table>
 +        
          <!-- Required Pages -->
          
 -        <table id="glm-table-required-page" class="glm-admin-table glm-settings-table">
 +        <table id="glm-table-required-page" class="glm-admin-table glm-settings-table glm-hidden">
+             {if $idError}<span class="glm-error">Page ID should be numerical and should not be empty</span>{/if}
+             {if $titleError}<span class="glm-error">Page Title should not be blank</span>{/if}
              {foreach from=$requiredPages key=addon item=requiredPage}
              <tr><td colspan="2"><h2>Plugin: {$addon}</h2></td></tr>
                  {foreach from=$requiredPage key=requiredPageName item=requiredPageData}