diff --git a/admin/filters.php b/admin/filters.php index b21e1df057d..0d7faa3c088 100644 --- a/admin/filters.php +++ b/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); diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 4e29ae4f78c..b9e436f7cc4 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -203,18 +203,17 @@ echo get_string('username') . ":\n"; if (!empty($formerror['username'])) { echo ' * '; } -echo html_writer::label(get_string('username'), 'menuusername', false, array('class' =>'accesshide')); -echo ''; +echo ''; // 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 ' * '; } 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 ' * '; } diff --git a/admin/portfolio.php b/admin/portfolio.php index 2e0ca378943..791c79f9489 100644 --- a/admin/portfolio.php +++ b/admin/portfolio.php @@ -197,7 +197,6 @@ 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 3b625a68a36..c3409a5b5a0 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,7 +342,6 @@ 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 b5bebe80038..d57233ff1a2 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -721,10 +721,7 @@ 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::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() { diff --git a/admin/timezone.php b/admin/timezone.php index b3fef54cd97..34e1fa40fda 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'
|