moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css

Browse source
This commit is contained in:
Bas Brands 2020-01-27 15:06:29 +01:00
parent a0fc902eb1
commit 4394f9e358
113 changed files with 958 additions and 1403 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/book/tool/print/classes/output/renderer.php
View file

@ -123,7 +123,7 @@ class renderer extends plugin_renderer_base {
$toc .= html_writer::tag('a', '', array('name' => 'toc')); // Representation of toc (HTML).
$toc .= html_writer::tag('h2', get_string('toc', 'mod_book'), ['class' => 'text-center p-b-2']);
$toc .= html_writer::tag('h2', get_string('toc', 'mod_book'), ['class' => 'text-center pb-5']);
$toc .= html_writer::start_tag('ul');
foreach ($chapters as $ch) {
if (!$ch->hidden) {
@ -189,12 +189,12 @@ class renderer extends plugin_renderer_base {
$chaptervisible = $chapter->hidden ? false : true;
$bookchapter = '';
$bookchapter .= html_writer::start_div('book_chapter p-t-1', ['id' => 'ch' . $chapter->id]);
$bookchapter .= html_writer::start_div('book_chapter pt-3', ['id' => 'ch' . $chapter->id]);
if (!$book->customtitles) {
if (!$chapter->subchapter) {
$bookchapter .= $this->output->heading($title, 2, 'text-center p-b-2');
$bookchapter .= $this->output->heading($title, 2, 'text-center pb-5');
} else {
$bookchapter .= $this->output->heading($title, 3, 'text-center p-b-2');
$bookchapter .= $this->output->heading($title, 3, 'text-center pb-5');
}
}

22
mod/book/tool/print/templates/print_book.mustache
View file

@ -63,15 +63,15 @@
}}
<div class="book p-4">
<div class="text-right">{{{ printdialoglink }}}</div>
<div class="text-center p-b-1 book_title">{{{ booktitle }}}</div>
<div class="book_info w-100 p-t-3 d-inline-block">
<div class="text-center pb-3 book_title">{{{ booktitle }}}</div>
<div class="book_info w-100 pt-6 d-inline-block">
<div class="w-50 float-left">
<table>
<tr>
<td>
{{# str }} site {{/ str }}:
</td>
<td class="p-l-1">
<td class="pl-3">
{{{ sitelink }}}
</td>
</tr>
@ -79,7 +79,7 @@
<td>
{{# str }} course {{/ str }}:
</td>
<td class="p-l-1">
<td class="pl-3">
{{{ coursename }}}
</td>
</tr>
@ -87,7 +87,7 @@
<td>
{{# str }} modulename, mod_book {{/ str }}:
</td>
<td class="p-l-1">
<td class="pl-3">
{{{ modulename }}}
</td>
</tr>
@ -99,7 +99,7 @@
<td>
{{# str }} printedby, booktool_print {{/ str }}:
</td>
<td class="p-l-1">
<td class="pl-3">
{{{ username }}}
</td>
</tr>
@ -107,7 +107,7 @@
<td>
{{# str }} printdate, booktool_print {{/ str }}:
</td>
<td class="p-l-1">
<td class="pl-3">
{{{ printdate }}}
</td>
</tr>
@ -116,19 +116,19 @@
</div>
{{#bookintro}}
<div class="w-100 book_description">
<div class="p-b-2 p-t-2">
<h2 class="text-center p-b-2">{{#str}} description {{/str}}</h2>
<div class="py-5">
<h2 class="text-center pb-5">{{#str}} description {{/str}}</h2>
<p class="book_summary">{{{ bookintro }}}</p>
</div>
</div>
{{/bookintro}}
<div class="w-100">
<div class="p-b-2 p-t-2">{{{ toc }}}</div>
<div class="py-5">{{{ toc }}}</div>
</div>
<div class="w-100">
{{#chapters}}
{{#visible }}
<div class="p-b-2">
<div class="pb-5">
{{{ content }}}
</div>
{{/visible}}

2
mod/book/tool/print/templates/print_book_chapter.mustache
View file

@ -44,7 +44,7 @@
}}
<div class="chapter col-12 p-4">
<div class="text-right">{{{ printdialoglink }}}</div>
<div class="text-center p-b-2">{{{ booktitle }}}</div>
<div class="text-center pb-5">{{{ booktitle }}}</div>
<div class="chapter">
{{#parentchaptertitle}}
<div class="text-center">

2
mod/forum/report/summary/index.php
View file

@ -167,7 +167,7 @@ if ($download) {
\forumreport_summary\event\report_viewed::create($eventparams)->trigger();
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('summarytitle', 'forumreport_summary', $title), 2, 'p-b-2');
echo $OUTPUT->heading(get_string('summarytitle', 'forumreport_summary', $title), 2, 'pb-5');
if (!empty($filters['groups'])) {
\core\notification::info(get_string('viewsdisclaimer', 'forumreport_summary'));

2
mod/forum/report/summary/templates/filter_groups.mustache
View file

@ -53,7 +53,7 @@
</div>
{{! Groups filter popover }}
<div id="filter-groups-popover" class="popover m-t-1 hidden" data-openfilter="false">
<div id="filter-groups-popover" class="popover mt-3 hidden" data-openfilter="false">
<h3 class="popover-header">{{# str}} filter:groupsname, forumreport_summary {{/ str}}</h3>
<div class="popover-body" data-region="filter-groups">
<div class="form-check filter-scrollable">

10
mod/forum/templates/discussion_list.mustache
View file

@ -50,7 +50,7 @@
{{{groupchangemenu}}}
<div class="p-t-1 p-b-1">
<div class="py-3">
{{#forum.capabilities.create}}
<a class="btn btn-primary" data-toggle="collapse" href="#collapseAddForm">
{{$discussion_create_text}}
@ -60,7 +60,7 @@
{{/forum.capabilities.create}}
{{^forum.capabilities.create}}
{{#forum.capabilities.selfenrol}}
<div class="p-t-1 p-b-1">
<div class="py-3">
<a class="btn btn-primary" href="{{forum.urls.create}}">
{{$discussion_create_text}}
{{#str}}addanewdiscussion, forum{{/str}}
@ -81,7 +81,7 @@
{{/forum.capabilities.grade}}
</div>
{{#forum.capabilities.create}}
<div class="collapse m-t-1 p-b-1" id="collapseAddForm">
<div class="collapse mt-3 pb-3" id="collapseAddForm">
{{{newdiscussionhtml}}}
</div>
{{/forum.capabilities.create}}
@ -101,7 +101,7 @@
<th scope="col">
<span class="accesshide">{{#str}}status{{/str}}</span>
</th>
<th scope="col" class="p-l-0">
<th scope="col" class="pl-0">
{{#state.sortorder.isdiscussiondesc}}
<a href="{{{forum.urls.sortdiscussionasc}}}" aria-label="{{#str}}discussionlistsortbydiscussionasc, mod_forum{{/str}}">{{#str}}discussion, mod_forum{{/str}}</a> <span class="text-primary">{{#pix}}t/downlong, core, {{#str}}desc, core{{/str}}{{/pix}}</span>
{{/state.sortorder.isdiscussiondesc}}
@ -206,7 +206,7 @@
{{/discussion.pinned}}
</td>
<th scope="row" class="topic p-0 align-middle">
<div class="p-3 p-l-0">
<div class="p-3 pl-0">
<a class="w-100 h-100 d-block" href="{{discussion.urls.view}}" title="{{discussion.name}}" aria-label="{{discussion.name}}">
{{#shortentext}}100, {{{discussion.name}}}{{/shortentext}}
</a>

2
mod/forum/templates/forum_discussion.mustache
View file

@ -33,7 +33,7 @@
<div id="discussion-container-{{uniqid}}" data-content="forum-discussion">
{{#html}}
{{#hasanyactions}}
<div class="d-flex flex-wrap flex-row-reverse m-b-1 text-right" data-container="discussion-tools">
<div class="d-flex flex-wrap flex-row-reverse mb-3 text-right" data-container="discussion-tools">
<div class="pl-1">
<div class="discussion-settings-menu">
{{> mod_forum/forum_action_menu}}

10
mod/forum/templates/local/grades/view_grade.mustache
View file

@ -39,11 +39,11 @@
}}
<div class="container-fluid grade-display" data-region="view-grade">
{{#grade}}
<div class="row-fluid px-3">
<div class="row px-3">
<h5 class="font-weight-bold description">{{#str}}grade{{/str}}:</h5>
<p class="ml-auto">{{usergrade}} / {{maxgrade}}</p>
</div>
<div class="row-fluid px-3">
<div class="row px-3">
<h5 class="font-weight-bold description">{{#str}}gradedby, forum{{/str}}:</h5>
<p class="ml-auto">
{{#gradedby}}
@ -54,12 +54,12 @@
{{/gradedby}}
</p>
</div>
<div class="row-fluid px-3">
<div class="row px-3">
<h5 class="font-weight-bold description">{{#str}}date{{/str}}:</h5>
<p class="ml-auto">{{#userdate}}{{timemodified}}, {{#str}} strftimedate, langconfig {{/str}}{{/userdate}}</p>
</div>
{{/grade}}
<div class="row-fluid px-3">
<div class="row px-3">
<h5 class="font-weight-bold description">
{{#str}}gradingstatus, forum{{/str}}
</h5>
@ -72,7 +72,7 @@
{{/hasgrade}}
</p>
</div>
<div class="row-fluid p-3">
<div class="row p-3">
<fieldset class="w-100" disabled="disabled">
<div class="w-100" data-region="grade-template"></div>
</fieldset>

4
mod/forum/tests/mail_test.php
View file

@ -1117,7 +1117,7 @@ class mod_forum_mail_testcase extends advanced_testcase {
$newcase['forums'][0]['forumposts'][0]['name'] = 'HTML text and image';
$newcase['forums'][0]['forumposts'][0]['message'] = '<p>Welcome to Moodle, '
.'<img src="@@PLUGINFILE@@/Screen%20Shot%202016-03-22%20at%205.54.36%20AM%20%281%29.png"'
.' alt="" width="200" height="393" class="img-responsive" />!</p>';
.' alt="" width="200" height="393" class="img-fluid" />!</p>';
$newcase['expectations'][0]['subject'] = '.*101.*HTML text and image';
$newcase['expectations'][0]['contents'] = array(
'~{\$a',
@ -1127,7 +1127,7 @@ class mod_forum_mail_testcase extends advanced_testcase {
'<p>Welcome to Moodle, '
.'<img src="https://www.example.com/moodle/tokenpluginfile.php/[^/]*/\d+/mod_forum/post/\d+/'
.'Screen%20Shot%202016-03-22%20at%205\.54\.36%20AM%20%281%29\.png"'
.' alt="" width="200" height="393" class="img-responsive" />!</p>',
.' alt="" width="200" height="393" class="img-fluid" />!</p>',
'>Love Moodle', '>1\d1');
$htmlcases['HTML mail with text+image message i.e. @@PLUGINFILE@@ token handling'] = array('data' => $newcase);

2
mod/glossary/formats/entrylist/entrylist_format.php
View file

@ -25,7 +25,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
}
if (!empty($entry->rating)) {
echo '<br />';
echo '<span class="ratings d-block p-t-1">';
echo '<span class="ratings d-block pt-3">';
$return = glossary_print_entry_ratings($course, $entry);
echo '</span>';
}

2
mod/glossary/lib.php
View file

@ -1369,7 +1369,7 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m
echo '<tr valign="top"><td class="icons">'.$icons.'</td></tr>';
}
if (!empty($entry->rating)) {
echo '<tr valign="top"><td class="ratings p-t-1">';
echo '<tr valign="top"><td class="ratings pt-3">';
glossary_print_entry_ratings($course, $entry);
echo '</td></tr>';
}

4
mod/lesson/locallib.php
View file

@ -2317,7 +2317,7 @@ class lesson extends lesson_base {
if ($instancename) {
return html_writer::link(new moodle_url('/mod/'.$modname.'/view.php',
array('id' => $this->properties->activitylink)), get_string('activitylinkname',
'lesson', $instancename), array('class' => 'centerpadded lessonbutton standardbutton p-r-1'));
'lesson', $instancename), array('class' => 'centerpadded lessonbutton standardbutton pr-3'));
}
}
}
@ -4261,7 +4261,7 @@ abstract class lesson_page extends lesson_base {
$options->attemptid = isset($attempt) ? $attempt->id : null;
$result->feedback .= $OUTPUT->box(format_text($this->get_contents(), $this->properties->contentsformat, $options),
'generalbox boxaligncenter p-y-1');
'generalbox boxaligncenter py-3');
$result->feedback .= '<div class="correctanswer generalbox"><em>'
. get_string("youranswer", "lesson").'</em> : <div class="studentanswer mt-2 mb-2">';

7
mod/lesson/renderer.php
View file

@ -620,7 +620,8 @@ class mod_lesson_renderer extends plugin_renderer_base {
$output .= $this->box_end(); // End of Lesson button to Continue.
if ($data->reviewlesson !== false) {
$output .= html_writer::link($data->reviewlesson, get_string('reviewlesson', 'lesson'), array('class' => 'centerpadded lessonbutton standardbutton p-r-1'));
$output .= html_writer::link($data->reviewlesson, get_string('reviewlesson', 'lesson'),
array('class' => 'centerpadded lessonbutton standardbutton pr-3'));
}
if ($data->modattemptsnoteacher !== false) {
$output .= $this->paragraph(get_string("modattemptsnoteacher", "lesson"), 'centerpadded');
@ -632,13 +633,13 @@ class mod_lesson_renderer extends plugin_renderer_base {
$url = new moodle_url('/course/view.php', array('id' => $course->id));
$output .= html_writer::link($url, get_string('returnto', 'lesson', format_string($course->fullname, true)),
array('class' => 'centerpadded lessonbutton standardbutton p-r-1'));
array('class' => 'centerpadded lessonbutton standardbutton pr-3'));
if (has_capability('gradereport/user:view', context_course::instance($course->id))
&& $course->showgrades && $lesson->grade != 0 && !$lesson->practice) {
$url = new moodle_url('/grade/index.php', array('id' => $course->id));
$output .= html_writer::link($url, get_string('viewgrades', 'lesson'),
array('class' => 'centerpadded lessonbutton standardbutton p-r-1'));
array('class' => 'centerpadded lessonbutton standardbutton pr-3'));
}
return $output;
}

6
mod/quiz/templates/modal_add_random_question.mustache
View file

@ -57,15 +57,15 @@
</li>
</ul>
<div class="tab-content" data-region="tab-content">
<div class="text-sm-center p-t-2" data-region="loading-container">
<div class="text-sm-center pt-5" data-region="loading-container">
{{> core/loading }}
</div>
<div class="tab-pane active p-t-1"
<div class="tab-pane active pt-3"
id="existing-category-{{uniqid}}"
role="tabpanel"
data-region="existing-category-container">
</div>
<div class="tab-pane p-t-1"
<div class="tab-pane pt-3"
id="new-category-{{uniqid}}"
role="tabpanel"
data-region="new-category-container">

2
mod/quiz/tests/behat/manually_mark_question.feature
View file

@ -76,7 +76,7 @@ Feature: Teachers can override the grade for any question
And I click on "Save image" "button"
# Editor is not inserting the html for the image correctly
# when running under behat so line below manually inserts it.
And I set the field "Comment" to "<img src=\"@@PLUGINFILE@@/moodle_logo.jpg\" alt=\"It's the logo\" width=\"48\" height=\"48\" class=\"img-responsive atto_image_button_text-bottom\"><!-- File hash: a8e3ffba4ab315b3fb9187ebbf122fe9 -->"
And I set the field "Comment" to "<img src=\"@@PLUGINFILE@@/moodle_logo.jpg\" alt=\"It's the logo\" width=\"48\" height=\"48\" class=\"img-fluid atto_image_button_text-bottom\"><!-- File hash: a8e3ffba4ab315b3fb9187ebbf122fe9 -->"
And I press "Save" and switch to main window
And I switch to the main window
And I should see "Commented: [It's the logo]" in the ".history table" "css_element"