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

Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2016-10-31 09:10:06 +00:00
parent 0b03040605 ad785e699e
commit 75de2e6199
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/templates/setting_configpasswordunmask.mustache
+15 -10
View File
@@ -35,18 +35,14 @@
}}
<div class="form-password">
<span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
<noscript>
<!-- Backwards compatability for Behat -->
<input type="password"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
>
</noscript>
<span class="visibleifjs">
<span data-passwordunmask="editor">
<!-- The input in the noscript will be moved here as part of the page load -->
<input type="hidden"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
>
</span>
<a href="#" data-passwordunmask="edit" title="{{ edithint }}">
<span data-passwordunmask="displayvalue">{{> core_form/element-passwordunmask-fill }}</span>
@@ -59,6 +55,15 @@
{{# str }} passwordunmaskinstructions, form {{/ str }}
</span>
</span>
<noscript>
<!-- Backwards compatability for Behat -->
<input type="password"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
>
</noscript>
</span>
</div>
{{#js}}
theme/boost/templates/core_admin/setting_configpasswordunmask.mustache
+17 -11
View File
@@ -35,19 +35,15 @@
}}
<div class="form-password">
<span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
<noscript>
<!-- Backwards compatability for Behat -->
<input type="password"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
class="form-control d-inline-block"
>
</noscript>
<span class="visibleifjs">
<span data-passwordunmask="editor">
<!-- The input in the noscript will be moved here as part of the page load -->
<input type="hidden"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
class="form-control d-inline-block"
>
</span>
<a href="#" data-passwordunmask="edit" title="{{ edithint }}">
<span data-passwordunmask="displayvalue">{{> core_form/element-passwordunmask-fill }}</span>
@@ -60,6 +56,16 @@
{{# str }} passwordunmaskinstructions, form {{/ str }}
</span>
</span>
<noscript>
<!-- Backwards compatability for Behat -->
<input type="password"
name="{{ name }}"
id="{{ id }}"
value="{{ value }}"
size="{{ size }}"
class="form-control d-inline-block"
>
</noscript>
</span>
</div>
{{#js}}