Changeset 1567044
- Timestamp:
- 01/03/2017 11:51:10 AM (9 years ago)
- Location:
- educator/trunk
- Files:
-
- 5 edited
-
assets/public/css/base.css (modified) (4 diffs)
-
educator.php (modified) (2 diffs)
-
includes/Edr/Main.php (modified) (1 diff)
-
includes/Edr/Widget/LessonsList.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
educator/trunk/assets/public/css/base.css
r1566587 r1567044 3 3 /* Buy Widget */ 4 4 .edr-buy-widget { 5 margin-bottom: 10px;5 margin-bottom: 20px; 6 6 } 7 7 … … 84 84 } 85 85 86 /* Courses and memberships shortcodes */ 87 .edr-course, 86 /* Courses shortcode */ 87 .edr-course { 88 margin: 0 0 2em; 89 } 90 91 .edr-course__image { 92 margin: 0 0 10px; 93 } 94 95 /* Membership shortcode */ 88 96 .edr-membership { 89 margin: 0 0 2em; 90 } 91 92 .edr-course__image { 93 margin: 0 0 10px; 97 margin: 0 0 40px; 98 } 99 100 .edr-membership__header { 101 margin: 0 0 20px; 102 } 103 104 .edr-membership__title { 105 margin: 0; 106 } 107 108 .edr-membership__price { 109 margin: 10px 0 0; 110 } 111 112 .edr-membership__summary p { 113 margin: 0 0 20px; 114 } 115 116 .edr-membership__more { 117 margin-right: 10px; 94 118 } 95 119 … … 105 129 /* No access notice */ 106 130 .edr-no-access-notice { 107 margin: 0 0 10px;131 margin: 0 0 20px; 108 132 } 109 133 … … 221 245 font-size: 18px; 222 246 } 247 248 /* Widgets */ 249 .syllabus-widget .group { 250 margin: 0 0 20px; 251 } 252 253 .syllabus-widget .group-header { 254 margin: 0 0 10px; 255 } -
educator/trunk/educator.php
r1566587 r1567044 6 6 * Author: educatorteam 7 7 * Author URI: http://educatorplugin.com/ 8 * Version: 2.0 8 * Version: 2.0.1 9 9 * License: GPLv2 or later 10 10 * License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 32 32 if ( ! defined( 'ABSPATH' ) ) exit; 33 33 34 define( 'EDR_VERSION', '2.0 ' );34 define( 'EDR_VERSION', '2.0.1' ); 35 35 define( 'EDR_DB_VERSION', '2.0' ); 36 36 define( 'EDR_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); -
educator/trunk/includes/Edr/Main.php
r1566587 r1567044 213 213 public function enqueue_scripts_styles() { 214 214 if ( apply_filters( 'edr_stylesheet', true ) ) { 215 wp_enqueue_style( 'edr-base', EDR_PLUGIN_URL . 'assets/public/css/base.css', array(), ' 1.0' );215 wp_enqueue_style( 'edr-base', EDR_PLUGIN_URL . 'assets/public/css/base.css', array(), '2.0.1' ); 216 216 } 217 217 218 218 if ( edr_is_page( 'payment' ) ) { 219 219 // Scripts for the payment page. 220 wp_enqueue_script( 'edr-payment', EDR_PLUGIN_URL . 'assets/public/js/payment.js', array( 'jquery' ), ' 1.0', true );220 wp_enqueue_script( 'edr-payment', EDR_PLUGIN_URL . 'assets/public/js/payment.js', array( 'jquery' ), '2.0.1', true ); 221 221 wp_localize_script( 'edr-payment', 'edrPaymentVars', array( 222 222 'ajaxurl' => admin_url( 'admin-ajax.php' ), -
educator/trunk/includes/Edr/Widget/LessonsList.php
r1566587 r1567044 13 13 14 14 public function widget( $args, $instance ) { 15 $lesson_id = get_the_ID(); 16 17 if ( ! $lesson_id || EDR_PT_LESSON != get_post_type( $lesson_id ) ) { 18 return; 19 } 20 15 21 echo $args['before_widget']; 16 22 … … 20 26 } 21 27 22 $lesson_id = get_the_ID(); 28 $obj_courses = Edr_Courses::get_instance(); 29 $course_id = $obj_courses->get_course_id( $lesson_id ); 30 $syllabus = $obj_courses->get_syllabus( $course_id ); 23 31 24 if ( $lesson_id && EDR_PT_LESSON == get_post_type() ) { 25 $obj_courses = Edr_Courses::get_instance(); 26 $course_id = $obj_courses->get_course_id( $lesson_id ); 27 $syllabus = $obj_courses->get_syllabus( $course_id ); 28 29 if ( ! empty( $syllabus ) ) { 30 Edr_View::the_template( 'widgets/lessons-list-syllabus', array( 31 'syllabus' => $syllabus, 32 'lessons' => $obj_courses->get_syllabus_lessons( $syllabus ), 33 ) ); 34 } else { 35 Edr_View::the_template( 'widgets/lessons-list-all', array( 36 'lessons' => $obj_courses->get_course_lessons( $course_id ), 37 ) ); 38 } 32 if ( ! empty( $syllabus ) ) { 33 Edr_View::the_template( 'widgets/lessons-list-syllabus', array( 34 'syllabus' => $syllabus, 35 'lessons' => $obj_courses->get_syllabus_lessons( $syllabus ), 36 ) ); 37 } else { 38 Edr_View::the_template( 'widgets/lessons-list-all', array( 39 'lessons' => $obj_courses->get_course_lessons( $course_id ), 40 ) ); 39 41 } 40 42 -
educator/trunk/readme.txt
r1566612 r1567044 5 5 Requires at least: 4.7 6 6 Tested up to: 4.7 7 Stable tag: 2.0 7 Stable tag: 2.0.1 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 33 33 1. Upload the "educator" plugin folder to the "/wp-content/plugins/" directory 34 34 2. Activate the plugin through the "Plugins" menu in WordPress admin panel 35 36 == Changelog == 37 38 = 2.0.1 = 39 40 * Adjusted the default public CSS 41 * Hide the lessons widget from pages other than the single lesson page
Note: See TracChangeset
for help on using the changeset viewer.