diff --git a/admin/filters.php b/admin/filters.php index 5c65c74085c..5f58bc7ee67 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_string('isactive', 'filters'), array('class' => 'accesshide')); $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_string('applyto', 'filters'), array('class' => 'accesshide')); $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 0354f150ac6..1c0470e18f7 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') . ":\n"; 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') . ":\n"; if (!empty($formerror['accessctrl'])) { echo ' * '; } diff --git a/admin/portfolio.php b/admin/portfolio.php index 77aa8ea13a7..16aa66183ed 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_string('action'), array('class' => 'accesshide')); $table->data[] = array($pluginname, $OUTPUT->render($select), $settings); } if (!in_array($plugin, $usedplugins)) { @@ -218,6 +219,7 @@ if (($action == 'edit') || ($action == 'new')) { $insaneplugins[] = $p; } else { $select = new single_select(portfolio_action_url($p, 'pf'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . $p); + $select->set_label(get_string('action'), array('class' => 'accesshide')); $table->data[] = array(portfolio_static_function($p, 'get_name'), $OUTPUT->render($select), ''); } } diff --git a/admin/repository.php b/admin/repository.php index 0adfdc6e8e2..3eb48b0da4d 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -352,7 +352,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_string('action'), array('class' => 'accesshide')); // Display up/down link $updown = ''; $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead @@ -389,6 +389,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_string('action'), array('class' => 'accesshide')); $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', ''); } } diff --git a/admin/timezone.php b/admin/timezone.php index 8cfefc7b7a4..546b021816a 100644 --- a/admin/timezone.php +++ b/admin/timezone.php @@ -44,7 +44,7 @@ $timezones = get_list_of_timezones(); echo '
'; - echo "$strusers ($strall): "; + echo html_writer::label($strusers . ' (' . $strall . '): ', 'menuzone'); echo html_writer::select($timezones, "zone", $current, array('99'=>get_string("serverlocaltime"))); echo ""; echo ''; diff --git a/admin/tool/langimport/index.php b/admin/tool/langimport/index.php index 80d8829865f..82b5cc23f58 100644 --- a/admin/tool/langimport/index.php +++ b/admin/tool/langimport/index.php @@ -287,7 +287,7 @@ $url = new moodle_url('/admin/tool/langimport/index.php', array('mode' => DELETI 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'), 'uninstalllang'); +echo html_writer::label(get_string('installedlangs', 'tool_langimport'), 'menuuninstalllang'); 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 @@ if (!empty($options)) { $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'), 'pack'); + echo html_writer::label(get_string('availablelangs','install'), 'menupack'); 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())); diff --git a/admin/tool/spamcleaner/index.php b/admin/tool/spamcleaner/index.php index 443f5cdffee..083527058fa 100644 --- a/admin/tool/spamcleaner/index.php +++ b/admin/tool/spamcleaner/index.php @@ -96,6 +96,7 @@ echo $OUTPUT->box_start(); // The forms section at the top
+ diff --git a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php index 5a863570803..df6b4a338b0 100644 --- a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php +++ b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php @@ -38,6 +38,7 @@ $string['spamfromcomments'] = 'From comments:'; $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'; diff --git a/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php b/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php index 4dca286a024..8332d219b87 100644 --- a/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php +++ b/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php @@ -113,7 +113,7 @@ class new_table_from_mysql extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
' . html_writer::select($selecttables, 'table') . '' .html_writer::select($aftertables, 'after') . '
' . html_writer::select($selecttables, 'table') . '' .html_writer::select($aftertables, 'after') . '
[' . $this->str['back'] . ']
'; diff --git a/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php index 11d779cf008..0ddf559ab34 100644 --- a/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php +++ b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php @@ -114,7 +114,7 @@ class view_structure_php extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= '
' . html_writer::select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::select($poptables, 'table', $tableparam, false) . '
' . html_writer::select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::select($poptables, 'table', $tableparam, false) . '
'; $o.= '
'; diff --git a/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php index 132c881bc10..235056f3faa 100644 --- a/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php +++ b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php @@ -163,7 +163,7 @@ class view_table_php extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= '
' . 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) . '
'; $o.= '';