From d6f2ce1486f55048068d6cd364c2f923180a5e60 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 22 Aug 2016 12:22:21 +0800
Subject: [PATCH] MDL-55656 theme_noname: Include advanced and required field
 markup

The new form elements were not including the markup for advanced
and required fields. I used an <abbr> tag in the label to give
and accessible indication of the advanced and required fields.

Part of MDL-55071
---
 lib/form/group.php                                       | 2 +-
 lib/formslib.php                                         | 6 ++++--
 lib/outputrenderers.php                                  | 4 +++-
 .../templates/core_form/element-template-inline.mustache | 4 +++-
 .../noname/templates/core_form/element-template.mustache | 9 +++++++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/form/group.php b/lib/form/group.php
index c19b31b1df6..b06094878ec 100644
--- a/lib/form/group.php
+++ b/lib/form/group.php
@@ -178,7 +178,7 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
                 }
             }
 
-            $out = $OUTPUT->mform_element($element, false, '', true);
+            $out = $OUTPUT->mform_element($element, false, false, '', true);
 
             if (empty($out)) {
                 $renderer = new HTML_QuickForm_Renderer_Default();
diff --git a/lib/formslib.php b/lib/formslib.php
index 51ca7b74166..e8d90091bb6 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2774,8 +2774,9 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
 
         // Update the ID.
         $group->updateAttributes(array('id' => $groupid));
+        $advanced = isset($this->_advancedElements[$group->getName()]);
 
-        $html = $OUTPUT->mform_element($group, $required, $error, false);
+        $html = $OUTPUT->mform_element($group, $required, $advanced, $error, false);
         $fromtemplate = !empty($html);
         if (!$fromtemplate) {
             if (method_exists($group, 'getElementTemplateType')) {
@@ -2833,8 +2834,9 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
 
         // Make sure the element has an id.
         $element->_generateId();
+        $advanced = isset($this->_advancedElements[$element->getName()]);
 
-        $html = $OUTPUT->mform_element($element, $required, $error, false);
+        $html = $OUTPUT->mform_element($element, $required, $advanced, $error, false);
         $fromtemplate = !empty($html);
         if (!$fromtemplate) {
             // Adding stuff to place holders in template
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index d2fefd78737..cd203f1784a 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -4426,11 +4426,12 @@ EOD;
      *
      * @param HTML_QuickForm_element $element element
      * @param bool $required if input is required field
+     * @param bool $advanced if input is an advanced field
      * @param string $error error message to display
      * @param bool $ingroup True if this element is rendered as part of a group
      * @return mixed string|bool
      */
-    public function mform_element($element, $required, $error, $ingroup) {
+    public function mform_element($element, $required, $advanced, $error, $ingroup) {
         $templatename = 'core_form/element-' . $element->getType();
         if ($ingroup) {
             $templatename .= "-inline";
@@ -4456,6 +4457,7 @@ EOD;
                     'element' => $elementcontext,
                     'label' => $label,
                     'required' => $required,
+                    'advanced' => $advanced,
                     'helpbutton' => $helpbutton,
                     'error' => $error
                 );
diff --git a/theme/noname/templates/core_form/element-template-inline.mustache b/theme/noname/templates/core_form/element-template-inline.mustache
index 08751af977c..bc20a80cc66 100644
--- a/theme/noname/templates/core_form/element-template-inline.mustache
+++ b/theme/noname/templates/core_form/element-template-inline.mustache
@@ -1,6 +1,8 @@
-<div class="form-group {{#error}}has-danger{{/error}} fitem">
+<div class="form-group {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}}">
     <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
         {{{label}}} {{{helpbutton}}}
+        {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">✲</abbr>{{/required}}
+        {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">❗</abbr>{{/advanced}}
     </label>
         {{$ element }}
             <!-- Element goes here -->
diff --git a/theme/noname/templates/core_form/element-template.mustache b/theme/noname/templates/core_form/element-template.mustache
index d6e9652afc0..1411c42d721 100644
--- a/theme/noname/templates/core_form/element-template.mustache
+++ b/theme/noname/templates/core_form/element-template.mustache
@@ -1,6 +1,11 @@
-<div class="form-group row {{#error}}has-danger{{/error}} fitem">
+<div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}}">
     <label class="col-md-3 col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
-        {{{label}}} {{{helpbutton}}}
+        {{{label}}}
+        <span class="pull-xs-right">
+        {{{helpbutton}}}
+        {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">✲</abbr>{{/required}}
+        {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">❗</abbr>{{/advanced}}
+        </span>
     </label>
     <div class="col-md-9 form-inline felement">
         {{$ element }}
-- 
2.17.1