Merge pull request #141 from woothemes/release-1-4-3

Release 1 4 3
Automattic · Oct 24, 2013 · 33ca12d · 33ca12d
2 parents 59a3fd1 + 1682ff4
commit 33ca12d
Show file tree

Hide file tree

Showing 6 changed files with 1,287 additions and 41 deletions.
diff --git a/assets/css/frontend.css b/assets/css/frontend.css
diff --git a/assets/css/frontend.less b/assets/css/frontend.less
@@ -2,7 +2,7 @@
 Plugin Name: Sensei
 Plugin URI: http://woothemes.com/
 Description: Sensei by WooThemes is the best Learning Management System ever!
-Version: 1.3.3
+Version: 1.4.3
 Author: WooThemes
 Author URI: http://woothemes.com/
 License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -36,12 +36,6 @@ License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2
 		margin: 0;
 	}
 	.course-meta  {
-		position: absolute;
-		top: .202em;
-		right: 0;
-		.course-start  {
-			margin-top: .53em;
-		}
 		.status  {
 			padding: .382em 1em;
 			.border_radius(5px);
@@ -136,9 +130,6 @@ License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2
 					}
 				}
 				.lesson-status  {
-					position: absolute;
-					top: .53em;
-					right: 0;
 					font-style: normal;
 					&.complete  {
 						color: @success;
@@ -159,12 +150,6 @@ License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2
 		}
 	}
 }
-.single.logged-in #main .type-course  {
-	border: none;
-	header h1  {
-		margin-right: 150px;
-	}
-}
 
 .lesson  {
 	.lesson-meta  {
@@ -578,6 +563,7 @@ section.entry span.course-price { padding-left: 10px; }
 		line-height: 1.618em;
 		.borderbox;
 		white-space: nowrap;
+		-webkit-appearance: none;
 
 		.border_radius(5px);
 		background: @color_links;
@@ -618,4 +604,28 @@ section.entry span.course-price { padding-left: 10px; }
 		}
 
 	}
+}
+
+#submit  {
+	-webkit-appearance: none;
+}
+
+/* RESPOND */
+@media only screen and (min-width: 768px)  {
+	#main .course  {
+		.course-meta  {
+			position: absolute;
+			top: .202em;
+			right: 0;
+			.course-start  {
+				margin-top: .53em;
+			}
+		}
+	}
+	.single.logged-in #main .type-course  {
+		border: none;
+		header h1  {
+			margin-right: 150px;
+		}
+	}
 }
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,10 @@
 *** Sensei Changelog ***
 
+2013.10.24 - version 1.4.3
+ * /assets/css/frontend.css - Responsive layout tweaks & fixes.
+ * /classes/class-woothemes-sensei-frontend.php - fixes missing complete course hook, fixes missing lesson complete message and reset lesson buttons, fixes 'delete course' function.
+ * /classes/class-woothemes-sensei-utils.php - fixes lesson complete message on single lesson page if there are no quiz questions.
+
 2013.10.15 - version 1.4.2
  * /assets/js/lesson-metadata.js - fixes post issues with multiline and boolean add and edit ajax functions.
  * /templates/woocommerce/add-to-cart.php - fixes adding of variable subscription courses to cart.

diff --git a/classes/class-woothemes-sensei-frontend.php b/classes/class-woothemes-sensei-frontend.php
@@ -834,22 +834,21 @@ public function sensei_complete_course() {
 		    		// Remove all quiz user meta lessons
 		    		// Mark all quiz user meta lessons as complete
 		    		$dataset_changes = false;
-		    		if ( isset( $lesson_quizzes ) && 0 < count($lesson_quizzes) )  {
-		    			foreach ($course_lessons as $lesson_item){
-		    				// Check for lesson complete
-		    				$dataset_changes = WooThemes_Sensei_Utils::sensei_delete_activities( array( 'post_id' => $lesson_item->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_lesson_end' ) );
-		    				// Lesson Quiz Meta
-		        			$lesson_quizzes = $this->lesson->lesson_quizzes( $lesson_item->ID );
-		        			if ( 0 < count($lesson_quizzes) )  {
-		        				foreach ($lesson_quizzes as $quiz_item){
-		        					// Check for quiz answers
-		        					$delete_answers = WooThemes_Sensei_Utils::sensei_delete_quiz_answers( $quiz_item->ID, $current_user->ID );
-		    						// Check for quiz grade
-		    						$dataset_changes = WooThemes_Sensei_Utils::sensei_delete_activities( array( 'post_id' => $quiz_item->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_quiz_grade' ) );
-		    					} // End For Loop
-		    				} // End If Statement
-		    			} // End For Loop
-		    		} // End If Statement
+	    			foreach ($course_lessons as $lesson_item){
+	    				// Check for lesson complete
+	    				$dataset_changes = WooThemes_Sensei_Utils::sensei_delete_activities( array( 'post_id' => $lesson_item->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_lesson_start' ) );
+	    				$dataset_changes = WooThemes_Sensei_Utils::sensei_delete_activities( array( 'post_id' => $lesson_item->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_lesson_end' ) );
+	    				// Lesson Quiz Meta
+	        			$lesson_quizzes = $this->lesson->lesson_quizzes( $lesson_item->ID );
+	        			if ( 0 < count($lesson_quizzes) )  {
+	        				foreach ($lesson_quizzes as $quiz_item){
+	        					// Check for quiz answers
+	        					$delete_answers = WooThemes_Sensei_Utils::sensei_delete_quiz_answers( $quiz_item->ID, $current_user->ID );
+	    						// Check for quiz grade
+	    						$dataset_changes = WooThemes_Sensei_Utils::sensei_delete_activities( array( 'post_id' => $quiz_item->ID, 'user_id' => $current_user->ID, 'type' => 'sensei_quiz_grade' ) );
+	    					} // End For Loop
+	    				} // End If Statement
+	    			} // End For Loop
 		    		// Success message
 		    		if ( $dataset_changes ) {
 		    			$this->messages = '<header class="archive-header"><div class="woo-sc-box tick">' . sprintf( __( '%1$s deleted.', 'woothemes-sensei' ), get_the_title( $sanitized_course_id ) ) . '</div></header><div class="fix"></div>';
@@ -1098,16 +1097,19 @@ public function sensei_lesson_quiz_meta( $post_id = 0, $user_id = 0 ) {
 		$lesson_course_id = get_post_meta( $post_id, '_lesson_course', true );
 		// Lesson Quiz Meta
 		$lesson_quizzes = $woothemes_sensei->frontend->lesson->lesson_quizzes( $post_id );
+		$has_user_completed_lesson = $this->sensei_has_user_completed_lesson( $post_id, $user_id );
 		?><header><?php
 		if ( 0 < count($lesson_quizzes) && is_user_logged_in() && sensei_has_user_started_course( $lesson_course_id, $user_id ) ) { ?>
             <?php $no_quiz_count = 0; ?>
         	<?php foreach ($lesson_quizzes as $quiz_item){
         		$quiz_questions = $woothemes_sensei->frontend->lesson->lesson_quiz_questions( $quiz_item->ID );
-	        	if( 0 < count( $quiz_questions ) ) {
-	        		// Display lesson quiz status message
+	        	// Display lesson quiz status message
+	        	if ( $has_user_completed_lesson || 0 < count( $quiz_questions ) ) {
 	        		$status = WooThemes_Sensei_Utils::sensei_user_quiz_status_message( $post_id, $user_id, true );
-	    			echo '<div class="woo-sc-box ' . $status['box_class'] . '">' . $status['message'] . '</div>';
-	    			echo $status['extra'];
+	        		echo '<div class="woo-sc-box ' . $status['box_class'] . '">' . $status['message'] . '</div>';
+	    			if( 0 < count( $quiz_questions ) ) {
+	        			echo $status['extra'];
+    				} // End If Statement
     			} // End If Statement
         	} // End For Loop ?>
         <?php } elseif( 0 < count($lesson_quizzes) && $woothemes_sensei->access_settings() ) { ?>
@@ -1118,7 +1120,11 @@ public function sensei_lesson_quiz_meta( $post_id = 0, $user_id = 0 ) {
 	        		<?php } ?>
         		<?php } // End For Loop ?>
         <?php } // End If Statement
-        sensei_complete_lesson_button();
+        if ( !$has_user_completed_lesson ) {
+        	sensei_complete_lesson_button();
+        } else {
+        	sensei_reset_lesson_button();
+        } // End If Statement
         ?></header><?php
 	} // End sensei_lesson_quiz_meta()
 
@@ -1381,6 +1387,7 @@ public function sensei_course_meta() {
 						if ( $activity_logged ) {
 							// Course is complete
 							$completed_course = true;
+							do_action( 'sensei_user_course_end', $current_user->ID, $post->ID );
 						} // End If Statement
 		    		} // End If Statement
 				} // End If Statement

diff --git a/classes/class-woothemes-sensei-utils.php b/classes/class-woothemes-sensei-utils.php
@@ -960,7 +960,12 @@ public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id
 						$status = 'passed';
 						$box_class = 'tick';
 						if( $is_lesson ) {
-							$message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %d%%', 'woothemes-sensei' ), round( $quiz_grade ) );
+							$quiz_questions = $woothemes_sensei->frontend->lesson->lesson_quiz_questions( $quiz_id );
+							if ( 0 < count( $quiz_questions ) ) {
+								$message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %d%%', 'woothemes-sensei' ), round( $quiz_grade ) );
+							} else {
+								$message = sprintf( __( 'Congratulations! You have passed this lesson.', 'woothemes-sensei' ) );
+							} // End If Statement
 						} else {
 							$message = sprintf( __( 'Congratulations! You have passed this quiz achieving %d%%', 'woothemes-sensei' ), round( $quiz_grade ) );
 						}

diff --git a/woothemes-sensei.php b/woothemes-sensei.php
@@ -3,7 +3,7 @@
 Plugin Name: Sensei
 Plugin URI: http://www.woothemes.com/products/sensei/
 Description: Sensei by WooThemes is the best Learning Management System ever!
-Version: 1.4.2
+Version: 1.4.3
 Author: WooThemes
 Author URI: http://www.woothemes.com/
 License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -31,7 +31,7 @@
 	if ( ! is_admin() ) require_once( 'inc/woothemes-sensei-template.php' );
 	global $woothemes_sensei;
 	$woothemes_sensei = new WooThemes_Sensei( __FILE__ );
-	$woothemes_sensei->version = '1.4.2';
+	$woothemes_sensei->version = '1.4.3';
 
     /**
      * Plugin updates