diff --git a/includes/classes/Template.php b/includes/classes/Template.php index aaf1cd0..138f3c8 100644 --- a/includes/classes/Template.php +++ b/includes/classes/Template.php @@ -33,8 +33,7 @@ public function single_course_template( $template ) { return $template; } - if ( $wp_query->is_single && ! empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] === tutor()->course_post_type ) { - + if ( is_single() && ! tutor_utils()->is_learning_area() && get_query_var( 'post_type' ) === tutor()->course_post_type ) { $is_page_builder_used = et_pb_is_pagebuilder_used( get_the_ID() ); if ( $is_page_builder_used ) { diff --git a/includes/modules/CourseAuthor/CourseAuthor.jsx b/includes/modules/CourseAuthor/CourseAuthor.jsx index 2c3a47e..53a6e43 100644 --- a/includes/modules/CourseAuthor/CourseAuthor.jsx +++ b/includes/modules/CourseAuthor/CourseAuthor.jsx @@ -13,6 +13,7 @@ class CourseAuthor extends Component { static css(props) { const additionalCss = []; const wrapper = "%%order_class%% .tutor-single-course-author-meta"; + const course_author_wrapper = ".tutor_course_author_0"; const img_selector = "%%order_class%% .tutor-avatar, %%order_class%% .tutor-avatar img"; //const label_selector = '%%order_class%% .tutor-single-course-author-name > span'; @@ -214,6 +215,16 @@ class CourseAuthor extends Component { ]); } + + if ( props.__author == null ) { + additionalCss.push([ + { + selector: course_author_wrapper, + declaration: `display: none !important` + } + ]); + } + return additionalCss; } diff --git a/includes/modules/CourseAuthor/CourseAuthor.php b/includes/modules/CourseAuthor/CourseAuthor.php index 79d3fcd..30c4e39 100644 --- a/includes/modules/CourseAuthor/CourseAuthor.php +++ b/includes/modules/CourseAuthor/CourseAuthor.php @@ -316,8 +316,9 @@ public static function get_content( $args = array() ) { */ public function render( $attrs, $content, $render_slug ) { // selectors - $wrapper = '%%order_class%% .tutor-single-course-author-meta'; - $img_selector = '%%order_class%% .tutor-avatar, %%order_class%% .tutor-avatar img'; + $wrapper = '%%order_class%% .tutor-single-course-author-meta'; + $course_author_wrapper = '.tutor_course_author_0'; + $img_selector = '%%order_class%% .tutor-avatar, %%order_class%% .tutor-avatar img'; // props $display = 'flex'; @@ -590,6 +591,16 @@ public function render( $attrs, $content, $render_slug ) { $output = self::get_content( $this->props ); + if ( '' === $output ) { + ET_Builder_Element::set_style( + $render_slug, + array( + 'selector' => $course_author_wrapper, + 'declaration' => 'display: none !important', + ) + ); + } + // Render empty string if no output is generated to avoid unwanted vertical space. if ( '' === $output ) { return ''; diff --git a/includes/modules/CourseCategories/CourseCategories.php b/includes/modules/CourseCategories/CourseCategories.php index 50efd18..7836b36 100644 --- a/includes/modules/CourseCategories/CourseCategories.php +++ b/includes/modules/CourseCategories/CourseCategories.php @@ -119,7 +119,7 @@ public function get_fields() { 'type' => 'text', 'option_category' => 'layout', 'default' => esc_html__( 'Categories:', 'tutor-lms-divi-modules' ), - 'toggle_slug' => 'main_content', + 'toggle_slug' => 'main_content', ), 'layout' => array( 'label' => esc_html__( 'Layout', 'tutor-lms-divi-modules' ), @@ -223,19 +223,22 @@ public static function get_content( $args = array() ) { '; if ( $course ) { $course_categories = get_tutor_course_categories(); - if ( is_array( $course_categories) && count( $course_categories ) ){ - $count = 1; + if ( is_array( $course_categories ) && count( $course_categories ) ) { + $count = 1; foreach ( $course_categories as $course_category ) { $category_name = $course_category->name; $comma = count( $course_categories ) > $count ? ', ' : ''; $category_link = get_term_link( $course_category->term_id ); $markup .= " $category_name" . $comma; - $count++; + ++$count; } - } - else{ - $markup = '
-
'; + } else { + $markup = sprintf( + '
+ %s +
', + esc_html__( 'Uncategorized', 'tutor-lms-divi-modules' ) + ); } } $markup .= '
'; diff --git a/includes/modules/CourseRequirements/CourseRequirements.php b/includes/modules/CourseRequirements/CourseRequirements.php index 46ed226..9ff746d 100644 --- a/includes/modules/CourseRequirements/CourseRequirements.php +++ b/includes/modules/CourseRequirements/CourseRequirements.php @@ -340,6 +340,11 @@ public static function get_props( $args = array() ) { public static function get_content( $args = array() ) { $course_id = Helper::get_course( $args ); ob_start(); + + if ( ! tutor_utils()->get_option( 'enable_course_requirements', false ) ) { + return ''; + } + if ( $course_id ) { include_once dtlms_get_template( 'course/requirements' ); } diff --git a/includes/templates/course/share.php b/includes/templates/course/share.php index e2d7d50..8175963 100644 --- a/includes/templates/course/share.php +++ b/includes/templates/course/share.php @@ -54,8 +54,11 @@
-
- +
+ +
@@ -66,20 +69,16 @@ diff --git a/pre-built-templates/layout-v5.json b/pre-built-templates/layout-v5.json index 8266f45..86a2c25 100644 --- a/pre-built-templates/layout-v5.json +++ b/pre-built-templates/layout-v5.json @@ -1 +1 @@ -{"context":"et_builder","data":{"49234":"\r\n\r\n\r\n\r\n\r\n[tutor_course_rating star_color=\"#ed9700\" _builder_version=\"4.14.4\" _module_preset=\"default\" count_text_font=\"||||||||\" count_text_text_color=\"#757c8e\" avg_text_font=\"||||||||\" avg_text_text_color=\"#000000\" global_colors_info=\"{}\" rating_gap=\"12px\"][\/tutor_course_rating]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_title _builder_version=\"4.14.4\" _module_preset=\"default\" header_font=\"|700|||||||\" header_text_color=\"#000000\" global_colors_info=\"{}\" header_line_height=\"1.6em\"][\/tutor_course_title]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_author avatar_size=\"36px\" avatar_gap=\"16px\"][\/tutor_course_author]\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_categories][\/tutor_course_categories]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_wishlist][\/tutor_course_wishlist]\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_share][\/tutor_course_share]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_thumbnail][\/tutor_course_thumbnail]\r\n\r\n\r\n\r\n\r\n[tutor_course_content course_content_title_margin_last_edited=\"off|desktop\" course_topics_padding=\"16px|40px|16px|20px|true|\" lesson_icon_size_last_edited=\"off|desktop\" custom_css_main_element=\"ul {\r\n padding: 0px !important;\r\n}\" course_benefits_alignment=\"left\" course_benefits_layout=\"inline\"][\/tutor_course_content]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_enrollment icon_size=\"14px\" custom_css_main_element=\"ul{ padding: 0; }\" custom_css_free_form=\"\"][\/tutor_course_enrollment]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_instructor course_instructor_label=\"A course by\" border_style_bottom=\"none\" border_radii__hover_enabled=\"off|desktop\" custom_padding=\"24px|32px|24px|32px|true|true\"][\/tutor_course_instructor]\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_materials][\/tutor_course_materials]\r\n\r\n\r\n\r\n\r\n[tutor_course_requirements title_font=\"|700|||||||\" space_between=\"12px\" requirements_text_text_color=\"#000000\" color=\"#757c8e\" size_last_edited=\"on|desktop\" custom_padding=\"16px||16px||true|\"][\/tutor_course_requirements]\r\n\r\n\r\n\r\n[tutor_course_tags label=\"Tags\" title_font=\"|700|||||||\" tags_margin=\"|||-30px||\"][\/tutor_course_tags]\r\n\r\n\r\n\r\n\r\n\r\n"},"presets":"","global_colors":[],"global_variables":[],"images":[],"thumbnails":[]} \ No newline at end of file +{"context":"et_builder","data":{"56004":"\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_rating star_color=\"#ed9700\" _builder_version=\"4.14.4\" _module_preset=\"default\" count_text_font=\"||||||||\" count_text_text_color=\"#757c8e\" avg_text_font=\"||||||||\" avg_text_text_color=\"#000000\" global_colors_info=\"{}\" rating_gap=\"12px\"][\/tutor_course_rating]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_title _builder_version=\"4.14.4\" _module_preset=\"default\" header_font=\"|700|||||||\" header_text_color=\"#000000\" global_colors_info=\"{}\" header_line_height=\"1.6em\"][\/tutor_course_title]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_author avatar_size=\"36px\" avatar_gap=\"16px\" profile_picture=\"on\" display_name=\"on\" disabled_on=\"off|off|off\"][\/tutor_course_author]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_categories alignment=\"left\"][\/tutor_course_categories]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_wishlist][\/tutor_course_wishlist]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_share close_button_size=\"20px\" z_index=\"2\"][\/tutor_course_share]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_thumbnail][\/tutor_course_thumbnail]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_content course_content_title_margin_last_edited=\"off|desktop\" course_topics_padding=\"16px|40px|16px|20px|true|\" lesson_icon_size_last_edited=\"off|desktop\" custom_css_main_element=\"ul {\r\n padding: 0px !important;\r\n}\" course_benefits_alignment=\"left\" course_benefits_layout=\"flex\"][\/tutor_course_content]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_enrollment icon_size=\"14px\" custom_css_free_form=\"\"][\/tutor_course_enrollment]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_instructor course_instructor_label=\"A course by\" border_style_bottom=\"none\" border_radii__hover_enabled=\"off|desktop\" custom_padding=\"24px|32px|24px|32px|true|true\"][\/tutor_course_instructor]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_materials][\/tutor_course_materials]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_requirements title_font=\"|700|||||||\" space_between=\"12px\" requirements_text_text_color=\"#000000\" color=\"#757c8e\" size_last_edited=\"on|desktop\" custom_padding=\"16px||16px||true|\"][\/tutor_course_requirements]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n[tutor_course_tags label=\"Tags\" title_font=\"|700|||||||\" tags_margin=\"|||-30px||\"][\/tutor_course_tags]\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"},"presets":null,"global_colors":[],"global_variables":[],"page_settings_meta":{"_et_pb_custom_css":[""]},"canvases":{"local":[],"global":[]},"images":[],"thumbnails":[]} \ No newline at end of file