L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-70721 output: remove {{#quote}} wherever it was misused

Browse Source 
Also use the new {{#cleanstr}} helper where it was more appropriate
than the {{#str} helper.
This commit is contained in:
Shamim Rezaie
2021-11-16 10:09:10 +11:00
parent 3c9e9efc97
commit c587c353c5
18 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/templates/setting_configcolourpicker.mustache
+1 -1
View File
@@ -48,6 +48,6 @@
</div>
<input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
{{#haspreviewconfig}}
<input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
<input type="button" id="{{id}}_preview" value="{{#cleanstr}}preview{{/cleanstr}}" class="admin_colourpicker_preview">
{{/haspreviewconfig}}
</div>
admin/tool/policy/templates/page_agreedocs.mustache
+2 -2
View File
@@ -134,9 +134,9 @@
{{# str }}somefieldsrequired, form, <i class="icon fa fa-exclamation-circle text-danger fa-fw" title="{{# str }} required {{/ str }}" ></i>{{/ str }}
<hr>
<input type="submit" class="btn btn-primary" name="submit" value={{#quote}}{{#str}} next {{/str}}{{/quote}}>
<input type="submit" class="btn btn-primary" name="submit" value="{{#cleanstr}} next {{/cleanstr}}">
{{#cancancel}}
<input type="submit" class="btn btn-secondary" name="cancel" value={{#quote}}{{#str}} cancel {{/str}}{{/quote}}>
<input type="submit" class="btn btn-secondary" name="cancel" value="{{#cleanstr}} cancel {{/cleanstr}}">
{{/cancancel}}
</form>
blocks/timeline/templates/event-list-item.mustache
+2 -2
View File
@@ -50,8 +50,8 @@
</div>
<div class="w-100 event-name-container text-truncate line-height-3">
<a href="{{url}}"
title={{#quote}}{{{name}}}{{/quote}}
aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": {{#quote}}{{{name}}}{{/quote}}, "course": {{#quote}}{{{course.fullnamedisplay}}}{{/quote}}, "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
title="{{name}}"
aria-label='{{#cleanstr}} ariaeventlistitem, block_timeline, { "name": {{#quote}}{{{name}}}{{/quote}}, "course": {{#quote}}{{{course.fullnamedisplay}}}{{/quote}}, "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/cleanstr}}'
><h6 class="event-name text-truncate mb-0">{{{name}}}</h6></a>
{{#course.fullnamedisplay}}
<small class="text-muted text-truncate mb-0">{{{course.fullnamedisplay}}}</small>
enrol/fee/templates/payment_region.mustache
+1 -1
View File
@@ -67,7 +67,7 @@
data-itemid="{{instanceid}}"
data-cost="{{cost}}"
data-successurl="{{successurl}}"
data-description={{# quote }}{{description}}{{/ quote }}
data-description="{{description}}"
>
{{# str }} sendpaymentbutton, enrol_fee {{/ str }}
</button>
enrol/lti/templates/copy_grid.mustache
+1 -1
View File
@@ -49,7 +49,7 @@
{{#rows}}
<div>
<label style="display: inline-block; width: 5em"
{{#id}}for={{#quote}}{{{id}}}-{{{uniqid}}}{{/quote}}{{/id}} {{#hidelabel}}
{{#id}}for="{{id}}-{{uniqid}}"{{/id}} {{#hidelabel}}
class="accesshide"{{/hidelabel}}>{{label}}</label>
<div style="display: inline-block">{{> core/copy_box }}</div>
</div>
grade/report/history/templates/user_button.mustache
+2 -2
View File
@@ -47,8 +47,8 @@
{{/params}}
<input type="button" class="btn btn-secondary selectortrigger"
id="{{id}}"
title={{#quote}}{{tooltip}}{{/quote}}
value={{#quote}}{{label}}{{/quote}}
title="{{tooltip}}"
value="{{label}}"
{{#disabled}}disabled{{/disabled}}>
</div>
</div>
grade/report/singleview/templates/button.mustache
+1 -1
View File
@@ -25,4 +25,4 @@
"value": "Save"
}
}}
<input type="{{type}}" value={{#quote}}{{value}}{{/quote}} class="btn btn-secondary">
<input type="{{type}}" value="{{value}}" class="btn btn-secondary">
grade/templates/edit_tree.mustache
+1 -1
View File
@@ -51,7 +51,7 @@
{{{table}}}
<div id="gradetreesubmit">
{{#showsave}}
<input class="advanced btn btn-primary" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
<input class="advanced btn btn-primary" type="submit" value="{{#cleanstr}}savechanges{{/cleanstr}}">
{{/showsave}}
{{#showbulkmove}}
<div class="form-inline mt-3">
lib/templates/action_menu_link.mustache
+1 -1
View File
@@ -27,7 +27,7 @@
}
}}
{{^disabled}}
<a href="{{url}}" class="{{$actionmenulinkclasses}}aabtn {{classes}}{{/actionmenulinkclasses}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>
<a href="{{url}}" class="{{$actionmenulinkclasses}}aabtn {{classes}}{{/actionmenulinkclasses}}" {{#attributes}}{{name}}="{{value}}" {{/attributes}}{{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>
{{#icon}}
{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}
{{/icon}}
lib/templates/block.mustache
+1 -1
View File
@@ -25,7 +25,7 @@
role="{{ariarole}}"
data-block="{{type}}"
{{#arialabel}}
aria-label={{#quote}}{{{arialabel}}}{{/quote}}
aria-label="{{arialabel}}"
{{/arialabel}}
{{^arialabel}}
{{#title}}
lib/templates/chooser.mustache
+2 -2
View File
@@ -68,8 +68,8 @@
</div>
<div class="submitbuttons">
<input type="submit" name="submitbutton" class="submitbutton btn btn-primary" value={{#quote}}{{#str}}add{{/str}}{{/quote}}>
<input type="submit" name="addcancel" class="addcancel btn btn-secondary" value={{#quote}}{{#str}}cancel{{/str}}{{/quote}}>
<input type="submit" name="submitbutton" class="submitbutton btn btn-primary" value="{{#cleanstr}}add{{/cleanstr}}">
<input type="submit" name="addcancel" class="addcancel btn btn-secondary" value="{{#cleanstr}}cancel{{/cleanstr}}">
</div>
</form>
lib/templates/copy_box.mustache
+1 -1
View File
@@ -31,7 +31,7 @@
Example context (json):
{ "text": "Copyable text"}
}}
<input type="text" class="copy_box" value="{{{ text }}}" readonly="readonly" size="48" {{#id}}id={{#quote}}{{{id}}}-{{{uniqid}}}{{/quote}}{{/id}}/>
<input type="text" class="copy_box" value="{{{ text }}}" readonly="readonly" size="48" {{#id}}id="{{id}}-{{uniqid}}"{{/id}}/>
{{# js }}
require(['jquery'], function($) {
$('.copy_box').on('click', function() {
lib/templates/loginform.mustache
+3 -3
View File
@@ -141,14 +141,14 @@
<input type="text" name="username" id="username"
class="form-control"
value="{{username}}"
placeholder={{#quote}}{{^canloginbyemail}}{{#str}}username{{/str}}{{/canloginbyemail}}{{#canloginbyemail}}{{#str}}usernameemail{{/str}}{{/canloginbyemail}}{{/quote}}
placeholder="{{^canloginbyemail}}{{#cleanstr}}username{{/cleanstr}}{{/canloginbyemail}}{{#canloginbyemail}}{{#cleanstr}}usernameemail{{/cleanstr}}{{/canloginbyemail}}"
autocomplete="username">
</div>
<div class="form-group">
<label for="password" class="sr-only">{{#str}} password {{/str}}</label>
<input type="password" name="password" id="password" value=""
class="form-control"
placeholder={{#quote}}{{#str}}password{{/str}}{{/quote}}
placeholder="{{#cleanstr}}password{{/cleanstr}}"
autocomplete="current-password">
</div>
{{#rememberusername}}
@@ -188,7 +188,7 @@
<div class="potentialidplist mt-3">
{{#identityproviders}}
<div class="potentialidp">
<a href="{{url}}" title={{#quote}}{{name}}{{/quote}} class="btn btn-secondary btn-block">
<a href="{{url}}" title="{{name}}" class="btn btn-secondary btn-block">
{{#iconurl}}
<img src="{{iconurl}}" alt="" width="24" height="24"/>
{{/iconurl}}
lib/templates/modal.mustache
+1 -1
View File
@@ -48,7 +48,7 @@
{{$header}}
<h5 id="{{uniqid}}-modal-title" class="modal-title" data-region="title">{{$title}}{{title}}{{/title}}</h5>
{{/header}}
<button type="button" class="close" data-action="hide" aria-label={{#quote}}{{#str}}closebuttontitle{{/str}}{{/quote}}>
<button type="button" class="close" data-action="hide" aria-label="{{#cleanstr}}closebuttontitle{{/cleanstr}}">
<span aria-hidden="true">&times;</span>
</button>
</div>
lib/templates/single_button.mustache
+2 -2
View File
@@ -58,9 +58,9 @@
{{/params}}
<button type="submit" class="btn {{#primary}}btn-primary{{/primary}}{{^primary}}btn-secondary{{/primary}}"
id="{{id}}"
title={{#quote}}{{tooltip}}{{/quote}}
title="{{tooltip}}"
{{#disabled}}disabled{{/disabled}}
{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{label}}</button>
{{#attributes}} {{name}}="{{value}}" {{/attributes}}>{{label}}</button>
</form>
</div>
{{#hasactions}}
message/templates/message_drawer.mustache
+1 -1
View File
@@ -38,7 +38,7 @@
<div id="message-drawer-{{uniqid}}" class="message-app" data-region="message-drawer" role="region">
<div class="closewidget text-right pr-2">
<a class="text-dark btn-link" data-action="closedrawer" href="#"
title="{{#str}} closebuttontitle {{/str}}" aria-label="{{#str}} closebuttontitle {{/str}}"
title="{{#cleanstr}} closebuttontitle {{/cleanstr}}" aria-label="{{#cleanstr}} closebuttontitle {{/cleanstr}}"
>
{{#pix}} i/window_close, core {{/pix}}
</a>
message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
+12 -12
View File
@@ -40,45 +40,45 @@
<div class="mb-2 custom-control custom-checkbox hidden" data-region="delete-messages-for-all-users-toggle-container">
<input type="checkbox" class="custom-control-input" id="delete-messages-for-all-users" data-region="delete-messages-for-all-users-toggle">
<label class="custom-control-label text-muted" for="delete-messages-for-all-users">
{{#str}} deleteforeveryone, core_message {{/str}}
{{#cleanstr}} deleteforeveryone, core_message {{/cleanstr}}
</label>
</div>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-block">
<span data-region="dialogue-button-text">{{#str}} blockuserconfirmbutton, core_message {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} blockuserconfirmbutton, core_message {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-unblock">
<span data-region="dialogue-button-text">{{#str}} unblock, core_message {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} unblock, core_message {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-remove-contact">
<span data-region="dialogue-button-text">{{#str}} remove, core {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} remove, core {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-add-contact">
<span data-region="dialogue-button-text">{{#str}} add, core {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} add, core {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-delete-selected-messages">
<span data-region="dialogue-button-text">{{#str}} delete, core {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} delete, core {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="confirm-delete-conversation">
<span data-region="dialogue-button-text">{{#str}} delete, core {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} delete, core {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="request-add-contact">
<span data-region="dialogue-button-text">{{#str}} sendcontactrequest, core_message {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} sendcontactrequest, core_message {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block hidden" data-action="accept-contact-request">
<span data-region="dialogue-button-text">{{#str}} acceptandaddcontact, core_message {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} acceptandaddcontact, core_message {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-secondary btn-block hidden" data-action="decline-contact-request">
<span data-region="dialogue-button-text">{{#str}} decline, core_message {{/str}}</span>
<span data-region="dialogue-button-text">{{#cleanstr}} decline, core_message {{/cleanstr}}</span>
<span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
</button>
<button type="button" class="btn btn-primary btn-block" data-action="okay-confirm">{{#str}} ok, core {{/str}}</button>
<button type="button" class="btn btn-secondary btn-block" data-action="cancel-confirm">{{#str}} cancel, core {{/str}}</button>
<button type="button" class="btn btn-primary btn-block" data-action="okay-confirm">{{#cleanstr}} ok, core {{/cleanstr}}</button>
<button type="button" class="btn btn-secondary btn-block" data-action="cancel-confirm">{{#cleanstr}} cancel, core {{/cleanstr}}</button>
</div>
report/insights/templates/bulk_action_button.mustache
+2 -2
View File
@@ -55,7 +55,7 @@
{{/params}}
<button type="submit" class="btn {{#primary}}btn-primary{{/primary}}{{^primary}}btn-outline-primary{{/primary}}"
id="{{id}}"
title={{#quote}}{{tooltip}}{{/quote}}
title="{{tooltip}}"
{{#disabled}}disabled{{/disabled}}
{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{{label}}}</button>
{{#attributes}} {{name}}="{{value}}" {{/attributes}}>{{{label}}}</button>
</div>