Skip to content

Commit

Permalink
MDL-64506 templates: BS2 m-x-x to BS4 mx-x
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolate-lightning committed Apr 3, 2019
1 parent b293214 commit 5cac5fa
Show file tree
Hide file tree
Showing 150 changed files with 444 additions and 394 deletions.
2 changes: 1 addition & 1 deletion admin/roles/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
marginRight : 'auto'
});
// Create the capability search input.
this.input = Y.Node.create('<input class="form-control m-x-1" type="text"' +
this.input = Y.Node.create('<input class="form-control mx-1" type="text"' +
' id="'+this.table.get('id')+'capabilitysearch" value="'+Y.Escape.html(filtervalue)+'" />');
// Create a label for the search input.
this.label = Y.Node.create('<label for="' + this.input.get('id') + '">' +
Expand Down
4 changes: 2 additions & 2 deletions admin/tool/analytics/classes/output/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function render_evaluate_results($results, $logs = array()) {
foreach ($results as $timesplittingid => $result) {

if (!CLI_SCRIPT) {
$output .= $OUTPUT->box_start('generalbox m-b-3');
$output .= $OUTPUT->box_start('generalbox mb-3');
}

// Check that the array key is a string, not all results depend on time splitting methods (e.g. general errors).
Expand Down Expand Up @@ -177,7 +177,7 @@ public function render_get_predictions_results($trainresults = false, $trainlogs
}

if ($predictresults || (!empty($predictlogs) && debugging())) {
$output .= $OUTPUT->heading(get_string('predictionresults', 'tool_analytics'), 3, 'main m-t-3');
$output .= $OUTPUT->heading(get_string('predictionresults', 'tool_analytics'), 3, 'main mt-3');
}

if ($predictresults) {
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/analytics/templates/invalid_analysables.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<h3>{{#str}}modelinvalidanalysables, tool_analytics, {{modelname}}{{/str}}</h3>
<div>{{#str}}invalidanalysablesinfo, tool_analytics{{/str}}</div>
{{#noanalysables}}
<div class="m-t-2 m-b-1">
<div class="mt-2 mb-1">
{{> core/notification_info}}
</div>
{{/noanalysables}}
{{^noanalysables}}
<div class="m-t-2 m-b-1">
<div class="mt-2 mb-1">
<span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
<span>{{#next}}{{> core/single_button}}{{/next}}</span>
</div>
Expand All @@ -77,7 +77,7 @@
{{/analysables}}
</tbody>
</table>
<div class="m-t-1 m-b-2">
<div class="mt-1 mb-2">
<span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
<span>{{#next}}{{> core/single_button}}{{/next}}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/customlang/templates/translator.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
{{{ outdatedhelp}}}
</div>
{{#showoriginalvsmaster}}
<div class="alert-secondary mt-3 m-t-1">
<div class="alert-secondary mt-3 mt-1">
{{{ original }}}
</div>
{{/showoriginalvsmaster}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function col_name($expiredctx) {
}
$infoicon = new pix_icon('i/info', implode(' / ', array_reverse($contextsinpath)));
$infoiconhtml = $OUTPUT->render($infoicon);
$name = html_writer::span(get_string('nameandparent', 'tool_dataprivacy', $contextdata), 'm-r-1');
$name = html_writer::span(get_string('nameandparent', 'tool_dataprivacy', $contextdata), 'mr-1');

return $name . $infoiconhtml;
}
Expand All @@ -158,7 +158,7 @@ public function col_info($expiredctx) {
}
$infoicon = new pix_icon('i/info', implode(', ', $childnames));
$infoiconhtml = $OUTPUT->render($infoicon);
$name = html_writer::span(get_string('nchildren', 'tool_dataprivacy', count($children)), 'm-r-1');
$name = html_writer::span(get_string('nchildren', 'tool_dataprivacy', count($children)), 'mr-1');

return $name . $infoiconhtml;
}
Expand Down
4 changes: 2 additions & 2 deletions admin/tool/dataprivacy/templates/categories.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
{{> core/action_link}}
{{/navigation}}

<div data-region="categories" class="m-t-3 m-b-1">
<div class="m-y-1">
<div data-region="categories" class="mt-3 mb-1">
<div class="my-1">
<button class="btn btn-secondary" data-add-element="category" title="{{#str}}addcategory, tool_dataprivacy{{/str}}">
{{#pix}}t/add, moodle, {{#str}}addcategory, tool_dataprivacy{{/str}}{{/pix}}
</button>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dataprivacy/templates/contact_dpo.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
}}
<div class="container">
<div class="row m-b-2">
<div class="row mb-2">
<label class="col-md-3 col-form-label">{{#str}}replyto, tool_dataprivacy{{/str}}</label>
<div class="col-md-9 col-form-label">{{replytoemail}}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dataprivacy/templates/data_deletion.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
{{/existingcontexts}}
</div>
<div class="row m-t-1 m-b-1" data-region="expired-contexts-table">
<div class="row mt-1 mb-1" data-region="expired-contexts-table">
{{{expiredcontexts}}}
</div>
<div class="row" data-region="bottom-nav">
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/dataprivacy/templates/data_registry.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
{{/actions}}
</div>
{{#info}}
<div class="m-t-1">
<div class="mt-1">
{{> core/notification_info}}
</div>
{{/info}}
{{#nosystemdefaults}}
<div class="m-t-1">
<div class="mt-1">
{{> core/notification_warning}}
</div>
{{/nosystemdefaults}}

<div class="container-fluid m-t-2">
<div class="container-fluid mt-2">
<div class="row">
<div class="col-md-4 p-l-0 nav-pills context-tree">
{{#tree}}
Expand Down
4 changes: 2 additions & 2 deletions admin/tool/dataprivacy/templates/data_requests.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{{/httpsite}}

<div data-region="datarequests">
<div class="m-t-1 m-b-1">
<div class="mt-1 mb-1">
<div class="pull-right">
<a href="{{newdatarequesturl}}" class="btn btn-primary" data-action="new-request">
{{#str}}newrequest, tool_dataprivacy{{/str}}
Expand All @@ -71,7 +71,7 @@
{{/filter}}
</div>

<div class="m-t-1 m-b-1" data-region="data-requests-table">
<div class="mt-1 mb-1" data-region="data-requests-table">
{{{datarequests}}}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"perpage" : "<div class='singleselect'></div>"
}
}}
<div class="m-t-1 d-inline-block w-100">
<div class="mt-1 d-inline-block w-100">
<div class="pull-left">
<select id="bulk-action" class="select custom-select">
{{#options}}
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/dataprivacy/templates/defaults_display.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
"contextlevel": 70
}
}}
<div class="row-fluid rtl-compatible m-t-1 m-b-1">
<div class="row-fluid rtl-compatible mt-1 mb-1">
<div class="col-md-9 span9">
<div class="row-fluid rtl-compatible m-t-1 m-b-1">
<div class="row-fluid rtl-compatible mt-1 mb-1">
<div class="col-md-3 span3">
<strong>{{#str}}category, tool_dataprivacy{{/str}}</strong>
</div>
<div class="col-md-9 span9">
{{category}}
</div>
</div>
<div class="row-fluid rtl-compatible m-t-1 m-b-1">
<div class="row-fluid rtl-compatible mt-1 mb-1">
<div class="col-md-3 span3">
<strong>{{#str}}purpose, tool_dataprivacy{{/str}}</strong>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dataprivacy/templates/defaults_page.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
{{/modemodule}}
{{/canedit}}
{{#modemodule}}
<table class="m-t-1 table table-striped">
<table class="mt-1 table table-striped">
<thead>
<tr>
<th>&nbsp;</th>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dataprivacy/templates/my_data_requests.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
{{/httpsite}}
<div data-region="datarequests">
<div class="m-t-1 m-b-1">
<div class="mt-1 mb-1">
<a href="{{newdatarequesturl}}" class="btn btn-primary" data-action="new-request">
{{#str}}newrequest, tool_dataprivacy{{/str}}
</a>
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/dataprivacy/templates/purposes.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}}

{{#navigation}}
<div class="m-b-1">
<div class="mb-1">
{{> core/action_link}}
</div>
{{/navigation}}
Expand All @@ -63,8 +63,8 @@
{{#str}}purposeoverview, tool_dataprivacy{{/str}}
</p>

<div data-region="purposes" class="m-b-1">
<div class="m-y-1">
<div data-region="purposes" class="mb-1">
<div class="my-1">
<button class="btn btn-secondary" data-add-element="purpose" title="{{#str}}addpurpose, tool_dataprivacy{{/str}}">
{{#pix}}t/add, moodle, {{#str}}addpurpose, tool_dataprivacy{{/str}}{{/pix}}
</button>
Expand Down
12 changes: 6 additions & 6 deletions admin/tool/dataprivacy/templates/request_details.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@
title="{{#str}}pictureof, moodle, {{foruser.fullname}}{{/str}}" />
</div>
<div class="media-body">
<h4 class="m-t-0 m-b-1">
<h4 class="mt-0 mb-1">
<a href="{{foruser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{foruser.fullname}}</a>
</h4>
<a href="mailto:{{foruser.email}}">{{foruser.email}}</a>
<div class="clearfix m-t-1 m-b-1">
<span class="pull-left m-r-1">
<div class="clearfix mt-1 mb-1">
<span class="pull-left mr-1">
<strong>{{#str}}daterequesteddetail, tool_dataprivacy{{/str}}</strong> {{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}
</span>
<span class="pull-left m-r-1">
<span class="pull-left mr-1">
<strong>{{#str}}statusdetail, tool_dataprivacy{{/str}}</strong>
<span class="badge {{statuslabelclass}}">{{statuslabel}}</span>
</span>
<span class="pull-left m-r-1">
<span class="pull-left mr-1">
<strong>{{#str}}requestbydetail, tool_dataprivacy{{/str}}</strong>
<span><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></span>
</span>
Expand All @@ -84,7 +84,7 @@
</div>
</div>
<hr>
<div class="m-b-1">
<div class="mb-1">
<strong>{{#str}}messagelabel, tool_dataprivacy{{/str}}</strong>
</div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/dataprivacy/templates/request_filter.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
]
}
}}
<form method="post" action="{{action}}" class="m-b-1" role="search" id="request_filter_form">
<form method="post" action="{{action}}" class="mb-1" role="search" id="request_filter_form">
<label for="request-filters" class="sr-only">{{#str}}filters{{/str}}</label>
<select name="request-filters[]" id="request-filters" multiple="multiple" class="form-autocomplete-original-select">
{{#filteroptions}}
Expand Down
4 changes: 2 additions & 2 deletions admin/tool/langimport/templates/langimport.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
}}
<div class="container-fluid langimport">
<div class="row row-fluid rtl-compatible">
<div class="col-md-{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} span{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} m-b-1">
<div class="col-md-{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} span{{#caninstall}}6{{/caninstall}}{{^caninstall}}12{{/caninstall}} mb-1">
<form id="uninstallform" action="{{uninstallurl}}" method="post">
<fieldset>
<div class="form-group">
Expand Down Expand Up @@ -94,7 +94,7 @@
{{/updateurl}}
</div>
{{#caninstall}}
<div class="col-md-6 m-b-1">
<div class="col-md-6 mb-1">
<form id="installform" action="{{installurl}}" method="post">
<fieldset>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/lp/templates/action_selector.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</div><br>
<div data-region="action-selector-radio-buttons">
{{#choices}}
<input id="action-selection-option-{{value}}" type="radio" class="m-r-1" name="choice" value="{{value}}"/><label for="action-selection-option-{{value}}">{{text}}</label><br>
<input id="action-selection-option-{{value}}" type="radio" class="mr-1" name="choice" value="{{value}}"/><label for="action-selection-option-{{value}}">{{text}}</label><br>
{{/choices}}
</div><br>
<div data-region="action_selector-buttons">
Expand Down
4 changes: 2 additions & 2 deletions admin/tool/lp/templates/competency_grader.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
{{/ratings}}
</select>
</div>
<div data-region="comment" class="m-t-1">
<div data-region="comment" class="mt-1">
<label for="comment_{{uniqid}}">{{#str}}ratecomment, tool_lp{{/str}}</label>
<textarea name="comment" id="comment_{{uniqid}}" class="form-control m-b-1"></textarea>
<textarea name="comment" id="comment_{{uniqid}}" class="form-control mb-1"></textarea>
</div>
</div>
<div data-region="footer" class="pull-xs-right">
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/lp/templates/competency_picker.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{{/frameworks}}
</select>
{{/singleFramework}}
<h3 class="m-t-1">{{#str}}locatecompetency, tool_lp{{/str}}</h3>
<h3 class="mt-1">{{#str}}locatecompetency, tool_lp{{/str}}</h3>

<form data-region="filtercompetencies" class="form-inline" data-frameworkid="{{framework.id}}">
<div class="form-group">
Expand All @@ -69,7 +69,7 @@
<button class="btn btn-secondary">{{#pix}}a/search, ,{{#str}}search{{/str}}{{/pix}}</button>
</div>
</form>
<ul data-enhance="linktree" style="display: none;" class="m-t-1 competency-tree">
<ul data-enhance="linktree" style="display: none;" class="mt-1 competency-tree">
<li><span>{{{framework.shortname}}}</span>
<ul>
{{#competencies}}
Expand All @@ -78,7 +78,7 @@
</ul>
</li>
</ul>
<div data-region="link-buttons" class="m-t-1 pull-xs-right">
<div data-region="link-buttons" class="mt-1 pull-xs-right">
<input type="button" class="btn btn-primary" data-action="add" value="{{#str}}add{{/str}}"/>
<input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<button class="btn btn-secondary">{{#pix}}a/search, ,{{#str}}search{{/str}}{{/pix}}</button>
</div>
</form>
<ul data-enhance="linktree" style="display: none;" class="m-t-1 competency-tree">
<ul data-enhance="linktree" style="display: none;" class="mt-1 competency-tree">
<li data-id="0"><span>{{{framework.shortname}}}</span>
<ul>
{{#competencies}}
Expand All @@ -60,7 +60,7 @@
</ul>
</li>
</ul>
<div data-region="link-buttons" class="m-t-1 pull-xs-right">
<div data-region="link-buttons" class="mt-1 pull-xs-right">
<input type="button" class="btn btn-primary" data-action="add" value="{{#str}}select{{/str}}"/>
<input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
</div>
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/lp/templates/competency_picker_user_plans.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</select>
{{/singlePlan}}

<h3 class="m-t-1">{{#str}}locatecompetency, tool_lp{{/str}}</h3>
<h3 class="mt-1">{{#str}}locatecompetency, tool_lp{{/str}}</h3>

<form data-region="filtercompetencies" data-planid="{{plan.id}}" class="form-inline">
<div class="form-group">
Expand All @@ -74,7 +74,7 @@
</div>
</form>

<ul data-enhance="linktree" style="display: none;" class="m-t-1 competency-tree">
<ul data-enhance="linktree" style="display: none;" class="mt-1 competency-tree">
<li><span>{{{plan.name}}}</span>
<ul>
{{#competencies}}
Expand All @@ -84,7 +84,7 @@
</li>
</ul>

<div data-region="link-buttons" class="m-t-1 pull-xs-right">
<div data-region="link-buttons" class="mt-1 pull-xs-right">
<input type="button" class="btn btn-primary" data-action="add" value="{{#str}}add{{/str}}"/>
<input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/lp/templates/competency_rule_config.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
{{/config}}
</div>

<div data-region="footer" class="pull-xs-right m-t-1">
<div data-region="footer" class="pull-xs-right mt-1">
{{#config}}
<input type="button" class="btn btn-primary" data-action="save" value="{{#str}}savechanges{{/str}}"/>
{{/config}}
Expand Down
Loading

0 comments on commit 5cac5fa

Please sign in to comment.