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

Merge branch 'MDL-84753-main' of https://github.com/roland04/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2025-03-24 17:48:16 +08:00
parent fb4c613e69 e1e6134f67
commit 95c6083f57
19 changed files with 85 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/field.php
+2 -2
View File
@@ -425,7 +425,7 @@ if (($mode == 'new') && (!empty($newtype))) { // Adding a new field.
echo '<div class="sortdefault">';
echo '<form id="sortdefault" action="'.$CFG->wwwroot.'/mod/data/field.php" method="get">';
echo '<div>';
echo '<div class="d-flex flex-column flex-md-row flex-wrap align-items-md-center gap-2">';
echo '<input type="hidden" name="d" value="'.$data->id.'" />';
echo '<input type="hidden" name="mode" value="sort" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
@@ -466,7 +466,7 @@ if (($mode == 'new') && (!empty($newtype))) { // Adding a new field.
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, ['class' => 'form-select']);
echo '<input type="submit" class="btn btn-secondary ms-1" value="'.get_string('save', 'data').'" />';
echo '<input type="submit" class="btn btn-secondary" value="'.get_string('save', 'data').'" />';
echo '</div>';
echo '</form>';
mod/data/field/checkbox/templates/checkbox.mustache
+2 -2
View File
@@ -43,11 +43,11 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="mb-3 row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="param1">{{#str}}fieldoptions, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="col-md-9 d-flex flex-wrap align-items-start felement">
<textarea class="optionstextarea form-control" name="param1" id="param1" cols="80" rows="10">{{param1}}</textarea>
</div>
</div>
mod/data/field/file/templates/file.mustache
+4 -5
View File
@@ -44,11 +44,10 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3"><label for="param3" class="mb-0">
{{#str}}maxsize, data{{/str}}</label></div>
<div class="col-md-9 form-inline align-items-start felement">
<select id="param3" class="select form-select form-control" name="param3">
<div class="row mb-2 fitem">
<label for="param3" class="col-md-3 col-form-label">{{#str}}maxsize, data{{/str}}</label>
<div class="col-md-9 felement">
<select id="param3" class="select form-select" name="param3">
{{#filesizes}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/filesizes}}
mod/data/field/latlong/templates/latlong.mustache
+9 -15
View File
@@ -62,11 +62,9 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param1">{{#str}}latlonglinkservicesdisplayed, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param1" class="col-md-3 col-form-label">{{#str}}latlonglinkservicesdisplayed, data{{/str}}</label>
<div class="col-md-9 felement">
<select class="linkservicesdisplayed form-control" name="param1[]" id="param1" multiple="multiple" size="{{latlonglinkservicessize}}">
{{#latlonglinkservices}}
<option {{#selected}}selected{{/selected}}>{{name}}</option>
@@ -74,12 +72,10 @@
</select>
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param2" class="mb-0">{{#str}}latlongkmllabelling, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<select class="kmllabelling select form-select form-control" name="param2" id="param2">
<div class="row mb-2 fitem">
<label for="param2" class="col-md-3 col-form-label">{{#str}}latlongkmllabelling, data{{/str}}</label>
<div class="col-md-9 felement">
<select class="kmllabelling select form-select" name="param2" id="param2">
{{#otherfields}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/otherfields}}
@@ -94,10 +90,8 @@
</div>
</div>
{{#fieldid}}
<div class="form-group row fitem">
<div class="col-md-3">
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<div class="offset-md-3 col-md-9 felement">
<a href='./field/latlong/kml.php?d={{dataid}}&fieldid={{fieldid}}'>{{#str}}latlongdownloadallhint, data{{/str}}</a>
</div>
</div>
mod/data/field/menu/templates/menu.mustache
+3 -5
View File
@@ -43,11 +43,9 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="param1">{{#str}}fieldoptions, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label class="col-md-3 col-form-label" for="param1">{{#str}}fieldoptions, data{{/str}}</label>
<div class="col-md-9 felement">
<textarea class="optionstextarea form-control" name="param1" id="param1" cols="80" rows="10">{{param1}}</textarea>
</div>
</div>
mod/data/field/multimenu/templates/multimenu.mustache
+3 -5
View File
@@ -43,11 +43,9 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="param1">{{#str}}fieldoptions, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param1" class="col-md-3 col-form-label">{{#str}}fieldoptions, data{{/str}}</label>
<div class="col-md-9 felement">
<textarea class="optionstextarea form-control" name="param1" id="param1" cols="80" rows="10">{{param1}}</textarea>
</div>
</div>
mod/data/field/picture/templates/picture.mustache
+16 -22
View File
@@ -54,40 +54,34 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param1">{{#str}}fieldwidthsingleview, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param1" class="col-md-3 col-form-label">{{#str}}fieldwidthsingleview, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="picturefieldsize form-control" type="text" name="param1" id="param1" value="{{param1}}">
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3"><label for="param2">{{#str}}fieldheightsingleview, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param2" class="col-md-3 col-form-label">{{#str}}fieldheightsingleview, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="picturefieldsize form-control" type="text" name="param2" id="param2" value="{{param2}}">
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3"><label for="param4">{{#str}}fieldwidthlistview, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param4" class="col-md-3 col-form-label">{{#str}}fieldwidthlistview, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="picturefieldsize form-control" type="text" name="param4" id="param4" value="{{param4}}">
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3"><label for="param5">{{#str}}fieldheightlistview, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param5" class="col-md-3 col-form-label">{{#str}}fieldheightlistview, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="picturefieldsize form-control" type="text" name="param5" id="param5" value="{{param5}}">
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3"><label for="param3" class="mb-0">
{{#str}}maxsize, data{{/str}}</label></div>
<div class="col-md-9 form-inline align-items-start felement">
<select id="param3" class="select form-select form-control" name="param3">
<div class="row mb-2 fitem">
<label for="param3" class="col-md-3 col-form-label">{{#str}}maxsize, data{{/str}}</label>
<div class="col-md-9 felement">
<select id="param3" class="select form-select" name="param3">
{{#options}}
<option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
{{/options}}
mod/data/field/radiobutton/templates/radiobutton.mustache
+3 -5
View File
@@ -43,11 +43,9 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="param1">{{#str}}fieldoptions, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="param1" class="col-md-3 col-form-label">{{#str}}fieldoptions, data{{/str}}</label>
<div class="col-md-9 felement">
<textarea class="optionstextarea form-control" name="param1" id="param1" cols="80" rows="10">{{param1}}</textarea>
</div>
</div>
mod/data/field/text/templates/autolink.mustache
+4 -8
View File
@@ -34,13 +34,9 @@
"param1": false
}
}}
<div class="form-group row fitem">
<div class="col-md-3 d-flex pb-0 pe-md-0">
<label for="param1" class="mb-0">{{#str}}fieldallowautolink, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="form-check-input" type="checkbox" name="param1" id="param1"
{{#param1}}checked="checked"{{/param1}}
value="1">
<div class="row mb-2 fitem">
<label for="param1" class="col-auto col-md-3 col-form-label">{{#str}}fieldallowautolink, data{{/str}}</label>
<div class="col col-md-9 align-self-center felement">
<input class="form-check" type="checkbox" name="param1" id="param1" {{#param1}}checked="checked"{{/param1}} value="1">
</div>
</div>
mod/data/field/textarea/field.class.php
+1 -1
View File
@@ -188,7 +188,7 @@ class data_field_textarea extends data_field_base {
'data-fieldtype="editor" ' .
'cols="'.$this->field->param2.'" spellcheck="true">'.s($text).'</textarea></div>';
$str .= '<div><label class="accesshide" for="' . $field . '_content1">' . get_string('format') . '</label>';
$str .= '<select id="' . $field . '_content1" name="'.$field.'_content1">';
$str .= '<select id="' . $field . '_content1" name="'.$field.'_content1" class="form-select mt-2">';
foreach ($formats as $key=>$desc) {
$selected = ($format == $key) ? 'selected="selected"' : '';
$str .= '<option value="'.s($key).'" '.$selected.'>'.$desc.'</option>';
mod/data/field/textarea/templates/textarea.mustache
+15 -18
View File
@@ -47,29 +47,26 @@
<fieldset>
{{> mod_data/fields/basicfields }}
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param2">{{#str}}fieldwidth, data{{/str}}</label>
<div class="row mb-2 fitem">
<label for="param2" class="col-md-3 col-form-label">{{#str}}fieldwidth, data{{/str}}</label>
<div class="col-md-9 d-flex gap-2 align-items-center felement">
<input class="textareafieldsize form-control" type="text" name="param2" id="param2" value="{{#param2}}{{param2}}{{/param2}}{{^param2}}60{{/param2}}">
{{#str}}columns, data{{/str}}
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="textareafieldsize form-control me-1" type="text" name="param2" id="param2" value="{{#param2}}{{param2}}{{/param2}}{{^param2}}60{{/param2}}">
{{#str}}columns, data{{/str}}</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param3">{{#str}}fieldheight, data{{/str}}</label>
<div class="row mb-2 fitem">
<label for="param3" class="col-md-3 col-form-label">{{#str}}fieldheight, data{{/str}}</label>
<div class="col-md-9 d-flex gap-2 align-items-center felement">
<input class="textareafieldsize form-control" type="text" name="param3" id="param3" value="{{#param3}}{{param3}}{{/param3}}{{^param3}}35{{/param3}}">
{{#str}}rows, data{{/str}}
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="textareafieldsize form-control me-1" type="text" name="param3" id="param3" value="{{#param3}}{{param3}}{{/param3}}{{^param3}}35{{/param3}}">
{{#str}}rows, data{{/str}}</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3">
<label for="param5">{{#str}}maxbytes, datafield_textarea{{/str}}</label>
<div class="row mb-2 fitem">
<label for="param5" class="col-md-3 col-form-label">{{#str}}maxbytes, datafield_textarea{{/str}}</label>
<div class="col-md-9 felement">
<input class="c1 form-control" type="text" name="param5" id="param5" value="{{#param5}}{{param5}}{{/param5}}{{^param5}}0{{/param5}}">
{{#str}}maxbytes_desc, datafield_textarea{{/str}}
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="c1 form-control me-1" type="text" name="param5" id="param5" value="{{#param5}}{{param5}}{{/param5}}{{^param5}}0{{/param5}}">
{{#str}}maxbytes_desc, datafield_textarea{{/str}}</div>
</div>
<input type="hidden" name="param4" id="param4" value="1"/>
</fieldset>
mod/data/field/url/templates/url.mustache
+12 -20
View File
@@ -46,31 +46,23 @@
<fieldset>
{{> mod_data/fields/basicfields }}
<div class="form-group row fitem">
<div class="col-md-3 d-flex pb-0 pe-md-0">
<label for="required" class="mb-0">{{#str}}autolinkurl, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="requiredfield form-check-input" type="checkbox" name="param1" id="param1" {{#param1}}
checked="checked" {{/param1}}>
<div class="row mb-2 fitem">
<label for="required" class="col-auto col-md-3 col-form-label">{{#str}}autolinkurl, data{{/str}}</label>
<div class="col col-md-9 align-self-center felement">
<input class="requiredfield form-check" type="checkbox" name="param1" id="param1" {{#param1}} checked="checked" {{/param1}}>
</div>
</div>
{{> mod_data/fields/requiredfield }}
<div class="form-group row fitem">
<div class="col-md-3 d-flex pb-0 pe-md-0">
<label for="param3">{{#str}}openlinkinnewwindow, datafield_url{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="requiredfield form-check-input" type="checkbox" name="param3" id="param3" {{#param3}}
checked="checked" {{/param3}}>
<div class="row mb-2 fitem">
<label for="param3" class="col-auto col-md-3 col-form-label">{{#str}}openlinkinnewwindow, datafield_url{{/str}}</label>
<div class="col col-md-9 align-self-center felement">
<input class="requiredfield form-check" type="checkbox" name="param3" id="param3" {{#param3}} checked="checked" {{/param3}}>
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3 col-form-label">
<label for="forcelinkname">{{#str}}forcelinkname, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="forcelinkname form-control" type="text" name="param2" id="forcelinkname" value="{{param2}}">
<div class="row mb-2 fitem">
<label for="forcelinkname" class="col-md-3 col-form-label">{{#str}}forcelinkname, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="fieldname form-control" type="text" name="param2" id="forcelinkname" value="{{param2}}">
</div>
</div>
</fieldset>
mod/data/preset/imagegallery/csstemplate.css
-8
View File
@@ -28,11 +28,3 @@
max-width: 100%;
height: auto;
}
/***** Add entry CSS *****/
.imagegallery-addentry .form-group label,
.imagegallery-asearch .form-group label {
font-weight: bold;
padding-top: 20px;
}
mod/data/preset/journal/csstemplate.css
-8
View File
@@ -6,11 +6,3 @@
-webkit-box-orient: vertical;
overflow: hidden;
}
/***** Add entry CSS *****/
.journal-addentry .form-group label,
.journal-asearch .form-group label {
font-weight: bold;
padding-top: 20px;
}
mod/data/preset/proposals/csstemplate.css
-8
View File
@@ -8,11 +8,3 @@
#proposals-list .card {
overflow: visible;
}
/***** Add entry CSS *****/
.proposals-addentry .form-group label,
.proposals-asearch .form-group label {
font-weight: bold;
padding-top: 20px;
}
mod/data/preset/resources/csstemplate.css
-8
View File
@@ -4,11 +4,3 @@
flex-shrink: 0;
width: 200px;
}
/***** Add entry CSS *****/
.resources-addentry .form-group label,
.resources-asearch .form-group label {
font-weight: bold;
padding-top: 20px;
}
mod/data/styles.css
-4
View File
@@ -60,10 +60,6 @@
margin: 1em 0;
}
.path-mod-data-field .sortdefault select {
margin-left: 1em;
}
.path-mod-data-field .fieldname,
.path-mod-data-field .fielddescription {
width: 300px;
mod/data/templates/fields/basicfields.mustache
+6 -10
View File
@@ -36,19 +36,15 @@
}
}}
<div class="form-group row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="name" class="mb-0">{{#str}}fieldname, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="name" class="col-md-3 col-form-label">{{#str}}fieldname, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="fieldname form-control" type="text" name="name" id="name" value="{{name}}">
</div>
</div>
<div class="form-group row fitem">
<div class="col-md-3 col-form-label d-flex pb-0 pe-md-0">
<label for="description" class="mb-0">{{#str}}fielddescription, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<div class="row mb-2 fitem">
<label for="description" class="col-md-3 col-form-label">{{#str}}fielddescription, data{{/str}}</label>
<div class="col-md-9 felement">
<input class="fielddescription form-control" type="text" name="description" id="description" value="{{description}}">
</div>
</div>
mod/data/templates/fields/requiredfield.mustache
+5 -7
View File
@@ -34,12 +34,10 @@
}
}}
<div class="form-group row fitem">
<div class="col-md-3 d-flex pb-0 pe-md-0">
<label for="required" class="mb-0">{{#str}}requiredfield, data{{/str}}</label>
</div>
<div class="col-md-9 form-inline align-items-start felement">
<input class="requiredfield form-check-input" type="checkbox" name="required" id="required" {{#required}}
checked="checked" {{/required}}>
<div class="row mb-2 fitem">
<label for="required" class="col-auto col-md-3 col-form-label">{{#str}}requiredfield, data{{/str}}</label>
<div class="col col-md-9 align-self-center felement">
<input class="requiredfield form-check" type="checkbox" name="required" id="required" {{#required}}
checked="checked" {{/required}}>
</div>
</div>