diff --git a/admin/filters.php b/admin/filters.php index 0d7faa3c088..b21e1df057d 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -242,6 +242,7 @@ 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 @@ -263,6 +264,7 @@ 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); diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index b9e436f7cc4..4e29ae4f78c 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -203,17 +203,18 @@ echo get_string('username') . ":\n"; if (!empty($formerror['username'])) { echo ' * '; } -echo ''; +echo html_writer::label(get_string('username'), 'menuusername', false, array('class' =>'accesshide')); +echo ''; // choose a remote host -echo " " . get_string('remotehost', 'mnet') . ":\n"; +echo html_writer::label(get_string('remotehost', 'mnet'), 'menumnet_host_id'); if (!empty($formerror['mnet_host_id'])) { echo ' * '; } echo html_writer::select($mnethosts, 'mnet_host_id'); // choose an access level -echo " " . get_string('accesslevel', 'mnet') . ":\n"; +echo html_writer::label(get_string('accesslevel', 'mnet'), 'menuaccessctrl'); if (!empty($formerror['accessctrl'])) { echo ' * '; } diff --git a/admin/portfolio.php b/admin/portfolio.php index 791c79f9489..2e0ca378943 100644 --- a/admin/portfolio.php +++ b/admin/portfolio.php @@ -197,6 +197,7 @@ if (($action == 'edit') || ($action == 'new')) { $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)) { diff --git a/admin/repository.php b/admin/repository.php index c3409a5b5a0..3b625a68a36 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -305,7 +305,7 @@ if (($action == 'edit') || ($action == 'new')) { } $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,6 +342,7 @@ if (($action == 'edit') || ($action == 'new')) { // 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), '', ''); } } diff --git a/admin/roles/lib.php b/admin/roles/lib.php index d57233ff1a2..b5bebe80038 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -721,7 +721,10 @@ class define_role_table_advanced extends capability_table_with_risks { foreach(get_role_archetypes() as $type) { $options[$type] = get_string('archetype'.$type, 'role'); } - return html_writer::select($options, 'archetype', $this->role->archetype, false); + + $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; } protected function get_assignable_levels_control() { diff --git a/admin/timezone.php b/admin/timezone.php index 34e1fa40fda..b3fef54cd97 100644 --- a/admin/timezone.php +++ b/admin/timezone.php @@ -42,7 +42,7 @@ $timezones = get_list_of_timezones(); echo '
| ' . html_writer::select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::select($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false) . ' | |
| ' . html_writer::select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::select($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false) . ' | |
| : | +- + changepasswordurl)) { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| : | +: | changepasswordurl)) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| : | +- + changepasswordurl)) { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| : | +- + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - + |
mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
|