Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <labe…

…l> for form input text and select tag"

This reverts commit f9f281b.

admin/filters.php

@@ -242,7 +242,6 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings)
 
     // Disable/off/on
     $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $filterinfo->active, null, 'active' . basename($filter));
-    $select->set_label(get_accesshide(get_string('isactive', 'filters')));
     $row[] = $OUTPUT->render($select);
 
     // Re-order
@@ -264,7 +263,6 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings)
 
     // Apply to strings.
     $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . basename($filter));
-    $select->set_label(get_accesshide(get_string('applyto', 'filters')));
     $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED;
     $row[] = $OUTPUT->render($select);
 

admin/mnet/access_control.php

@@ -203,18 +203,17 @@
 if (!empty($formerror['username'])) {
     echo '<span class="error"> * </span>';
 }
-echo html_writer::label(get_string('username'), 'menuusername', false, array('class' =>'accesshide'));
-echo '<input id="menuusername" type="text" name="username" size="20" maxlength="100" />';
+echo '<input type="text" name="username" size="20" maxlength="100" />';
 
 // choose a remote host
-echo html_writer::label(get_string('remotehost', 'mnet'), 'menumnet_host_id');
+echo " " . get_string('remotehost', 'mnet') . ":\n";
 if (!empty($formerror['mnet_host_id'])) {
     echo '<span class="error"> * </span>';
 }
 echo html_writer::select($mnethosts, 'mnet_host_id');
 
 // choose an access level
-echo html_writer::label(get_string('accesslevel', 'mnet'), 'menuaccessctrl');
+echo " " . get_string('accesslevel', 'mnet') . ":\n";
 if (!empty($formerror['accessctrl'])) {
     echo '<span class="error"> * </span>';
 }

admin/portfolio.php

@@ -197,7 +197,6 @@ function portfolio_action_url($portfolio) {
                 $currentaction = 'hide';
             }
             $select = new single_select(portfolio_action_url($pluginid, 'pf'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . $pluginid);
-            $select->set_label(get_accesshide(get_string('portfolio', 'portfolio')));
             $table->data[] = array($pluginname, $OUTPUT->render($select), $settings);
         }
         if (!in_array($plugin, $usedplugins)) {

admin/repository.php

@@ -305,7 +305,7 @@ function repository_action_url($repository) {
             }
 
             $select = new single_select(repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
-            $select->set_label(get_accesshide(get_string('action')));
+
             // Display up/down link
             $updown = '';
             $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
@@ -342,7 +342,6 @@ function repository_action_url($repository) {
             // Check that it has not already been listed
             if (!in_array($plugin, $alreadyplugins)) {
                 $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
-                $select->set_label(get_accesshide(get_string('action')));
                 $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
             }
         }

admin/roles/lib.php

@@ -721,10 +721,7 @@ protected function get_archetype_field($id) {
         foreach(get_role_archetypes() as $type) {
             $options[$type] = get_string('archetype'.$type, 'role');
         }
-
-        $return = html_writer::label(get_string('archetype'.$type, 'role'), 'menuarchetype', false, array('class' => 'accesshide'));
-        $return .= html_writer::select($options, 'archetype', $this->role->archetype, false);
-        return $return;
+        return html_writer::select($options, 'archetype', $this->role->archetype, false);
     }
 
     protected function get_assignable_levels_control() {

admin/timezone.php

@@ -42,7 +42,7 @@
     $timezones = get_list_of_timezones();
 
     echo '<center><form action="timezone.php" method="post">';
-    echo html_writer::label($strusers . ' (' . $strall . '): ', 'menuzone');
+    echo "$strusers ($strall): ";
     echo html_writer::select($timezones, "zone", $current, array('99'=>get_string("serverlocaltime")));
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />";
     echo '<input type="submit" value="'.s($strsavechanges).'" />';

admin/tool/langimport/index.php

@@ -287,7 +287,7 @@
 echo html_writer::start_tag('td', array('valign' => 'top'));
 echo html_writer::start_tag('form', array('id' => 'uninstallform', 'action' => $url->out(), 'method' => 'post'));
 echo html_writer::start_tag('fieldset');
-echo html_writer::label(get_string('installedlangs', 'tool_langimport'), 'menuuninstalllang');
+echo html_writer::label(get_string('installedlangs', 'tool_langimport'), 'uninstalllang');
 echo html_writer::empty_tag('br');
 echo html_writer::select($installedlangs, 'uninstalllang', '', false, array('size' => 15));
 echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
@@ -315,7 +315,7 @@
     $url = new moodle_url('/admin/tool/langimport/index.php', array('mode' => INSTALLATION_OF_SELECTED_LANG));
     echo html_writer::start_tag('form', array('id' => 'installform', 'action' => $url->out(), 'method' => 'post'));
     echo html_writer::start_tag('fieldset');
-    echo html_writer::label(get_string('availablelangs','install'), 'menupack');
+    echo html_writer::label(get_string('availablelangs','install'), 'pack');
     echo html_writer::empty_tag('br');
     echo html_writer::select($options, 'pack[]', '', false, array('size' => 15, 'multiple' => 'multiple'));
     echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));

admin/tool/spamcleaner/index.php

@@ -96,7 +96,6 @@
 
 <form method="post" action="index.php">
   <div>
-    <label class="accesshide" for="keyword_el"><?php get_string('keyword', 'tool_spamcleaner') ?></label>
     <input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" />
     <input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
     <input type="submit" value="<?php echo get_string('spamsearch', 'tool_spamcleaner')?>" />

admin/tool/spamcleaner/lang/en/tool_spamcleaner.php

@@ -38,7 +38,6 @@
 $string['spamfrommessages'] = 'From messages:';
 $string['spamfromforumpost'] = 'From forum post:';
 $string['spaminvalidresult'] = 'Unknown but invalid result';
-$string['spamkeyword'] = 'Keyword';
 $string['spamoperation'] = 'Operation';
 $string['spamresult'] = 'Results of searching user profiles containing:';
 $string['spamsearch'] = 'Search for these keywords';

admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php

@@ -115,7 +115,7 @@ function invoke() {
             $o.= '    <input type="hidden" name ="postaction" value="edit_table" />';
             $o.= '    <input type="hidden" name ="sesskey" value="' . sesskey() . '" />';
             $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
-            $o.= '      <tr><td><label for="menutable" accesskey="t">' . $this->str['createtable'] .' </label>' . html_writer::select($selecttables, 'table') . '<label for="menuafter" accesskey="a">' . $this->str['aftertable'] . ' </label>' .html_writer::select($aftertables, 'after') . '</td></tr>';
+            $o.= '      <tr><td><label for="table" accesskey="t">' . $this->str['createtable'] .' </label>' . html_writer::select($selecttables, 'table') . '<label for="after" accesskey="a">' . $this->str['aftertable'] . ' </label>' .html_writer::select($aftertables, 'after') . '</td></tr>';
             $o.= '      <tr><td colspan="2" align="center"><input type="submit" value="' .$this->str['create'] . '" /></td></tr>';
             $o.= '      <tr><td colspan="2" align="center"><a href="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '">[' . $this->str['back'] . ']</a></td></tr>';
             $o.= '    </table>';

admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php

@@ -116,7 +116,7 @@ function invoke() {
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="action" value="view_structure_php" />';
         $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><label for="menucommand" accesskey="c">' . $this->str['selectaction'] .' </label>' . html_writer::select($popcommands, 'command', $commandparam, false) . '&nbsp;<label for="menutable" accesskey="t">' . $this->str['selecttable'] . ' </label>' .html_writer::select($poptables, 'table', $tableparam, false) . '</td></tr>';
+        $o.= '      <tr><td><label for="action" accesskey="c">' . $this->str['selectaction'] .' </label>' . html_writer::select($popcommands, 'command', $commandparam, false) . '&nbsp;<label for="table" accesskey="t">' . $this->str['selecttable'] . ' </label>' .html_writer::select($poptables, 'table', $tableparam, false) . '</td></tr>';
         $o.= '      <tr><td colspan="2" align="center"><input type="submit" value="' .$this->str['view'] . '" /></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';

admin/tool/xmldb/actions/view_table_php/view_table_php.class.php

@@ -165,7 +165,7 @@ function invoke() {
         $o.= '    <input type="hidden" name ="table" value="' . s($tableparam) . '" />';
         $o.= '    <input type="hidden" name ="action" value="view_table_php" />';
         $o.= '    <table id="formelements" class="boxaligncenter" cellpadding="5">';
-        $o.= '      <tr><td><label for="menucommand" accesskey="c">' . $this->str['selectaction'] .' </label>' . html_writer::select($popcommands, 'command', $commandparam, false) . '&nbsp;<label for="menufieldkeyindex" accesskey="f">' . $this->str['selectfieldkeyindex'] . ' </label>' .html_writer::select($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false) . '</td></tr>';
+        $o.= '      <tr><td><label for="action" accesskey="c">' . $this->str['selectaction'] .' </label>' . html_writer::select($popcommands, 'command', $commandparam, false) . '&nbsp;<label for="fieldkeyindex" accesskey="f">' . $this->str['selectfieldkeyindex'] . ' </label>' .html_writer::select($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false) . '</td></tr>';
         $o.= '      <tr><td colspan="2" align="center"><input type="submit" value="' .$this->str['view'] . '" /></td></tr>';
         $o.= '    </table>';
         $o.= '</div></form>';

auth/cas/config.html

@@ -94,9 +94,9 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><label for="hostname"><?php print_string('auth_cas_hostname_key', 'auth_cas') ?>: </label></td>
+    <td align="right"><?php print_string('auth_cas_hostname_key', 'auth_cas') ?>:</td>
     <td>
-        <input name="hostname" id="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" />
+        <input name="hostname" type="text" size="30" value="<?php echo $config->hostname ?>" />
         <?php if (isset($err['hostname'])) { echo $OUTPUT->error_text($err['hostname']); } ?>
     </td>
     <td>
@@ -105,10 +105,10 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
 </tr>
 <tr valign="top" class="required">
     <td align="right">
-        <label for="baseuri"><?php print_string('auth_cas_baseuri_key', 'auth_cas') ?>: </label>
+        <?php print_string('auth_cas_baseuri_key', 'auth_cas') ?>:
     </td>
     <td>
-        <input name="baseuri" id="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" />
+        <input name="baseuri" type="text" size="30" value="<?php echo $config->baseuri ?>" />
         <?php if (isset($err['baseuri'])) { echo $OUTPUT->error_text($err['baseuri']); } ?>
     </td>
     <td>
@@ -117,10 +117,10 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
 </tr>
 <tr valign="top" class="required">
     <td align="right">
-        <label for="port"><?php print_string('auth_cas_port_key', 'auth_cas') ?>: </label>
+        <?php print_string('auth_cas_port_key', 'auth_cas') ?>:
     </td>
     <td>
-        <input name="port" id="port" type="text" size="30" value="<?php echo $config->port ?>" />
+        <input name="port" type="text" size="30" value="<?php echo $config->port ?>" />
         <?php if (isset($err['port'])) { echo $OUTPUT->error_text($err['port']); } ?>
     </td>
     <td>
@@ -129,7 +129,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
 </tr>
 <tr valign="top" class="required">
     <td align="right">
-        <?php echo html_writer::label(get_string('auth_cas_casversion', 'auth_cas'), 'menucasversion'); ?>:
+        <?php print_string('auth_cas_casversion', 'auth_cas') ?>:
     </td>
     <td>
         <?php
@@ -145,7 +145,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><?php echo html_writer::label(get_string('auth_cas_language_key', 'auth_cas'), 'menulanguage'); ?>:</td>
+    <td align="right"><?php print_string('auth_cas_language_key', 'auth_cas') ?>:</td>
     <td>
         <?php echo html_writer::select($CASLANGUAGES, 'language', $config->language, false); ?>
     </td>
@@ -155,7 +155,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
 </tr>
 <tr valign="top" class="required">
     <td align="right">
-        <?php echo html_writer::label(get_string('auth_cas_proxycas_key', 'auth_cas'), 'menuproxycas'); ?>:
+        <?php print_string('auth_cas_proxycas_key', 'auth_cas') ?>:
     </td>
     <td>
         <?php echo html_writer::select($yesno, 'proxycas', $config->proxycas, false); ?>
@@ -165,7 +165,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><?php echo html_writer::label(get_string('auth_cas_logoutcas_key', 'auth_cas'), 'menulogoutcas'); ?>:</td>
+    <td align="right"><?php print_string('auth_cas_logoutcas_key', 'auth_cas') ?>:</td>
     <td>
         <?php echo html_writer::select($yesno, 'logoutcas', $config->logoutcas, false); ?>
     </td>
@@ -174,7 +174,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><?php echo html_writer::label(get_string('auth_cas_multiauth_key', 'auth_cas'), 'menumultiauth'); ?>:</td>
+    <td align="right"><?php print_string('auth_cas_multiauth_key', 'auth_cas') ?>:</td>
     <td>
         <?php echo html_writer::select($yesno, 'multiauth', $config->multiauth, false); ?>
     </td>
@@ -183,7 +183,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top"  class="required">
-    <td align="right"><?php echo html_writer::label(get_string('auth_cas_certificate_check_key', 'auth_cas'), 'menucertificate_check'); ?>:</td>
+    <td align="right"><?php print_string('auth_cas_certificate_check_key', 'auth_cas') ?>:</td>
     <td>
         <?php echo html_writer::select($yesno, 'certificate_check', $config->certificate_check, false); ?>
     </td>
@@ -192,7 +192,7 @@ <h4><?php print_string('auth_cas_server_settings', 'auth_cas') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><label for="certificate_path"><?php print_string('auth_cas_certificate_path_key', 'auth_cas') ?>: </label></td>
+    <td align="right"><?php print_string('auth_cas_certificate_path_key', 'auth_cas') ?>:</td>
     <td>
         <input name="certificate_path" id="certificate_path" type="text" size="30" value="<?php echo $config->certificate_path ?>" />
         <?php if (isset($err['certificate_path'])) echo $OUTPUT->error_text($err['certificate_path']); ?>
@@ -219,7 +219,7 @@ <h4><?php print_string('auth_ldap_server_settings', 'auth_ldap') ?></h4>
     </td>
 </tr>
 <tr valign="top" class="required">
-    <td align="right"><label for="menuldap_version"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label></td>
+    <td align="right"><label for="menuversion"><?php print_string('auth_ldap_version_key', 'auth_ldap') ?></label></td>
     <td>
         <?php
              $versions = array();

auth/fc/config.html

@@ -27,9 +27,9 @@
 <table cellspacing="0" cellpadding="5" border="0">
 
 <tr valign="top" class="required">
-    <td align="right"><label for="host"><?php  print_string("auth_fchost_key", "auth_fc") ?>:</label></td>
+    <td align="right"><?php  print_string("auth_fchost_key", "auth_fc") ?>:</td>
     <td>
-        <input name="host" id="host" type="text" size="30" value="<?php echo $config->host?>" />
+        <input name="host" type="text" size="30" value="<?php echo $config->host?>" />
     <?php  if (isset($err["host"])) echo $OUTPUT->error_text($err["host"]); ?>
     </td>
     <td>
@@ -38,9 +38,9 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"><label for="fppport"><?php  print_string("auth_fcfppport_key", "auth_fc") ?>: </label></td>
+    <td align="right"><?php  print_string("auth_fcfppport_key", "auth_fc") ?>:</td>
     <td>
-        <input name="fppport" id="fppport" type="text" size="30" value="<?php echo $config->fppport?>" />
+        <input name="fppport" type="text" size="30" value="<?php echo $config->fppport?>" />
     <?php  if (isset($err["fppport"])) echo $OUTPUT->error_text($err["host"]); ?>
     </td>
     <td>
@@ -70,9 +70,9 @@
 </tr>
 
 <tr valign="top" class="required">
-    <td align="right"><label for="creators"><?php  print_string("auth_fccreators_key", "auth_fc") ?>: </label></td>
+    <td align="right"><?php  print_string("auth_fccreators_key", "auth_fc") ?>:</td>
     <td>
-        <input name="creators" id="creators" type="text" size="30" value="<?php echo $config->creators?>" />
+        <input name="creators" type="text" size="30" value="<?php echo $config->creators?>" />
     <?php  if (isset($err["creators"])) echo $OUTPUT->error_text($err["creators"]); ?>
     </td>
     <td>
@@ -81,9 +81,9 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"><label for="changepasswordurl"><?php print_string('auth_fcchangepasswordurl', 'auth_fc') ?>: </label></td>
+    <td align="right"><?php print_string('auth_fcchangepasswordurl', 'auth_fc') ?>: </td>
     <td>
-        <input name="changepasswordurl" id="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
+        <input name="changepasswordurl" type="text" value="<?php echo $config->changepasswordurl ?>" />
         <?php
 
         if (isset($err['changepasswordurl'])) {