From 930ce60550cb2829150907279721cb13654422e1 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Thu, 10 Nov 2016 16:25:48 +0800
Subject: [PATCH] MDL-56725 mod_data: better field alignment

Labels containing only accesshide text should have the accesshide class
on the label, not the content so the label does not push the content
down.
---
 mod/data/field/multimenu/field.class.php | 4 ++--
 mod/data/field/textarea/field.class.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/data/field/multimenu/field.class.php b/mod/data/field/multimenu/field.class.php
index 7ab1405a377..92590d6199e 100644
--- a/mod/data/field/multimenu/field.class.php
+++ b/mod/data/field/multimenu/field.class.php
@@ -52,8 +52,8 @@ class data_field_multimenu extends data_field_base {
         $str = '<div title="'.s($this->field->description).'">';
         $str .= '<input name="field_' . $this->field->id . '[xxx]" type="hidden" value="xxx"/>'; // hidden field - needed for empty selection
 
-        $str .= '<label for="field_' . $this->field->id . '">';
-        $str .= html_writer::span($this->field->name, 'accesshide');
+        $str .= '<label for="field_' . $this->field->id . '" class="accesshide">';
+        $str .= html_writer::span($this->field->name);
         if ($this->field->required) {
             $str .= '<div class="inline-req">';
             $str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index 0fbd34ca352..bdbd6e9a1bf 100644
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -61,8 +61,8 @@ class data_field_textarea extends data_field_base {
         $text   = '';
         $format = 0;
         $str = '<div title="' . s($this->field->description) . '">';
-        $str .= '<label for="field_' . $this->field->id . '">';
-        $str .= html_writer::span($this->field->name, "accesshide");
+        $str .= '<label for="field_' . $this->field->id . '" class="accesshide">';
+        $str .= html_writer::span($this->field->name);
         if ($this->field->required) {
             $image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
                                      array('class' => 'req', 'title' => get_string('requiredelement', 'form')));