Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-34650_m22' of git://github.com/rwijaya/moodle into …

…MOODLE_22_STABLE
  • Loading branch information...
commit 906f0ddbcac4c6040ab99105844ddd0d48faa9cb 2 parents b21f174 + 9000014
@nebgor nebgor authored
View
11 lang/en/moodle.php
@@ -906,6 +906,7 @@
$string['list'] = 'List';
$string['listfiles'] = 'List of files in {$a}';
$string['listofallpeople'] = 'List of all people';
+$string['listofcourses'] = 'List of courses';
$string['local'] = 'Local';
$string['localplugindeleteconfirm'] = 'You are about to completely delete the local plugin \'{$a}\'. This will completely delete everything in the database associated with this plugin. Are you SURE you want to continue?';
$string['localplugins'] = 'Local plugins';
@@ -998,6 +999,7 @@
$string['migratinggrades'] = 'Migrating grades';
$string['min'] = 'min';
$string['mins'] = 'mins';
+$string['minute'] = 'minute';
$string['minutes'] = 'minutes';
$string['miscellaneous'] = 'Miscellaneous';
$string['missingcategory'] = 'You need to choose a category';
@@ -1024,6 +1026,8 @@
$string['missingteacher'] = 'Must choose something';
$string['missingurl'] = 'Missing URL';
$string['missingusername'] = 'Missing username';
+$string['month'] = 'Month';
+$string['months'] = 'Months';
$string['modified'] = 'Modified';
$string['moduledeleteconfirm'] = 'You are about to completely delete the module \'{$a}\'. This will completely delete everything in the database associated with this activity module. Are you SURE you want to continue?';
$string['moduledeletefiles'] = 'All data associated with the module \'{$a->module}\' has been deleted from the database. To complete the deletion (and prevent the module re-installing itself), you should now delete this directory from your server: {$a->directory}';
@@ -1207,6 +1211,7 @@
$string['olduserdirectory'] = 'This is the OLD users directory, and is no longer needed. You may safely delete it. The files it contains have been copied to the NEW user directory.';
$string['opentoguests'] = 'Guest access';
$string['optional'] = 'optional';
+$string['options'] = 'options';
$string['order'] = 'Order';
$string['orphanedactivities'] = 'Orphaned activities';
$string['other'] = 'Other';
@@ -1451,9 +1456,15 @@
$string['seealsostats'] = 'See also: stats';
$string['select'] = 'Select';
$string['selectacountry'] = 'Select a country';
+$string['selectacourse'] = 'Select a course';
+$string['selectacoursesite'] = 'Select a course or site';
+$string['selectanaction'] = 'Select an action';
+$string['selectagroup'] = 'Select a group';
$string['selectaregion'] = 'Select a region';
+$string['selctauser'] = 'Select a user';
$string['selectall'] = 'Select all';
$string['selectamodule'] = 'Please select an activity module';
+$string['selectanoptions'] = 'Select an options';
$string['selectdefault'] = 'Select default';
$string['selectedfile'] = 'Selected file';
$string['selectednowmove'] = '{$a} files selected for moving. Now go into the destination folder and press \'Move files to here\'';
View
1  lang/en/table.php
@@ -27,5 +27,6 @@
$string['downloadcsv'] = 'a comma separated values text file';
$string['downloadexcel'] = 'a Microsoft Excel spreadsheet';
$string['downloadods'] = 'an OpenDocument Spreadsheet (ODS)';
+$string['downloadoptions'] = 'Select download options';
$string['downloadtsv'] = 'a tab separated values text file';
$string['downloadxhtml'] = 'an unpaged XHTML document';
View
5 lib/form/editor.php
@@ -238,9 +238,10 @@ function toHtml() {
$str .= '<div>';
if (count($formats)>1) {
- $str.= html_writer::select($formats, $elname.'[format]', $format, false);
+ $str .= html_writer::label(get_string('format'), 'menu'. $elname. 'format', false, array('class' => 'accesshide'));
+ $str .= html_writer::select($formats, $elname.'[format]', $format, false, array('id' => 'menu'. $elname. 'format'));
} else {
- $str.= html_writer::empty_tag('input',
+ $str .= html_writer::empty_tag('input',
array('name'=>$elname.'[format]', 'type'=> 'hidden', 'value' => array_pop(array_keys($formats))));
}
$str .= '</div>';
View
16 lib/outputcomponents.php
@@ -626,6 +626,10 @@ class single_select implements renderable {
*/
var $label = '';
/**
+ * @var array Button label's
+ */
+ var $labelattributes = array();
+ /**
* Form submit method
* @var string post or get
*/
@@ -718,10 +722,12 @@ public function set_help_icon($identifier, $component = 'moodle') {
/**
* Sets select's label
* @param string $label
+ * @param array $attributes (optional)
* @return void
*/
- public function set_label($label) {
+ public function set_label($label, $attributes = array()) {
$this->label = $label;
+ $this->labelattributes = $attributes;
}
}
@@ -762,6 +768,10 @@ class url_select implements renderable {
*/
var $label = '';
/**
+ * @var array Button label's attributes
+ */
+ var $labelattributes = array();
+ /**
* Wrapping div class
* @var string
* */
@@ -834,10 +844,12 @@ public function set_help_icon($identifier, $component = 'moodle') {
/**
* Sets select's label
* @param string $label
+ * @param array $attributes (optional)
* @return void
*/
- public function set_label($label) {
+ public function set_label($label, $attributes = array()) {
$this->label = $label;
+ $this->labelattributes = $attributes;
}
}
View
6 lib/outputrenderers.php
@@ -1234,7 +1234,7 @@ protected function render_single_select(single_select $select) {
}
if ($select->label) {
- $output .= html_writer::label($select->label, $select->attributes['id']);
+ $output .= html_writer::label($select->label, $select->attributes['id'], false, $select->labelattributes);
}
if ($select->helpicon instanceof help_icon) {
@@ -1242,7 +1242,6 @@ protected function render_single_select(single_select $select) {
} else if ($select->helpicon instanceof old_help_icon) {
$output .= $this->render($select->helpicon);
}
-
$output .= html_writer::select($select->options, $select->name, $select->selected, $select->nothing, $select->attributes);
$go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
@@ -1310,7 +1309,7 @@ protected function render_url_select(url_select $select) {
$output = '';
if ($select->label) {
- $output .= html_writer::label($select->label, $select->attributes['id']);
+ $output .= html_writer::label($select->label, $select->attributes['id'], false, $select->labelattributes);
}
if ($select->helpicon instanceof help_icon) {
@@ -1521,6 +1520,7 @@ function render_rating(rating $rating) {
$scalearray = array(RATING_UNSET_RATING => $strrate.'...') + $rating->settings->scale->scaleitems;
$scaleattrs = array('class'=>'postratingmenu ratinginput','id'=>'menurating'.$rating->itemid);
+ $ratinghtml .= html_writer::label($rating->rating, 'menurating'.$rating->itemid, false, array('class' => 'accesshide'));
$ratinghtml .= html_writer::select($scalearray, 'rating', $rating->rating, false, $scaleattrs);
//output submit button
View
3  lib/portfoliolib.php
@@ -443,7 +443,8 @@ function portfolio_instance_select($instances, $callerformats, $callbackclass, $
$pinsane = portfolio_plugin_sanity_check();
$count = 0;
- $selectoutput = "\n" . '<select name="' . $selectname . '">' . "\n";
+ $selectoutput = "\n" . '<label class="accesshide" for="instanceid">' . get_string('plugin', 'portfolio') . '</label>';
+ $selectoutput .= "\n" . '<select id="instanceid" name="' . $selectname . '">' . "\n";
$existingexports = portfolio_existing_exports_by_plugin($USER->id);
foreach ($instances as $instance) {
$formats = portfolio_supported_formats_intersect($callerformats, $instance->supported_formats());
View
2  lib/questionlib.php
@@ -992,7 +992,7 @@ function question_category_select_menu($contexts, $top = false, $currentcat = 0,
foreach ($categoriesarray as $group => $opts) {
$options[] = array($group => $opts);
}
-
+ echo html_writer::label($selected, 'menucategory', false, array('class' => 'accesshide'));
echo html_writer::select($options, 'category', $selected, $choose);
}
View
1  lib/tablelib.php
@@ -929,6 +929,7 @@ function download_buttons() {
$html = '<form action="'. $this->baseurl .'" method="post">';
$html .= '<div class="mdl-align">';
$html .= '<input type="submit" value="'.get_string('downloadas', 'table').'"/>';
+ $html .= html_writer::label(get_string('downloadoptions', 'table'), 'menudownload', false, array('class' => 'accesshide'));
$html .= html_writer::select($downloadoptions, 'download', $this->defaultdownloadformat, false);
$html .= '</div></form>';
Please sign in to comment.
Something went wrong with that request. Please try again.