projects / WP-Themes / saultstemarie360.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5884a8)
fixing javascript syntax errors and misc styles
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Aug 2018 17:22:11 +0000 (13:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Aug 2018 17:22:11 +0000 (13:22 -0400)
footer.php patch | blob | history
header.php patch | blob | history
inc/glm-dev.php patch | blob | history
js/custom.js patch | blob | history

diff --git a/footer.php b/footer.php
index 4d8c9fa..2043361 100644 (file)
--- a/footer.php
+++ b/footer.php
@@ -194,6 +194,19 @@
     .learndash_profile_quiz_heading .quiz_title{
         padding-left: 5px;
     }
+    .close-modal{
+        background-color: #043867;
+        color: white;
+        padding: 4px 8px;
+        font-weight: bold;
+        border-radius: 50%;
+        position: relative;
+        left: 215px;
+        top: -25px;
+    }
+    .close-modal:hover{
+        cursor: pointer;
+    }
 </style>
 </body>
 </html>
diff --git a/header.php b/header.php
index e13f004..1abd01c 100644 (file)
--- a/header.php
+++ b/header.php
@@ -37,6 +37,7 @@
 <body <?php body_class(); ?> data-page="<?php echo $page; ?>">
 <?php //if($page !== "registration"){ ?>
     <div id="modal-login">
+        <span class="close-modal">X</span>
         <?php echo do_shortcode('[glm-login-form]'); ?>
         <a class="registration-link" href="<?php echo get_permalink(367); ?>"> Sign Up </a>
     </div>
@@ -49,20 +50,17 @@
         <div class="flex-box">
         <div id="logo-group">
             <div id="main-logo" class="logo-<?php echo $page; ?> <?php echo $type; ?> header-logo">
-                <a href="https://hospitalitymentality360.gaslightmedia.com" target="_blank" rel="home">
+                <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
                     <img id="hm360-logo" src="<?php echo get_template_directory_uri()."/assets/logo-small-white.png"; ?>" alt="<?php bloginfo( 'name' ); ?>">
                 </a>
             </div>
             <div id="site-logo" class="logo-<?php echo $page; ?> <?php echo $type; ?> header-logo">
                 <?php if ( get_header_image() ) : ?>
-                <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
                     <?php if($page !== "demo" && $page !== "my-courses" && $type !== "cmvl_channel"){ ?>
                         <img src="<?php header_image(); ?>" alt="<?php bloginfo( 'name' ); ?>">
                     <?php } else { ?>
                         <img src="<?php echo get_template_directory_uri()."/assets/ssm.png"; ?>" alt="<?php bloginfo( 'name' ); ?>">
                     <?php } ?>
-                    
-                </a>
                 <?php else:?>
                     <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
                     <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
diff --git a/inc/glm-dev.php b/inc/glm-dev.php
index 966da7a..e15cfc5 100644 (file)
--- a/inc/glm-dev.php
+++ b/inc/glm-dev.php
@@ -1,5 +1,12 @@
 
 <?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 }
+
 function glm_login_form( $atts ){
     ob_start(); ?>
     <div id='glm-member-login-form'>
@@ -18,4 +25,40 @@ function glm_login_form( $atts ){
     <?php return ob_get_clean();
 
  }
-add_shortcode( 'glm-login-form', 'glm_login_form' );
\ No newline at end of file
+ add_action( 'login_form_bottom', 'add_lost_password_link' );
+function add_lost_password_link() {
+       return '<a href="/wp-login.php?action=lostpassword">Lost Password?</a>';
+}
+add_shortcode( 'glm-login-form', 'glm_login_form' );
+add_filter( 'gform_validation_1', 'validate_code' );
+
+function validate_code( $validation_result ) {
+    $form = $validation_result['form'];
+    $codes = array('SSM350');
+
+    // We want uppercase code values
+    if ( ! in_array(rgpost( 'input_7' ) , $codes) ) {
+
+        // set the form validation to false
+        $validation_result['is_valid'] = false;
+
+        //finding Field with ID of 5 and marking it as failed validation
+        foreach( $form['fields'] as &$field ) {
+
+            if ( $field->id == '7' ) {
+                $field->failed_validation = true;
+                $field->validation_message = rgpost('input_7') ." is not a valid code";
+                break;
+            }
+        }
+
+    }
+    // function get_field(){
+    //     $data = array('code' => strtoupper( rgpost( 'input_7' ) ), 'first' => rgpost( 'input_1.3' ), 'last' =>  rgpost( 'input_1.6' ), 'school' => rgpost( 'input_4' ) );
+    //     return $data;
+    // }
+    //Assign modified $form object back to the validation result
+    $validation_result['form'] = $form;
+    return $validation_result;
+
+}
\ No newline at end of file
diff --git a/js/custom.js b/js/custom.js
index c48e1c4..bd94251 100644 (file)
--- a/js/custom.js
+++ b/js/custom.js
@@ -189,6 +189,10 @@ jQuery(document).ready(function($){
         $('.login-modal').on("click", function(){
             $("#modal-login").toggleClass("show-login");
         })
+
+        $(".close-modal").on("click", function(){
+            $("#modal-login").removeClass("show-login");
+        })
     }
     let icon_url = `${window.icon_url}/assets/course-icon.png`;
     let course_cards = $('.cmvl-courses-list-shortcode').find('tbody').children('tr');