Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

This commit is contained in:
Sam Hemelryk 2012-04-10 12:34:37 +12:00
commit 5bfeb5ffd3
108 changed files with 390 additions and 216 deletions

View file

@ -210,7 +210,7 @@ echo $OUTPUT->doctype() ?>
<div data-role="fieldcontain" id="sliderdiv">
<label for="slider"><?php p(get_string('mtoggle','theme_mymobile')); ?>:</label>
<select name="slider" class="slider" data-role="slider" data-track-theme="b">
<select id="slider" name="slider" class="slider" data-role="slider" data-track-theme="b">
<option value="on">On</option>
<option value="off">Off</option>
</select>

View file

@ -746,6 +746,8 @@ class theme_mymobile_core_renderer extends core_renderer {
if ($select->label) {
$output .= html_writer::label($select->label, $select->attributes['id']);
} else {
$output .= html_writer::label($select->selected, $select->attributes['id']);
}
if ($select->helpicon instanceof help_icon) {