L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61832-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2018-05-28 09:21:22 +08:00
parent d4773c32d6 9b127bcb70
commit c3c8223ca2
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/renderer.php
+2 -3
View File
@@ -282,11 +282,10 @@ class mod_lesson_renderer extends plugin_renderer_base {
$pagetable->cellspacing = 0;
$pagetable->cellpadding = '5px';
$pagetable->data = array();
$pagetable->id = 'lesson-' . $pageid;
$pageheading = new html_table_cell();
$pageheading->text = format_string($page->title);
$pageheading->text = html_writer::tag('a', '', array('id' => 'lesson-' . $pageid)) . format_string($page->title);
if ($canedit) {
$pageheading->text .= ' '.$this->page_action_links($page, $npages);
}
@@ -309,7 +308,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
$pagetable = $page->display_answers($pagetable);
$content .= html_writer::start_tag('div', array('class' => 'no-overflow'));
$content .= html_writer::start_tag('div');
$content .= html_writer::table($pagetable);
$content .= html_writer::end_tag('div');
mod/lesson/tests/behat/lesson_delete_answers.feature
+2 -2
View File
@@ -50,7 +50,7 @@ branch table contents
And I follow "Expanded"
Scenario: Edit lesson content page
Given I click on "//th[normalize-space(.)='First page name']/descendant::a[2]" "xpath_element"
Given I click on "//th[normalize-space(.)='First page name']/descendant::a[3]" "xpath_element"
When I set the following fields to these values:
| id_answer_editor_1 | |
And I press "Save page"
@@ -73,7 +73,7 @@ branch table contents
And I should see "Your score is 1 (out of 1)."
Scenario: Edit lesson question page
Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[2]" "xpath_element"
Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[3]" "xpath_element"
When I set the following fields to these values:
| id_answer_editor_1 | |
And I press "Save page"
mod/lesson/tests/behat/lesson_edit_cluster.feature
+3 -3
View File
@@ -71,16 +71,16 @@ Feature: In a lesson activity, teacher can edit a cluster page
And I press "Save page"
Scenario: Edit lesson cluster page
Given I click on "//th[normalize-space(.)='Cluster']/descendant::a[2]" "xpath_element"
Given I click on "//th[normalize-space(.)='Cluster']/descendant::a[3]" "xpath_element"
When I set the following fields to these values:
| Page title | Modified name |
| Page contents | Modified contents |
And I press "Save page"
Then I should see "Modified name"
And I click on "//th[normalize-space(.)='Modified name']/descendant::a[2]" "xpath_element"
And I click on "//th[normalize-space(.)='Modified name']/descendant::a[3]" "xpath_element"
And I should see "Unseen question within a cluster"
And I press "Cancel"
And I click on "//th[normalize-space(.)='End of cluster']/descendant::a[2]" "xpath_element"
And I click on "//th[normalize-space(.)='End of cluster']/descendant::a[3]" "xpath_element"
And I set the following fields to these values:
| Page title | Modified end |
| Page contents | Modified end contents |
mod/lesson/tests/behat/lesson_edit_pages.feature
+2 -2
View File
@@ -56,7 +56,7 @@ Feature: In a lesson activity, teacher can edit lesson's pages
And I press "Save page"
Scenario: Edit lesson content page
Given I click on "//th[normalize-space(.)='Second page name']/descendant::a[2]" "xpath_element"
Given I click on "//th[normalize-space(.)='Second page name']/descendant::a[3]" "xpath_element"
When I set the following fields to these values:
| Page title | Modified second page |
| Page contents | Modified contents |
@@ -91,7 +91,7 @@ Feature: In a lesson activity, teacher can edit lesson's pages
And I should see "Your score is 1 (out of 1)."
Scenario: Edit lesson question page
Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[2]" "xpath_element"
Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[3]" "xpath_element"
When I set the following fields to these values:
| Page title | New hardest question |
| Page contents | 1 + 2? |