MDL-68030 core_course: Tuncate long module names

diff --git a/course/amd/build/activitychooser.min.js.map b/course/amd/build/activitychooser.min.js.map
index 5dc3ca7..8e0e90b 100644 (file)
Binary files a/course/amd/build/activitychooser.min.js.map and b/course/amd/build/activitychooser.min.js.map differ

diff --git a/course/amd/src/activitychooser.js b/course/amd/src/activitychooser.js
index 6565e72..c3e5566 100644 (file)
--- a/course/amd/src/activitychooser.js
+++ b/course/amd/src/activitychooser.js
@@ -109,10 +109,10 @@ const sectionIdMapper = (webServiceData, id) => {
 };
 
 /**
- * Build a modal for each section ID and store it into a map for quick access
+ * Build a modal on demand to save page load times
  *
  * @method modalBuilder
- * @param {Map} data our map of section ID's & modules to generate modals for
+ * @param {Array} data our array of modules with section ID's applied in the URL field
  * @return {Object} Our modal that we are going to show the user
  */
 const modalBuilder = data => buildModal(templateDataBuilder(data));
@@ -149,7 +149,7 @@ const templateDataBuilder = (data) => {
 };
 
 /**
- * Given an object we want to prebuild a modal ready to store into a map
+ * Given an object we want to build a modal ready to show
  *
  * @method buildModal
  * @param {Object} data The template data which contains arrays of modules

diff --git a/course/templates/chooser_item.mustache b/course/templates/chooser_item.mustache
index a05e965..ccebf94 100644 (file)
--- a/course/templates/chooser_item.mustache
+++ b/course/templates/chooser_item.mustache
@@ -35,7 +35,7 @@
             <span class="optionicon d-block">
                 {{{icon}}}
             </span>
-            <span class="optionname d-block">{{title}}</span>
+            <p class="optionname d-block mt-2 mb-0"> {{#shortentext}}20, {{title}}{{/shortentext}}</p>
         </a>
         <div class="optionactions btn-group" role="group" data-region="chooser-option-actions-container">
             {{^legacyitem}}

diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 0d9e238..cd0a8fa 100644 (file)
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -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;
@@ -1580,7 +1578,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
         .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;

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 48b9ab4..34e1911 100644 (file)
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10702,7 +10702,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     .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;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 4928b14..89c12e9 100644 (file)
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10909,7 +10909,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     .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;