From 56cd8fb97b95939fc0359c71a3385111472e8162 Mon Sep 17 00:00:00 2001 From: prasanna-lmsace <57126778+prasanna-lmsace@users.noreply.github.com> Date: Sat, 16 Nov 2024 14:36:03 +0530 Subject: [PATCH] Bug fixes - KICK-207, KICK-208 --- styles.css | 15 +++++++------- tests/behat/behat_format_kickstart.php | 28 +++++++++++--------------- version.php | 2 +- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/styles.css b/styles.css index cc6b0cc..9024327 100644 --- a/styles.css +++ b/styles.css @@ -150,13 +150,10 @@ body.format-kickstart .form-control .fa-search { .format-kickstart .course-content > .card .card-body .card-title { width: 50%; text-align: left; - margin-top: 5px; - margin-bottom: 9px; - margin-right: 5px; + margin: 5px 5px 5px 0; } .format-kickstart .course-content > .card .card-body a.btn { - margin-right: 5px; - margin-bottom: 5px; + margin: 5px 5px 5px 0; } .format-kickstart .course-content > .card .card-body a.btn:not(.btn-outline-dark) { margin-left: auto; @@ -189,6 +186,7 @@ body#page-course-format-kickstart-template.template-designer-format #fitem_id_co margin-bottom: 20px; flex-direction: row; align-items: center; + padding: 1.25rem; } .format-kickstart .course-content .kickstart-list-view .templates-block .card .card-body { padding: 0; @@ -234,7 +232,10 @@ body#page-course-format-kickstart-template.template-designer-format #fitem_id_co text-align: right; border: 0; background: none; - padding: 0; + padding: 0 0 0 1.25rem; +} +.format-kickstart .course-content .kickstart-list-view .templates-block .card .card-footer a { + margin: 5px 0; } .format-kickstart .course-content .kickstart-list-view .templates-block .card .card-footer a.btn-outline-primary { margin-left: 10px; @@ -253,7 +254,7 @@ body#page-course-format-kickstart-template.template-designer-format #fitem_id_co /* Content Migration from course block */ .format-kickstart.path-course-view .course-content .card { - padding: 15px; + padding: 1.25rem; } /* Teacher profile block */ .format-kickstart.path-course-view .course-content .card .card-header, diff --git a/tests/behat/behat_format_kickstart.php b/tests/behat/behat_format_kickstart.php index c9bd937..aa5b46d 100644 --- a/tests/behat/behat_format_kickstart.php +++ b/tests/behat/behat_format_kickstart.php @@ -38,8 +38,8 @@ class behat_format_kickstart extends behat_base { /** + * Click the disable link for single activity course format. * @Given /^I click on disable link single activity$/ - * @param string $format The course data */ public function i_click_on_disable_link_single_activity() { global $CFG; @@ -51,8 +51,8 @@ public function i_click_on_disable_link_single_activity() { } /** + * Click the ecit link for custom sections course format. * @Given /^I click on enable link custom sections$/ - * @param string $format The course data */ public function i_click_on_edit_link_custom_sections() { global $CFG; @@ -63,9 +63,9 @@ public function i_click_on_edit_link_custom_sections() { } } - /** + /** + * Click the edit link for single activity course format. * @Given /^I click on enable link single activity$/ - * @param string $format The course data */ public function i_click_on_edit_link_single_activity() { global $CFG; @@ -77,22 +77,18 @@ public function i_click_on_edit_link_single_activity() { } /** + * Check the single activity condition. * @Given /^I check single activity condition kickstart:$/ - * @param string $format The course data + * @param TableNode $table The course data */ public function i_check_single_activity_condition_kickstart(TableNode $table) { - global $CFG; - //if ($CFG->branch <= '403') { - $this->execute('behat_forms::i_set_the_following_fields_to_these_values', $table); - $this->execute('behat_forms::press_button', "Save and display"); - $this->execute('behat_general::assert_page_contains_text', "There are no discussion topics yet in this forum"); - //} - /* else { - $this->execute('behat_general::assert_element_contains_text', ["There are no discussion topics yet in this forum", ".alert-warning","css_element"]); - } */ + $this->execute('behat_forms::i_set_the_following_fields_to_these_values', $table); + $this->execute('behat_forms::press_button', "Save and display"); + $this->execute('behat_general::assert_page_contains_text', "There are no discussion topics yet in this forum"); } /** + * I should see the course format. * @Given /^I should see course format "(?P(?:[^"]|\\")*)"$/ * @param string $format The course data */ @@ -119,6 +115,7 @@ public function i_should_see_define_course_format($format) { /** + * I should not see the course format. * @Given /^I should not see course format "(?P(?:[^"]|\\")*)"$/ * @param string $format The course data */ @@ -192,11 +189,10 @@ public function i_click_kickstart_template($selector) { } - /** + /** * Set the kickstart course format plugins settings. * * @Given /^I click kickstart single activity format template$/ - * @param string $selector Selector */ public function i_click_kickstart_single_activity_format_template() { global $CFG; diff --git a/version.php b/version.php index d392f49..5ef4146 100644 --- a/version.php +++ b/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2024111500; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2024111600; // The current plugin version (Date: YYYYMMDDXX). $plugin->requires = 2022041900; // Requires this Moodle version. $plugin->release = 'Version 1.4'; $plugin->component = 'format_kickstart'; // Full name of the plugin (used for diagnostics).