From 2c3a6e2479d203dc8306edbdc71e060c068e8dda Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 26 Aug 2016 08:29:43 +0800
Subject: [PATCH] MDL-55657 theme_noname: Use a separate template for
 passwordunmask

Part of MDL-55071
---
 lib/form/passwordunmask.php                   |  1 +
 .../core_form/element-password.mustache       |  9 --------
 .../core_form/element-passwordunmask.mustache | 23 +++++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 theme/noname/templates/core_form/element-passwordunmask.mustache

diff --git a/lib/form/passwordunmask.php b/lib/form/passwordunmask.php
index b8d4102ea81..73bee9d211d 100644
--- a/lib/form/passwordunmask.php
+++ b/lib/form/passwordunmask.php
@@ -65,6 +65,7 @@ class MoodleQuickForm_passwordunmask extends MoodleQuickForm_password {
         }
 
         parent::__construct($elementName, $elementLabel, $attributes);
+        $this->setType('passwordunmask');
     }
 
     /**
diff --git a/theme/noname/templates/core_form/element-password.mustache b/theme/noname/templates/core_form/element-password.mustache
index 8d6d191ef56..ac1da19d34b 100644
--- a/theme/noname/templates/core_form/element-password.mustache
+++ b/theme/noname/templates/core_form/element-password.mustache
@@ -12,12 +12,3 @@
                 {{/error}} {{{attributes}}}>
     {{/element}}
 {{/ core_form/element-template }}
-{{#js}}
-require(['core/yui'], function(Y) {
-    Y.use('moodle-form-passwordunmask', function() {
-        M.form.passwordunmask({ formid: {{#quote}}{{element.id}}{{/quote}},
-                                checkboxlabel: {{#quote}}{{#str}}unmaskpassword, form{{/str}}{{/quote}},
-                                checkboxname: {{#quote}}{{element.name}}{{/quote}} });
-    });
-});
-{{/js}}
diff --git a/theme/noname/templates/core_form/element-passwordunmask.mustache b/theme/noname/templates/core_form/element-passwordunmask.mustache
new file mode 100644
index 00000000000..8d6d191ef56
--- /dev/null
+++ b/theme/noname/templates/core_form/element-passwordunmask.mustache
@@ -0,0 +1,23 @@
+{{< core_form/element-template }}
+    {{$element}}
+        <input type="password"
+                {{#element.frozen}}readonly{{/element.frozen}}
+                class="form-control {{#error}}form-control-danger{{/error}}"
+                name="{{element.name}}"
+                id="{{element.id}}"
+                value="{{element.value}}"
+                size="{{element.size}}"
+                {{#error}}
+                    autofocus aria-describedby="id_error_{{element.name}}"
+                {{/error}} {{{attributes}}}>
+    {{/element}}
+{{/ core_form/element-template }}
+{{#js}}
+require(['core/yui'], function(Y) {
+    Y.use('moodle-form-passwordunmask', function() {
+        M.form.passwordunmask({ formid: {{#quote}}{{element.id}}{{/quote}},
+                                checkboxlabel: {{#quote}}{{#str}}unmaskpassword, form{{/str}}{{/quote}},
+                                checkboxname: {{#quote}}{{element.name}}{{/quote}} });
+    });
+});
+{{/js}}