L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-40119-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-01-08 02:18:21 +01:00
parent 51add5708c caccbdda8d
commit ccd01c08f4
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/dateselector.php
+5 -2
View File
@@ -119,8 +119,11 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group
$this->_elements[] = @MoodleQuickForm::createElement('select', 'day', get_string('day', 'form'), $days, $this->getAttributes(), true);
$this->_elements[] = @MoodleQuickForm::createElement('select', 'month', get_string('month', 'form'), $months, $this->getAttributes(), true);
$this->_elements[] = @MoodleQuickForm::createElement('select', 'year', get_string('year', 'form'), $years, $this->getAttributes(), true);
$this->_elements[] = @MoodleQuickForm::createElement('image', 'calendar', $OUTPUT->pix_url('i/calendar', 'moodle'),
array('title' => get_string('calendar', 'calendar'), 'class' => 'visibleifjs'));
$image = $OUTPUT->pix_icon('i/calendar', get_string('calendar', 'calendar'), 'moodle');
$this->_elements[] = @MoodleQuickForm::createElement('link', 'calendar',
null, '#', $image,
array('class' => 'visibleifjs'));
// If optional we add a checkbox which the user can use to turn if on
if($this->_options['optional']) {
$this->_elements[] = @MoodleQuickForm::createElement('checkbox', 'enabled', null, get_string('enable'), $this->getAttributes(), true);
lib/form/datetimeselector.php
+4 -2
View File
@@ -133,8 +133,10 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group{
$this->_elements[] = @MoodleQuickForm::createElement('select', 'hour', get_string('hour', 'form'), $hours, $this->getAttributes(), true);
$this->_elements[] = @MoodleQuickForm::createElement('select', 'minute', get_string('minute', 'form'), $minutes, $this->getAttributes(), true);
}
$this->_elements[] = @MoodleQuickForm::createElement('image', 'calendar', $OUTPUT->pix_url('i/calendar', 'moodle'),
array('title' => get_string('calendar', 'calendar'), 'class' => 'visibleifjs'));
$image = $OUTPUT->pix_icon('i/calendar', get_string('calendar', 'calendar'), 'moodle');
$this->_elements[] = @MoodleQuickForm::createElement('link', 'calendar',
null, '#', $image,
array('class' => 'visibleifjs'));
// If optional we add a checkbox which the user can use to turn if on
if($this->_options['optional']) {
$this->_elements[] = @MoodleQuickForm::createElement('checkbox', 'enabled', null, get_string('enable'), $this->getAttributes(), true);
lib/form/yui/dateselector/dateselector.js
Vendored
+1 -1
View File
@@ -73,7 +73,7 @@ YUI.add('moodle-form-dateselector', function(Y) {
}, this);
// Loop through the input fields.
var inputs = this.get('node').all('input');
var inputs = this.get('node').all('input, a');
inputs.each(function(node) {
// Check if the current node is a calendar image field.
if (node.get('name').match(/\[calendar]/)) {