Merge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle

blocks/blog_tags/edit_form.php

@@ -31,7 +31,7 @@
 class block_blog_tags_edit_form extends block_edit_form {
     protected function specific_definition($mform) {
         // Fields for editing HTML block title and contents.
-        $mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
+        $mform->addElement('header', 'configheader', get_string('configtitle', 'block_blog_tags'));
 
         $mform->addElement('text', 'config_title', get_string('blocktitle', 'blog'));
         $mform->setDefault('config_title', get_string('blogtags', 'blog'));

blocks/blog_tags/lang/en/block_blog_tags.php

@@ -24,3 +24,4 @@
 
 $string['blog_tags:addinstance'] = 'Add a new blog tags block';
 $string['pluginname'] = 'Blog tags';
+$string['configtitle'] = 'Blog tags block title';

blocks/html/lang/en/block_html.php

@@ -27,7 +27,7 @@ $string['configallowadditionalcssclasses'] = 'Adds a configuration option to HTM
 $string['configclasses'] = 'Additional CSS classes';
 $string['configclasses_help'] = 'The purpose of this configuration is to aid with theming by helping distinguish HTML blocks from each other. Any CSS classes entered here (space delimited) will be appended to the block\'s default classes.';
 $string['configcontent'] = 'Content';
-$string['configtitle'] = 'Block title';
+$string['configtitle'] = 'HTML block title';
 $string['html:addinstance'] = 'Add a new HTML block';
 $string['html:myaddinstance'] = 'Add a new HTML block to Dashboard';
 $string['leaveblanktohide'] = 'leave blank to hide the title';

blocks/html/tests/behat/configuring_html_block.feature

@@ -12,10 +12,11 @@ Feature: Adding and configuring HTML blocks
     And I add the "HTML" block
     And I configure the "(new HTML block)" block
     And I set the field "Content" to "Static text without a header"
+    Then I should see "HTML block title"
     And I press "Save changes"
     Then I should not see "(new HTML block)"
     And I configure the "block_html" block
-    And I set the field "Block title" to "The HTML block header"
+    And I set the field "HTML Block title" to "The HTML block header"
     And I set the field "Content" to "Static text with a header"
     And I press "Save changes"
     And "block_html" "block" should exist
@@ -32,7 +33,7 @@ Feature: Adding and configuring HTML blocks
     And I press "Save changes"
     Then I should not see "(new HTML block)"
     And I configure the "block_html" block
-    And I set the field "Block title" to "The HTML block header"
+    And I set the field "HTML Block title" to "The HTML block header"
     And I set the field "Content" to "Static text with a header"
     And I press "Save changes"
     And "block_html" "block" should exist

blocks/html/tests/behat/course_block.feature

@@ -21,15 +21,15 @@ Feature: HTML blocks in a course
     And I add the "HTML" block
     And I configure the "(new HTML block)" block
     And I set the field "Content" to "First block content"
-    And I set the field "Block title" to "First block header"
+    And I set the field "HTML Block title" to "First block header"
     And I press "Save changes"
     And I add the "HTML" block
     And I configure the "(new HTML block)" block
     And I set the field "Content" to "Second block content"
-    And I set the field "Block title" to "Second block header"
+    And I set the field "HTML Block title" to "Second block header"
     And I press "Save changes"
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
     And I should see "First block content" in the "First block header" "block"
-    And I should see "Second block content" in the "Second block header" "block"
+    And I should see "Second block content" in the "Second block header" "block"

blocks/html/tests/behat/multiple_instances.feature

@@ -29,12 +29,12 @@ Feature: Adding and configuring multiple HTML blocks
 
   Scenario: Adding multiple instances of HTML block on a page
     And I configure the "block_html" block
-    And I set the field "Block title" to "The HTML block header"
+    And I set the field "HTML Block title" to "The HTML block header"
     And I set the field "Content" to "Static text with a header"
     And I press "Save changes"
     And I add the "HTML" block
     And I configure the "(new HTML block)" block
-    And I set the field "Block title" to "The second HTML block header"
+    And I set the field "HTML Block title" to "The second HTML block header"
     And I set the field "Content" to "Second block contents"
     And I press "Save changes"
     And I log out

blocks/mentees/lang/en/block_mentees.php

@@ -23,8 +23,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['configtitle'] = 'Block title';
-$string['configtitleblankhides'] = 'Block title (no title if blank)';
+$string['configtitle'] = 'Mentees block title';
+$string['configtitleblankhides'] = 'Mentees block title (no title if blank)';
 $string['leaveblanktohide'] = 'leave blank to hide the title';
 $string['mentees:addinstance'] = 'Add a new mentees block';
 $string['mentees:myaddinstance'] = 'Add a new mentees block to Dashboard';

blocks/mentees/tests/behat/configuring_mentees_block.feature

@@ -0,0 +1,18 @@
+@block @block_mentees @core_block
+Feature: Adding and configuring Mentees blocks
+  In order to have a Mentees blocks on a page
+  As admin
+  I need to be able to insert and configure a Mentees blocks
+
+  @javascript
+  Scenario: Configuring the Mentees block with Javascript on
+    Given I log in as "admin"
+    And I am on site homepage
+    When I turn editing mode on
+    And I add the "Mentees" block
+    And I configure the "(new Mentees block)" block
+    Then I should see "Mentees block title (no title if blank)"
+    And I set the field "Mentees block title (no title if blank)" to "The Mentees block header"
+    And I press "Save changes"
+    And "block_mentees" "block" should exist
+    Then "The Mentees block header" "block" should exist

blocks/tag_flickr/lang/en/block_tag_flickr.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['configtitle'] = 'Title';
+$string['configtitle'] = 'Flickr block title';
 $string['date-posted-asc'] = 'Date posted ASC';
 $string['date-posted-desc'] = 'Date posted DESC';
 $string['date-taken-asc'] = 'Date taken ASC';

blocks/tag_flickr/tests/behat/configuring_tag_flickr_block.feature

@@ -0,0 +1,20 @@
+@block @block_tag_flickr
+Feature: Adding and configuring Flickr block
+  In order to have the Flickr block used
+  As a admin
+  I need to add the Flickr block to the tags site page
+
+  @javascript
+  Scenario: Adding Flickr block to the tags site page
+    Given I log in as "admin"
+    And I press "Customise this page"
+    # TODO MDL-57120 site "Tags" link not accessible without navigation block.
+    And I add the "Navigation" block if not present
+    And I navigate to "Tags" node in "Site pages"
+    And I add the "Flickr" block
+    And I configure the "Flickr" block
+    Then I should see "Flickr block title"
+    And I set the field "Flickr block title" to "The Flickr block header"
+    And I press "Save changes"
+    And "block_tag_flickr" "block" should exist
+    Then "The Flickr block header" "block" should exist

blocks/tag_youtube/lang/en/block_tag_youtube.php

@@ -29,7 +29,7 @@ $string['apikeyinfo'] = 'Get a <a href="https://developers.google.com/youtube/v3
 $string['autosvehicles'] = 'Autos &amp; Vehicles';
 $string['category'] = 'Category';
 $string['comedy'] = 'Comedy';
-$string['configtitle'] = 'Title';
+$string['configtitle'] = 'YouTube block title';
 $string['education'] = 'Education';
 $string['entertainment'] = 'Entertainment';
 $string['filmsanimation'] = 'Films &amp; Animation';

blocks/tags/lang/en/block_tags.php

@@ -24,7 +24,7 @@
 
 $string['anycollection'] = 'Any';
 $string['anytype'] = 'All';
-$string['configtitle'] = 'Block title';
+$string['configtitle'] = 'Tags block title';
 $string['disabledtags'] = 'Tags are disabled';
 $string['defaultdisplay'] = 'Display tags';
 $string['pluginname'] = 'Tags';

lang/en/blog.php

@@ -35,7 +35,6 @@ $string['autotags'] = 'Add these tags';
 $string['autotags_help'] = 'Enter one or more local tags (separated by commas) that you want to automatically add to each blog entry copied from the external blog into your local blog.';
 $string['backupblogshelp'] = 'If enabled then blogs will be included in SITE automated backups';
 $string['blockexternalstitle'] = 'External blogs';
-$string['blocktitle'] = 'Blog tags block title';
 $string['blog'] = 'Blog';
 $string['blogaboutthis'] = 'Blog about this {$a->type}';
 $string['blogaboutthiscourse'] = 'Add an entry about this course';