Merge pull request #4 from WordImpress/master

update
impress-org · Jul 19, 2016 · 67258bf · 67258bf
2 parents 40d65a0 + bb93665
commit 67258bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/includes/admin/class-addon-activation-banner.php b/includes/admin/class-addon-activation-banner.php
@@ -7,12 +7,14 @@
  * https://github.com/WordImpress/Give-Activation-Banner
  */
 
-
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+/**
+ * Class Give_Addon_Activation_Banner
+ */
 class Give_Addon_Activation_Banner {
 
 	/**
@@ -201,7 +203,8 @@ public function give_addon_activation_admin_notice() {
 
 	/**
 	 * Ignore Nag
-	 * @description: This is the action that allows the user to dismiss the banner it basically sets a tag to their user meta data
+	 *
+	 * This is the action that allows the user to dismiss the banner it basically sets a tag to their user meta data
 	 */
 	public function give_addon_notice_ignore() {
 
@@ -218,5 +221,4 @@ public function give_addon_notice_ignore() {
 		}
 	}
 
-}
-
+}
diff --git a/includes/forms/template.php b/includes/forms/template.php
@@ -960,7 +960,7 @@ function give_get_login_fields( $form_id ) {
 				 <a href="<?php echo wp_lostpassword_url( $redirect )?>"> <?php _e( 'Forgot password?' ) ?> </a>
 			 </span>
 		</div>
-		
+
 		<div id="give-user-login-submit-<?php echo $form_id; ?>" class="give-clearfix">
 			<input type="submit" class="give-submit give-btn button" name="give_login_submit" value="<?php _e( 'Login', 'give' ); ?>"/>
 			<?php if ( $show_register_form !== 'login' ) { ?>
@@ -1055,16 +1055,16 @@ function give_terms_agreement( $form_id ) {
 
 	if ( $form_option === 'yes' && ! empty( $terms ) ) { ?>
 		<fieldset id="give_terms_agreement">
-			<div id="give_terms" style="display:none;">
+			<div id="give_terms" class= "give_terms-<?php echo $form_id;?>" style="display:none;">
 				<?php
 				do_action( 'give_before_terms' );
 				echo wpautop( stripslashes( $terms ) );
 				do_action( 'give_after_terms' );
 				?>
 			</div>
 			<div id="give_show_terms">
-				<a href="#" class="give_terms_links"><?php _e( 'Show Terms', 'give' ); ?></a>
-				<a href="#" class="give_terms_links" style="display:none;"><?php _e( 'Hide Terms', 'give' ); ?></a>
+				<a href="#" class="give_terms_links give_terms_links-<?php echo $form_id;?>"><?php _e( 'Show Terms', 'give' ); ?></a>
+				<a href="#" class="give_terms_links give_terms_links-<?php echo $form_id;?>" style="display:none;"><?php _e( 'Hide Terms', 'give' ); ?></a>
 			</div>
 
 			<input name="give_agree_to_terms" class="required" type="checkbox" id="give_agree_to_terms" value="1"/>
@@ -1179,10 +1179,10 @@ function give_agree_to_terms_js( $form_id ) {
 		?>
 		<script type="text/javascript">
 			jQuery(document).ready(function ($) {
-				$('body').on('click', '.give_terms_links', function (e) {
+				$('body').on('click', '.give_terms_links-<?php echo $form_id;?>', function (e) {
 					e.preventDefault();
-					$('#give_terms').slideToggle();
-					$('.give_terms_links').toggle();
+					$('.give_terms-<?php echo $form_id;?>').slideToggle();
+					$('.give_terms_links-<?php echo $form_id;?>').toggle();
 					return false;
 				});
 			});