Merge pull request #300 from woothemes/release-1-4-9

v1.4.9

assets/css/frontend.less

@@ -547,6 +547,7 @@ section.entry span.course-price { padding-left: 10px; }
 /*-------------------------------------------------------------------------------------------*/
 .course-container, .course, .lesson, .quiz, .learner-info  {
 	p.sensei-message, div.sensei-message {
+		clear: both;
 		margin: 1.387em 0 1.618em 0;
 		padding: 1em 1.618em;
 		border:none!important;

assets/js/lesson-metadata.js

@@ -830,7 +830,7 @@ jQuery(document).ready( function($) {
 	if ( jQuery( '#course-prerequisite-options' ).exists() ) { jQuery( '#course-prerequisite-options' ).chosen(); }
 	if ( jQuery( '#course-category-options' ).exists() ) { jQuery( '#course-category-options' ).chosen(); }
 	// Courses Write Panel
-	if ( jQuery( '#course-woocommerce-product-options' ).exists() && '-' != jQuery( '#course-woocommerce-product-options' ).val() ) { jQuery( '#course-woocommerce-product-options' ).chosen(); }
+	if ( jQuery( '#course-woocommerce-product-options' ).exists() ) { jQuery( '#course-woocommerce-product-options' ).chosen(); }
 	if ( jQuery( '#course-prerequisite-options' ).exists() ) { jQuery( '#course-prerequisite-options' ).chosen(); }
 	// Sensei Settings Panel
 	jQuery( 'div.woothemes-sensei-settings form select' ).each( function() {

changelog.txt

@@ -1,5 +1,11 @@
 *** Sensei Changelog ***
 
+2014.02.13 - version 1.4.9
+ * Fix - Fixing WooCommerce taxonomy templates when Sensei is active
+ * Fix - Fixing bug that was causing grades to be higher than 100%
+ * Fix - Clearing floats on Sensei front-end messages
+ * Fix - Making sure chosen drop down is always used on course product selection
+
 2014.01.23 - version 1.4.8
  * New - Allowing access to courses when WooCommerce order is marked as processing
  * Fix - Ensuring that all purchased courses show up on the My Courses page

classes/class-woothemes-sensei-frontend.php

@@ -179,7 +179,7 @@ public function enqueue_styles () {
 		$disable_styles = apply_filters( 'sensei_disable_styles', $disable_styles );
 
 		if ( ! $disable_styles ) {
-			wp_register_style( $woothemes_sensei->token . '-frontend', $woothemes_sensei->plugin_url . 'assets/css/frontend.css', '', '1.3.3', 'screen' );
+			wp_register_style( $woothemes_sensei->token . '-frontend', $woothemes_sensei->plugin_url . 'assets/css/frontend.css', '', '1.4.9', 'screen' );
 			wp_enqueue_style( $woothemes_sensei->token . '-frontend' );
 
 			// Allow additional stylesheets to be loaded

classes/class-woothemes-sensei-lesson.php

@@ -814,7 +814,7 @@ public function enqueue_scripts( $hook ) {
 		if ( ( ( isset( $post_type ) && in_array( $post_type, $allowed_post_types ) ) && ( isset( $hook ) && in_array( $hook, $allowed_post_type_pages ) ) ) || ( isset( $hook ) && in_array( $hook, $allowed_hooks ) ) ) {
 
 			// Load the lessons script
-			wp_enqueue_script( 'woosensei-lesson-metadata', $woothemes_sensei->plugin_url . 'assets/js/lesson-metadata.js', array( 'jquery' ), '1.4.8' );
+			wp_enqueue_script( 'woosensei-lesson-metadata', $woothemes_sensei->plugin_url . 'assets/js/lesson-metadata.js', array( 'jquery' ), '1.4.9' );
 			wp_enqueue_script( 'woosensei-lesson-chosen', $woothemes_sensei->plugin_url . 'assets/chosen/chosen.jquery.min.js', array( 'jquery' ), '1.3.0' );
 			wp_enqueue_script( 'woosensei-chosen-ajax', $woothemes_sensei->plugin_url . 'assets/chosen/ajax-chosen.jquery.min.js', array( 'jquery', 'woosensei-lesson-chosen' ), '1.4.6' );
 			$translation_strings = array();

classes/class-woothemes-sensei-utils.php

@@ -616,6 +616,9 @@ public function sensei_get_quiz_total( $quiz_id = 0 ) {
 			$question_grade = 0;
 			foreach( $questions as $question ) {
 				$question_grade = get_post_meta( $question->ID, '_question_grade', true );
+				if( ! $question_grade || $question_grade == '' ) {
+					$question_grade = 1;
+				}
 				$quiz_total += $question_grade;
 			}
 		}

classes/class-woothemes-sensei.php

@@ -416,16 +416,6 @@ public function template_loader ( $template ) {
 				$find[] = $this->template_url . $file;
 			} // End If Statement
 
-		} elseif ( is_tax( 'product_cat' ) || is_tax( 'product_tag' ) ) {
-
-		    $term = get_queried_object();
-
-		    $file 		= 'taxonomy-' . $term->taxonomy . '.php';
-		    $find[] 	= 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
-		    $find[] 	= $this->template_url . 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
-		    $find[] 	= $file;
-		    $find[] 	= $this->template_url . $file;
-
 		} elseif ( is_post_type_archive( 'course' ) || is_page( $this->get_page_id( 'courses' ) ) ) {
 
 		    $file 	= 'archive-course.php';

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.8
+Version: 1.4.9
 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.8';
+	$woothemes_sensei->version = '1.4.9';
 
     /**
      * Plugin updates