Add login form wrapper for styles

diff --git a/includes/glma/glm-members-only-login-form.php b/includes/glma/glm-members-only-login-form.php
new file mode 100644 (file)
index 0000000..7a0b13c
--- /dev/null
+++ b/includes/glma/glm-members-only-login-form.php
@@ -0,0 +1,71 @@
+<div id="glm-member-login-wrapper" class="fusion-fullwidth fullwidth-box nonhundred-percent-fullwidth non-hundred-percent-height-scrolling">
+    <div class="wp_login_error">
+        <p id="glm-member-login-notification">
+            <?php if( isset( $_GET['login'] ) && $_GET['login'] == 'failed' ) { ?>
+                The information you entered is incorrect. Please try again.
+            <?php }
+                else if( isset( $_GET['login'] ) && $_GET['login'] == 'empty' ) { ?>
+                Please enter both username and password.
+            <?php } else { ?>
+                <?php $glmAssociateConfig = apply_filters('glm_associate_config', null);
+                    $supportEmail = $glmAssociateConfig['settings']['members_only_support_email'];
+                    $supportPhone = $glmAssociateConfig['settings']['members_only_support_phone'];
+                    $glmTerm = $glmAssociateConfig['terms']['term_member'];
+                ?>
+                Please log in with your <?php echo $glmTerm; ?> username and password.
+
+                <?php if ($supportEmail || $supportPhone) {
+                    echo "<br>If you need assistance, ";
+                    if ($supportEmail) {
+                        echo "email (".$supportEmail.")";
+                        if ($supportPhone) {
+                            echo " or ";
+                        }
+                    }
+                    if ($supportPhone) {
+                        echo "call (".$supportPhone.")";
+                    }
+                }
+                ?>
+            <?php } ?>
+        </p>
+    </div>
+    <div id='glm-member-login-form'>
+        <?php
+            update_option('glm_members_database_frontend_login_request', 'true');
+        $args = array(
+            'echo'    => false,
+            'form_id' => 'glm_login_form'
+        );
+        $loginForm = wp_login_form($args);
+        $captcha   = apply_filters('cptch_display', '', 'glm_login_form');
+        $form      = str_replace( '<p class="login-remember">', $captcha . '<p class="login-remember">', $loginForm );
+        echo $form;
+        ?>
+    </div>
+
+    <a id="glm-member-password-lost-link" title="Lost Password">Lost Password?</a>
+    <div id="glm-member-password-lost-form">
+
+        <p>
+            <?php
+                _e(
+                    "Enter your email address and we'll send you a link you can use to pick a new password.",
+                    'personalize_login'
+                );
+            ?>
+        </p>
+
+        <form id="lostpasswordform" action="<?php echo wp_lostpassword_url(); ?>" method="post">
+            <p class="form-row">
+                <label for="user_login"><?php _e( 'Email', 'personalize-login' ); ?>
+                <input type="text" name="user_login" id="user_login">
+            </p>
+
+            <p class="lostpassword-submit">
+                <input type="submit" name="submit" class="lostpassword-button"
+                        value="<?php _e( 'Reset Password', 'personalize-login' ); ?>"/>
+            </p>
+        </form>
+    </div>
+</div>
\ No newline at end of file

diff --git a/includes/glma/glm-members-only-template.php b/includes/glma/glm-members-only-template.php
new file mode 100644 (file)
index 0000000..d40f24e
--- /dev/null
+++ b/includes/glma/glm-members-only-template.php
@@ -0,0 +1,30 @@
+<div id="members-only-wrapper">
+    <?php if ( current_user_can("glm_members_member") ) { ?>
+        <!-- If user is logged in as a member, display members side bar, top bar & content -->
+        <div id="members-only-sidebar">
+            <h2> Members Only Area </h2>
+            <?php glm_members_only_menu(); ?>
+        </div>
+        <div id="members-only-content-wrapper">
+            <div id="glm-member-front-header" class="small-12 columns">
+                <div class='glm-member-greeting'>Hello,     <?php $current_user = wp_get_current_user();echo $current_user->user_login ?>.</div>
+                <a class='button glm-button' href="<?php echo wp_logout_url( home_url() ); ?>">Logout</a>
+                <?php if (current_user_can("glm_members_member")) { ?>
+                    <?php apply_filters('glm_associate_terms', $glmAssociateTerms);?>
+                    <a class='button glm-button' href='<?php echo get_admin_url(); ?>'>Enter <?php echo $glmAssociateTerms['term_member_cap']; ?> Admin Area</a>                        
+                <?php } ?>
+            </div>
+            <div id="members-only-content">
+                <?php the_content(); ?>
+            </div>
+        </div>
+    <?php } else if (get_the_ID() == get_option("glm_members_database_option_members_only_id")) {?>
+        <!-- If user is not logged in as member, but it's the main members only page, display content & form -->
+        <?php the_content(); ?>
+        <?php include "glm-members-only-login-form.php"; ?>
+    <?php } else { ?>
+        <!-- Otherwise, display main members only page content & form -->
+        <?php echo get_post_page_content(get_option("glm_members_database_option_members_only_id")); ?>
+        <?php include "glm-members-only-login-form.php"; ?>
+    <?php } ?>
+</div>
\ No newline at end of file

diff --git a/includes/lib/glma/glm-members-only-login-form.php b/includes/lib/glma/glm-members-only-login-form.php
deleted file mode 100644 (file)
index 354bf62..0000000
--- a/includes/lib/glma/glm-members-only-login-form.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="wp_login_error">
-    <p id="glm-member-login-notification">
-        <?php if( isset( $_GET['login'] ) && $_GET['login'] == 'failed' ) { ?>
-            The information you entered is incorrect. Please try again.
-        <?php }
-            else if( isset( $_GET['login'] ) && $_GET['login'] == 'empty' ) { ?>
-            Please enter both username and password.
-        <?php } else { ?>
-            <?php $glmAssociateConfig = apply_filters('glm_associate_config', null);
-                $supportEmail = $glmAssociateConfig['settings']['members_only_support_email'];
-                $supportPhone = $glmAssociateConfig['settings']['members_only_support_phone'];
-                $glmTerm = $glmAssociateConfig['terms']['term_member'];
-            ?>
-            Please log in with your <?php echo $glmTerm; ?> username and password.
-
-            <?php if ($supportEmail || $supportPhone) {
-                echo "<br>If you need assistance, ";
-                if ($supportEmail) {
-                    echo "email (".$supportEmail.")";
-                    if ($supportPhone) {
-                        echo " or ";
-                    }
-                }
-                if ($supportPhone) {
-                    echo "call (".$supportPhone.")";
-                }
-            }
-            ?>
-        <?php } ?>
-    </p>
-</div>
-<div id='glm-member-login-form'>
-    <?php
-        update_option('glm_members_database_frontend_login_request', 'true');
-    $args = array(
-        'echo'    => false,
-        'form_id' => 'glm_login_form'
-    );
-    $loginForm = wp_login_form($args);
-    $captcha   = apply_filters('cptch_display', '', 'glm_login_form');
-    $form      = str_replace( '<p class="login-remember">', $captcha . '<p class="login-remember">', $loginForm );
-    echo $form;
-    ?>
-</div>
-
-<a id="glm-member-password-lost-link" title="Lost Password">Lost Password?</a>
-<div id="glm-member-password-lost-form">
-
-    <p>
-        <?php
-            _e(
-                "Enter your email address and we'll send you a link you can use to pick a new password.",
-                'personalize_login'
-            );
-        ?>
-    </p>
-
-    <form id="lostpasswordform" action="<?php echo wp_lostpassword_url(); ?>" method="post">
-        <p class="form-row">
-            <label for="user_login"><?php _e( 'Email', 'personalize-login' ); ?>
-            <input type="text" name="user_login" id="user_login">
-        </p>
-
-        <p class="lostpassword-submit">
-            <input type="submit" name="submit" class="lostpassword-button"
-                    value="<?php _e( 'Reset Password', 'personalize-login' ); ?>"/>
-        </p>
-    </form>
-</div>

diff --git a/includes/lib/glma/glm-members-only-template.php b/includes/lib/glma/glm-members-only-template.php
deleted file mode 100644 (file)
index d40f24e..0000000
--- a/includes/lib/glma/glm-members-only-template.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="members-only-wrapper">
-    <?php if ( current_user_can("glm_members_member") ) { ?>
-        <!-- If user is logged in as a member, display members side bar, top bar & content -->
-        <div id="members-only-sidebar">
-            <h2> Members Only Area </h2>
-            <?php glm_members_only_menu(); ?>
-        </div>
-        <div id="members-only-content-wrapper">
-            <div id="glm-member-front-header" class="small-12 columns">
-                <div class='glm-member-greeting'>Hello,     <?php $current_user = wp_get_current_user();echo $current_user->user_login ?>.</div>
-                <a class='button glm-button' href="<?php echo wp_logout_url( home_url() ); ?>">Logout</a>
-                <?php if (current_user_can("glm_members_member")) { ?>
-                    <?php apply_filters('glm_associate_terms', $glmAssociateTerms);?>
-                    <a class='button glm-button' href='<?php echo get_admin_url(); ?>'>Enter <?php echo $glmAssociateTerms['term_member_cap']; ?> Admin Area</a>                        
-                <?php } ?>
-            </div>
-            <div id="members-only-content">
-                <?php the_content(); ?>
-            </div>
-        </div>
-    <?php } else if (get_the_ID() == get_option("glm_members_database_option_members_only_id")) {?>
-        <!-- If user is not logged in as member, but it's the main members only page, display content & form -->
-        <?php the_content(); ?>
-        <?php include "glm-members-only-login-form.php"; ?>
-    <?php } else { ?>
-        <!-- Otherwise, display main members only page content & form -->
-        <?php echo get_post_page_content(get_option("glm_members_database_option_members_only_id")); ?>
-        <?php include "glm-members-only-login-form.php"; ?>
-    <?php } ?>
-</div>
\ No newline at end of file

diff --git a/page.php b/page.php
index 689fe71..4d2bd64 100644 (file)
--- a/page.php
+++ b/page.php
@@ -37,7 +37,7 @@ if ( ! defined( 'ABSPATH' ) ) {
                        <div class="post-content">
                                <?php if ( is_in_tree( get_option("glm_members_database_option_members_only_id") ) ) { ?>
                                        <!-- if this is a page in the members only tree, go through members only content -->
-                                       <?php include "includes/lib/glma/glm-members-only-template.php"; ?>
+                                       <?php include "includes/glma/glm-members-only-template.php"; ?>
                                <?php } else { ?>
                                        <!-- if this is not a members-only template, show the regular content -->
                                        <?php the_content(); ?>