{{^legacyitem}}
diff --git a/course/templates/chooser_search.mustache b/course/templates/local/activitychooser/search.mustache
similarity index 95%
rename from course/templates/chooser_search.mustache
rename to course/templates/local/activitychooser/search.mustache
index 68be1ea8402..b0e62f6d5c5 100644
--- a/course/templates/chooser_search.mustache
+++ b/course/templates/local/activitychooser/search.mustache
@@ -29,7 +29,7 @@
+
{{#str}} resultsfound, core, {{searchresultsnumber}} {{/str}}
+
{{#searchresults}}
- {{>core_course/chooser_item}}
+ {{>core_course/local/activitychooser/item}}
{{/searchresults}}
diff --git a/course/tests/behat/behat_course.php b/course/tests/behat/behat_course.php
index ed41a46fad9..1f16af605b6 100644
--- a/course/tests/behat/behat_course.php
+++ b/course/tests/behat/behat_course.php
@@ -250,7 +250,7 @@ class behat_course extends behat_base {
// Clicks the selected activity if it exists.
$activityxpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' modchooser ')]" .
"/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' optioninfo ')]" .
- "/descendant::span[contains(concat(' ', normalize-space(@class), ' '), ' optionname ')]" .
+ "/descendant::p[contains(concat(' ', normalize-space(@class), ' '), ' optionname ')]" .
"[normalize-space(.)=$activityliteral]" .
"/parent::a";
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 4e6fbb68956..cd0a8fac32b 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -1509,7 +1509,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
*/
.modchooser .modal-body {
padding: 0;
- height: 590px;
+ height: 640px;
overflow-y: auto;
.loading-icon {
@@ -1552,7 +1552,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
}
.clear {
-
i {
height: 23px;
width: 23px;
@@ -1561,7 +1560,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
}
}
.search-icon {
-
i {
height: 20px;
width: 20px;
@@ -1576,11 +1574,10 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
overflow-x: hidden;
.option {
// Six items per line.
- flex-basis: 16%;
+ flex-basis: 16.66%;
.optionactions {
.optionaction {
cursor: pointer;
- margin: 0.2rem;
color: $gray-600;
i {
margin: 0;
@@ -1593,9 +1590,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
&:hover {
text-decoration: none;
}
- .optionname {
- margin-top: 0.5em;
- }
.optionicon {
.icon {
margin: 0;
@@ -1614,8 +1608,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
background-color: $white;
overflow-x: hidden;
overflow-y: auto;
- line-height: 2em;
- height: 590px;
+ height: 640px;
.content {
overflow-y: auto;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 6a5a1c52ebf..b46b0e198a7 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10652,7 +10652,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
*/
.modchooser .modal-body {
padding: 0;
- height: 590px;
+ height: 640px;
overflow-y: auto; }
.modchooser .modal-body .loading-icon {
opacity: 1; }
@@ -10698,11 +10698,10 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
overflow-x: hidden; }
.modchoosercontainer .optionscontainer .option,
.modchoosercontainer .searchresultitemscontainer .option {
- flex-basis: 16%; }
+ flex-basis: 16.66%; }
.modchoosercontainer .optionscontainer .option .optionactions .optionaction,
.modchoosercontainer .searchresultitemscontainer .option .optionactions .optionaction {
cursor: pointer;
- margin: 0.2rem;
color: #868e96; }
.modchoosercontainer .optionscontainer .option .optionactions .optionaction i,
.modchoosercontainer .searchresultitemscontainer .option .optionactions .optionaction i {
@@ -10713,9 +10712,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.modchoosercontainer .optionscontainer .option .optioninfo a:hover,
.modchoosercontainer .searchresultitemscontainer .option .optioninfo a:hover {
text-decoration: none; }
- .modchoosercontainer .optionscontainer .option .optioninfo a .optionname,
- .modchoosercontainer .searchresultitemscontainer .option .optioninfo a .optionname {
- margin-top: 0.5em; }
.modchoosercontainer .optionscontainer .option .optioninfo a .optionicon .icon,
.modchoosercontainer .searchresultitemscontainer .option .optioninfo a .optionicon .icon {
margin: 0;
@@ -10728,8 +10724,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
background-color: #fff;
overflow-x: hidden;
overflow-y: auto;
- line-height: 2em;
- height: 590px; }
+ height: 640px; }
.modchooser .modal-body .optionsummary .content {
overflow-y: auto; }
.modchooser .modal-body .optionsummary .content .heading .icon {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 415f3ef6145..66087fb7dff 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10859,7 +10859,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
*/
.modchooser .modal-body {
padding: 0;
- height: 590px;
+ height: 640px;
overflow-y: auto; }
.modchooser .modal-body .loading-icon {
opacity: 1; }
@@ -10905,11 +10905,10 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
overflow-x: hidden; }
.modchoosercontainer .optionscontainer .option,
.modchoosercontainer .searchresultitemscontainer .option {
- flex-basis: 16%; }
+ flex-basis: 16.66%; }
.modchoosercontainer .optionscontainer .option .optionactions .optionaction,
.modchoosercontainer .searchresultitemscontainer .option .optionactions .optionaction {
cursor: pointer;
- margin: 0.2rem;
color: #868e96; }
.modchoosercontainer .optionscontainer .option .optionactions .optionaction i,
.modchoosercontainer .searchresultitemscontainer .option .optionactions .optionaction i {
@@ -10920,9 +10919,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.modchoosercontainer .optionscontainer .option .optioninfo a:hover,
.modchoosercontainer .searchresultitemscontainer .option .optioninfo a:hover {
text-decoration: none; }
- .modchoosercontainer .optionscontainer .option .optioninfo a .optionname,
- .modchoosercontainer .searchresultitemscontainer .option .optioninfo a .optionname {
- margin-top: 0.5em; }
.modchoosercontainer .optionscontainer .option .optioninfo a .optionicon .icon,
.modchoosercontainer .searchresultitemscontainer .option .optioninfo a .optionicon .icon {
margin: 0;
@@ -10935,8 +10931,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
background-color: #fff;
overflow-x: hidden;
overflow-y: auto;
- line-height: 2em;
- height: 590px; }
+ height: 640px; }
.modchooser .modal-body .optionsummary .content {
overflow-y: auto; }
.modchooser .modal-body .optionsummary .content .heading .icon {