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

MDL-47494 ddmarker: Update OU Qtype ddmarker for simplified forms #6859

Browse Source
This commit is contained in:
Colin Chambers
2013-05-21 14:49:07 +01:00
parent e2245b62d4
commit 26492f707c
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/ddmarker/edit_ddmarker_form.php
+11 -8
View File
@@ -58,7 +58,7 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
$maxsizes->bgimage->height = QTYPE_DDMARKER_BGIMAGE_MAXHEIGHT;
$params = array('maxsizes' => $maxsizes,
'topnode' => 'fieldset#previewareaheader');
'topnode' => 'fieldset#id_previewareaheader');
$PAGE->requires->yui_module('moodle-qtype_ddmarker-form',
'M.qtype_ddmarker.init_form',
@@ -66,13 +66,15 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
}
protected function definition_draggable_items($mform, $itemrepeatsatstart) {
$mform->addElement('header', 'draggableitemheader',
get_string('markers', 'qtype_ddmarker'));
$mform->addElement('advcheckbox', 'shuffleanswers', ' ',
get_string('shuffleimages', 'qtype_'.$this->qtype()));
$mform->setDefault('shuffleanswers', 0);
$this->repeat_elements($this->draggable_item($mform), $itemrepeatsatstart,
$this->draggable_items_repeated_options(),
'noitems', 'additems', self::ADD_NUM_ITEMS,
get_string('addmoreitems', 'qtype_ddmarker'));
get_string('addmoreitems', 'qtype_ddmarker'), true);
}
protected function draggable_item($mform) {
@@ -80,7 +82,7 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
$grouparray= array();
$grouparray[] = $mform->createElement('text', 'label',
get_string('marker_n', 'qtype_ddmarker'),
'',
array('size'=>30, 'class'=>'tweakcss'));
$mform->setType('text', PARAM_RAW_TRIMMED);
@@ -92,7 +94,9 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
}
protected function draggable_items_repeated_options() {
return array();
$repeatedoptions = array();
$repeatedoptions['drags[label]']['type'] = PARAM_TEXT;
return $repeatedoptions;
}
@@ -103,7 +107,7 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
$grouparray = array();
$shapearray = qtype_ddmarker_shape::shape_options();
$grouparray[] = $mform->createElement('select', 'shape',
get_string('marker', 'qtype_ddmarker'), $shapearray);
get_string('shape', 'qtype_ddmarker'), $shapearray);
$grouparray[] = $mform->createElement('text', 'coords',
get_string('coords', 'qtype_ddmarker'),
array('size'=>50, 'class'=>'tweakcss'));
@@ -113,8 +117,6 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
for ($i = 1; $i <= $imagerepeats; $i += 1) {
$markernos[$i] = $i;
}
$grouparray[] = $mform->createElement('static', '', '', ' ' .
get_string('marker', 'qtype_ddmarker').' ');
$grouparray[] = $mform->createElement('select', 'choice',
get_string('marker', 'qtype_ddmarker'), $markernos);
$dropzone = $mform->createElement('group', 'drops',
@@ -124,6 +126,7 @@ class qtype_ddmarker_edit_form extends qtype_ddtoimage_edit_form_base {
protected function drop_zones_repeated_options() {
$repeatedoptions = array();
$repeatedoptions['drops[coords]']['type'] = PARAM_TEXT;
return $repeatedoptions;
}
question/type/ddmarker/styles.css
+5 -5
View File
@@ -3,7 +3,7 @@
display: block;
}
.que.ddmarker div.droparea img, form.mform fieldset#previewareaheader div.droparea img {
.que.ddmarker div.droparea img, form.mform fieldset#id_previewareaheader div.droparea img {
border: 1px solid #000000;
}
@@ -25,22 +25,22 @@
.que.ddmarker .dragitems.readonly .dragitem {
cursor: auto;
}
.que.ddmarker div.ddarea, form.mform fieldset#previewareaheader div.ddarea {
.que.ddmarker div.ddarea, form.mform fieldset#id_previewareaheader div.ddarea {
text-align : center;
}
.que.ddmarker .dropbackground, form.mform fieldset#previewareaheader .dropbackground {
.que.ddmarker .dropbackground, form.mform fieldset#id_previewareaheader .dropbackground {
margin:0 auto;
}
.que.ddmarker div.dragitems div.draghome, .que.ddmarker div.dragitems div.dragitem,
form.mform fieldset#previewareaheader div.draghome, form.mform fieldset#previewareaheader div.drag {
form.mform fieldset#id_previewareaheader div.draghome, form.mform fieldset#id_previewareaheader div.drag {
font:13px/1.231 arial,helvetica,clean,sans-serif;
*font-size:small; /* for IE */
*font:x-small; /* for IE in quirks mode */
}
.que.ddmarker div.dragitems span.markertext,
.que.ddmarker div.markertexts span.markertext,
form.mform fieldset#previewareaheader div.markertexts span.markertext {
form.mform fieldset#id_previewareaheader div.markertexts span.markertext {
margin: 5px;
z-index: 3;
background-color: white;
question/type/ddmarker/version.php
+5 -5
View File
@@ -26,14 +26,14 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2013031400;
$plugin->requires = 2012062500;
$plugin->version = 2013052000;
$plugin->requires = 2013051400;
$plugin->cron = 0;
$plugin->component = 'qtype_ddmarker';
$plugin->maturity = MATURITY_STABLE;
$plugin->release = '1.2 for Moodle 2.3+';
$plugin->release = '1.3 for Moodle 2.5+';
$plugin->dependencies = array(
'qtype_gapselect' => 2013031400,
'qtype_ddimageortext' => 2013031400,
'qtype_gapselect' => 2013042900,
'qtype_ddimageortext' => 2013052000,
);
question/type/ddmarker/yui/form/form.js
Vendored
+5 -4
View File
@@ -11,7 +11,8 @@ YUI.add('moodle-qtype_ddmarker-form', function(Y) {
initializer : function() {
this.fp = this.file_pickers();
Y.one(this.get('topnode')).append(
var tn = Y.one(this.get('topnode'));
tn.one('div.fcontainer').append(
'<div class="ddarea">'+
'<div class="markertexts"></div>'+
'<div class="droparea"></div>'+
@@ -138,19 +139,19 @@ YUI.add('moodle-qtype_ddmarker-form', function(Y) {
},
stop_selector_events : function () {
Y.all('fieldset#dropzoneheader select').detachAll();
Y.all('fieldset#id_dropzoneheader select').detachAll();
},
setup_form_events : function () {
//events triggered by changes to form data
//x and y coordinates
Y.all('fieldset#draggableitemheader input').on('change', function () {
Y.all('fieldset#id_draggableitemheader input').on('change', function () {
this.set_options_for_drag_item_selectors();
}, this);
//change in selected item
Y.all('fieldset#dropzoneheader select').on('change', function () {
Y.all('fieldset#id_dropzoneheader select').on('change', function () {
this.set_options_for_drag_item_selectors();
}, this);
},