moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-11-10 15:37:38 +00:00
commit 6063f62e7d
20 changed files with 146 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mod/data/edit.php
View file

@ -352,12 +352,17 @@ foreach ($generalnotifications as $notification) {
}
echo $newtext;
echo '<div class="mdl-align"><input type="submit" name="saveandview" value="'.get_string('saveandview','data').'" />';
echo '<div class="mdl-align m-t-1"><input type="submit" class="btn btn-primary" name="saveandview" ' .
'value="' . get_string('saveandview', 'data') . '" />';
if ($rid) {
echo '&nbsp;<input type="submit" name="cancel" value="'.get_string('cancel').'" onclick="javascript:history.go(-1)" />';
echo '&nbsp;<input type="submit" class="btn btn-primary" name="cancel" ' .
'value="' . get_string('cancel') . '" onclick="javascript:history.go(-1)" />';
} else {
if ((!$data->maxentries) || has_capability('mod/data:manageentries', $context) || (data_numentries($data) < ($data->maxentries - 1))) {
echo '&nbsp;<input type="submit" name="saveandadd" value="' . get_string('saveandadd', 'data') . '" />';
if ((!$data->maxentries) ||
has_capability('mod/data:manageentries', $context) ||
(data_numentries($data) < ($data->maxentries - 1))) {
echo '&nbsp;<input type="submit" class="btn btn-primary" name="saveandadd" ' .
'value="' . get_string('saveandadd', 'data') . '" />';
}
}
echo '</div>';

11
mod/data/export_form.php
View file

@ -41,7 +41,8 @@ class mod_data_export_form extends moodleform {
unset($choices[$key]);
}
$typesarray = array();
$typesarray[] = $mform->createElement('radio', 'exporttype', null, get_string('csvwithselecteddelimiter', 'data') . '&nbsp;', 'csv');
$str = get_string('csvwithselecteddelimiter', 'data');
$typesarray[] = $mform->createElement('radio', 'exporttype', null, $str . '&nbsp;', 'csv');
$typesarray[] = $mform->createElement('select', 'delimiter_name', null, $choices);
//temporarily commenting out Excel export option. See MDL-19864
//$typesarray[] = $mform->createElement('radio', 'exporttype', null, get_string('excel', 'data'), 'xls');
@ -59,12 +60,16 @@ class mod_data_export_form extends moodleform {
$mform->addElement('header', 'notice', get_string('chooseexportfields', 'data'));
foreach($this->_datafields as $field) {
if($field->text_export_supported()) {
$mform->addElement('advcheckbox', 'field_'.$field->field->id, '<div title="' . s($field->field->description) . '">' . $field->field->name . '</div>', ' (' . $field->name() . ')', array('group'=>1));
$html = '<div title="' . s($field->field->description) . '" ' .
'class="d-inline-block">' . $field->field->name . '</div>';
$name = ' (' . $field->name() . ')';
$mform->addElement('advcheckbox', 'field_' . $field->field->id, $html, $name, array('group' => 1));
$mform->setDefault('field_' . $field->field->id, 1);
} else {
$a = new stdClass();
$a->fieldtype = $field->name();
$mform->addElement('static', 'unsupported'.$field->field->id, $field->field->name, get_string('unsupportedexport', 'data', $a));
$str = get_string('unsupportedexport', 'data', $a);
$mform->addElement('static', 'unsupported' . $field->field->id, $field->field->name, $str);
}
}
$this->add_checkbox_controller(1, null, null, 1);

9
mod/data/field.php
View file

@ -312,7 +312,8 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { ///
echo '<div class="fieldadd">';
$popupurl = $CFG->wwwroot.'/mod/data/field.php?d='.$data->id.'&mode=new&sesskey='. sesskey();
echo $OUTPUT->single_select(new moodle_url($popupurl), 'newtype', $menufield, null, array('' => 'choosedots'),
'fieldform', array('label' => get_string('newfield', 'data') . $OUTPUT->help_icon('newfield', 'data')));
'fieldform', array('label' => get_string('newfield', 'data')));
echo $OUTPUT->help_icon('newfield', 'data');
echo '</div>';
echo '<div class="sortdefault">';
@ -322,7 +323,7 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { ///
echo '<input type="hidden" name="mode" value="sort" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<label for="defaultsort">'.get_string('defaultsortfield','data').'</label>';
echo '<select id="defaultsort" name="defaultsort">';
echo '<select id="defaultsort" name="defaultsort" class="custom-select">';
if ($fields = $DB->get_records('data_fields', array('dataid'=>$data->id))) {
echo '<optgroup label="'.get_string('fields', 'data').'">';
foreach ($fields as $field) {
@ -357,8 +358,8 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { ///
$options = array(0 => get_string('ascending', 'data'),
1 => get_string('descending', 'data'));
echo html_writer::label(get_string('sortby'), 'menudefaultsortdir', false, array('class' => 'accesshide'));
echo html_writer::select($options, 'defaultsortdir', $data->defaultsortdir, false);
echo '<input type="submit" value="'.get_string('save', 'data').'" />';
echo html_writer::select($options, 'defaultsortdir', $data->defaultsortdir, false, array('class' => 'custom-select'));
echo '<input type="submit" class="btn btn-secondary m-l-1" value="'.get_string('save', 'data').'" />';
echo '</div>';
echo '</form>';
echo '</div>';

11
mod/data/field/checkbox/field.class.php
View file

@ -67,7 +67,7 @@ class data_field_checkbox extends data_field_base {
}
$str .= '<input type="hidden" name="field_' . $this->field->id . '[]" value="" />';
$str .= '<input type="checkbox" id="field_'.$this->field->id.'_'.$i.'" name="field_' . $this->field->id . '[]" ';
$str .= 'value="' . s($checkbox) . '" class="mod-data-input" ';
$str .= 'value="' . s($checkbox) . '" class="mod-data-input m-r-1" ';
if (array_search($checkbox, $content) !== false) {
$str .= 'checked />';
@ -95,13 +95,13 @@ class data_field_checkbox extends data_field_base {
$str = '';
$found = false;
$marginclass = ['class' => 'm-r-1'];
foreach (explode("\n",$this->field->param1) as $checkbox) {
$checkbox = trim($checkbox);
if (in_array($checkbox, $content)) {
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), true, $checkbox);
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), true, $checkbox, $marginclass);
} else {
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), false, $checkbox);
$str .= html_writer::checkbox('f_'.$this->field->id.'[]', s($checkbox), false, $checkbox, $marginclass);
}
$str .= html_writer::empty_tag('br');
$found = true;
@ -110,7 +110,8 @@ class data_field_checkbox extends data_field_base {
return '';
}
$str .= html_writer::checkbox('f_'.$this->field->id.'_allreq', null, $allrequired, get_string('selectedrequired', 'data'));
$requiredstr = get_string('selectedrequired', 'data');
$str .= html_writer::checkbox('f_'.$this->field->id.'_allreq', null, $allrequired, $requiredstr, $marginclass);
return $str;
}

4
mod/data/field/date/field.class.php
View file

@ -62,7 +62,7 @@ class data_field_date extends data_field_base {
$content = time();
}
$str = '<div title="'.s($this->field->description).'" class="mod-data-input">';
$str = '<div title="'.s($this->field->description).'" class="mod-data-input form-inline">';
$dayselector = html_writer::select_time('days', 'field_'.$this->field->id.'_day', $content);
$monthselector = html_writer::select_time('months', 'field_'.$this->field->id.'_month', $content);
$yearselector = html_writer::select_time('years', 'field_'.$this->field->id.'_year', $content);
@ -78,7 +78,7 @@ class data_field_date extends data_field_base {
. html_writer::select_time('months', 'f_'.$this->field->id.'_m', $value['timestamp'])
. html_writer::select_time('years', 'f_'.$this->field->id.'_y', $value['timestamp']);
$datecheck = html_writer::checkbox('f_'.$this->field->id.'_z', 1, $value['usedate']);
$str = $selectors . ' ' . $datecheck . ' ' . get_string('usedate', 'data');
$str = '<div class="form-inline">' . $selectors . ' ' . $datecheck . ' ' . get_string('usedate', 'data') . '</div>';
return $str;
}

3
mod/data/field/file/field.class.php
View file

@ -104,7 +104,8 @@ class data_field_file extends data_field_base {
function display_search_field($value = '') {
return '<label class="accesshide" for="f_' . $this->field->id . '">' . $this->field->name . '</label>' .
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" ' .
'value="'.s($value).'" class="form-control"/>';
}
function generate_sql($tablealias, $value) {

28
mod/data/field/latlong/field.class.php
View file

@ -61,21 +61,28 @@ class data_field_latlong extends data_field_base {
}
$str = '<div title="'.s($this->field->description).'">';
$str .= '<fieldset><legend><span class="accesshide">'.$this->field->name.'</span></legend>';
$str .= '<table><tr><td align="right">';
$str .= '<label for="field_'.$this->field->id.'_0" class="mod-data-input">' . get_string('latitude', 'data');
$str .= '<table class="form-inline"><tr><td align="right">';
$classes = 'mod-data-input form-control-static';
$str .= '<label for="field_'.$this->field->id.'_0" class="' . $classes . '">' . get_string('latitude', 'data');
if ($this->field->required) {
$str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
}
$str .= '</label></td><td><input type="text" name="field_'.$this->field->id.'_0" id="field_'.$this->field->id.'_0" value="';
$classes = 'form-control m-x-1';
$str .= '</label></td><td>';
$str .= '<input class="' . $classes . '" type="text" name="field_'.$this->field->id.'_0" ';
$str .= ' id="field_'.$this->field->id.'_0" value="';
$str .= s($lat).'" size="10" />°N</td></tr>';
$str .= '<tr><td align="right"><label for="field_'.$this->field->id.'_1" class="mod-data-input">';
$classes = 'mod-data-input form-control-static';
$str .= '<tr><td align="right"><label for="field_'.$this->field->id.'_1" class="' . $classes . '">';
$str .= get_string('longitude', 'data');
if ($this->field->required) {
$str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
}
$str .= '</label></td><td><input type="text" name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="';
$classes = 'form-control m-x-1';
$str .= '</label></td><td><input class="' . $classes . '" type="text" ';
$str .= 'name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="';
$str .= s($long).'" size="10" />°E</td>';
$str .= '</tr>';
$str .= '</table>';
@ -103,8 +110,10 @@ class data_field_latlong extends data_field_base {
}
$latlongsrs->close();
$return = html_writer::label(get_string('latlong', 'data'), 'menuf_'.$this->field->id, false, array('class' => 'accesshide'));
$return .= html_writer::select($options, 'f_'.$this->field->id, $value);
$classes = array('class' => 'accesshide');
$return = html_writer::label(get_string('latlong', 'data'), 'menuf_'.$this->field->id, false, $classes);
$classes = array('class' => 'custom-select');
$return .= html_writer::select($options, 'f_'.$this->field->id, $value, null, $classes);
return $return;
}
@ -176,7 +185,7 @@ class data_field_latlong extends data_field_base {
$str = '<form id="latlongfieldbrowse">';
$str .= "$compasslat, $compasslong\n";
$str .= "<label class='accesshide' for='jumpto'>". get_string('jumpto') ."</label>";
$str .= "<select id='jumpto' name='jumpto'>";
$str .= '<select id="jumpto" name="jumpto" class="custom-select">';
foreach($servicesshown as $servicename){
// Add a link to a service
$str .= "\n <option value='"
@ -185,7 +194,8 @@ class data_field_latlong extends data_field_base {
}
// NB! If you are editing this, make sure you don't break the javascript reference "previousSibling"
// which allows the "Go" button to refer to the drop-down selector.
$str .= "\n</select><input type='button' value='" . get_string('go') . "' onclick='if(previousSibling.value){self.location=previousSibling.value}'/>";
$str .= '\n</select><input type="button" class="btn m-l-1 btn-secondary" value="' . get_string('go');
$str .= '" onclick="if(previousSibling.value){self.location=previousSibling.value}"/>';
$str .= '</form>';
} else {
$str = "$compasslat, $compasslong";

4
mod/data/field/menu/field.class.php
View file

@ -64,7 +64,7 @@ class data_field_menu extends data_field_base {
}
$str .= '</label>';
$str .= html_writer::select($options, 'field_'.$this->field->id, $content, array('' => get_string('menuchoose', 'data')),
array('id' => 'field_'.$this->field->id, 'class' => 'mod-data-input'));
array('id' => 'field_'.$this->field->id, 'class' => 'mod-data-input custom-select'));
$str .= '</div>';
@ -105,7 +105,7 @@ class data_field_menu extends data_field_base {
$return = html_writer::label(get_string('fieldtypelabel', "datafield_" . $this->type),
'menuf_' . $this->field->id, false, array('class' => 'accesshide'));
$return .= html_writer::select($options, 'f_'.$this->field->id, $content);
$return .= html_writer::select($options, 'f_'.$this->field->id, $content, array('class' => 'custom-select'));
return $return;
}

11
mod/data/field/multimenu/field.class.php
View file

@ -52,8 +52,8 @@ class data_field_multimenu extends data_field_base {
$str = '<div title="'.s($this->field->description).'">';
$str .= '<input name="field_' . $this->field->id . '[xxx]" type="hidden" value="xxx"/>'; // hidden field - needed for empty selection
$str .= '<label for="field_' . $this->field->id . '">';
$str .= html_writer::span($this->field->name, 'accesshide');
$str .= '<label for="field_' . $this->field->id . '" class="accesshide">';
$str .= html_writer::span($this->field->name);
if ($this->field->required) {
$str .= '<div class="inline-req">';
$str .= html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
@ -62,7 +62,7 @@ class data_field_multimenu extends data_field_base {
}
$str .= '</label>';
$str .= '<select name="field_' . $this->field->id . '[]" id="field_' . $this->field->id . '"';
$str .= ' multiple="multiple" class="mod-data-input">';
$str .= ' multiple="multiple" class="mod-data-input form-control">';
foreach (explode("\n", $this->field->param1) as $option) {
$option = trim($option);
@ -96,7 +96,7 @@ class data_field_multimenu extends data_field_base {
static $c = 0;
$str = '<label class="accesshide" for="f_' . $this->field->id . '">' . $this->field->name . '</label>';
$str .= '<select id="f_'.$this->field->id.'" name="f_'.$this->field->id.'[]" multiple="multiple">';
$str .= '<select id="f_'.$this->field->id.'" name="f_'.$this->field->id.'[]" multiple="multiple" class="form-control">';
// display only used options
$varcharcontent = $DB->sql_compare_text('content', 255);
@ -140,7 +140,8 @@ class data_field_multimenu extends data_field_base {
$str .= '</select>';
$str .= html_writer::checkbox('f_'.$this->field->id.'_allreq', null, $allrequired, get_string('selectedrequired', 'data'));
$str .= html_writer::checkbox('f_'.$this->field->id.'_allreq', null, $allrequired,
get_string('selectedrequired', 'data'), array('class' => 'm-r-1'));
return $str;

3
mod/data/field/number/field.class.php
View file

@ -71,7 +71,8 @@ class data_field_number extends data_field_base {
function display_search_field($value = '') {
return '<label class="accesshide" for="f_'.$this->field->id.'">' . get_string('fieldname', 'data') . '</label>' .
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" ' .
'value="'.s($value).'" class="form-control d-inline"/>';
}
function parse_search_field() {

9
mod/data/field/picture/field.class.php
View file

@ -110,8 +110,10 @@ class data_field_picture extends data_field_base {
$str .= '<div class="mdl-left">';
$str .= '<input type="hidden" name="field_' . $this->field->id . '_file" value="' . s($itemid) . '" />';
$str .= '<label for="field_'.$this->field->id.'_alttext">'.get_string('alttext','data') .'</label>&nbsp;<input type="text" name="field_'
.$this->field->id.'_alttext" id="field_'.$this->field->id.'_alttext" value="'.s($alttext).'" />';
$str .= '<label for="field_' . $this->field->id . '_alttext">' .
get_string('alttext', 'data') .
'</label>&nbsp;<input type="text" class="form-control" name="field_' .
$this->field->id . '_alttext" id="field_' . $this->field->id . '_alttext" value="' . s($alttext) . '" />';
$str .= '</div>';
$str .= '</div>';
@ -140,7 +142,8 @@ class data_field_picture extends data_field_base {
function display_search_field($value = '') {
return '<label class="accesshide" for="f_' . $this->field->id . '">' . get_string('fieldname', 'data') . '</label>' .
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
'<input type="text" size="16" id="f_' . $this->field->id . '" name="f_' . $this->field->id . '" ' .
'value="' . s($value) . '" class="form-control"/>';
}
function parse_search_field() {

4
mod/data/field/radiobutton/field.class.php
View file

@ -69,7 +69,7 @@ class data_field_radiobutton extends data_field_base {
continue; // skip empty lines
}
$str .= '<input type="radio" id="field_'.$this->field->id.'_'.$i.'" name="field_' . $this->field->id . '" ';
$str .= 'value="' . s($radio) . '" class="mod-data-input" ';
$str .= 'value="' . s($radio) . '" class="mod-data-input m-r-1" ';
if ($content == $radio) {
// Selected by user.
@ -104,7 +104,7 @@ class data_field_radiobutton extends data_field_base {
}
$return = html_writer::label(get_string('fieldtypelabel', "datafield_" . $this->type),
'menuf_' . $this->field->id, false, array('class' => 'accesshide'));
$return .= html_writer::select($options, 'f_'.$this->field->id, $value);
$return .= html_writer::select($options, 'f_'.$this->field->id, $value, null, array('class' => 'custom-select'));
return $return;
}

4
mod/data/field/text/field.class.php
View file

@ -33,7 +33,9 @@ class data_field_text extends data_field_base {
protected static $priority = self::MAX_PRIORITY;
function display_search_field($value = '') {
return '<label class="accesshide" for="f_' . $this->field->id . '">'. $this->field->name.'</label>' . '<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
return '<label class="accesshide" for="f_' . $this->field->id . '">' . $this->field->name.'</label>' .
'<input type="text" class="form-control" size="16" id="f_' . $this->field->id . '" ' .
'name="f_' . $this->field->id . '" value="' . s($value) . '" />';
}
function parse_search_field() {

7
mod/data/field/textarea/field.class.php
View file

@ -61,8 +61,8 @@ class data_field_textarea extends data_field_base {
$text = '';
$format = 0;
$str = '<div title="' . s($this->field->description) . '">';
$str .= '<label for="field_' . $this->field->id . '">';
$str .= html_writer::span($this->field->name, "accesshide");
$str .= '<label for="field_' . $this->field->id . '" class="accesshide">';
$str .= html_writer::span($this->field->name);
if ($this->field->required) {
$image = html_writer::img($OUTPUT->pix_url('req'), get_string('requiredelement', 'form'),
array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
@ -172,7 +172,8 @@ class data_field_textarea extends data_field_base {
function display_search_field($value = '') {
return '<label class="accesshide" for="f_' . $this->field->id . '">' . $this->field->name . '</label>' .
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
'<input type="text" size="16" id="f_' . $this->field->id . '" name="f_' . $this->field->id . '" ' .
'value="' . s($value) . '" class="form-control"/>';
}
function parse_search_field() {

20
mod/data/field/url/field.class.php
View file

@ -65,7 +65,7 @@ class data_field_url extends data_field_base {
$autolinkable = !empty($this->field->param1) and empty($this->field->param2);
$str = '<div title="' . s($this->field->description) . '">';
$str = '<div title="' . s($this->field->description) . '" class="form-inline">';
$label = '<label for="' . $fieldid . '"><span class="accesshide">' . $this->field->name . '</span>';
if ($this->field->required) {
@ -87,19 +87,22 @@ class data_field_url extends data_field_base {
}
$str .= '</td><td>';
$str .= $label;
$str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.s($url).'" size="60" />';
$str .= '<button id="filepicker-button-'.$options->client_id.'" style="display:none">'.$straddlink.'</button></td></tr>';
$str .= '<input type="text" name="field_' . $this->field->id . '_0" id="' . $fieldid . '" value="' . s($url) . '" ' .
'size="40" class="form-control d-inline"/>';
$str .= '<button class="btn btn-secondary m-l-1" id="filepicker-button-' . $options->client_id . '" ' .
'style="display:none">' . $straddlink . '</button></td></tr>';
$str .= '<tr><td align="right"><span class="mod-data-input">' . get_string('text', 'data') . ':</span></td><td>';
$str .= '<input type="text" name="field_'.$this->field->id.'_1" id="field_'.$this->field->id.'_1" value="'.s($text).'"';
$str .= ' size="60" /></td></tr>';
$str .= '<input type="text" name="field_' . $this->field->id . '_1" id="field_' . $this->field->id . '_1" ' .
'value="' . s($text) . '" size="40" class="form-control d-inline"/></td></tr>';
$str .= '</table>';
} else {
// Just the URL field
$str .= $label;
$str .= '<input type="text" name="field_'.$this->field->id.'_0" id="'.$fieldid.'" value="'.s($url).'"';
$str .= ' size="60" class="mod-data-input" />';
$str .= ' size="40" class="mod-data-input form-control d-inline" />';
if (count($options->repositories) > 0) {
$str .= '<button id="filepicker-button-'.$options->client_id.'" class="visibleifjs">'.$straddlink.'</button>';
$str .= '<button id="filepicker-button-' . $options->client_id . '" class="visibleifjs btn btn-secondary m-l-1">' .
$straddlink . '</button>';
}
}
@ -114,7 +117,8 @@ class data_field_url extends data_field_base {
function display_search_field($value = '') {
return '<label class="accesshide" for="f_' . $this->field->id . '">' . get_string('fieldname', 'data') . '</label>' .
'<input type="text" size="16" id="f_'.$this->field->id.'" name="f_'.$this->field->id.'" value="'.s($value).'" />';
'<input type="text" size="16" id="f_' . $this->field->id . '" '.
' name="f_' . $this->field->id . '" value="' . s($value) . '" class="form-control d-inline"/>';
}
function parse_search_field() {

37
mod/data/lib.php
View file

@ -308,8 +308,9 @@ class data_field_base { // Base class for Database Field Types (see field/*/
array('class' => 'req', 'title' => get_string('requiredelement', 'form')));
$str .= html_writer::div($image, 'inline-req');
}
$str .= '</label><input class="basefieldinput mod-data-input" type="text" name="field_'.$this->field->id.'"';
$str .= ' id="field_' . $this->field->id . '" value="'.s($content).'" />';
$str .= '</label><input class="basefieldinput form-control d-inline mod-data-input" ' .
'type="text" name="field_' . $this->field->id . '" ' .
'id="field_' . $this->field->id . '" value="' . s($content) . '" />';
$str .= '</div>';
return $str;
@ -349,8 +350,8 @@ class data_field_base { // Base class for Database Field Types (see field/*/
require_once($CFG->dirroot.'/mod/data/field/'.$this->type.'/mod.html');
echo '<div class="mdl-align">';
echo '<input type="submit" value="'.$savebutton.'" />'."\n";
echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />'."\n";
echo '<input type="submit" class="btn btn-primary" value="'.$savebutton.'" />'."\n";
echo '<input type="submit" class="btn btn-secondary" name="cancel" value="'.get_string('cancel').'" />'."\n";
echo '</div>';
echo '</form>';
@ -1663,7 +1664,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
echo '<label for="pref_perpage">'.get_string('pagesize','data').'</label> ';
$pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15,
20=>20,30=>30,40=>40,50=>50,100=>100,200=>200,300=>300,400=>400,500=>500,1000=>1000);
echo html_writer::select($pagesizes, 'perpage', $perpage, false, array('id'=>'pref_perpage'));
echo html_writer::select($pagesizes, 'perpage', $perpage, false, array('id' => 'pref_perpage', 'class' => 'custom-select'));
if ($advanced) {
$regsearchclass = 'search_none';
@ -1672,11 +1673,12 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
$regsearchclass = 'search_inline';
$advancedsearchclass = 'search_none';
}
echo '<div id="reg_search" class="' . $regsearchclass . '" >&nbsp;&nbsp;&nbsp;';
echo '<label for="pref_search">'.get_string('search').'</label> <input type="text" size="16" name="search" id= "pref_search" value="'.s($search).'" /></div>';
echo '<div id="reg_search" class="' . $regsearchclass . ' form-inline" >&nbsp;&nbsp;&nbsp;';
echo '<label for="pref_search">' . get_string('search') . '</label> <input type="text" ' .
'class="form-control" size="16" name="search" id= "pref_search" value="' . s($search) . '" /></div>';
echo '&nbsp;&nbsp;&nbsp;<label for="pref_sortby">'.get_string('sortby').'</label> ';
// foreach field, print the option
echo '<select name="sort" id="pref_sortby">';
echo '<select name="sort" id="pref_sortby" class="custom-select m-r-1">';
if ($fields = $DB->get_records('data_fields', array('dataid'=>$data->id), 'name')) {
echo '<optgroup label="'.get_string('fields', 'data').'">';
foreach ($fields as $field) {
@ -1707,7 +1709,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
echo '</optgroup>';
echo '</select>';
echo '<label for="pref_order" class="accesshide">'.get_string('order').'</label>';
echo '<select id="pref_order" name="order">';
echo '<select id="pref_order" name="order" class="custom-select m-r-1">';
if ($order == 'ASC') {
echo '<option value="ASC" selected="selected">'.get_string('ascending','data').'</option>';
} else {
@ -1729,8 +1731,10 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
$PAGE->requires->js('/mod/data/data.js');
echo '&nbsp;<input type="hidden" name="advanced" value="0" />';
echo '&nbsp;<input type="hidden" name="filter" value="1" />';
echo '&nbsp;<input type="checkbox" id="advancedcheckbox" name="advanced" value="1" '.$checked.' onchange="showHideAdvSearch(this.checked);" /><label for="advancedcheckbox">'.get_string('advancedsearch', 'data').'</label>';
echo '&nbsp;<input type="submit" value="'.get_string('savesettings','data').'" />';
echo '&nbsp;<input type="checkbox" id="advancedcheckbox" name="advanced" value="1" ' . $checked . ' ' .
'onchange="showHideAdvSearch(this.checked);" class="m-x-1" />' .
'<label for="advancedcheckbox">' . get_string('advancedsearch', 'data') . '</label>';
echo '&nbsp;<input type="submit" class="btn btn-secondary" value="' . get_string('savesettings', 'data') . '" />';
echo '<br />';
echo '<div class="' . $advancedsearchclass . '" id="data_adv_form">';
@ -1781,9 +1785,11 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
$fn = !empty($search_array[DATA_FIRSTNAME]->data) ? $search_array[DATA_FIRSTNAME]->data : '';
$ln = !empty($search_array[DATA_LASTNAME]->data) ? $search_array[DATA_LASTNAME]->data : '';
$patterns[] = '/##firstname##/';
$replacement[] = '<label class="accesshide" for="u_fn">'.get_string('authorfirstname', 'data').'</label><input type="text" size="16" id="u_fn" name="u_fn" value="'.s($fn).'" />';
$replacement[] = '<label class="accesshide" for="u_fn">' . get_string('authorfirstname', 'data') . '</label>' .
'<input type="text" class="form-control" size="16" id="u_fn" name="u_fn" value="' . s($fn) . '" />';
$patterns[] = '/##lastname##/';
$replacement[] = '<label class="accesshide" for="u_ln">'.get_string('authorlastname', 'data').'</label><input type="text" size="16" id="u_ln" name="u_ln" value="'.s($ln).'" />';
$replacement[] = '<label class="accesshide" for="u_ln">' . get_string('authorlastname', 'data') . '</label>' .
'<input type="text" class="form-control" size="16" id="u_ln" name="u_ln" value="' . s($ln) . '" />';
// actual replacement of the tags
$newtext = preg_replace($patterns, $replacement, $data->asearchtemplate);
@ -1795,7 +1801,10 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
echo format_text($newtext, FORMAT_HTML, $options);
echo '</td></tr>';
echo '<tr><td colspan="4"><br/><input type="submit" value="'.get_string('savesettings','data').'" /><input type="submit" name="resetadv" value="'.get_string('resetsettings','data').'" /></td></tr>';
echo '<tr><td colspan="4"><br/>' .
'<input type="submit" class="btn btn-primary m-r-1" value="' . get_string('savesettings', 'data') . '" />' .
'<input type="submit" class="btn btn-secondary" name="resetadv" value="' . get_string('resetsettings', 'data') . '" />' .
'</td></tr>';
echo '</table>';
echo '</div>';
echo '</div>';

8
mod/data/renderer.php
View file

@ -40,7 +40,8 @@ class mod_data_renderer extends plugin_renderer_base {
foreach ($newfields as $nid => $newfield) {
$row = array();
$row[0] = html_writer::tag('label', $newfield->name, array('for'=>'id_'.$newfield->name));
$row[1] = html_writer::start_tag('select', array('name'=>'field_'.$nid, 'id'=>'id_'.$newfield->name));
$attrs = array('name' => 'field_' . $nid, 'id' => 'id_' . $newfield->name, 'class' => 'custom-select');
$row[1] = html_writer::start_tag('select', $attrs);
$selected = false;
foreach ($currentfields as $cid => $currentfield) {
@ -72,9 +73,10 @@ class mod_data_renderer extends plugin_renderer_base {
$html .= html_writer::start_tag('div', array('class'=>'overwritesettings'));
$html .= html_writer::tag('label', get_string('overwritesettings', 'data'), array('for' => 'overwritesettings'));
$html .= html_writer::empty_tag('input', array('type'=>'checkbox', 'name'=>'overwritesettings', 'id'=>'overwritesettings'));
$attrs = array('type' => 'checkbox', 'name' => 'overwritesettings', 'id' => 'overwritesettings', 'class' => 'm-l-1');
$html .= html_writer::empty_tag('input', $attrs);
$html .= html_writer::end_tag('div');
$html .= html_writer::empty_tag('input', array('type'=>'submit', 'class'=>'button', 'value'=>$strcontinue));
$html .= html_writer::empty_tag('input', array('type' => 'submit', 'class' => 'btn btn-primary', 'value' => $strcontinue));
$html .= html_writer::end_tag('div');
$html .= html_writer::end_tag('form');

8
mod/data/styles.css
View file

@ -1,11 +1,3 @@
.path-mod-data .fieldadd,
.path-mod-data .sortdefault,
.path-mod-data .defaulttemplate,
#page-mod-data-view .datapreferences,
#page-mod-data-preset .presetmapping {
text-align: center;
}
.path-mod-data-field .c0,
#page-mod-data-view #sortsearch .c0 {
text-align: right;

29
mod/data/templates.php
View file

@ -241,7 +241,7 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') {
echo '<br />';
echo '<div class="no-overflow" id="availabletags_wrapper">';
echo '<select name="fields1[]" id="availabletags" size="12" onclick="insert_field_tags(this)">';
echo '<select name="fields1[]" id="availabletags" size="12" onclick="insert_field_tags(this)" class="form-control">';
$fields = $DB->get_records('data_fields', array('dataid'=>$data->id));
echo '<optgroup label="'.get_string('fields', 'data').'">';
@ -300,7 +300,8 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') {
echo '</select>';
echo '</div>';
echo '<br /><br /><br /><br /><input type="submit" name="defaultform" value="'.get_string('resettemplate','data').'" />';
echo '<br /><br /><br /><br />';
echo '<input type="submit" class="btn btn-secondary" name="defaultform" value="'.get_string('resettemplate', 'data').'" />';
echo '<br /><br />';
if ($usehtmleditor) {
$switchlink = new moodle_url($PAGE->url, ['useeditor' => false]);
@ -315,7 +316,8 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') {
]);
}
} else {
echo '<br /><br /><br /><br /><input type="submit" name="defaultform" value="'.get_string('resettemplate','data').'" />';
echo '<br /><br /><br /><br />';
echo '<input type="submit" class="btn btn-primary" name="defaultform" value="' . get_string('resettemplate', 'data') . '" />';
}
echo '</td>';
@ -329,7 +331,10 @@ if ($mode == 'listtemplate'){
$field = 'template';
$editor->set_text($data->{$mode});
$editor->use_editor($field, $options);
echo '<div><textarea id="'.$field.'" name="'.$field.'" rows="15" cols="80">'.s($data->{$mode}).'</textarea></div>';
echo '<div>';
echo '<textarea class="form-control" id="' . $field . '" ' .
'name="' . $field . '" rows="15" cols="80">' . s($data->{$mode}) . '</textarea>';
echo '</div>';
echo '</td>';
echo '</tr>';
@ -342,25 +347,33 @@ if ($mode == 'listtemplate'){
$field = 'listtemplatefooter';
$editor->set_text($data->listtemplatefooter);
$editor->use_editor($field, $options);
echo '<div><textarea id="'.$field.'" name="'.$field.'" rows="15" cols="80">'.s($data->listtemplatefooter).'</textarea></div>';
echo '<div>';
echo '<textarea id="' . $field . '" class="form-control" ' .
'name="' . $field . '" rows="15" cols="80">' . s($data->listtemplatefooter) . '</textarea>';
echo '</div>';
echo '</td>';
echo '</tr>';
} else if ($mode == 'rsstemplate') {
echo '<tr>';
echo '<td>&nbsp;</td>';
echo '<td>';
echo '<div class="template_heading"><label for="edit-rsstitletemplate">'.get_string('rsstitletemplate','data').'</label></div>';
echo '<div class="template_heading">';
echo '<label for="edit-rsstitletemplate">' . get_string('rsstitletemplate', 'data') . '</label>';
echo '</div>';
$field = 'rsstitletemplate';
$editor->set_text($data->rsstitletemplate);
$editor->use_editor($field, $options);
echo '<div><textarea id="'.$field.'" name="'.$field.'" rows="15" cols="80">'.s($data->rsstitletemplate).'</textarea></div>';
echo '<div>';
echo '<textarea id="' . $field . '" name="' . $field . '" ' .
'class="form-control" rows="15" cols="80">' . s($data->rsstitletemplate) . '</textarea>';
echo '</div>';
echo '</td>';
echo '</tr>';
}
echo '<tr><td class="save_template" colspan="2">';
echo '<input type="submit" value="'.get_string('savetemplate','data').'" />&nbsp;';
echo '<input type="submit" class="btn btn-primary" value="'.get_string('savetemplate','data').'" />&nbsp;';
echo '</td></tr></table>';

3
mod/data/view.php
View file

@ -824,16 +824,19 @@ if ($showactivity) {
'type' => 'button',
'id' => 'checkall',
'value' => get_string('selectall'),
'class' => 'btn btn-secondary m-r-1'
));
echo html_writer::empty_tag('input', array(
'type' => 'button',
'id' => 'checknone',
'value' => get_string('deselectall'),
'class' => 'btn btn-secondary m-r-1'
));
echo html_writer::empty_tag('input', array(
'class' => 'form-submit',
'type' => 'submit',
'value' => get_string('deleteselected'),
'class' => 'btn btn-secondary m-r-1'
));
$module = array('name' => 'mod_data', 'fullpath' => '/mod/data/module.js');