Some plain text
Some more text
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -32,7 +32,7 @@ Feature: Atto accessibility checker Scenario: Low contrast Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Hard to read
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -42,7 +42,7 @@ Feature: Atto accessibility checker Scenario: No headings Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Sweet roll oat cake jelly-o macaroon donut oat cake. Caramels macaroon cookie sweet roll croissant cheesecake candy jelly-o. Gummies sugar plum sugar plum gingerbread dessert. Tiramisu bonbon jujubes danish marshmallow cookie chocolate cake cupcake tiramisu. Bear claw oat cake chocolate bar croissant. Lollipop cookie topping liquorice croissant. Brownie cookie cupcake lollipop cupcake cupcake. Fruitcake dessert sweet biscuit dragée caramels marzipan brownie. Chupa chups gingerbread apple pie cookie liquorice caramels carrot cake cookie gingerbread. Croissant candy jelly beans. Tiramisu apple pie dessert apple pie macaroon soufflé. Brownie powder carrot cake chocolate. Tart applicake croissant dragée macaroon chocolate donut.
Jelly beans gingerbread tootsie roll. Sugar plum tiramisu cotton candy toffee pie cotton candy tiramisu. Carrot cake chocolate bar sesame snaps cupcake cake dessert sweet fruitcake wafer. Marshmallow cupcake gingerbread pie sweet candy canes powder gummi bears. Jujubes cake muffin marshmallow candy jelly beans tootsie roll pie. Gummi bears applicake chocolate cake sweet jelly sesame snaps lollipop lollipop carrot cake. Marshmallow cake jelly beans. Jelly beans sesame snaps muffin halvah cookie ice cream candy canes carrot cake. Halvah donut marshmallow tiramisu. Cookie dessert gummi bears. Sugar plum apple pie jelly beans gummi bears tart chupa chups. Liquorice macaroon gummi bears gummies macaroon marshmallow sweet roll cake topping. Lemon drops caramels pie icing danish. Chocolate cake oat cake dessert halvah danish carrot cake apple pie.
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -52,7 +52,7 @@ Feature: Atto accessibility checker Scenario: Merged cells Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
Some plain text
Some plain text
" When I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor diff --git a/lib/editor/atto/plugins/align/tests/behat/align.feature b/lib/editor/atto/plugins/align/tests/behat/align.feature index f3f724add7b..130389088a8 100644 --- a/lib/editor/atto/plugins/align/tests/behat/align.feature +++ b/lib/editor/atto/plugins/align/tests/behat/align.feature @@ -6,7 +6,7 @@ Feature: Atto align text Scenario: Right align some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Fascism
" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor @@ -16,14 +16,14 @@ Feature: Atto align text And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "style=\"text-align:right;\"" @javascript Scenario: Left align some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Communism
" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor @@ -34,14 +34,14 @@ Feature: Atto align text And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "style=\"text-align:left;\"" @javascript Scenario: Center align some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "United Future
" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor @@ -51,6 +51,6 @@ Feature: Atto align text And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "style=\"text-align:center;\"" diff --git a/lib/editor/atto/plugins/bold/tests/behat/bold.feature b/lib/editor/atto/plugins/bold/tests/behat/bold.feature index a1d6316a515..7baf1addcc7 100644 --- a/lib/editor/atto/plugins/bold/tests/behat/bold.feature +++ b/lib/editor/atto/plugins/bold/tests/behat/bold.feature @@ -6,7 +6,7 @@ Feature: Atto bold button Scenario: Bold some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Badger" And I select the text in the "Description" Atto editor When I click on "Bold" "button" @@ -15,14 +15,14 @@ Feature: Atto bold button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Badger" @javascript Scenario: Unbold some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Mouse" And I select the text in the "Description" Atto editor When I click on "Bold" "button" @@ -32,6 +32,6 @@ Feature: Atto bold button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should not see "Mouse" And I should see "Mouse" diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature index f7d648169ab..9da6cc936d9 100644 --- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature +++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature @@ -6,7 +6,7 @@ Feature: Atto charmap button Scenario: Insert symbols Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "1980 Mullet
" And I select the text in the "Description" Atto editor When I click on "Show more buttons" "button" @@ -17,5 +17,5 @@ Feature: Atto charmap button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "ā" diff --git a/lib/editor/atto/plugins/clear/tests/behat/clear.feature b/lib/editor/atto/plugins/clear/tests/behat/clear.feature index 1915c7bffba..c458ee6f2d3 100644 --- a/lib/editor/atto/plugins/clear/tests/behat/clear.feature +++ b/lib/editor/atto/plugins/clear/tests/behat/clear.feature @@ -6,7 +6,7 @@ Feature: Atto clear button Scenario: Clear formatting Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Pisa" And I select the text in the "Description" Atto editor And I click on "Italic" "button" @@ -18,6 +18,6 @@ Feature: Atto clear button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should not see "Pisa" diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature index 5174ded51b9..88f1aab15b6 100644 --- a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature +++ b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature @@ -6,7 +6,7 @@ Feature: Atto collapse button Scenario: Toggle toolbar Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" When I click on "Show more buttons" "button" Then "Equation editor" "button" should be visible And I click on "Show fewer buttons" "button" diff --git a/lib/editor/atto/plugins/equation/tests/behat/equation.feature b/lib/editor/atto/plugins/equation/tests/behat/equation.feature index a74efe0bfc6..9e219a28126 100644 --- a/lib/editor/atto/plugins/equation/tests/behat/equation.feature +++ b/lib/editor/atto/plugins/equation/tests/behat/equation.feature @@ -6,7 +6,7 @@ Feature: Atto equation editor Scenario: Create an equation Given I log in as "admin" When I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Equation test
" # Set field on the bottom of page, so equation editor dialogue is visible. And I expand all fieldsets @@ -25,7 +25,7 @@ Feature: Atto equation editor Scenario: Edit an equation Given I log in as "admin" When I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "\( \pi \)
" # Set field on the bottom of page, so equation editor dialogue is visible. And I expand all fieldsets diff --git a/lib/editor/atto/plugins/html/tests/behat/html.feature b/lib/editor/atto/plugins/html/tests/behat/html.feature index cf4613415a5..1357cfcb0df 100644 --- a/lib/editor/atto/plugins/html/tests/behat/html.feature +++ b/lib/editor/atto/plugins/html/tests/behat/html.feature @@ -6,7 +6,7 @@ Feature: Atto edit HTML Scenario: Edit the html source Given I log in as "admin" When I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Smurf
" And I click on "Show more buttons" "button" And I click on "HTML" "button" diff --git a/lib/editor/atto/plugins/image/tests/behat/image.feature b/lib/editor/atto/plugins/image/tests/behat/image.feature index 744831de47a..c493d0043b8 100644 --- a/lib/editor/atto/plugins/image/tests/behat/image.feature +++ b/lib/editor/atto/plugins/image/tests/behat/image.feature @@ -9,12 +9,12 @@ Feature: Add images to Atto And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" When I set the field "Description" to "Image test
" And I select the text in the "Description" Atto editor And I click on "Image" "button" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle-logo.png" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the Moodle" @@ -42,7 +42,7 @@ Feature: Add images to Atto And the field "Height" matches value "456" And I click on "Save image" "button" And I click on "Update profile" "button" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I select the text in the "Description" Atto editor And I click on "Image" "button" Then the field "Describe this image for someone who cannot see it" matches value "It's the Moodle" @@ -53,7 +53,7 @@ Feature: Add images to Atto Scenario: Manually inserting an image Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Image: .
Image: .
I need some space.
" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -16,14 +16,14 @@ Feature: Indent text in Atto And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "class=\"editor-indent\"" @javascript Scenario: Indent and outdent Given I log in as "admin" And I follow "Profile" in the user menu - When I follow "Edit profile" + When I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "I need some space.
" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -34,5 +34,5 @@ Feature: Indent text in Atto And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should not see "class=\"editor-indent\"" diff --git a/lib/editor/atto/plugins/italic/tests/behat/italic.feature b/lib/editor/atto/plugins/italic/tests/behat/italic.feature index cd063f069e7..01770e6174a 100644 --- a/lib/editor/atto/plugins/italic/tests/behat/italic.feature +++ b/lib/editor/atto/plugins/italic/tests/behat/italic.feature @@ -6,7 +6,7 @@ Feature: Atto italic button Scenario: Italicise some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Tower of Pisa" And I select the text in the "Description" Atto editor When I click on "Italic" "button" @@ -15,14 +15,14 @@ Feature: Atto italic button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Tower of Pisa" @javascript Scenario: Toggle italics in some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "GHD - for hair" And I select the text in the "Description" Atto editor When I click on "Italic" "button" @@ -32,6 +32,6 @@ Feature: Atto italic button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should not see "GHD - for hair" And I should see "GHD - for hair" diff --git a/lib/editor/atto/plugins/link/tests/behat/link.feature b/lib/editor/atto/plugins/link/tests/behat/link.feature index 0a0234adaea..4d02eb6d73a 100644 --- a/lib/editor/atto/plugins/link/tests/behat/link.feature +++ b/lib/editor/atto/plugins/link/tests/behat/link.feature @@ -9,12 +9,12 @@ Feature: Add links to Atto And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" When I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Super cool" And I select the text in the "Description" Atto editor And I click on "Link" "button" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle-logo.png" "link" And I click on "Select this file" "button" And I click on "Update profile" "button" @@ -22,6 +22,6 @@ Feature: Add links to Atto And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Super cool" diff --git a/lib/editor/atto/plugins/media/tests/behat/media.feature b/lib/editor/atto/plugins/media/tests/behat/media.feature index f558f9e4615..5c1326a0bed 100644 --- a/lib/editor/atto/plugins/media/tests/behat/media.feature +++ b/lib/editor/atto/plugins/media/tests/behat/media.feature @@ -16,7 +16,7 @@ Feature: Add media to Atto And I set the field "Entry title" to "The best video in the entire world (not really)" And I click on "Media" "button" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle-logo.webm" "link" And I click on "Select this file" "button" And I set the field "Enter name" to "It's the logo" diff --git a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature index 65393cb829c..548d9c21c3a 100644 --- a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature +++ b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature @@ -6,7 +6,7 @@ Feature: Atto ordered list button Scenario: Make a list from some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Have you heard the news everyone's talkingLife is good 'cause everything's awesome
" And I select the text in the "Description" Atto editor When I click on "Ordered list" "button" @@ -15,6 +15,6 @@ Feature: Atto ordered list button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "
- Have you heard the news everyone's talking"
diff --git a/lib/editor/atto/plugins/strike/tests/behat/strike.feature b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
index dba4d44bb07..5c38924b921 100644
--- a/lib/editor/atto/plugins/strike/tests/behat/strike.feature
+++ b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
@@ -6,7 +6,7 @@ Feature: Atto strike button
Scenario: Strike some text
Given I log in as "admin"
And I follow "Profile" in the user menu
- And I follow "Edit profile"
+ And I click on "Edit profile" "link" in the "region-main" "region"
And I set the field "Description" to "MUA"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
@@ -16,6 +16,6 @@ Feature: Atto strike button
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
- And I follow "Edit profile"
+ And I click on "Edit profile" "link" in the "region-main" "region"
Then I should see "
MUA" diff --git a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature index 9569b07569a..8581a8bfc9b 100644 --- a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature +++ b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature @@ -6,7 +6,7 @@ Feature: Atto subscript button Scenario: Subscript some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Submarine" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -16,14 +16,14 @@ Feature: Atto subscript button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Submarine" @javascript Scenario: Subscript some text in enclosed in superscript Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Submarine" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -33,6 +33,6 @@ Feature: Atto subscript button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Submarine" diff --git a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature index 72ce449397a..2e3ed49cfff 100644 --- a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature +++ b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature @@ -6,7 +6,7 @@ Feature: Atto superscript button Scenario: Subscript some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Helicopter" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -16,14 +16,14 @@ Feature: Atto superscript button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Helicopter" @javascript Scenario: Superscript some text that is enclosed in subscript Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Helicopter" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -33,6 +33,6 @@ Feature: Atto superscript button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Helicopter" diff --git a/lib/editor/atto/plugins/title/tests/behat/title.feature b/lib/editor/atto/plugins/title/tests/behat/title.feature index 4f36ea82ac5..527f28456d9 100644 --- a/lib/editor/atto/plugins/title/tests/behat/title.feature +++ b/lib/editor/atto/plugins/title/tests/behat/title.feature @@ -6,7 +6,7 @@ Feature: Atto title Scenario: Create a heading Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "How The Rock Has Made the WWE World Heavyweight Title More Important Than Ever" And I select the text in the "Description" Atto editor When I click on "Paragraph styles" "button" @@ -16,6 +16,6 @@ Feature: Atto title And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "How The Rock" diff --git a/lib/editor/atto/plugins/underline/tests/behat/underline.feature b/lib/editor/atto/plugins/underline/tests/behat/underline.feature index f4dd9917ce5..c30716cecb1 100644 --- a/lib/editor/atto/plugins/underline/tests/behat/underline.feature +++ b/lib/editor/atto/plugins/underline/tests/behat/underline.feature @@ -6,7 +6,7 @@ Feature: Atto underline button Scenario: Underline some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Deprecated HTML Tag" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -16,6 +16,6 @@ Feature: Atto underline button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "Deprecated HTML Tag" diff --git a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature index 8dcf84fddbc..fdaaa7c7e3c 100644 --- a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature +++ b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature @@ -6,7 +6,7 @@ Feature: Atto unordered list button Scenario: Make a list from some text Given I log in as "admin" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I set the field "Description" to "Things, dogs, clogs, they're awesome
Rocks, clocks, and socks, they're awesome
Figs, and wigs, and twigs, that's awesome
Everything you see or think or say is awesome" And I select the text in the "Description" Atto editor When I click on "Unordered list" "button" @@ -15,6 +15,6 @@ Feature: Atto unordered list button And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" Then I should see "- Things, dogs, clogs"
diff --git a/lib/editor/atto/tests/behat/autosave.feature b/lib/editor/atto/tests/behat/autosave.feature
index 2f3d17ceacb..7a413eaed5c 100644
--- a/lib/editor/atto/tests/behat/autosave.feature
+++ b/lib/editor/atto/tests/behat/autosave.feature
@@ -62,7 +62,7 @@ Feature: Atto Autosave
And I select the text in the "Course summary" Atto editor
And I click on "Image" "button"
And I click on "Browse repositories..." "button"
- And I click on "Private files" "link"
+ And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "moodle-logo.png" "link"
And I click on "Select this file" "button"
And I set the field "Describe this image" to "It's the Moodle"
diff --git a/lib/form/advcheckbox.php b/lib/form/advcheckbox.php
index 5d9a07984cb..4b9a724cf98 100644
--- a/lib/form/advcheckbox.php
+++ b/lib/form/advcheckbox.php
@@ -88,6 +88,7 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox implements
}
parent::__construct($elementName, $elementLabel, $text, $attributes, $values);
+ $this->_type = 'advcheckbox';
}
/**
@@ -142,7 +143,7 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox implements
$context['selectedvalue'] = $this->_values[1];
$context['deselectedvalue'] = $this->_values[0];
-
+ $context['frozenvalue'] = $this->getValue();
return $context;
}
diff --git a/lib/form/checkbox.php b/lib/form/checkbox.php
index 83e64992875..5366ebb57e1 100644
--- a/lib/form/checkbox.php
+++ b/lib/form/checkbox.php
@@ -41,7 +41,10 @@ require_once('templatable_form_element.php');
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox implements templatable {
- use templatable_form_element;
+
+ use templatable_form_element {
+ export_for_template as export_for_template_base;
+ }
/** @var string html for help button, if empty then no help */
var $_helpbutton='';
@@ -141,4 +144,10 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox implements templa
}
return $output;
}
+
+ public function export_for_template(renderer_base $output) {
+ $context = $this->export_for_template_base($output);
+ $context['frozenvalue'] = $this->getValue();
+ return $context;
+ }
}
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
index 844a90ee6be..ad1b5996d2f 100644
--- a/lib/form/templatable_form_element.php
+++ b/lib/form/templatable_form_element.php
@@ -74,7 +74,7 @@ trait templatable_form_element {
// Other attributes.
$otherattributes = [];
foreach ($this->getAttributes() as $attr => $value) {
- if (!in_array($attr, $standardattributes) && $attr != 'class') {
+ if (!in_array($attr, $standardattributes) && $attr != 'class' && !is_object($value)) {
$otherattributes[] = $attr . '="' . s($value) . '"';
}
}
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d0503f11495..b9c10aebed9 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8885,36 +8885,37 @@ function get_performance_info() {
global $CFG, $PERF, $DB, $PAGE;
$info = array();
- $info['html'] = ''; // Holds userfriendly HTML representation.
$info['txt'] = me() . ' '; // Holds log-friendly representation.
+ $info['html'] = '';
if (!empty($CFG->themedesignermode)) {
// Attempt to avoid devs debugging peformance issues, when its caused by css building and so on.
- $info['html'] = '
Warning: Theme designer mode is enabled.
'; + $info['html'] .= 'Warning: Theme designer mode is enabled.
'; } + $info['html'] .= '- '; // Holds userfriendly HTML representation.
$info['realtime'] = microtime_diff($PERF->starttime, microtime());
- $info['html'] .= ''.$info['realtime'].' secs ';
+ $info['html'] .= '
- '.$info['realtime'].' secs '; $info['txt'] .= 'time: '.$info['realtime'].'s '; if (function_exists('memory_get_usage')) { $info['memory_total'] = memory_get_usage(); $info['memory_growth'] = memory_get_usage() - $PERF->startmemory; - $info['html'] .= 'RAM: '.display_size($info['memory_total']).' '; + $info['html'] .= '
- RAM: '.display_size($info['memory_total']).' '; $info['txt'] .= 'memory_total: '.$info['memory_total'].'B (' . display_size($info['memory_total']).') memory_growth: '. $info['memory_growth'].'B ('.display_size($info['memory_growth']).') '; } if (function_exists('memory_get_peak_usage')) { $info['memory_peak'] = memory_get_peak_usage(); - $info['html'] .= 'RAM peak: '.display_size($info['memory_peak']).' '; + $info['html'] .= '
- RAM peak: '.display_size($info['memory_peak']).' '; $info['txt'] .= 'memory_peak: '.$info['memory_peak'].'B (' . display_size($info['memory_peak']).') '; } $inc = get_included_files(); $info['includecount'] = count($inc); - $info['html'] .= 'Included '.$info['includecount'].' files '; + $info['html'] .= '
- Included '.$info['includecount'].' files '; $info['txt'] .= 'includecount: '.$info['includecount'].' '; if (!empty($CFG->early_install_lang) or empty($PAGE)) { @@ -8927,7 +8928,7 @@ function get_performance_info() { list($filterinfo, $nicenames) = $filtermanager->get_performance_summary(); $info = array_merge($filterinfo, $info); foreach ($filterinfo as $key => $value) { - $info['html'] .= "$nicenames[$key]: $value "; + $info['html'] .= "
- $nicenames[$key]: $value "; $info['txt'] .= "$key: $value "; } } @@ -8937,23 +8938,23 @@ function get_performance_info() { list($filterinfo, $nicenames) = $stringmanager->get_performance_summary(); $info = array_merge($filterinfo, $info); foreach ($filterinfo as $key => $value) { - $info['html'] .= "$nicenames[$key]: $value "; + $info['html'] .= "
- $nicenames[$key]: $value "; $info['txt'] .= "$key: $value "; } } if (!empty($PERF->logwrites)) { $info['logwrites'] = $PERF->logwrites; - $info['html'] .= 'Log DB writes '.$info['logwrites'].' '; + $info['html'] .= '
- Log DB writes '.$info['logwrites'].' '; $info['txt'] .= 'logwrites: '.$info['logwrites'].' '; } $info['dbqueries'] = $DB->perf_get_reads().'/'.($DB->perf_get_writes() - $PERF->logwrites); - $info['html'] .= 'DB reads/writes: '.$info['dbqueries'].' '; + $info['html'] .= '
- DB reads/writes: '.$info['dbqueries'].' '; $info['txt'] .= 'db reads/writes: '.$info['dbqueries'].' '; $info['dbtime'] = round($DB->perf_get_queries_time(), 5); - $info['html'] .= 'DB queries time: '.$info['dbtime'].' secs '; + $info['html'] .= '
- DB queries time: '.$info['dbtime'].' secs '; $info['txt'] .= 'db queries time: ' . $info['dbtime'] . 's '; if (function_exists('posix_times')) { @@ -8962,7 +8963,7 @@ function get_performance_info() { foreach ($ptimes as $key => $val) { $info[$key] = $ptimes[$key] - $PERF->startposixtimes[$key]; } - $info['html'] .= "ticks: $info[ticks] user: $info[utime] sys: $info[stime] cuser: $info[cutime] csys: $info[cstime] "; + $info['html'] .= "
- ticks: $info[ticks] user: $info[utime] sys: $info[stime] cuser: $info[cutime] csys: $info[cstime] "; $info['txt'] .= "ticks: $info[ticks] user: $info[utime] sys: $info[stime] cuser: $info[cutime] csys: $info[cstime] "; } } @@ -8982,7 +8983,7 @@ function get_performance_info() { } if (!empty($serverload)) { $info['serverload'] = $serverload; - $info['html'] .= 'Load average: '.$info['serverload'].' '; + $info['html'] .= '
- Load average: '.$info['serverload'].' '; $info['txt'] .= "serverload: {$info['serverload']} "; } @@ -8994,8 +8995,8 @@ function get_performance_info() { } if ($stats = cache_helper::get_stats()) { - $html = ''; - $html .= 'Caches used (hits/misses/sets)'; + $html = '
- Caches used (hits/misses/sets) '; $text = 'Caches used (hits/misses/sets): '; $hits = 0; $misses = 0; @@ -9015,34 +9016,34 @@ function get_performance_info() { $mode = ' [r]'; break; } - $html .= ''; - $html .= ''.$definition.$mode.''; + $html .= '
- '.$definition.$mode.' '; $text .= "$definition {"; foreach ($details['stores'] as $store => $data) { $hits += $data['hits']; $misses += $data['misses']; $sets += $data['sets']; if ($data['hits'] == 0 and $data['misses'] > 0) { - $cachestoreclass = 'nohits'; + $cachestoreclass = 'nohits text-danger'; } else if ($data['hits'] < $data['misses']) { - $cachestoreclass = 'lowhits'; + $cachestoreclass = 'lowhits text-warning'; } else { - $cachestoreclass = 'hihits'; + $cachestoreclass = 'hihits text-success'; } $text .= "$store($data[hits]/$data[misses]/$data[sets]) "; - $html .= "$store: $data[hits] / $data[misses] / $data[sets]"; + $html .= "
- $store: $data[hits] / $data[misses] / $data[sets] "; } - $html .= '
- ';
+ $html .= '
- ';
+ $html .= '
Total: $hits / $misses / $sets"; $info['cachesused'] = "$hits / $misses / $sets"; $info['html'] .= $html; $info['txt'] .= $text.'. '; } else { $info['cachesused'] = '0 / 0 / 0'; - $info['html'] .= 'Caches used (hits/misses/sets): 0/0/0'; + $info['html'] .= 'Caches used (hits/misses/sets): 0/0/0'; $info['txt'] .= 'Caches used (hits/misses/sets): 0/0/0 '; } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index b6ebf72769d..76be37be26a 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -143,6 +143,8 @@ class navigation_node implements renderable { public $includesectionnum = false; /** @var bool does the node need to be loaded via ajax */ public $requiresajaxloading = false; + /** @var bool If set to true this node will be added to the "flat" navigation */ + public $showinflatnavigation = false; /** * Constructs a new navigation_node @@ -236,6 +238,65 @@ class navigation_node implements renderable { return false; } + /** + * True if this nav node has siblings in the tree. + * + * @return bool + */ + public function has_siblings() { + if (empty($this->parent) || empty($this->parent->children)) { + return false; + } + if ($this->parent->children instanceof navigation_node_collection) { + $count = $this->parent->children->count(); + } else { + $count = count($this->parent->children); + } + return ($count > 1); + } + + /** + * Recursively walk the tree looking for a node with a valid action. + * Depth first search. + * + * @return bool + */ + public function resolve_action() { + if ($this->action) { + return $this->action; + } + if (!empty($this->children)) { + foreach ($this->children as $child) { + $action = $child->resolve_action(); + if (!empty($action)) { + return $action; + } + } + } + return false; + } + + /** + * Get a list of sibling navigation nodes at the same level as this one. + * + * @return bool|array of navigation_node + */ + public function get_siblings() { + // Returns a list of the siblings of the current node for display in a flat navigation element. Either + // the in-page links or the breadcrumb links. + $siblings = false; + + if ($this->has_siblings()) { + $siblings = []; + foreach ($this->parent->children as $child) { + if ($child->display) { + $siblings[] = $child; + } + } + } + return $siblings; + } + /** * This sets the URL that the URL of new nodes get compared to when locating * the active node. @@ -381,6 +442,27 @@ class navigation_node implements renderable { return $this->children->find($key, $type); } + /** + * Walk the tree building up a list of all the flat navigation nodes. + * + * @param flat_navigation $nodes List of the found flat navigation nodes. + * @param boolean $showdivider Show a divider before the first node. + */ + public function build_flat_navigation_list(flat_navigation $nodes, $showdivider = false) { + if ($this->showinflatnavigation) { + $indent = 0; + if ($this->type == self::TYPE_COURSE) { + $indent = 1; + } + $flat = new flat_navigation_node($this, $indent); + $flat->set_showdivider($showdivider); + $nodes->add($flat); + } + foreach ($this->children as $child) { + $child->build_flat_navigation_list($nodes, false); + } + } + /** * Get the child of this node that has the given key + (optional) type. * @@ -1053,6 +1135,7 @@ class global_navigation extends navigation_node { // Use the parents constructor.... good good reuse parent::__construct($properties); + $this->showinflatnavigation = true; // Initalise and set defaults $this->page = $page; @@ -1106,10 +1189,12 @@ class global_navigation extends navigation_node { // The home element should be my moodle because the root element is the site if (isloggedin() && !isguestuser()) { // Makes no sense if you aren't logged in $this->rootnodes['home'] = $this->add(get_string('myhome'), new moodle_url('/my/'), self::TYPE_SETTING, null, 'home'); + $this->rootnodes['home']->showinflatnavigation = true; } } else { // The home element should be the site because the root node is my moodle $this->rootnodes['home'] = $this->add(get_string('sitehome'), new moodle_url('/'), self::TYPE_SETTING, null, 'home'); + $this->rootnodes['home']->showinflatnavigation = true; if (!empty($CFG->defaulthomepage) && ($CFG->defaulthomepage == HOMEPAGE_MY)) { // We need to stop automatic redirection $this->rootnodes['home']->action->param('redirect', '0'); @@ -1128,15 +1213,18 @@ class global_navigation extends navigation_node { $this->load_course_sections($SITE, $this->rootnodes['site']); $course = $this->page->course; + $this->load_courses_enrolled(); // $issite gets set to true if the current pages course is the sites frontpage course $issite = ($this->page->course->id == $SITE->id); + // Determine if the user is enrolled in any course. $enrolledinanycourse = enrol_user_sees_own_courses(); $this->rootnodes['currentcourse']->mainnavonly = true; if ($enrolledinanycourse) { $this->rootnodes['mycourses']->isexpandable = true; + $this->rootnodes['mycourses']->showinflatnavigation = true; if ($CFG->navshowallcourses) { // When we show all courses we need to show both the my courses and the regular courses branch. $this->rootnodes['courses']->isexpandable = true; @@ -1147,13 +1235,8 @@ class global_navigation extends navigation_node { // Load the users enrolled courses if they are viewing the My Moodle page AND the admin has not // set that they wish to keep the My Courses branch collapsed by default. - if (!empty($CFG->navexpandmycourses) && $this->page->pagelayout === 'mydashboard'){ - $this->rootnodes['mycourses']->forceopen = true; - $this->load_courses_enrolled(); - } else { - $this->rootnodes['mycourses']->collapse = true; - $this->rootnodes['mycourses']->make_inactive(); - } + $this->rootnodes['mycourses']->forceopen = true; + $this->load_courses_enrolled(); $canviewcourseprofile = true; @@ -2304,7 +2387,7 @@ class global_navigation extends navigation_node { $usercoursenode = $userscoursesnode->add($usercourseshortname, new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $usercourse->id)), self::TYPE_CONTAINER); - $gradeavailable = has_capability('moodle/grade:viewall', $usercoursecontext); + $gradeavailable = has_capability('moodle/grade:view', $usercoursecontext); if (!$gradeavailable && !empty($usercourse->showgrades) && is_array($reports) && !empty($reports)) { foreach ($reports as $plugin => $plugindir) { if (has_capability('gradereport/'.$plugin.':view', $usercoursecontext)) { @@ -2428,6 +2511,14 @@ class global_navigation extends navigation_node { // This is the name that will be shown for the course. $coursename = empty($CFG->navshowfullcoursenames) ? $shortname : $fullname; + if ($coursetype == self::COURSE_CURRENT) { + if ($coursenode = $this->rootnodes['mycourses']->find($course->id, self::TYPE_COURSE)) { + return $coursenode; + } else { + $coursetype = self::COURSE_OTHER; + } + } + // Can the user expand the course to see its content. $canexpandcourse = true; if ($issite) { @@ -2468,6 +2559,7 @@ class global_navigation extends navigation_node { } $coursenode = $parent->add($coursename, $url, self::TYPE_COURSE, $shortname, $course->id); + $coursenode->showinflatnavigation = $coursetype == self::COURSE_MY; $coursenode->hidden = (!$course->visible); $coursenode->title(format_string($course->fullname, true, array('context' => $coursecontext, 'escape' => false))); if ($canexpandcourse) { @@ -2555,7 +2647,7 @@ class global_navigation extends navigation_node { return true; } - $navoptions = course_get_user_navigation_options($this->page->context); + $navoptions = course_get_user_navigation_options($this->page->context, $course); //Participants if ($navoptions->participants) { @@ -2582,11 +2674,21 @@ class global_navigation extends navigation_node { if ($navoptions->badges) { $url = new moodle_url('/badges/view.php', array('type' => 2, 'id' => $course->id)); - $coursenode->add(get_string('coursebadges', 'badges'), null, - navigation_node::TYPE_CONTAINER, null, 'coursebadges'); - $coursenode->get('coursebadges')->add(get_string('badgesview', 'badges'), $url, + $coursenode->add(get_string('coursebadges', 'badges'), $url, navigation_node::TYPE_SETTING, null, 'badgesview', - new pix_icon('i/badge', get_string('badgesview', 'badges'))); + new pix_icon('i/badge', get_string('coursebadges', 'badges'))); + } + + // Check access to the course and competencies page. + if ($navoptions->competencies) { + // Just a link to course competency. + $title = get_string('competencies', 'core_competency'); + $path = new moodle_url("/admin/tool/lp/coursecompetencies.php", array('courseid' => $course->id)); + $coursenode->add($title, $path, navigation_node::TYPE_SETTING, null, null, new pix_icon('i/competencies', '')); + } + if ($navoptions->grades) { + $url = new moodle_url('/grade/report/index.php', array('id'=>$course->id)); + $gradenode = $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, 'grades', new pix_icon('i/grades', '')); } return true; @@ -2603,7 +2705,7 @@ class global_navigation extends navigation_node { * @return bool True for successfull generation */ public function add_front_page_course_essentials(navigation_node $coursenode, stdClass $course) { - global $CFG; + global $CFG, $USER; require_once($CFG->dirroot . '/course/lib.php'); if ($coursenode == false || $coursenode->get('frontpageloaded', navigation_node::TYPE_CUSTOM)) { @@ -2657,7 +2759,18 @@ class global_navigation extends navigation_node { if ($navoptions->calendar) { // Calendar $calendarurl = new moodle_url('/calendar/view.php', array('view' => 'month')); - $coursenode->add(get_string('calendar', 'calendar'), $calendarurl, self::TYPE_CUSTOM, null, 'calendar'); + $node = $coursenode->add(get_string('calendar', 'calendar'), $calendarurl, self::TYPE_CUSTOM, null, 'calendar'); + $node->showinflatnavigation = true; + } + + if (isloggedin()) { + $usercontext = context_user::instance($USER->id); + if (has_capability('moodle/user:manageownfiles', $usercontext)) { + $url = new moodle_url('/user/files.php'); + $node = $coursenode->add(get_string('privatefiles'), $url, self::TYPE_SETTING); + $node->display = false; + $node->showinflatnavigation = true; + } } return true; @@ -3090,13 +3203,12 @@ class navbar extends navigation_node { public $includesettingsbase = false; /** @var breadcrumb_navigation_node[] $prependchildren */ protected $prependchildren = array(); + /** * The almighty constructor * * @param moodle_page $page */ - - public function __construct(moodle_page $page) { global $CFG; if (during_initial_install()) { @@ -3255,6 +3367,10 @@ class navbar extends navigation_node { $items = array_merge($items, array_reverse($this->prependchildren)); } + $last = reset($items); + if ($last) { + $last->set_last(true); + } $this->items = array_reverse($items); return $this->items; } @@ -3416,6 +3532,9 @@ class navbar extends navigation_node { */ class breadcrumb_navigation_node extends navigation_node { + /** @var $last boolean A flag indicating this is the last item in the list of breadcrumbs. */ + private $last = false; + /** * A proxy constructor * @@ -3436,6 +3555,184 @@ class breadcrumb_navigation_node extends navigation_node { } } + /** + * Getter for "last" + * @return boolean + */ + public function is_last() { + return $this->last; + } + + /** + * Setter for "last" + * @param $val boolean + */ + public function set_last($val) { + $this->last = $val; + } +} + +/** + * Subclass of navigation_node allowing different rendering for the flat navigation + * in particular allowing dividers and indents. + * + * @package core + * @category navigation + * @copyright 2016 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class flat_navigation_node extends navigation_node { + + /** @var $indent integer The indent level */ + private $indent = 0; + + /** @var $showdivider bool Show a divider before this element */ + private $showdivider = false; + + /** + * A proxy constructor + * + * @param mixed $navnode A navigation_node or an array + */ + public function __construct($navnode, $indent) { + if (is_array($navnode)) { + parent::__construct($navnode); + } else if ($navnode instanceof navigation_node) { + + // Just clone everything. + $objvalues = get_object_vars($navnode); + foreach ($objvalues as $key => $value) { + $this->$key = $value; + } + } else { + throw coding_exception('Not a valid flat_navigation_node'); + } + $this->indent = $indent; + } + + /** + * Does this node represent a course section link. + * @return boolean + */ + public function is_section() { + return $this->type == navigation_node::TYPE_SECTION; + } + + /** + * Getter for "showdivider" + * @return boolean + */ + public function showdivider() { + return $this->showdivider; + } + + /** + * Setter for "showdivider" + * @param $val boolean + */ + public function set_showdivider($val) { + $this->showdivider = $val; + } + + /** + * Getter for "indent" + * @return boolean + */ + public function get_indent() { + return $this->indent; + } + + /** + * Setter for "indent" + * @param $val boolean + */ + public function set_indent($val) { + $this->indent = $val; + } + +} + +/** + * Class used to generate a collection of navigation nodes most closely related + * to the current page. + * + * @package core + * @copyright 2016 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class flat_navigation extends navigation_node_collection { + /** @var moodle_page the moodle page that the navigation belongs to */ + protected $page; + + /** + * Constructor. + * + * @param moodle_page $page + */ + public function __construct(moodle_page &$page) { + if (during_initial_install()) { + return false; + } + $this->page = $page; + } + + /** + * Build the list of navigation nodes based on the current navigation and settings trees. + * + */ + public function initialise() { + global $PAGE, $USER, $OUTPUT, $CFG; + if (during_initial_install()) { + return; + } + + $current = false; + + $course = $PAGE->course; + + $this->page->navigation->initialise(); + + // First walk the nav tree looking for "flat_navigation" nodes. + if ($course->id > 1) { + // It's a real course. + $url = new moodle_url('/course/view.php', array('id' => $course->id)); + $flat = new flat_navigation_node(navigation_node::create($course->shortname, $url), 0); + $flat->key = 'coursehome'; + + $coursenode = $PAGE->navigation->find_active_node(); + while (!empty($coursenode) && ($coursenode->type != navigation_node::TYPE_COURSE)) { + $coursenode = $coursenode->parent; + } + // There is one very strange page in mod/feedback/view.php which thinks it is both site and course + // context at the same time. That page is broken but we need to handle it (hence the SITEID). + if ($coursenode && $coursenode->key != SITEID) { + $this->add($flat); + foreach ($coursenode->children as $child) { + if ($child->action) { + $flat = new flat_navigation_node($child, 0); + $this->add($flat); + } + } + } + + $this->page->navigation->build_flat_navigation_list($this, true); + } else { + $this->page->navigation->build_flat_navigation_list($this, false); + } + + $admin = $PAGE->settingsnav->find('siteadministration', navigation_node::TYPE_SITE_ADMIN); + if (!$admin) { + // Try again - crazy nav tree! + $admin = $PAGE->settingsnav->find('root', navigation_node::TYPE_SITE_ADMIN); + } + if ($admin) { + $flat = new flat_navigation_node($admin, 0); + $flat->set_showdivider(true); + $flat->key = 'sitesettings'; + $this->add($flat); + } + } + } /** @@ -3480,6 +3777,7 @@ class settings_navigation extends navigation_node { $this->cache = new navigation_cache(NAVIGATION_CACHE_NAME); $this->children = new navigation_node_collection(); } + /** * Initialise the settings navigation based on the current context * @@ -3561,7 +3859,7 @@ class settings_navigation extends navigation_node { $adminsettings->remove(); $adminsettings = false; } - $siteadminnode = $this->add(get_string('administrationsite'), new moodle_url('/admin'), self::TYPE_SITE_ADMIN, null, 'siteadministration'); + $siteadminnode = $this->add(get_string('administrationsite'), new moodle_url('/admin/search.php'), self::TYPE_SITE_ADMIN, null, 'siteadministration'); $siteadminnode->id = 'expandable_branch_'.$siteadminnode->type.'_'.clean_param($siteadminnode->key, PARAM_ALPHANUMEXT); $siteadminnode->requiresajaxloading = 'true'; } @@ -3681,7 +3979,7 @@ class settings_navigation extends navigation_node { // Disable the navigation from automatically finding the active node navigation_node::$autofindactive = false; - $referencebranch = $this->add(get_string('administrationsite'), null, self::TYPE_SITE_ADMIN, null, 'root'); + $referencebranch = $this->add(get_string('administrationsite'), '/admin/search.php', self::TYPE_SITE_ADMIN, null, 'root'); foreach ($adminroot->children as $adminbranch) { $this->load_administration_settings($referencebranch, $adminbranch); } @@ -3789,6 +4087,13 @@ class settings_navigation extends navigation_node { $coursenode->force_open(); } + + if ($adminoptions->update) { + // Add the course settings link + $url = new moodle_url('/course/edit.php', array('id'=>$course->id)); + $coursenode->add(get_string('editsettings'), $url, self::TYPE_SETTING, null, 'editsettings', new pix_icon('i/settings', '')); + } + if ($this->page->user_allowed_editing()) { // Add the turn on/off settings @@ -3813,9 +4118,6 @@ class settings_navigation extends navigation_node { } if ($adminoptions->update) { - // Add the course settings link - $url = new moodle_url('/course/edit.php', array('id'=>$course->id)); - $coursenode->add(get_string('editsettings'), $url, self::TYPE_SETTING, null, 'editsettings', new pix_icon('i/settings', '')); // Add the course completion settings link if ($CFG->enablecompletion && $course->enablecompletion) { @@ -3858,11 +4160,6 @@ class settings_navigation extends navigation_node { } } - if ($adminoptions->grades) { - $url = new moodle_url('/grade/report/index.php', array('id'=>$course->id)); - $gradenode = $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, 'grades', new pix_icon('i/grades', '')); - } - // Check if we can view the gradebook's setup page. if ($adminoptions->gradebook) { $url = new moodle_url('/grade/edit/tree/index.php', array('id' => $course->id)); @@ -3959,7 +4256,8 @@ class settings_navigation extends navigation_node { } } if (is_array($roles) && count($roles)>0) { - $switchroles = $this->add(get_string('switchroleto'), null, self::TYPE_CONTAINER, null, 'switchroleto'); + $url = new moodle_url('/course/switchrole.php', array('id'=>$course->id, 'switchrole'=>'-1', 'returnurl'=>$this->page->url->out_as_local_url(false))); + $switchroles = $coursenode->add(get_string('switchroleto'), $url, self::TYPE_CONTAINER, null, 'switchroleto'); if ((count($roles)==1 && array_key_exists(0, $roles))|| $assumedrole!==false) { $switchroles->force_open(); } @@ -4393,7 +4691,7 @@ class settings_navigation extends navigation_node { if (($currentuser || is_siteadmin($USER) || !is_siteadmin($user)) && has_capability('moodle/user:update', $systemcontext)) { $url = new moodle_url('/user/editadvanced.php', array('id'=>$user->id, 'course'=>$course->id)); - $useraccount->add(get_string('editmyprofile'), $url, self::TYPE_SETTING); + $useraccount->add(get_string('editmyprofile'), $url, self::TYPE_SETTING, null, 'editprofile'); } else if ((has_capability('moodle/user:editprofile', $usercontext) && !is_siteadmin($user)) || ($currentuser && has_capability('moodle/user:editownprofile', $systemcontext))) { if ($userauthplugin && $userauthplugin->can_edit_profile()) { @@ -4401,7 +4699,7 @@ class settings_navigation extends navigation_node { if (empty($url)) { $url = new moodle_url('/user/edit.php', array('id'=>$user->id, 'course'=>$course->id)); } - $useraccount->add(get_string('editmyprofile'), $url, self::TYPE_SETTING); + $useraccount->add(get_string('editmyprofile'), $url, self::TYPE_SETTING, null, 'editprofile'); } } } diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index edea6df9c58..157bb158d09 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -3905,6 +3905,15 @@ class action_menu implements renderable, templatable { $this->menutrigger = $trigger; } + /** + * Return true if there is at least one visible link in the menu. + * + * @return bool + */ + public function is_empty() { + return !count($this->primaryactions) && !count($this->secondaryactions); + } + /** * Initialises JS required fore the action menu. * The JS is only required once as it manages all action menu's on the page. diff --git a/lib/outputlib.php b/lib/outputlib.php index 726e99ff0ab..4f496f001da 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -344,6 +344,12 @@ class theme_config { */ public $doctype = 'html5'; + /** + * @var string undeletableblocktypes If set to a string, will list the block types that cannot be deleted. Defaults to + * navigation and settings. + */ + public $undeletableblocktypes = false; + //==Following properties are not configurable from theme config.php== /** @@ -524,7 +530,7 @@ class theme_config { $configurable = array( 'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets', 'javascripts', 'javascripts_footer', 'parents_exclude_javascripts', - 'layouts', 'enable_dock', 'enablecourseajax', + 'layouts', 'enable_dock', 'enablecourseajax', 'undeletableblocktypes', 'rendererfactory', 'csspostprocess', 'editor_sheets', 'rarrow', 'larrow', 'uarrow', 'darrow', 'hidefromselector', 'doctype', 'yuicssmodules', 'blockrtlmanipulations', 'lessfile', 'extralesscallback', 'lessvariablescallback', 'blockrendermethod', diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index c5d29ca21f9..c4d7bb8f466 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -4086,18 +4086,6 @@ EOD; return $html; } - /** - * Returns the header bar. - * - * @since Moodle 2.9 - * @param array $headerinfo An array of header information, dependant on what type of header is being displayed. The following - * array example is user specific. - * heading => Override the page heading. - * user => User object. - * usercontext => user context. - * @param int $headinglevel What level the 'h' tag will be. - * @return string HTML for the header bar. - */ public function context_header($headerinfo = null, $headinglevel = 1) { global $DB, $USER, $CFG; $context = $this->page->context; @@ -4390,6 +4378,18 @@ EOD; } } + /** + * Render the login signup form into a nice template for the theme. + * + * @param mform $form + * @return string + */ + public function render_login_signup_form($form) { + $context = $form->export_for_template($this); + + return $this->render_from_template('core/signup_form_layout', $context); + } + /** * Renders a progress bar. * diff --git a/lib/pagelib.php b/lib/pagelib.php index 061335d9d9e..df546f5aa7d 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -286,6 +286,11 @@ class moodle_page { */ protected $_settingsnav = null; + /** + * @var flat_navigation Contains a list of nav nodes, most closely related to the current page. + */ + protected $_flatnav = null; + /** * @var navbar Contains the navbar structure. */ @@ -726,6 +731,18 @@ class moodle_page { return $this->_settingsnav; } + /** + * Returns the flat navigation object + * @return flat_navigation + */ + protected function magic_get_flatnav() { + if ($this->_flatnav === null) { + $this->_flatnav = new flat_navigation($this); + $this->_flatnav->initialise(); + } + return $this->_flatnav; + } + /** * Returns request IP address. * diff --git a/lib/templates/settings_link_page.mustache b/lib/templates/settings_link_page.mustache new file mode 100644 index 00000000000..608e64939e3 --- /dev/null +++ b/lib/templates/settings_link_page.mustache @@ -0,0 +1,43 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see+diff --git a/lib/templates/settings_link_page_single.mustache b/lib/templates/settings_link_page_single.mustache new file mode 100644 index 00000000000..525e7bfb3bb --- /dev/null +++ b/lib/templates/settings_link_page_single.mustache @@ -0,0 +1,39 @@ +{{! + This file is part of Moodle - http://moodle.org/ + + Moodle is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Moodle is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Moodle. If not, see+++++++ {{#node}} + {{> core/settings_link_page_single }} + {{/node}} ++{{#str}}newaccount{{/str}}
+{{{formhtml}}} diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php index 45ac0d38580..15959a62948 100644 --- a/lib/tests/accesslib_test.php +++ b/lib/tests/accesslib_test.php @@ -2354,7 +2354,6 @@ class core_accesslib_testcase extends advanced_testcase { $context = context_course::instance($testcourses[2]); $children = $context->get_child_contexts(); - $this->assertCount(7, $children); // Depends on number of default blocks. $context = context_module::instance($testpages[3]); $children = $context->get_child_contexts(); @@ -2401,7 +2400,7 @@ class core_accesslib_testcase extends advanced_testcase { context_helper::reset_caches(); context_helper::preload_course($SITE->id); $numfrontpagemodules = $DB->count_records('course_modules', array('course' => $SITE->id)); - $this->assertEquals(6 + $numfrontpagemodules, context_inspection::test_context_cache_size()); // Depends on number of default blocks. + $this->assertEquals(3 + $numfrontpagemodules, context_inspection::test_context_cache_size()); // Depends on number of default blocks. // Test assign_capability(), unassign_capability() functions. diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php index 1455857d583..edc4cca71a1 100644 --- a/lib/tests/behat/behat_general.php +++ b/lib/tests/behat/behat_general.php @@ -86,6 +86,15 @@ class behat_general extends behat_base { $this->getSession()->visit($this->locate_path('/?redirect=0')); } + /** + * Opens course index page. + * + * @Given /^I am on course index$/ + */ + public function i_am_on_course_index() { + $this->getSession()->visit($this->locate_path('/course/index.php')); + } + /** * Reloads the current page. * diff --git a/lib/tests/behat/behat_permissions.php b/lib/tests/behat/behat_permissions.php index 67943bbf327..76cb49b54bc 100644 --- a/lib/tests/behat/behat_permissions.php +++ b/lib/tests/behat/behat_permissions.php @@ -82,7 +82,7 @@ class behat_permissions extends behat_base { ); if (!$this->running_javascript()) { - $this->execute("behat_forms::press_button", get_string('go')); + $this->execute("behat_general::i_click_on_in_the", [get_string('go'), 'button', 'region-main', 'region']); } $this->execute("behat_permissions::i_fill_the_capabilities_form_with_the_following_permissions", $table); diff --git a/lib/upgrade.txt b/lib/upgrade.txt index fed4655ef32..65dedb18e83 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -3,6 +3,7 @@ information provided here is intended especially for developers. === 3.2 === +* Admin setting "Show My courses expanded on Dashboard" has been removed. * MForms element 'submitlink' has been deprecated. * Node.js versions >=4 are now required to run grunt. * JQuery has been updated to 3.1.0. JQuery migrate plugins are no longer shipped - please read diff --git a/login/signup.php b/login/signup.php index 1e54597dbac..abe977e0e0b 100644 --- a/login/signup.php +++ b/login/signup.php @@ -87,10 +87,11 @@ $login = get_string('login'); $PAGE->navbar->add($login); $PAGE->navbar->add($newaccount); +$PAGE->set_pagelayout('login'); $PAGE->set_title($newaccount); $PAGE->set_heading($SITE->fullname); echo $OUTPUT->header(); -echo $OUTPUT->heading($newaccount); -$mform_signup->display(); + +echo $OUTPUT->render($mform_signup); echo $OUTPUT->footer(); diff --git a/login/signup_form.php b/login/signup_form.php index 185cb69ac66..07980d8bc0f 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -30,7 +30,7 @@ require_once($CFG->libdir.'/formslib.php'); require_once($CFG->dirroot.'/user/profile/lib.php'); require_once($CFG->dirroot . '/user/editlib.php'); -class login_signup_form extends moodleform { +class login_signup_form extends moodleform implements renderable, templatable { function definition() { global $USER, $CFG; @@ -142,4 +142,21 @@ class login_signup_form extends moodleform { return $errors; } + + /** + * Export this data so it can be used as the context for a mustache template. + * + * @param renderer_base $output Used to do a final render of any components that need to be rendered for export. + * @return array + */ + public function export_for_template(renderer_base $output) { + ob_start(); + $this->display(); + $formhtml = ob_get_contents(); + ob_end_clean(); + $context = [ + 'formhtml' => $formhtml + ]; + return $context; + } } diff --git a/login/tests/behat/change_password.feature b/login/tests/behat/change_password.feature index 93ffb843a82..0bddba3dd9f 100644 --- a/login/tests/behat/change_password.feature +++ b/login/tests/behat/change_password.feature @@ -20,7 +20,7 @@ Feature: Change password And I click on "Save changes" "button" Then I should see "Password has been changed" And I click on "Continue" "button" - And I should see "Preferences" in the "#region-main" "css_element" + And I should see "Preferences" in the "region-main" "region" And I log out And I follow "Log in" And I set the field "Username" to "testuser" diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature index 98c0a3aca45..aa068197c8c 100644 --- a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature +++ b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature @@ -26,6 +26,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading Then I should see "Changes saved" And I follow "Test ghostscript path" And I should see "The ghostscript path appears to be OK" + And I press "Continue" And I log out And I log in as "teacher1" And I follow "Course 1" diff --git a/mod/assign/feedback/file/tests/behat/feedback_file.feature b/mod/assign/feedback/file/tests/behat/feedback_file.feature index cdd2a026916..0cad53e21df 100644 --- a/mod/assign/feedback/file/tests/behat/feedback_file.feature +++ b/mod/assign/feedback/file/tests/behat/feedback_file.feature @@ -60,7 +60,7 @@ Feature: In an assignment, teacher can submit feedback files during grading Given I set the field "applytoall" to "0" And I press "Save changes" And I click on "Ok" "button" - And I follow "Course 1" + And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element" And I log out And I log in as "student1" And I follow "Course 1" @@ -76,7 +76,7 @@ Feature: In an assignment, teacher can submit feedback files during grading Scenario: A teacher can provide a feedback file when grading an assignment and all students in the group will receive the file. Given I press "Save changes" And I click on "Ok" "button" - And I follow "Course 1" + And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element" And I log out And I log in as "student1" And I follow "Course 1" @@ -86,4 +86,4 @@ Feature: In an assignment, teacher can submit feedback files during grading When I log in as "student2" And I follow "Course 1" And I follow "Test assignment name" - Then I should see "feedback.txt" \ No newline at end of file + Then I should see "feedback.txt" diff --git a/mod/assign/tests/behat/edit_student_submission.feature b/mod/assign/tests/behat/edit_student_submission.feature index f8527bdbc8b..0028337ceb6 100644 --- a/mod/assign/tests/behat/edit_student_submission.feature +++ b/mod/assign/tests/behat/edit_student_submission.feature @@ -38,14 +38,14 @@ Feature: In an assignment, the administrator can edit students' submissions And I follow "Test assignment name" And I follow "View all submissions" And I click on "Edit" "link" in the "Student 1" "table_row" - And I follow "Edit submission" + And I choose "Edit submission" in the open action menu And I set the following fields to these values: | Online text | Have you seen the movie Chef? | And I press "Save changes" And I follow "View all submissions" Then I should see "Have you seen the movie Chef?" And I click on "Edit" "link" in the "Student 1" "table_row" - And I follow "Edit submission" + And I choose "Edit submission" in the open action menu And I set the following fields to these values: | Online text | I have seen the movie chef. | And I press "Save changes" diff --git a/mod/assign/tests/behat/outcome_grading.feature b/mod/assign/tests/behat/outcome_grading.feature index 8dc65dbc037..a008b17879d 100644 --- a/mod/assign/tests/behat/outcome_grading.feature +++ b/mod/assign/tests/behat/outcome_grading.feature @@ -36,7 +36,7 @@ Feature: Outcome grading And I press "Save changes" And I am on site homepage And I follow "Course 1" - And I follow "Outcomes" + And I navigate to "Outcomes" node in "Course administration" And I set the field "Available standard outcomes" to "Outcome Test" And I click on "#add" "css_element" And I log out diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature index 85a6aefe596..854325e871a 100644 --- a/mod/assign/tests/behat/quickgrading.feature +++ b/mod/assign/tests/behat/quickgrading.feature @@ -65,7 +65,7 @@ Feature: In an assignment, teachers grade multiple students on one page | enableoutcomes | 1 | When I log in as "teacher1" And I follow "Course 1" - And I follow "Outcomes" + And I navigate to "Outcomes" node in "Course administration" And I follow "Edit outcomes" And I press "Add a new outcome" And I follow "Add a new scale" @@ -74,7 +74,7 @@ Feature: In an assignment, teachers grade multiple students on one page | Scale | Noob, Nub, 1337, HaXor | And I press "Save changes" And I follow "Course 1" - And I follow "Outcomes" + And I navigate to "Outcomes" node in "Course administration" And I follow "Edit outcomes" And I press "Add a new outcome" And I set the following fields to these values: @@ -133,7 +133,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I should see "I'm the teacher first feedback" And I should see "60.0" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" And I should see "1337" And I log out And I log in as "student2" @@ -142,7 +142,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I should not see "I'm the teacher first feedback" And I should not see "60.0" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" And I should not see "1337" And I log out And I log in as "teacher1" @@ -172,7 +172,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I should see "I'm the teacher first feedback" And I should see "60.0" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" And I should see "1337" And I log out And I log in as "student2" @@ -181,5 +181,5 @@ Feature: In an assignment, teachers grade multiple students on one page And I should not see "I'm the teacher first feedback" And I should not see "60.0" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" And I should not see "1337" diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature index 35d7967415b..548cf29bc36 100644 --- a/mod/assign/tests/behat/steps_blind_marking.feature +++ b/mod/assign/tests/behat/steps_blind_marking.feature @@ -80,7 +80,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I log out And I log in as "student1" And I follow "Course 1" - And I navigate to "Grades" node in "Course administration" + And I click on "Grades" "link" in the "Navigation" "block" And I set the field "Grade report" to "User report" Then I should see "50" And I should see "Great job! Lol, not really." @@ -108,7 +108,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I log out And I log in as "student1" And I follow "Course 1" - And I navigate to "Grades" node in "Course administration" + And I click on "Grades" "link" in the "Navigation" "block" And I set the field "Grade report" to "User report" Then I should see "50" And I should see "Great job! Lol, not really." diff --git a/mod/data/tests/behat/view_entries.feature b/mod/data/tests/behat/view_entries.feature index 92018305fe6..b8b5eabeaea 100644 --- a/mod/data/tests/behat/view_entries.feature +++ b/mod/data/tests/behat/view_entries.feature @@ -50,7 +50,7 @@ Feature: Users can view and search database entries And I follow "Next" And I should see "Teacher entry 2" And I should not see "Teacher entry 1" - And I follow "3" + And I click on "3" "link" in the "region-main" "region" And I should see "Teacher entry 3" And I should not see "Teacher entry 2" And I follow "Previous" diff --git a/mod/feedback/tests/behat/anonymous.feature b/mod/feedback/tests/behat/anonymous.feature index f18b618e426..70adbe3f840 100644 --- a/mod/feedback/tests/behat/anonymous.feature +++ b/mod/feedback/tests/behat/anonymous.feature @@ -28,8 +28,8 @@ Feature: Anonymous feedback | feedback | Course feedback | C1 | feedback1 | 1 | 1 | When I log in as "manager" And I am on site homepage - And I follow "Site feedback" - And I follow "Edit questions" + And I navigate to "Site feedback" node in "Site pages" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like our site? | | Label | multichoice2 | @@ -48,7 +48,7 @@ Feature: Anonymous feedback Scenario: Complete anonymous feedback on the front page as an authenticated user And I log in as "user1" And I am on site homepage - When I follow "Site feedback" + When I navigate to "Site feedback" node in "Site pages" And I follow "Preview" And I should see "Do you like our site?" And I press "Continue" @@ -69,7 +69,7 @@ Feature: Anonymous feedback And I log out And I log in as "user1" And I am on site homepage - When I follow "Site feedback" + When I navigate to "Site feedback" node in "Site pages" And I follow "Preview" And I should see "Do you like our site?" And I press "Continue" @@ -81,7 +81,7 @@ Feature: Anonymous feedback And I log out And I log in as "user2" And I am on site homepage - When I follow "Site feedback" + And I navigate to "Site feedback" node in "Site pages" And I follow "Preview" And I should see "Do you like our site?" And I press "Continue" @@ -100,7 +100,7 @@ Feature: Anonymous feedback And I log out And I log in as "manager" And I am on site homepage - And I follow "Site feedback" + And I navigate to "Site feedback" node in "Site pages" And I follow "Show responses" And I should not see "Username" And I should see "Anonymous entries (2)" @@ -165,7 +165,7 @@ Feature: Anonymous feedback And I should see "1 (50.00 %)" in the "No" "table_row" And I log in as "manager" And I am on site homepage - And I follow "Site feedback" + And I navigate to "Site feedback" node in "Site pages" And I follow "Show responses" And I should see "Anonymous entries (2)" And I follow "Response number: 1" @@ -178,7 +178,7 @@ Feature: Anonymous feedback When I log in as "teacher" And I follow "Course 1" And I follow "Course feedback" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like this course? | | Label | multichoice1 | @@ -236,7 +236,7 @@ Feature: Anonymous feedback And I should see "Response number: 2 (Anonymous)" And I should see "Prev" And I should not see "Next" - And I follow "Back" + And I click on "Back" "link" in the "[role=main]" "css_element" # Delete anonymous response And I click on "Delete entry" "link" in the "Response number: 1" "table_row" And I press "Yes" diff --git a/mod/feedback/tests/behat/coursemapping.feature b/mod/feedback/tests/behat/coursemapping.feature index 8943c07550b..fbb80664243 100644 --- a/mod/feedback/tests/behat/coursemapping.feature +++ b/mod/feedback/tests/behat/coursemapping.feature @@ -36,8 +36,8 @@ Feature: Mapping courses in a feedback | feedback | Another feedback | C1 | feedback1 | 1 | 1 | When I log in as "manager" And I am on site homepage - And I follow "Course feedback" - And I follow "Edit questions" + And I navigate to "Course feedback" node in "Site pages" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Information" question to the feedback with: | Question | this is an information question | | Label | info | @@ -77,7 +77,7 @@ Feature: Mapping courses in a feedback Scenario: Site feedback is not mapped to any course And I log in as "user1" And I am on site homepage - And I follow "Course feedback" + And I navigate to "Course feedback" node in "Site pages" And I follow "Answer the questions..." And I should see "Acceptance test site" in the ".feedback_form" "css_element" And I set the following fields to these values: @@ -112,7 +112,7 @@ Feature: Mapping courses in a feedback And I log out And I log in as "manager" And I am on site homepage - And I follow "Course feedback" + And I navigate to "Course feedback" node in "Site pages" And I follow "Analysis" And I should see "All courses" in the "#feedback_course_filter [data-fieldtype=autocomplete] .form-autocomplete-selection [role=listitem]" "css_element" @@ -124,7 +124,7 @@ Feature: Mapping courses in a feedback And I follow "Sort by course" And I should see "2.50" in the "C1" "table_row" And I should see "1.00" in the "Acceptance test site" "table_row" - And I follow "Back" + And I click on "Back" "link" in the "region-main" "region" And I set the field "Filter by course" to "Course 1" And I press "Filter" And I should see "Course 1" in the "#feedback_course_filter [data-fieldtype=autocomplete] .form-autocomplete-selection [role=listitem]" "css_element" @@ -138,7 +138,7 @@ Feature: Mapping courses in a feedback Scenario: Site feedback is mapped to courses And I log in as "manager" And I am on site homepage - And I follow "Course feedback" + And I navigate to "Course feedback" node in "Site pages" And I follow "Map feedback to courses" And I set the field "Courses" to "Course 2" And I set the field "Courses" to "Course 3" @@ -147,7 +147,7 @@ Feature: Mapping courses in a feedback And I log in as "user1" And I am on site homepage - And I follow "Course feedback" + And I navigate to "Course feedback" node in "Site pages" And I should see "You can only access this feedback from a course" And I should not see "Answer the questions..." @@ -196,7 +196,7 @@ Feature: Mapping courses in a feedback And I log out And I log in as "manager" And I am on site homepage - And I follow "Course feedback" + And I navigate to "Course feedback" node in "Site pages" And I follow "Analysis" And I should see "All courses" in the "#feedback_course_filter [data-fieldtype=autocomplete] .form-autocomplete-selection [role=listitem]" "css_element" And I show chart data for the "multichoicerated" feedback @@ -207,7 +207,7 @@ Feature: Mapping courses in a feedback And I click on "Sort by course" "link" And I should see "3.00" in the "C3" "table_row" And I should see "2.50" in the "C2" "table_row" - And I follow "Back" + And I click on "Back" "link" in the "region-main" "region" And I set the field "Filter by course" to "Course 2" And I press "Filter" And I show chart data for the "multichoicerated" feedback @@ -234,8 +234,9 @@ Feature: Mapping courses in a feedback Scenario: Site feedback deletion hides feedback block completely When I log in as "manager" And I am on site homepage - And I follow "Turn editing on" + And I turn editing mode on And I add the "Feedback" block + And I add the "Main menu" block And I click on "Delete" "link" in the "//*[contains(@class,'block_site_main_menu')]//li[contains(.,'Course feedback')]" "xpath_element" And I press "Yes" And I follow "Turn editing off" diff --git a/mod/feedback/tests/behat/export_import.feature b/mod/feedback/tests/behat/export_import.feature index 63484185bd5..9ad877a6129 100644 --- a/mod/feedback/tests/behat/export_import.feature +++ b/mod/feedback/tests/behat/export_import.feature @@ -24,7 +24,7 @@ Feature: Exporting and importing feedbacks When I log in as "teacher" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Information" question to the feedback with: | Question | this is an information question | | Label | info | @@ -76,7 +76,7 @@ Feature: Exporting and importing feedbacks When I log in as "teacher" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Numeric answer" question to the feedback with: | Question | Existing question | | Label | numeric | @@ -85,7 +85,7 @@ Feature: Exporting and importing feedbacks And I follow "Import questions" And I upload "mod/feedback/tests/fixtures/testexport.xml" file to "File" filemanager And I press "Yes" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" Then I should not see "Existing question" And I should see "this is an information question" And I should see "label text" @@ -103,7 +103,7 @@ Feature: Exporting and importing feedbacks When I log in as "teacher" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Numeric answer" question to the feedback with: | Question | Existing question | | Label | numeric | @@ -113,7 +113,7 @@ Feature: Exporting and importing feedbacks And I set the field "Append new items" to "1" And I upload "mod/feedback/tests/fixtures/testexport.xml" file to "File" filemanager And I press "Yes" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" Then I should see "Existing question" And "Existing question" "text" should appear before "this is an information question" "text" And I should see "this is an information question" diff --git a/mod/feedback/tests/behat/groups.feature b/mod/feedback/tests/behat/groups.feature index 181188d6cbe..359e17fc989 100644 --- a/mod/feedback/tests/behat/groups.feature +++ b/mod/feedback/tests/behat/groups.feature @@ -52,8 +52,8 @@ Feature: Feedbacks in courses with groups | feedback | Course anon feedback | C1 | feedback2 | 1 | 1 | 1 | When I log in as "manager" And I am on site homepage - And I follow "Site feedback" - And I follow "Edit questions" + And I navigate to "Site feedback" node in "Site pages" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like our site? | | Label | multichoice2 | @@ -67,7 +67,7 @@ Feature: Feedbacks in courses with groups When I log in as "teacher" And I follow "Course 1" And I follow "Course feedback" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like this course? | | Label | multichoice1 | @@ -170,7 +170,7 @@ Feature: Feedbacks in courses with groups When I log in as "teacher" And I follow "Course 1" And I follow "Course anon feedback" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like this course? | | Label | multichoice1 | diff --git a/mod/feedback/tests/behat/multichoice.feature b/mod/feedback/tests/behat/multichoice.feature index dc20d35562d..3468d1bbcc5 100644 --- a/mod/feedback/tests/behat/multichoice.feature +++ b/mod/feedback/tests/behat/multichoice.feature @@ -24,7 +24,7 @@ Feature: Testing multichoice questions in feedback And I log in as "teacher1" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" @javascript Scenario: Non-rated single-answer multiple choice questions in feedback @@ -157,7 +157,7 @@ Feature: Testing multichoice questions in feedback And I should not see "%" in the "option h" "table_row" And I should see "1 (100.00 %)" in the "option i" "table_row" # Change the settings so we don't analyse empty submits - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element" And I choose "Edit question" in the open action menu And I set the field "Do not analyse empty submits" to "Yes" @@ -301,7 +301,7 @@ Feature: Testing multichoice questions in feedback And I should not see "%" in the "option h" "table_row" And I should see "1 (100.00 %)" in the "option i" "table_row" # Change the settings so we don't analyse empty submits - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element" And I choose "Edit question" in the open action menu And I set the field "Do not analyse empty submits" to "Yes" @@ -424,7 +424,7 @@ Feature: Testing multichoice questions in feedback And I should not see "%" in the "option h" "table_row" And I should see "1 (100.00 %)" in the "option i" "table_row" # Change the settings so we don't analyse empty submits - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element" And I choose "Edit question" in the open action menu And I set the field "Do not analyse empty submits" to "Yes" diff --git a/mod/feedback/tests/behat/non_anonymous.feature b/mod/feedback/tests/behat/non_anonymous.feature index f657f773109..98419388450 100644 --- a/mod/feedback/tests/behat/non_anonymous.feature +++ b/mod/feedback/tests/behat/non_anonymous.feature @@ -28,8 +28,8 @@ Feature: Non anonymous feedback | feedback | Course feedback | C1 | feedback1 | 2 | 1 | When I log in as "manager" And I am on site homepage - And I follow "Site feedback" - And I follow "Edit questions" + And I navigate to "Site feedback" node in "Site pages" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like our site? | | Label | multichoice2 | @@ -48,7 +48,7 @@ Feature: Non anonymous feedback Scenario: Complete non anonymous feedback on the front page as an authenticated user And I log in as "user1" And I am on site homepage - When I follow "Site feedback" + And I navigate to "Site feedback" node in "Site pages" And I follow "Preview" And I should see "Do you like our site?" And I press "Continue" @@ -69,7 +69,7 @@ Feature: Non anonymous feedback And I log out And I log in as "user1" And I am on site homepage - When I follow "Site feedback" + When I navigate to "Site feedback" node in "Site pages" And I follow "Answer the questions..." And I should see "Do you like our site?" And I set the following fields to these values: @@ -78,7 +78,7 @@ Feature: Non anonymous feedback And I log out And I log in as "user2" And I am on site homepage - When I follow "Site feedback" + When I navigate to "Site feedback" node in "Site pages" And I follow "Answer the questions..." And I set the following fields to these values: | Not at all | 1 | @@ -95,7 +95,7 @@ Feature: Non anonymous feedback And I log out And I log in as "manager" And I am on site homepage - And I follow "Site feedback" + And I navigate to "Site feedback" node in "Site pages" And I follow "Show responses" And I should see "Username" And I should see "Non anonymous entries (2)" @@ -111,7 +111,7 @@ Feature: Non anonymous feedback When I log in as "teacher" And I follow "Course 1" And I follow "Course feedback" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | Do you like this course? | | Label | multichoice1 | @@ -163,7 +163,7 @@ Feature: Non anonymous feedback And I should see "(Username 2)" And I should not see "Next" And I should see "Prev" - And I follow "Back" + And I click on "Back" "link" in the "region-main" "region" # Delete non anonymous response And I click on "Delete entry" "link" in the "Username 1" "table_row" And I press "Yes" diff --git a/mod/feedback/tests/behat/question_types.feature b/mod/feedback/tests/behat/question_types.feature index 1fddcc3e1c0..96206aa6dc1 100644 --- a/mod/feedback/tests/behat/question_types.feature +++ b/mod/feedback/tests/behat/question_types.feature @@ -25,7 +25,7 @@ Feature: Test creating different types of feedback questions for anonymous feedb When I log in as "teacher1" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Information" question to the feedback with: | Question | this is an information question | | Label | info | diff --git a/mod/feedback/tests/behat/question_types_non_anon.feature b/mod/feedback/tests/behat/question_types_non_anon.feature index 834a146af92..51d2ef2ac9d 100644 --- a/mod/feedback/tests/behat/question_types_non_anon.feature +++ b/mod/feedback/tests/behat/question_types_non_anon.feature @@ -25,7 +25,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f When I log in as "teacher1" And I follow "Course 1" And I follow "Learning experience" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Information" question to the feedback with: | Question | this is an information question | | Label | info | diff --git a/mod/feedback/tests/behat/show_nonrespondents.feature b/mod/feedback/tests/behat/show_nonrespondents.feature index 73b40cb4308..1d3d63779cb 100644 --- a/mod/feedback/tests/behat/show_nonrespondents.feature +++ b/mod/feedback/tests/behat/show_nonrespondents.feature @@ -46,7 +46,7 @@ Feature: Show users who have not responded to the feedback survey | Record user names | User's name will be logged and shown with answers | | Access restrictions | Grouping: GX1 | And I follow "Frogs" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I set the field "Add question" to "Short text answer" And I set the following fields to these values: | Question | Y/N? | diff --git a/mod/feedback/tests/behat/templates.feature b/mod/feedback/tests/behat/templates.feature index dbf7e1d467b..ae65cf53868 100644 --- a/mod/feedback/tests/behat/templates.feature +++ b/mod/feedback/tests/behat/templates.feature @@ -28,7 +28,7 @@ Feature: Saving, using and deleting feedback templates And I log in as "teacher" And I follow "Course 1" And I follow "Learning experience course 1" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | this is a multiple choice 1 | | Label | multichoice1 | @@ -84,7 +84,7 @@ Feature: Saving, using and deleting feedback templates # Add questions to another feedback And I follow "Course 1" And I follow "Another feedback in course 1" - And I follow "Edit questions" + And I click on "Edit questions" "link" in the "[role=main]" "css_element" And I add a "Multiple choice" question to the feedback with: | Question | What is your favourite subject | | Label | subjectchoice | @@ -169,7 +169,7 @@ Feature: Saving, using and deleting feedback templates And I am on site homepage And I follow "Course 1" And I follow "Learning experience course 1" - And I follow "Templates" + And I click on "Templates" "link" in the "[role=main]" "css_element" And I set the field "Name" to "My public template" And I set the field "Public" to "1" And I press "Save as new template" diff --git a/mod/forum/tests/behat/advanced_search.feature b/mod/forum/tests/behat/advanced_search.feature index e38968ee16c..03c5e10fd85 100644 --- a/mod/forum/tests/behat/advanced_search.feature +++ b/mod/forum/tests/behat/advanced_search.feature @@ -20,6 +20,8 @@ Feature: The forum search allows users to perform advanced searches for forum po | student1 | C1 | student | And I log in as "teacher1" And I follow "Course 1" + And I turn editing mode on + And I add the "Latest announcements" block And I navigate to "Edit settings" node in "Course administration" And I set the field "id_newsitems" to "1" And I press "Save and display" diff --git a/mod/forum/tests/behat/edit_post_student.feature b/mod/forum/tests/behat/edit_post_student.feature index 8f42c7fb1eb..d73f74b0982 100644 --- a/mod/forum/tests/behat/edit_post_student.feature +++ b/mod/forum/tests/behat/edit_post_student.feature @@ -52,6 +52,7 @@ Feature: Students can edit or delete their forum posts within a set time limit And I am on site homepage And I follow "Course 1" And I turn editing mode on + And I add the "Recent activity" block And I add a "Forum" to section "1" and I fill the form with: | Forum name | Test forum name | | Forum type | Standard forum for general use | diff --git a/mod/lesson/tests/behat/duplicate_lesson_page.feature b/mod/lesson/tests/behat/duplicate_lesson_page.feature index 5f7774c3158..779de6d7d9d 100644 --- a/mod/lesson/tests/behat/duplicate_lesson_page.feature +++ b/mod/lesson/tests/behat/duplicate_lesson_page.feature @@ -40,9 +40,9 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page | id_jumpto_1 | Previous page | # Atto needs focus to add image, select empty p tag to do so. And I select the text in the "id_contents_editor" Atto editor - And I click on "Image" "button" in the "#fitem_id_contents_editor" "css_element" + And I click on "Image" "button" in the "[data-fieldtype=editor]" "css_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the logo" @@ -76,9 +76,9 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page | id_score_1 | 0 | # Atto needs focus to add image, select empty p tag to do so. And I select the text in the "id_answer_editor_0" Atto editor - And I click on "Image" "button" in the "#fitem_id_answer_editor_0" "css_element" + And I click on "Image" "button" in the "//*[@id='id_answer_editor_0']/ancestor::*[@data-fieldtype='editor']" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the logo" @@ -113,9 +113,9 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page | id_score_1 | 0 | # Atto needs focus to add image, select empty p tag to do so. And I select the text in the "id_response_editor_0" Atto editor - And I click on "Image" "button" in the "#fitem_id_response_editor_0" "css_element" + And I click on "Image" "button" in the "//*[@id='id_response_editor_0']/ancestor::*[@data-fieldtype='editor']" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the logo" diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature index 78f4a862083..868c078e1e3 100644 --- a/mod/lesson/tests/behat/lesson_group_override.feature +++ b/mod/lesson/tests/behat/lesson_group_override.feature @@ -64,7 +64,7 @@ Feature: Lesson user override | deadline[minute] | 00 | And I press "Save" And I should see "Wednesday, 1 January 2020, 8:00" - Then I click on "Edit" "link" + Then I click on "Edit" "link" in the "region-main" "region" And I set the following fields to these values: | deadline[year] | 2030 | And I press "Save" diff --git a/mod/lesson/tests/behat/lesson_practice.feature b/mod/lesson/tests/behat/lesson_practice.feature index 65eeb3d6fb3..49900ff0a38 100644 --- a/mod/lesson/tests/behat/lesson_practice.feature +++ b/mod/lesson/tests/behat/lesson_practice.feature @@ -71,7 +71,7 @@ Feature: Practice mode in a lesson activity And I press "Submit" Then I should not see "View grades" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "Course 1" "table_row" And I should not see "Practice lesson" Scenario: Practice lesson with scale doesn't record grades in the gradebook @@ -92,5 +92,5 @@ Feature: Practice mode in a lesson activity And I press "Submit" Then I should not see "View grades" And I follow "Grades" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "Course 1" "table_row" And I should not see "Practice lesson with scale" diff --git a/mod/lesson/tests/behat/lesson_user_override.feature b/mod/lesson/tests/behat/lesson_user_override.feature index 6cd33ce59af..90eb263e6f8 100644 --- a/mod/lesson/tests/behat/lesson_user_override.feature +++ b/mod/lesson/tests/behat/lesson_user_override.feature @@ -57,7 +57,7 @@ Feature: Lesson user override | deadline[minute] | 00 | And I press "Save" And I should see "Wednesday, 1 January 2020, 8:00" - Then I click on "Edit" "link" + Then I click on "Edit" "link" in the "Sam1 Student1" "table_row" And I set the following fields to these values: | deadline[year] | 2030 | And I press "Save" diff --git a/mod/lesson/tests/behat/questions_images.feature b/mod/lesson/tests/behat/questions_images.feature index c83a7c529a1..630ee850a78 100644 --- a/mod/lesson/tests/behat/questions_images.feature +++ b/mod/lesson/tests/behat/questions_images.feature @@ -49,7 +49,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ And I select the text in the "id_answer_editor_2" Atto editor And I click on "Image" "button" in the "//*[@data-fieldtype='editor']/*[descendant::*[@id='id_answer_editor_2']]" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the logo" @@ -71,7 +71,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ And I select the text in the "id_response_editor_0" Atto editor And I click on "Image" "button" in the "//*[@data-fieldtype='editor']/*[descendant::*[@id='id_response_editor_0']]" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodle_logo.jpg" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "It's the logo" diff --git a/mod/quiz/tests/behat/editing_repaginate.feature b/mod/quiz/tests/behat/editing_repaginate.feature index 2d7b438e847..c86865434ce 100644 --- a/mod/quiz/tests/behat/editing_repaginate.feature +++ b/mod/quiz/tests/behat/editing_repaginate.feature @@ -30,7 +30,7 @@ Feature: Edit quiz page - pagination Then I should see "Editing quiz: Quiz 1" # Add the first Essay question. - And I follow "Add" + And I click on "Add" "link" in the "region-main" "region" And I follow "a new question" And I set the field "item_qtype_essay" to "1" And I press "submitbutton" @@ -42,7 +42,7 @@ Feature: Edit quiz page - pagination And I should see "Essay 01 new" on quiz page "1" # Add the second Essay question. - And I follow "Add" + And I click on "Add" "link" in the "region-main" "region" And I follow "a new question" And I set the field "item_qtype_essay" to "1" And I press "submitbutton" @@ -67,7 +67,7 @@ Feature: Edit quiz page - pagination And I should not see "Page 2" # Add the third Essay question. - And I follow "Add" + And I click on "Add" "link" in the "region-main" "region" And I follow "a new question" And I set the field "item_qtype_essay" to "1" And I press "submitbutton" diff --git a/mod/quiz/tests/behat/settings_form_fields_disableif.feature b/mod/quiz/tests/behat/settings_form_fields_disableif.feature index 587e84b7809..431a0fc5e38 100644 --- a/mod/quiz/tests/behat/settings_form_fields_disableif.feature +++ b/mod/quiz/tests/behat/settings_form_fields_disableif.feature @@ -68,7 +68,7 @@ Feature: Settings form fields disabled if not required When I press "Save and display" And I navigate to "User overrides" node in "Quiz administration" - And I follow "Edit" + And I click on "Edit" "link" in the "region-main" "region" And I set the field "Attempts allowed" to "2" And I press "Save" And I navigate to "Edit settings" node in "Quiz administration" diff --git a/mod/wiki/tests/behat/page_history.feature b/mod/wiki/tests/behat/page_history.feature index 49ac414288c..49b38d8de72 100644 --- a/mod/wiki/tests/behat/page_history.feature +++ b/mod/wiki/tests/behat/page_history.feature @@ -61,7 +61,7 @@ Feature: A history of each wiki page is available And I follow "History" And I click on "3" "link" in the "Student 2" "table_row" And I should see "Third edition" - And I should see "Student 2" in the "#region-main" "css_element" + And I should see "Student 2" in the "region-main" "region" And I follow "History" And I click on "comparewith" "radio" in the "Student 1" "table_row" And I click on "compare" "radio" in the "Teacher 1" "table_row" diff --git a/mod/workshop/tests/behat/embedded_images.feature b/mod/workshop/tests/behat/embedded_images.feature index 03f298aa278..29fa1d2f4dd 100644 --- a/mod/workshop/tests/behat/embedded_images.feature +++ b/mod/workshop/tests/behat/embedded_images.feature @@ -31,9 +31,9 @@ Feature: Teachers can embed images into instructions and conclusion fields And I expand all fieldsets And I set the field "Instructions for submission" to "Image test
" And I select the text in the "Instructions for submission" Atto editor - And I click on "Image" "button" in the "#fitem_id_instructauthorseditor" "css_element" + And I click on "Image" "button" in the "//*[@data-fieldtype='editor']/*[descendant::*[@id='id_instructauthorseditor']]" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "How to submit" @@ -44,9 +44,9 @@ Feature: Teachers can embed images into instructions and conclusion fields And I expand all fieldsets And I set the field "Instructions for assessment" to "Image test
" And I select the text in the "Instructions for assessment" Atto editor - And I click on "Image" "button" in the "#fitem_id_instructreviewerseditor" "css_element" + And I click on "Image" "button" in the "//*[@data-fieldtype='editor']/*[descendant::*[@id='id_instructreviewerseditor']]" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "How to assess" @@ -57,9 +57,9 @@ Feature: Teachers can embed images into instructions and conclusion fields And I expand all fieldsets And I set the field "Conclusion" to "Image test
" And I select the text in the "Conclusion" Atto editor - And I click on "Image" "button" in the "#fitem_id_conclusioneditor" "css_element" + And I click on "Image" "button" in the "//*[@data-fieldtype='editor']/*[descendant::*[@id='id_conclusioneditor']]" "xpath_element" And I click on "Browse repositories..." "button" - And I click on "Private files" "link" + And I click on "Private files" "link" in the ".fp-repo-area" "css_element" And I click on "moodlelogo.png" "link" And I click on "Select this file" "button" And I set the field "Describe this image for someone who cannot see it" to "Well done" diff --git a/notes/index.php b/notes/index.php index 6ba0099c6ef..8bff3392321 100644 --- a/notes/index.php +++ b/notes/index.php @@ -103,11 +103,6 @@ if ($userid && $course->id == SITEID) { $PAGE->navbar->add(get_string('notes', 'notes'), $notesurl); } else if ($course->id != SITEID) { $notenode = $PAGE->navigation->find('currentcoursenotes', null)->make_inactive(); - $participantsurl = new moodle_url('/user/view.php', array('id' => $userid, 'course' => $course->id)); - $currentcoursenode = $PAGE->navigation->find('currentcourse', null); - $participantsnode = $currentcoursenode->find('participants', null); - $usernode = $participantsnode->add(fullname($user), $participantsurl); - $usernode->make_active(); $notesurl = new moodle_url('/notes/index.php', array('user' => $userid, 'course' => $courseid)); $PAGE->navbar->add(get_string('notes', 'notes'), $notesurl); diff --git a/report/log/tests/behat/filter_log.feature b/report/log/tests/behat/filter_log.feature index 623ce581a05..96d25f44fca 100644 --- a/report/log/tests/behat/filter_log.feature +++ b/report/log/tests/behat/filter_log.feature @@ -25,7 +25,7 @@ Feature: In a report, admin can filter log data | loglegacy | 1 | logstore_legacy | And I follow "Home" And I follow "Course 1" - And I navigate to "Participants" node in "Current course > C1" + And I navigate to "Participants" node in "My courses > C1" And I follow "Student 1" And I click on "Log in as" "link" And I press "Continue" @@ -45,7 +45,7 @@ Feature: In a report, admin can filter log data @javascript Scenario: Filter log report for standard log reader Given I follow "Course 1" - And I navigate to "Participants" node in "Current course > C1" + And I navigate to "Participants" node in "My courses > C1" And I follow "Student 1" And I click on "Log in as" "link" And I press "Continue" diff --git a/report/log/tests/behat/user_log.feature b/report/log/tests/behat/user_log.feature index d8be3c70fe5..354c94af047 100644 --- a/report/log/tests/behat/user_log.feature +++ b/report/log/tests/behat/user_log.feature @@ -38,7 +38,7 @@ Feature: User can view activity log. Scenario: View Todays' and all log report for user Given I log in as "teacher1" And I follow "Course 1" - And I navigate to "Participants" node in "Current course > C1" + And I navigate to "Participants" node in "My courses > C1" And I follow "Student 1" When I follow "Today's logs" And I should see "Assignment: Test assignment name" @@ -54,7 +54,7 @@ Feature: User can view activity log. And I log out And I log in as "teacher1" And I follow "Course 1" - And I navigate to "Participants" node in "Current course > C1" + And I navigate to "Participants" node in "My courses > C1" And I follow "Student 1" When I follow "Today's logs" And I should see "No log reader enabled" diff --git a/report/outline/tests/behat/user.feature b/report/outline/tests/behat/user.feature index b27700ea5e6..98ade5ea365 100644 --- a/report/outline/tests/behat/user.feature +++ b/report/outline/tests/behat/user.feature @@ -48,12 +48,12 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" And I follow "Complete report" And I should see "4 views" And I should see "3 views" @@ -76,12 +76,12 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" When I follow "Complete report" And I should see "4 views" And I should see "3 views" @@ -106,12 +106,12 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" And I follow "Profile" in the user menu - And I follow "Course 1" + And I click on "Course 1" "link" in the "region-main" "region" When I follow "Complete report" And I should see "4 views" And I should see "3 views" diff --git a/tag/tests/behat/collections.feature b/tag/tests/behat/collections.feature index ad3dd6994e4..0622be17da4 100644 --- a/tag/tests/behat/collections.feature +++ b/tag/tests/behat/collections.feature @@ -86,7 +86,7 @@ Feature: Managers can create and manage tag collections Scenario: Moving tags when changing tag collections And I follow "Preferences" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I expand all fieldsets And I set the field "List of interests" to "Swimming, Tag0, Tag3" And I press "Update profile" diff --git a/tag/tests/behat/standard_tags.feature b/tag/tests/behat/standard_tags.feature index ab40ffd8ba8..465c8ed1818 100644 --- a/tag/tests/behat/standard_tags.feature +++ b/tag/tests/behat/standard_tags.feature @@ -90,7 +90,7 @@ Feature: Manager can add standard tags and change the tag type of existing tags Scenario: Changing standard tags property of tag area When I log in as "manager1" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I expand all fieldsets And I should not see "Manage standard tags" And I set the following fields to these values: @@ -101,7 +101,7 @@ Feature: Manager can add standard tags and change the tag type of existing tags And the field "Change showing standard tags in area User interests" matches value "Don't suggest" And I set the field "Change showing standard tags in area User interests" to "Suggest" And I follow "Profile" in the user menu - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I expand all fieldsets And I should see "Manage standard tags" And I navigate to "Manage tags" node in "Site administration > Appearance" @@ -111,7 +111,7 @@ Feature: Manager can add standard tags and change the tag type of existing tags And I follow "Profile" in the user menu And I should see "Tag3" And I should see "Tag2" - And I follow "Edit profile" + And I click on "Edit profile" "link" in the "region-main" "region" And I expand all fieldsets And I should see "Manage standard tags" And I press "Update profile" diff --git a/theme/boost/amd/build/blocks_drawer.min.js b/theme/boost/amd/build/blocks_drawer.min.js new file mode 100644 index 00000000000..6abe8582ffc --- /dev/null +++ b/theme/boost/amd/build/blocks_drawer.min.js @@ -0,0 +1 @@ +define(["jquery","core/custom_interaction_events","core/notification"],function(a,b,c){var d={CONTAINER_REGION:'[data-region="blocks-drawer"]',TOGGLE_REGION:'[data-region="blocks-drawer-toggle"]',TOGGLE_ACTION:'[data-action="toggle-blocks-drawer"]',BODY:"body"},e=function(){a(d.CONTAINER_REGION).length||c.exception({message:"Page is missing a blocks drawer region"}),a(d.TOGGLE_REGION).length||c.exception({message:"Page is missing a blocks drawer toggle region"}),a(d.TOGGLE_ACTION).length||c.exception({message:"Page is missing a blocks drawer toggle link"});var b=a(d.CONTAINER_REGION),e=a(d.TOGGLE_REGION),f="true"==b.attr("aria-hidden"),g=a(d.BODY);f?(b.addClass("closed"),e.addClass("closed"),b.attr("aria-hidden","true")):(g.addClass("blocks-drawer-open"),b.attr("aria-hidden","false")),this.registerEventListeners()};return e.prototype.toggleBlocksDrawer=function(){var b=a(d.CONTAINER_REGION),c=a(d.TOGGLE_REGION),e=a(d.BODY);e.addClass("blocks-drawer-ease");var f="true"==b.attr("aria-hidden");f?(b.removeClass("closed"),c.removeClass("closed"),b.attr("aria-hidden","false"),e.addClass("blocks-drawer-open"),M.util.set_user_preference("blocks-drawer-open","true")):(b.addClass("closed"),c.addClass("closed"),e.removeClass("blocks-drawer-open"),b.attr("aria-hidden","true"),M.util.set_user_preference("blocks-drawer-open","false"))},e.prototype.registerEventListeners=function(){var c=a(d.TOGGLE_ACTION);b.define(c,[b.events.activate]),c.on(b.events.activate,function(a,b){this.toggleBlocksDrawer(),b.originalEvent.preventDefault()}.bind(this))},{init:function(){return new e}}}); \ No newline at end of file diff --git a/theme/boost/amd/build/drawer.min.js b/theme/boost/amd/build/drawer.min.js new file mode 100644 index 00000000000..919a930e0a2 --- /dev/null +++ b/theme/boost/amd/build/drawer.min.js @@ -0,0 +1 @@ +define(["jquery","core/custom_interaction_events","core/log"],function(a,b,c){var d={TOGGLE_REGION:'[data-region="drawer-toggle"]',TOGGLE_ACTION:'[data-action="toggle-drawer"]',TOGGLE_TARGET:"aria-controls",TOGGLE_SIDE:"left",BODY:"body"},e=function(){a(d.TOGGLE_REGION).length||c.debug("Page is missing a drawer region"),a(d.TOGGLE_ACTION).length||c.debug("Page is missing a drawer toggle link"),a(d.TOGGLE_REGION).each(function(b,c){var e=a(c).find(d.TOGGLE_ACTION),f=e.attr("aria-controls"),g=a(document.getElementById(f)),h="false"==e.attr("aria-expanded"),i=e.attr("data-side"),j=a(d.BODY);g.on("mousewheel DOMMouseScroll",this.preventPageScroll),h?e.attr("aria-expanded","false"):(j.addClass("drawer-open-"+i),e.attr("aria-expanded","true"))}.bind(this)),this.registerEventListeners()};return e.prototype.closeAll=function(){a(d.TOGGLE_REGION).each(function(b,c){var e=a(c).find(d.TOGGLE_ACTION),f=e.attr("data-side"),g=a(d.BODY),h=e.attr("aria-controls"),i=a(document.getElementById(h)),j=e.attr("data-preference");e.attr("aria-expanded","false"),g.removeClass("drawer-open-"+f),i.attr("aria-hidden","true"),i.addClass("closed"),M.util.set_user_preference(j,"false")}.bind(this))},e.prototype.toggleDrawer=function(b){var c=a(b.target).closest("[data-action=toggle-drawer]"),e=c.attr("aria-controls"),f=a(document.getElementById(e)),g=a(d.BODY),h=c.attr("data-side"),i=c.attr("data-preference");g.addClass("drawer-ease");var j="true"==c.attr("aria-expanded");if(j)g.removeClass("drawer-open-"+h),c.attr("aria-expanded","false"),f.attr("aria-hidden","true"),f.addClass("closed"),M.util.set_user_preference(i,"false");else{var k=a(document).width()<512;k&&this.closeAll(),c.attr("aria-expanded","true"),f.attr("aria-hidden","false"),g.addClass("drawer-open-"+h),f.removeClass("closed"),M.util.set_user_preference(i,"true")}},e.prototype.preventPageScroll=function(b){var c=b.wheelDelta||b.originalEvent&&b.originalEvent.wheelDelta||-b.originalEvent.detail,d=this.scrollTop+a(this).outerHeight()-this.scrollHeight>=0,e=this.scrollTop<=0;(c<0&&d||c>0&&e)&&b.preventDefault()},e.prototype.registerEventListeners=function(){a(d.TOGGLE_ACTION).each(function(c,d){b.define(a(d),[b.events.activate]),a(d).on(b.events.activate,function(a,b){this.toggleDrawer(b.originalEvent),b.originalEvent.preventDefault()}.bind(this))}.bind(this))},{init:function(){return new e}}}); \ No newline at end of file diff --git a/theme/boost/amd/src/drawer.js b/theme/boost/amd/src/drawer.js new file mode 100644 index 00000000000..ce208babb85 --- /dev/null +++ b/theme/boost/amd/src/drawer.js @@ -0,0 +1,159 @@ +// This file is part of Moodle - http://moodle.org/ +// +// Moodle is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Moodle is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see+ {{{ sidepreblocks }}} +diff --git a/theme/boost/templates/columns1.mustache b/theme/boost/templates/columns1.mustache index 67dbd8a1acc..6f0f9305a28 100644 --- a/theme/boost/templates/columns1.mustache +++ b/theme/boost/templates/columns1.mustache @@ -7,46 +7,30 @@ - +{{{ output.standard_top_of_body_html }}} - {{>theme_boost/header}} - -- {{{ output.full_header }}} - +- - +{{{ output.standard_end_of_body_html }}} {{#js}} diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache index 98668cc58f5..413431cb81b 100644 --- a/theme/boost/templates/columns2.mustache +++ b/theme/boost/templates/columns2.mustache @@ -7,7 +7,7 @@ - +--+- {{{ output.course_content_header }}} - {{{ output.main_content }}} - {{{ output.course_content_footer }}} - -+ + + {{{ output.course_content_header }}} + {{{ output.main_content }}} + {{{ output.course_content_footer }}} ++@@ -15,25 +15,35 @@ {{>theme_boost/header}} -+{{{ output.full_header }}}--+ {{> theme_boost/nav-drawer }}---+- {{{ output.course_content_header }}} - {{{ output.main_content }}} - {{{ output.course_content_footer }}} - -+ {{#hasblocks}} +- {{{ sidepreblocks }}}+ {{{ sidepreblocks }}} + ++ {{/hasblocks}} + {{^hasblocks}} + + {{/hasblocks}} + + + {{{ output.course_content_header }}} + {{{ output.main_content }}} + {{{ output.course_content_footer }}} ++
- Things, dogs, clogs"
diff --git a/lib/editor/atto/tests/behat/autosave.feature b/lib/editor/atto/tests/behat/autosave.feature
index 2f3d17ceacb..7a413eaed5c 100644
--- a/lib/editor/atto/tests/behat/autosave.feature
+++ b/lib/editor/atto/tests/behat/autosave.feature
@@ -62,7 +62,7 @@ Feature: Atto Autosave
And I select the text in the "Course summary" Atto editor
And I click on "Image" "button"
And I click on "Browse repositories..." "button"
- And I click on "Private files" "link"
+ And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "moodle-logo.png" "link"
And I click on "Select this file" "button"
And I set the field "Describe this image" to "It's the Moodle"
diff --git a/lib/form/advcheckbox.php b/lib/form/advcheckbox.php
index 5d9a07984cb..4b9a724cf98 100644
--- a/lib/form/advcheckbox.php
+++ b/lib/form/advcheckbox.php
@@ -88,6 +88,7 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox implements
}
parent::__construct($elementName, $elementLabel, $text, $attributes, $values);
+ $this->_type = 'advcheckbox';
}
/**
@@ -142,7 +143,7 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox implements
$context['selectedvalue'] = $this->_values[1];
$context['deselectedvalue'] = $this->_values[0];
-
+ $context['frozenvalue'] = $this->getValue();
return $context;
}
diff --git a/lib/form/checkbox.php b/lib/form/checkbox.php
index 83e64992875..5366ebb57e1 100644
--- a/lib/form/checkbox.php
+++ b/lib/form/checkbox.php
@@ -41,7 +41,10 @@ require_once('templatable_form_element.php');
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox implements templatable {
- use templatable_form_element;
+
+ use templatable_form_element {
+ export_for_template as export_for_template_base;
+ }
/** @var string html for help button, if empty then no help */
var $_helpbutton='';
@@ -141,4 +144,10 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox implements templa
}
return $output;
}
+
+ public function export_for_template(renderer_base $output) {
+ $context = $this->export_for_template_base($output);
+ $context['frozenvalue'] = $this->getValue();
+ return $context;
+ }
}
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
index 844a90ee6be..ad1b5996d2f 100644
--- a/lib/form/templatable_form_element.php
+++ b/lib/form/templatable_form_element.php
@@ -74,7 +74,7 @@ trait templatable_form_element {
// Other attributes.
$otherattributes = [];
foreach ($this->getAttributes() as $attr => $value) {
- if (!in_array($attr, $standardattributes) && $attr != 'class') {
+ if (!in_array($attr, $standardattributes) && $attr != 'class' && !is_object($value)) {
$otherattributes[] = $attr . '="' . s($value) . '"';
}
}
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d0503f11495..b9c10aebed9 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8885,36 +8885,37 @@ function get_performance_info() {
global $CFG, $PERF, $DB, $PAGE;
$info = array();
- $info['html'] = ''; // Holds userfriendly HTML representation.
$info['txt'] = me() . ' '; // Holds log-friendly representation.
+ $info['html'] = '';
if (!empty($CFG->themedesignermode)) {
// Attempt to avoid devs debugging peformance issues, when its caused by css building and so on.
- $info['html'] = '