From 29551c4b1a688d62960104272be77c0ec017450e Mon Sep 17 00:00:00 2001 From: Mathew May Date: Thu, 7 Mar 2019 09:54:01 +0800 Subject: [PATCH] MDL-64506 templates: Move BS2 btns' to BS4 btns' well bs2 class is now card in bs4 --- .../analytics/templates/models_list.mustache | 4 ++-- .../classes/output/crud_element.php | 2 +- .../classes/output/data_registry_page.php | 4 ++-- .../templates/data_deletion.mustache | 4 ++-- .../templates/defaults_display.mustache | 2 +- .../templates/request_details.mustache | 2 +- .../langimport/templates/langimport.mustache | 6 +++--- .../course_competency_statistics.mustache | 2 +- .../lp/templates/evidence_summary.mustache | 2 +- .../template_competencies_page.mustache | 2 +- .../templates/page_nopermission.mustache | 2 +- .../moodle-core_availability-form-debug.js | Bin 40182 -> 40190 bytes .../moodle-core_availability-form-min.js | Bin 16555 -> 16563 bytes .../moodle-core_availability-form.js | Bin 40182 -> 40190 bytes availability/yui/src/form/js/form.js | 8 ++++---- blocks/login/block_login.php | 2 +- course/classes/management_renderer.php | 4 ++-- group/templates/index.mustache | 14 +++++++------- .../moodle-atto_charmap-button-debug.js | Bin 18552 -> 18554 bytes .../moodle-atto_charmap-button-min.js | Bin 11453 -> 11455 bytes .../moodle-atto_charmap-button.js | Bin 18552 -> 18554 bytes .../charmap/yui/src/button/js/button.js | 2 +- .../moodle-atto_equation-button-debug.js | Bin 26485 -> 26489 bytes .../moodle-atto_equation-button-min.js | Bin 8476 -> 8480 bytes .../moodle-atto_equation-button.js | Bin 26262 -> 26266 bytes .../equation/yui/src/button/js/button.js | 4 ++-- .../moodle-atto_image-button-debug.js | Bin 35847 -> 35881 bytes .../moodle-atto_image-button-min.js | Bin 14127 -> 14131 bytes .../moodle-atto_image-button.js | Bin 35669 -> 35703 bytes .../plugins/image/yui/src/button/js/button.js | 5 +++-- .../moodle-atto_link-button-debug.js | Bin 13542 -> 13546 bytes .../moodle-atto_link-button-min.js | Bin 4606 -> 4610 bytes .../moodle-atto_link-button.js | Bin 13542 -> 13546 bytes .../plugins/link/yui/src/button/js/button.js | 4 ++-- .../moodle-atto_media-button-debug.js | Bin 48552 -> 48556 bytes .../moodle-atto_media-button-min.js | Bin 24410 -> 24414 bytes .../moodle-atto_media-button.js | Bin 48552 -> 48556 bytes .../plugins/media/yui/src/button/js/button.js | 4 ++-- .../moodle-atto_table-button-debug.js | Bin 53190 -> 53194 bytes .../moodle-atto_table-button-min.js | Bin 22145 -> 22149 bytes .../moodle-atto_table-button.js | Bin 53190 -> 53194 bytes .../plugins/table/yui/src/button/js/button.js | 4 ++-- mod/feedback/view.php | 2 +- mod/lti/styles.css | 4 ++-- .../cartridge_registration_form.mustache | 2 +- mod/scorm/player.php | 2 +- question/behaviour/rendererbase.php | 2 +- .../templates/user_course_navigation.mustache | 2 +- 48 files changed, 49 insertions(+), 48 deletions(-) diff --git a/admin/tool/analytics/templates/models_list.mustache b/admin/tool/analytics/templates/models_list.mustache index bd11e0b0a3e..b49c9e212cd 100644 --- a/admin/tool/analytics/templates/models_list.mustache +++ b/admin/tool/analytics/templates/models_list.mustache @@ -111,8 +111,8 @@
- {{#str}}createmodel, tool_analytics{{/str}} - {{#str}}importmodel, tool_analytics{{/str}} + {{#str}}createmodel, tool_analytics{{/str}} + {{#str}}importmodel, tool_analytics{{/str}}
diff --git a/admin/tool/dataprivacy/classes/output/crud_element.php b/admin/tool/dataprivacy/classes/output/crud_element.php index 87d8ce9bd11..738f9b8c85a 100644 --- a/admin/tool/dataprivacy/classes/output/crud_element.php +++ b/admin/tool/dataprivacy/classes/output/crud_element.php @@ -49,7 +49,7 @@ abstract class crud_element { new \moodle_url('/admin/tool/dataprivacy/dataregistry.php'), get_string('back'), null, - ['class' => 'btn btn-default'] + ['class' => 'btn btn-primary'] ); return [$back]; } diff --git a/admin/tool/dataprivacy/classes/output/data_registry_page.php b/admin/tool/dataprivacy/classes/output/data_registry_page.php index be0e99668cb..7249adfc675 100644 --- a/admin/tool/dataprivacy/classes/output/data_registry_page.php +++ b/admin/tool/dataprivacy/classes/output/data_registry_page.php @@ -80,12 +80,12 @@ class data_registry_page implements renderable, templatable { new \moodle_url('/admin/tool/dataprivacy/defaults.php'), get_string('setdefaults', 'tool_dataprivacy'), null, - ['class' => 'btn btn-default'] + ['class' => 'btn btn-primary'] ); $data->defaultsbutton = $defaultsbutton->export_for_template($output); $actionmenu = new \action_menu(); - $actionmenu->set_menu_trigger(get_string('edit'), 'btn btn-default'); + $actionmenu->set_menu_trigger(get_string('edit'), 'btn btn-primary'); $actionmenu->set_owner_selector('dataregistry-actions'); $actionmenu->set_alignment(\action_menu::TL, \action_menu::BL); diff --git a/admin/tool/dataprivacy/templates/data_deletion.mustache b/admin/tool/dataprivacy/templates/data_deletion.mustache index cbf5ed34115..49d750eaa42 100644 --- a/admin/tool/dataprivacy/templates/data_deletion.mustache +++ b/admin/tool/dataprivacy/templates/data_deletion.mustache @@ -65,7 +65,7 @@ {{#existingcontexts}}
- +
{{/existingcontexts}} @@ -75,7 +75,7 @@
{{#existingcontexts}}
- +
{{/existingcontexts}}
diff --git a/admin/tool/dataprivacy/templates/defaults_display.mustache b/admin/tool/dataprivacy/templates/defaults_display.mustache index 8a006d581da..44f3824ee5c 100644 --- a/admin/tool/dataprivacy/templates/defaults_display.mustache +++ b/admin/tool/dataprivacy/templates/defaults_display.mustache @@ -62,7 +62,7 @@
{{#canedit}} -
{{#canreview}} - + {{/canreview}} diff --git a/admin/tool/langimport/templates/langimport.mustache b/admin/tool/langimport/templates/langimport.mustache index 4f316dab736..04464baecda 100644 --- a/admin/tool/langimport/templates/langimport.mustache +++ b/admin/tool/langimport/templates/langimport.mustache @@ -79,7 +79,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -107,7 +107,7 @@
- +
diff --git a/admin/tool/lp/templates/course_competency_statistics.mustache b/admin/tool/lp/templates/course_competency_statistics.mustache index 9891b57ae0f..31260af1d28 100644 --- a/admin/tool/lp/templates/course_competency_statistics.mustache +++ b/admin/tool/lp/templates/course_competency_statistics.mustache @@ -49,7 +49,7 @@ Template statistics template. }} {{#competencycount}} -
+
{{#canbegradedincourse}} {{< tool_lp/progress_bar}} {{$progresstext}} diff --git a/admin/tool/lp/templates/evidence_summary.mustache b/admin/tool/lp/templates/evidence_summary.mustache index 128fd9c1f2a..06d7ca08fc5 100644 --- a/admin/tool/lp/templates/evidence_summary.mustache +++ b/admin/tool/lp/templates/evidence_summary.mustache @@ -44,7 +44,7 @@ "id": 1 } }} -
+
{{#candelete}}
{{#pix}}t/delete{{/pix}} diff --git a/admin/tool/lp/templates/template_competencies_page.mustache b/admin/tool/lp/templates/template_competencies_page.mustache index a380d29276f..0b6a4c7d1a6 100644 --- a/admin/tool/lp/templates/template_competencies_page.mustache +++ b/admin/tool/lp/templates/template_competencies_page.mustache @@ -41,7 +41,7 @@
{{#competencies}}
-
+
{{#canmanagetemplatecompetencies}}
diff --git a/admin/tool/policy/templates/page_nopermission.mustache b/admin/tool/policy/templates/page_nopermission.mustache index f01feaa760d..ad06c19232a 100644 --- a/admin/tool/policy/templates/page_nopermission.mustache +++ b/admin/tool/policy/templates/page_nopermission.mustache @@ -62,7 +62,7 @@

{{#str}}nopermissiontoagreedocscontact, tool_policy{{/str}}

-
+

{{{supportname}}}

{{supportemail}}

diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js index 1a7586a66683b95fdaaf04900b9c63659a24e0c0..eea5b3d216f3867eafa932e5783b847e9a2d3504 100644 GIT binary patch delta 92 zcmeyilj+}1rVaJh0>!Dx`FSacMU@JsVz@xQfYw YCX$;&;&(A2gf@#NEl1`aPBFFs0H50<-2eap delta 65 zcmeyjlj++|rVaJh>?x^fiKRIun>(!6DZ@CEKc+}+j*Q>Q1QXaSowOXmIh|r`0RW;N B8yWxr diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js index 3f3c424e7a524bac8a8bcdde7d63e169cc6b1b08..23da9be5be035582357296843a8b91c229992cc1 100644 GIT binary patch delta 109 zcmZ48$hf(Yaf6Hqe{pJZeqKsqQKdqzZi%kpw$11pzBy BD0Tn< diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js index 1a7586a66683b95fdaaf04900b9c63659a24e0c0..eea5b3d216f3867eafa932e5783b847e9a2d3504 100644 GIT binary patch delta 92 zcmeyilj+}1rVaJh0>!Dx`FSacMU@JsVz@xQfYw YCX$;&;&(A2gf@#NEl1`aPBFFs0H50<-2eap delta 65 zcmeyjlj++|rVaJh>?x^fiKRIun>(!6DZ@CEKc+}+j*Q>Q1QXaSowOXmIh|r`0RW;N B8yWxr diff --git a/availability/yui/src/form/js/form.js b/availability/yui/src/form/js/form.js index 8c932239928..66c7186c099 100644 --- a/availability/yui/src/form/js/form.js +++ b/availability/yui/src/form/js/form.js @@ -413,7 +413,7 @@ M.core_availability.List = function(json, root, parentRoot) { } // Create the button and add it. - var button = Y.Node.create(''); button.on("click", function() { this.clickAdd(); @@ -671,7 +671,7 @@ M.core_availability.List.prototype.clickAdd = function() { var content = Y.Node.create('
' + '
    ' + '
    ' + - '
    '); var cancel = content.one('button'); @@ -687,7 +687,7 @@ M.core_availability.List.prototype.clickAdd = function() { // Add entry for plugin. li = Y.Node.create('
  • '); id = 'availability_addrestriction_' + type; - button = Y.Node.create('
    '); button.on('click', this.getAddHandler(type, dialogRef), this); li.appendChild(button); @@ -699,7 +699,7 @@ M.core_availability.List.prototype.clickAdd = function() { // Extra entry for lists. li = Y.Node.create('
  • '); id = 'availability_addrestriction_list_'; - button = Y.Node.create('
    '); button.on('click', this.getAddHandler(null, dialogRef), this); li.appendChild(button); diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php index 8247355a96b..8e75282baef 100644 --- a/blocks/login/block_login.php +++ b/blocks/login/block_login.php @@ -114,7 +114,7 @@ class block_login extends block_base { $this->content->text .= '
    '; foreach ($potentialidps as $idp) { $this->content->text .= '
    '; - $this->content->text .= 'content->text .= 'content->text .= 'href="' . $idp['url']->out() . '" title="' . s($idp['name']) . '">'; if (!empty($idp['iconurl'])) { $this->content->text .= ''; diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php index c0f25d0d098..d9b5c551a67 100644 --- a/course/classes/management_renderer.php +++ b/course/classes/management_renderer.php @@ -332,7 +332,7 @@ class core_course_management_renderer extends plugin_renderer_base { if ($cancreatecategory) { $url = new moodle_url('/course/editcategory.php', array('parent' => $category->id)); - $actions[] = html_writer::link($url, get_string('createnewcategory'), array('class' => 'btn btn-default')); + $actions[] = html_writer::link($url, get_string('createnewcategory'), array('class' => 'btn btn-secondary')); } if (core_course_category::can_approve_course_requests()) { $actions[] = html_writer::link(new moodle_url('/course/pending.php'), get_string('coursespending')); @@ -660,7 +660,7 @@ class core_course_management_renderer extends plugin_renderer_base { $actions = array(); if ($category->can_create_course()) { $url = new moodle_url('/course/edit.php', array('category' => $category->id, 'returnto' => 'catmanage')); - $actions[] = html_writer::link($url, get_string('createnewcourse'), array('class' => 'btn btn-default')); + $actions[] = html_writer::link($url, get_string('createnewcourse'), array('class' => 'btn btn-secondary')); } if ($category->can_request_course()) { // Request a new course. diff --git a/group/templates/index.mustache b/group/templates/index.mustache index a86b15a52e5..e768a12c5c8 100644 --- a/group/templates/index.mustache +++ b/group/templates/index.mustache @@ -92,22 +92,22 @@
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -127,7 +127,7 @@
    - +
    diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js index 422e2d8faad163db9d10d5e5ee2be3dc61330f09..43f1310115af2a0501f03777a6acc686b60e145d 100644 GIT binary patch delta 24 fcmew{f$`S_#tn+joW-fh`FSacMU|U1oC8<^f~W~? delta 22 dcmex0f$_%##tn+j>?x^fiKRIuo3)$+SOIQW2#Npz diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js index 339dad4263a3b2649677084e97cefe7257915d62..1e1561da0dc0529587bcce4267f7e33e3010f1d7 100644 GIT binary patch delta 22 dcmdlRxj%A4v=(P^YI1&FN@7vv<|M6XCID`i2+;rl delta 20 bcmdlVxi@k{v=)0xYFc7xPRZsJt!O3yTh9mX diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js index 422e2d8faad163db9d10d5e5ee2be3dc61330f09..43f1310115af2a0501f03777a6acc686b60e145d 100644 GIT binary patch delta 24 fcmew{f$`S_#tn+joW-fh`FSacMU|U1oC8<^f~W~? delta 22 dcmex0f$_%##tn+j>?x^fiKRIuo3)$+SOIQW2#Npz diff --git a/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js b/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js index 397f1fe20f7..395edf40980 100644 --- a/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js @@ -377,7 +377,7 @@ Y.namespace('M.atto_charmap').Button = Y.Base.create('button', Y.M.editor_atto.E '
    ' + '{{#each CHARMAP}}' + '{{#if this.[2]}}' + - '' + + '' + '
    ' + '', LIBRARY: '' + @@ -86,7 +86,7 @@ var COMPONENTNAME = 'atto_equation', 'id="{{../elementid}}_{{../CSS.LIBRARY_GROUP_PREFIX}}_{{@key}}">' + '
    ' + '{{#split "\n" elements}}' + - '' + diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js index 6d8d35024edea3a902b4ce0e782d037647d5748a..4b40ea54c3dc46727d315a4972a83ed9cce0a421 100644 GIT binary patch delta 57 zcmZpl!L)J)(}tzIoW-fh`FSacMU|V^@NN)5a3?3rsj#XmXe+2sKFBRGxnGih^HjN_ FTmW*$6p;V` delta 39 pcmZ2EgQ?x^fiKRIuo7eGf5P)$er^~5qUMbg*3jj7B4{!hg diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js index f3ca2136791ca3628ceed6c8a434cee8373d364c..882c239a2e865d6ea32280c02a3009a669841f42 100644 GIT binary patch delta 37 kcmZ3Vw>fXaN>=ui)U?FXoRZC(SkH69IbHlK)dBR<4buPs diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js index 6f0b146a39e64ec58c5b58103f9cdbdb0fe43390..e08468bf36ec6bfd9d1ce59d6275fbd83e0e3cb6 100644 GIT binary patch delta 57 zcmcaQjp_R|rVUGZIg3-1^Yc;?iz+v-;oTsB;7(4KQ(;wC&{j~Ne2`mWa=#@1=BaWA FasZTB6?Oms delta 39 pcmex9jp^z%rVUGZ*;7)}5=(PRHm~E|AOPb`PM1^Jyi)F54ggI85LEyG diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js index cafa5e455f1..f2f14459742 100644 --- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js @@ -103,7 +103,7 @@ var CSS = { '' + '' + - '' + '' + '
    ' + @@ -178,7 +178,8 @@ var CSS = { '
    ' + // Add the submit button and close the form. - '' + + '' + '
    ' + '', diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js index 34a122270f4226a84147271ef2928a20b8b8b99c..cb9147161c7b53c871eb6651df3db76036fe9856 100644 GIT binary patch delta 37 jcmaEs`6_dRK09Y|YI1&FN@7vvW;6Ce79{REZVOESB1#Tj delta 33 hcmaEr`7CpTK0A9#YFc7xPRV8q_CgjoXA`%DCIIFv44D7` diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js index cf5d382fb55a0fa68db133511743c4d3495258d5..fe26a4c4886a3c89539c5aaea2afe5a9de686d20 100644 GIT binary patch delta 37 icmeyT+@!LBg^9B`H90>oC9$Y-GdI&DWbP7{C|&^k?+rEp delta 33 gcmZot`KP>rg^4{SH7&6;r(`oP(' + '' + - '' + '' + '
    ' + @@ -66,7 +66,7 @@ var COMPONENTNAME = 'atto_link', '
    ' + '
    ' + '
    ' + - '' + + '' + '
    ' + ''; Y.namespace('M.atto_link').Button = Y.Base.create('button', Y.M.editor_atto.EditorPlugin, [], { diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js index 895858e50df6c40ef3d3c8c1ded5f2d8de4c859d..45318fe617a843cf7e5ad68bb2dce7b589e6fbae 100644 GIT binary patch delta 39 lcmZ4Sn`zB&rVTAJoW-fh`FSacMU|VoWp)cAaeWP?x^fiKRIun|oz;3&S~q2GP9$7QGI= diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js index 49dc8128c17f465150675608502843f018635eef..99a32436350996c0f86095b2d14aa92325e75c84 100644 GIT binary patch delta 39 mcmcb$kMZ6<#tlydIEz!0^Yc;?iz+w27D(hp;s(pHI|2Y-2oMDT delta 35 jcmcb&kMY(%#tlyd*i%x|5=(PRHop}}<=7no97hg8 diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js index 895858e50df6c40ef3d3c8c1ded5f2d8de4c859d..45318fe617a843cf7e5ad68bb2dce7b589e6fbae 100644 GIT binary patch delta 39 lcmZ4Sn`zB&rVTAJoW-fh`FSacMU|VoWp)cAaeWP?x^fiKRIun|oz;3&S~q2GP9$7QGI= diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js index 042db255c8c..cce997e9200 100644 --- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js @@ -146,7 +146,7 @@ var COMPONENTNAME = 'atto_media', '
    ' + '
    ' + '
    ' + - '' + + '' + '
    ' + '', TAB_PANES: { @@ -215,7 +215,7 @@ var COMPONENTNAME = 'atto_media', '
    ' + '' + '' + - '' + '' + '
    ' + diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js index 8624a7be891ac87a951230755b094529d062f361..4be5b4e51dd4fe9eb8643246898ab0da69c3b4e7 100644 GIT binary patch delta 42 qcmX>$pZU~$<_!~dIg3-1^Yc;?iz+93>ZwlNtJ{hY+3cxTyAS|*Z4q7o delta 38 ocmX>#pZVB)<_!~d*;7)}5=(PRCj08CPTsHE3gd6~)vH|y05pLQo&W#< diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js index 3039fcda865fdb066117c701610c484aecd7b1f7..686aa891b9f11ead08d8437b396040b380425be8 100644 GIT binary patch delta 42 mcmZo%%haf7NPXK`wBeqKsqQRQSE$zl|q>gLmu+iU<$cMrq> delta 38 kcmZo&%h$pZU~$<_!~dIg3-1^Yc;?iz+93>ZwlNtJ{hY+3cxTyAS|*Z4q7o delta 38 ocmX>#pZVB)<_!~d*;7)}5=(PRCj08CPTsHE3gd6~)vH|y05pLQo&W#< diff --git a/lib/editor/atto/plugins/table/yui/src/button/js/button.js b/lib/editor/atto/plugins/table/yui/src/button/js/button.js index 5a36fa981aa..b3b5284375d 100644 --- a/lib/editor/atto/plugins/table/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/table/yui/src/button/js/button.js @@ -206,10 +206,10 @@ var COMPONENT = 'atto_table', '
    ' + '
    ' + '{{#if edit}}' + - '' + + '' + '{{/if}}' + '{{#if nonedit}}' + - '' + + '' + '{{/if}}' + '
    ' + '', diff --git a/mod/feedback/view.php b/mod/feedback/view.php index a2a9b60cecf..fe2ef8b6dba 100644 --- a/mod/feedback/view.php +++ b/mod/feedback/view.php @@ -139,7 +139,7 @@ if ($feedbackcompletion->can_complete()) { } else { $label = get_string('complete_the_form', 'feedback'); } - echo html_writer::div(html_writer::link($completeurl, $label, array('class' => 'btn btn-default')), 'complete-feedback'); + echo html_writer::div(html_writer::link($completeurl, $label, array('class' => 'btn btn-secondary')), 'complete-feedback'); } else { // Feedback was already submitted. echo $OUTPUT->notification(get_string('this_feedback_is_already_submitted', 'feedback')); diff --git a/mod/lti/styles.css b/mod/lti/styles.css index 199bcf6a5f0..268131eb090 100644 --- a/mod/lti/styles.css +++ b/mod/lti/styles.css @@ -113,7 +113,7 @@ min-height: 260px; } -#registration-form-container .well { +#registration-form-container .card { margin-bottom: 0; } @@ -121,7 +121,7 @@ margin-bottom: 0; } -#registration-choice-container .well { +#registration-choice-container .card { text-align: center; } diff --git a/mod/lti/templates/cartridge_registration_form.mustache b/mod/lti/templates/cartridge_registration_form.mustache index 1f75a14bb79..d49d05266c7 100644 --- a/mod/lti/templates/cartridge_registration_form.mustache +++ b/mod/lti/templates/cartridge_registration_form.mustache @@ -39,7 +39,7 @@ }}
    -
    +

    {{#str}} enterkeyandsecret, mod_lti {{/str}}

    {{#str}} enterkeyandsecret_help, mod_lti {{/str}}

    diff --git a/mod/scorm/player.php b/mod/scorm/player.php index d6fc8da3ccf..07bf5b5756e 100644 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -169,7 +169,7 @@ if (empty($scorm->popup) || $displaymode == 'popup') { $exiturl = course_get_url($course, $cm->sectionnum); } - $exitlink = html_writer::link($exiturl, $strexit, array('title' => $strexit, 'class' => 'btn btn-default')); + $exitlink = html_writer::link($exiturl, $strexit, array('title' => $strexit, 'class' => 'btn btn-secondary')); $PAGE->set_button($exitlink); } diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php index 416826ab3c7..7cf92b9ba56 100644 --- a/question/behaviour/rendererbase.php +++ b/question/behaviour/rendererbase.php @@ -234,7 +234,7 @@ abstract class qbehaviour_renderer extends plugin_renderer_base { 'id' => $qa->get_behaviour_field_name('submit'), 'name' => $qa->get_behaviour_field_name('submit'), 'value' => get_string('check', 'question'), - 'class' => 'submit btn btn-default', + 'class' => 'submit btn btn-secondary', ); if ($options->readonly) { $attributes['disabled'] = 'disabled'; diff --git a/report/competency/templates/user_course_navigation.mustache b/report/competency/templates/user_course_navigation.mustache index 89cef395a79..447b269ad76 100644 --- a/report/competency/templates/user_course_navigation.mustache +++ b/report/competency/templates/user_course_navigation.mustache @@ -1,4 +1,4 @@ -
    +

    {{{groupselector}}}

    {{#hasusers}} -- 2.17.1
    {{#str}}analyticmodels, tool_analytics{{/str}}