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

MDL-75401 mod_data: add sticky footers

Browse Source
This commit is contained in:
Ferran Recio
2022-10-19 14:51:10 +02:00
parent 3d483ac2ef
commit 8305c1c74d
20 changed files with 419 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/classes/output/view_action_bar.php
+1 -4
View File
@@ -58,15 +58,12 @@ class view_action_bar implements templatable, renderable {
* @return array
*/
public function export_for_template(\renderer_base $output): array {
global $PAGE, $DB;
global $PAGE;
$data = [
'urlselect' => $this->urlselect->export_for_template($output),
];
$addentrybutton = new add_entries_action($this->id);
$data['addentrybutton'] = $addentrybutton->export_for_template($output);
if (has_capability('mod/data:manageentries', $PAGE->context)) {
$importentrieslink = new moodle_url('/mod/data/import.php',
['d' => $this->id, 'backto' => $PAGE->url->out(false)]);
mod/data/classes/output/view_footer.php
+156
View File
@@ -0,0 +1,156 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace mod_data\output;
use action_link;
use core\output\sticky_footer;
use html_writer;
use mod_data\manager;
use mod_data\template;
use moodle_url;
use renderer_base;
/**
* Renderable class for sticky footer in the view pages of the database activity.
*
* @package mod_data
* @copyright 2022 Ferran Recio <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class view_footer extends sticky_footer {
/** @var int $totalcount the total records count. */
private $totalcount;
/** @var int $currentpage the current page */
private $currentpage;
/** @var int $nowperpage the number of elements per page */
private $nowperpage;
/** @var moodle_url $baseurl the page base url */
private $baseurl;
/** @var template $parser the template name */
private $parser;
/** @var manager $manager if the user can manage capabilities or not */
private $manager;
/**
* The class constructor.
*
* @param manager $manager the activity manager
* @param int $totalcount the total records count
* @param int $currentpage the current page
* @param int $nowperpage the number of elements per page
* @param moodle_url $baseurl the page base url
* @param template $parser the current template name
*/
public function __construct(
manager $manager,
int $totalcount,
int $currentpage,
int $nowperpage,
moodle_url $baseurl,
template $parser
) {
$this->manager = $manager;
$this->totalcount = $totalcount;
$this->currentpage = $currentpage;
$this->nowperpage = $nowperpage;
$this->baseurl = $baseurl;
$this->parser = $parser;
}
/**
* Export this data so it can be used as the context for a mustache template (core/inplace_editable).
*
* @param renderer_base $output typically, the renderer that's calling this function
* @return array data context for a mustache template
*/
public function export_for_template(renderer_base $output) {
$this->set_content(
$this->get_footer_output($output)
);
return parent::export_for_template($output);
}
/**
* Generate the pre-rendered footer content.
*
* @param \renderer_base $output The renderer to be used to render the action bar elements.
* @return string the rendered content
*/
public function get_footer_output(renderer_base $output): string {
$data = [];
$cm = $this->manager->get_coursemodule();
$instance = $this->manager->get_instance();
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
$context = $this->manager->get_context();
$canmanageentries = has_capability('mod/data:manageentries', $context);
$parser = $this->parser;
// Sticky footer content.
$data['pagination'] = $output->paging_bar(
$this->totalcount,
$this->currentpage,
$this->nowperpage,
$this->baseurl
);
if ($parser->get_template_name() != 'singletemplate' && $canmanageentries) {
// Build the select/deselect all control.
$selectallid = 'selectall-listview-entries';
$togglegroup = 'listview-entries';
$mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
'id' => $selectallid,
'name' => $selectallid,
'value' => 1,
'label' => get_string('selectall'),
'classes' => 'btn-secondary mr-1',
], true);
$data['selectall'] = $output->render($mastercheckbox);
$data['deleteselected'] = html_writer::empty_tag('input', [
'class' => 'btn btn-secondary',
'type' => 'submit',
'value' => get_string('deleteselected'),
'disabled' => true,
'data-action' => 'toggle',
'data-togglegroup' => $togglegroup,
'data-toggle' => 'action',
]);
}
if (data_user_can_add_entry($instance, $currentgroup, $groupmode, $context)) {
$addentrylink = new moodle_url(
'/mod/data/edit.php',
['id' => $cm->id, 'backto' => $this->baseurl]
);
$addentrybutton = new action_link(
$addentrylink,
get_string('add', 'mod_data'),
null,
['class' => 'btn btn-primary', 'role' => 'button']
);
$data['addentrybutton'] = $addentrybutton->export_for_template($output);
}
return $output->render_from_template('mod_data/view_footer', $data);
}
}
mod/data/classes/template.php
+9
View File
@@ -215,6 +215,15 @@ class template {
$this->tags = $matches['tags'];
}
/**
* Return the current template name.
*
* @return string the template name
*/
public function get_template_name(): string {
return $this->templatename;
}
/**
* Generate the list of action icons.
*
mod/data/edit.php
+3 -1
View File
@@ -217,7 +217,9 @@ if (!$rid && ((!$data->maxentries) ||
]);
}
echo html_writer::div($actionbuttons, 'mdl-align mt-2');
$stickyfooter = new core\output\sticky_footer($actionbuttons);
echo $OUTPUT->render($stickyfooter);
echo $OUTPUT->box_end();
echo '</div></form>';
mod/data/field.php
+16 -27
View File
@@ -70,36 +70,22 @@ if ($action !== '') {
}
if ($id) {
$url->param('id', $id);
$PAGE->set_url($url);
if (! $cm = get_coursemodule_from_id('data', $id)) {
throw new \moodle_exception('invalidcoursemodule');
}
if (! $course = $DB->get_record('course', array('id'=>$cm->course))) {
throw new \moodle_exception('coursemisconf');
}
if (! $data = $DB->get_record('data', array('id'=>$cm->instance))) {
throw new \moodle_exception('invalidcoursemodule');
}
} else {
list($course, $cm) = get_course_and_cm_from_cmid($id, manager::MODULE);
$manager = manager::create_from_coursemodule($cm);
$url->param('id', $cm->id);
} else { // We must have $d.
$instance = $DB->get_record('data', ['id' => $d], '*', MUST_EXIST);
$manager = manager::create_from_instance($instance);
$cm = $manager->get_coursemodule();
$course = get_course($cm->course);
$url->param('d', $d);
$PAGE->set_url($url);
if (! $data = $DB->get_record('data', array('id'=>$d))) {
throw new \moodle_exception('invalidid', 'data');
}
if (! $course = $DB->get_record('course', array('id'=>$data->course))) {
throw new \moodle_exception('invalidcoursemodule');
}
if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
throw new \moodle_exception('invalidcoursemodule');
}
}
require_login($course, true, $cm);
$manager = manager::create_from_coursemodule($cm);
$PAGE->set_url($url);
$data = $manager->get_instance();
$context = $manager->get_context();
require_login($course, true, $cm);
require_capability('mod/data:managetemplates', $context);
$formimportzip = new data_import_preset_zip_form();
@@ -438,8 +424,11 @@ if (($mode == 'new') && (!empty($newtype))) { // Adding a new field.
echo '<input type="submit" class="btn btn-secondary ml-1" value="'.get_string('save', 'data').'" />';
echo '</div>';
echo '</form>';
echo '</div>';
// Add a sticky footer.
echo $renderer->render_fields_footer($manager);
echo '</div>';
}
/// Finish the page
mod/data/lang/en/data.php
+2 -1
View File
@@ -388,7 +388,6 @@ $string['savedataaspreset'] = 'Save all fields and templates as preset';
$string['saveaspresetmissingcapability'] = 'The user does not have permission to save the database as a preset.';
$string['savesettings'] = 'Save settings';
$string['savesuccess'] = 'Preset saved. <a href="{$a->url}">Preview preset</a>';
$string['savetemplate'] = 'Save template';
$string['search'] = 'Search';
$string['search:activity'] = 'Database - activity information';
$string['search:entry'] = 'Database - entries';
@@ -441,6 +440,7 @@ $string['usestandard'] = 'Use a preset';
$string['usestandard_help'] = 'To use a preset available to the whole site, select it from the list. (If you have added a preset to the list using the save as preset feature then you have the option of deleting it.)';
$string['viewfromdate'] = 'Read only from';
$string['viewnavigation'] = 'View mode tertiary navigation';
$string['viewtemplates'] = 'View templates';
$string['viewtodate'] = 'Read only to';
$string['viewtodatevalidation'] = 'The read only to date cannot be before the read only from date.';
$string['wrongdataid'] = 'Wrong data id provided';
@@ -453,3 +453,4 @@ $string['buttons'] = 'Actions';
$string['nolisttemplate'] = 'List template is not yet defined';
$string['nosingletemplate'] = 'Single template is not yet defined';
$string['blank'] = 'Blank';
$string['savetemplate'] = 'Save template';
mod/data/lang/en/deprecated.txt
+1
View File
@@ -3,3 +3,4 @@ buttons,mod_data
nosingletemplate,mod_data
nolisttemplate,mod_data
blank,mod_data
savetemplate,mod_data
mod/data/lib.php
+20 -9
View File
@@ -406,25 +406,36 @@ class data_field_base { // Base class for Database Field Types (see field/*/
echo '<input type="hidden" name="d" value="'.$this->data->id.'" />'."\n";
if (empty($this->field->id)) {
echo '<input type="hidden" name="mode" value="add" />'."\n";
$savebutton = get_string('add');
} else {
echo '<input type="hidden" name="fid" value="'.$this->field->id.'" />'."\n";
echo '<input type="hidden" name="mode" value="update" />'."\n";
$savebutton = get_string('savechanges');
}
echo '<input type="hidden" name="type" value="'.$this->type.'" />'."\n";
echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />'."\n";
echo $OUTPUT->heading($this->name(), 3);
require_once($CFG->dirroot.'/mod/data/field/'.$this->type.'/mod.html');
$modpath = $CFG->dirroot . '/mod/data/field/' . $this->type . '/mod.html';
if (file_exists($modpath)) {
require_once($modpath);
}
echo html_writer::start_div('mt-3');
echo html_writer::tag('input', null, array('type' => 'submit', 'value' => $savebutton,
'class' => 'btn btn-primary'));
echo html_writer::tag('input', null, array('type' => 'submit', 'name' => 'cancel',
'value' => get_string('cancel'), 'class' => 'btn btn-secondary ml-2'));
echo html_writer::end_div();
$actionbuttons = html_writer::start_div();
$actionbuttons .= html_writer::tag('input', null, [
'type' => 'submit',
'name' => 'cancel',
'value' => get_string('cancel'),
'class' => 'btn btn-secondary mr-2'
]);
$actionbuttons .= html_writer::tag('input', null, [
'type' => 'submit',
'value' => get_string('save'),
'class' => 'btn btn-primary'
]);
$actionbuttons .= html_writer::end_div();
$stickyfooter = new core\output\sticky_footer($actionbuttons);
echo $OUTPUT->render($stickyfooter);
echo '</form>';
mod/data/renderer.php
+54 -2
View File
@@ -1,6 +1,29 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Database activity renderer.
*
* @copyright 2010 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_data
*/
use mod_data\local\importer\preset_existing_importer;
use mod_data\manager;
defined('MOODLE_INTERNAL') || die();
@@ -33,7 +56,6 @@ class mod_data_renderer extends plugin_renderer_base {
*/
public function importing_preset(stdClass $datamodule, \mod_data\local\importer\preset_importer $importer): string {
$strcontinue = get_string('continue');
$strwarning = get_string('mappingwarning', 'data');
$strfieldmappings = get_string('fieldmappings', 'data');
@@ -99,7 +121,23 @@ class mod_data_renderer extends plugin_renderer_base {
$attrs = array('type' => 'checkbox', 'name' => 'overwritesettings', 'id' => 'overwritesettings', 'class' => 'ml-1');
$html .= html_writer::empty_tag('input', $attrs);
$html .= html_writer::end_tag('div');
$html .= html_writer::empty_tag('input', array('type' => 'submit', 'class' => 'btn btn-primary', 'value' => $strcontinue));
$actionbuttons = html_writer::start_div();
$cancelurl = new moodle_url('/mod/data/preset.php', ['d' => $datamodule->id]);
$actionbuttons .= html_writer::tag('a', get_string('cancel') , [
'href' => $cancelurl->out(false),
'class' => 'btn btn-secondary mr-2',
'role' => 'button',
]);
$actionbuttons .= html_writer::empty_tag('input', [
'type' => 'submit',
'class' => 'btn btn-primary',
'value' => get_string('continue'),
]);
$actionbuttons .= html_writer::end_div();
$stickyfooter = new core\output\sticky_footer($actionbuttons);
$html .= $this->render($stickyfooter);
$html .= html_writer::end_tag('div');
$html .= html_writer::end_tag('form');
@@ -119,6 +157,20 @@ class mod_data_renderer extends plugin_renderer_base {
return $this->render_from_template('mod_data/fields_action_bar', $data);
}
/**
* Renders the fields page footer.
*
* @param manager $manager the instance manager
* @return string The HTML output
*/
public function render_fields_footer(manager $manager): string {
$cm = $manager->get_coursemodule();
$pageurl = new moodle_url('/mod/data/templates.php', ['id' => $cm->id]);
return $this->render_from_template('mod_data/fields_footer', [
'pageurl' => $pageurl->out(false),
]);
}
/**
* Renders the action bar for the view page.
*
mod/data/templates/action_bar.mustache
+2 -2
View File
@@ -50,9 +50,9 @@
"title": null
},
"extraurlselect": {
"id": "url_select_test",
"id": "extra_url_select_test",
"action": "https://example.com/post",
"formid": "url_select_form",
"formid": "extra_url_select_form",
"sesskey": "sesskey",
"classes": "urlselect",
"label": "",
mod/data/templates/fields_footer.mustache
+31
View File
@@ -0,0 +1,31 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template mod_data/fields_footer
The mod_data fields sticky footer content.
Example context (json):
{
"pageurl": "http://yoursite/mod/data/field.php"
}
}}
{{< core/sticky_footer }}
{{$ stickyclasses }} justify-content-start{{/ stickyclasses }}
{{$ stickycontent }}
<div class="pl-3">
<a href="{{pageurl}}">{{#str}} viewtemplates, mod_data {{/str}}</a>
</div>
{{/ stickycontent }}
{{/ core/sticky_footer }}
mod/data/templates/preset_preview.mustache
+11 -7
View File
@@ -34,10 +34,14 @@
{{{preview}}}
</div>
</div>
<form method="post" action="{{formactionurl}}" class="mt-4">
<input type="hidden" name="d" value="{{d}}">
<input type="hidden" name="mode" value="usepreset">
<input type="hidden" name="action" value="select">
<input type="hidden" name="fullname" value="{{userid}}/{{shortname}}">
<input type="submit" name="selectpreset" value="{{#str}}usepreset, mod_data{{/str}}" class="btn btn-secondary mt-2 float-right">
</form>
{{< core/sticky_footer }}
{{$ stickycontent }}
<form method="post" action="{{formactionurl}}">
<input type="hidden" name="d" value="{{d}}">
<input type="hidden" name="mode" value="usepreset">
<input type="hidden" name="action" value="select">
<input type="hidden" name="fullname" value="{{userid}}/{{shortname}}">
<input type="submit" name="selectpreset" value="{{#str}}usepreset, mod_data{{/str}}" class="btn btn-primary">
</form>
{{/ stickycontent }}
{{/ core/sticky_footer }}
mod/data/templates/presets.mustache
+11 -1
View File
@@ -86,7 +86,17 @@
</tbody>
</table>
<input type="submit" name="selectpreset" value="{{#str}}usepreset, mod_data{{/str}}" class="btn btn-secondary mt-2 float-right" disabled>
{{< core/sticky_footer }}
{{$ stickycontent }}
<input
type="submit"
name="selectpreset"
value="{{#str}}usepreset, mod_data{{/str}}"
class="btn btn-secondary"
disabled
>
{{/ stickycontent }}
{{/ core/sticky_footer }}
</form>
{{#js}}
mod/data/templates/template_editor.mustache
+19 -15
View File
@@ -93,22 +93,9 @@
{{/editors}}
</div>
</div>
{{#disableeditor}}
<div class="container-fluid mt-4">
<div class="row">
<div>
<input
class="btn btn-secondary"
type="button"
name="resetbutton"
value="{{#str}} resettemplate, data {{/str}}"
/>
<input
class="btn btn-primary"
type="submit"
value="{{#str}} savetemplate, data {{/str}}"
/>
</div>
{{#disableeditor}}
<div class="ml-auto">
<input
type="checkbox"
@@ -119,7 +106,24 @@
/>
<label for="useeditor">{{#str}} editorenable, data {{/str}}</label>
</div>
{{/disableeditor}}
</div>
</div>
{{/disableeditor}}
{{< core/sticky_footer }}
{{$ stickycontent }}
<div>
<input
class="btn btn-secondary"
type="button"
name="resetbutton"
value="{{#str}} reset {{/str}}"
/>
<input
class="btn btn-primary"
type="submit"
value="{{#str}} save {{/str}}"
/>
</div>
{{/ stickycontent }}
{{/ core/sticky_footer }}
</form>
mod/data/templates/view_footer.mustache
+52
View File
@@ -0,0 +1,52 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template mod_data/view_footer
The mod_data sticky footer content.
Example context (json):
{
"selectall": "<button>Select all</button>",
"deleteselected": "<button>Cancel selection</button>",
"pagination": "1, 2, 3...",
"addentrybutton": {
"disabled": false,
"url": "#",
"id": "test-id",
"classes": "btn btn-link",
"attributes": [
{
"name": "title",
"value": "Add entry"
}
],
"text": "Add"
}
}
}}
{{#selectall}}
<div class="navitem">
{{{selectall}}}
{{{deleteselected}}}
</div>
{{/selectall}}
<div class="navitem submit mr-auto ml-auto">
{{{pagination}}}
</div>
{{#addentrybutton}}
<div class="navitem">
{{> core/action_link}}
</div>
{{/addentrybutton}}
mod/data/tests/behat/actionsmenu_replacement.feature
+2 -2
View File
@@ -40,11 +40,11 @@ Feature: Users can add the ##actionsmenu## replacement to the database templates
| Header | <table> |
| Repeated entry | <tr><td>[[field1]]</td><td>##actionsmenu##</td><tr> |
| Footer | </table> |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
And I set the field "Templates tertiary navigation" to "Single template"
And I set the following fields to these values:
| Single template | <table><tr><td>[[field1]]</td><td>[[field2]]</td><td>##actionsmenu##</td><tr></table> |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
@javascript
Scenario: The ##actionsmenu## replacement displays the expected actions with default settings depending on the user permissions
mod/data/tests/behat/behat_mod_data.php
+1 -1
View File
@@ -62,7 +62,7 @@ class behat_mod_data extends behat_base {
}
$this->execute("behat_forms::i_set_the_following_fields_to_these_values", $fielddata);
$this->execute('behat_forms::press_button', get_string('add'));
$this->execute('behat_forms::press_button', get_string('save'));
}
/**
mod/data/tests/behat/default_templates.feature
+2 -2
View File
@@ -131,7 +131,7 @@ Feature: Users can use mod_data without editing the templates
| Header | New header! |
| Repeated entry | This is the template content |
| Footer | New footer! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
And I navigate to "Database" in current page administration
And I should see "New header!"
And I should see "This is the template content"
@@ -139,7 +139,7 @@ Feature: Users can use mod_data without editing the templates
And I should not see "Student entry 1"
And I should not see "Some content 1"
When I navigate to "Templates" in current page administration
And I click on "Reset template" "button"
And I click on "Reset" "button" in the "sticky-footer" "region"
And I click on "Reset template" "button" in the "Reset template?" "dialogue"
And I should see "Template reset"
And I navigate to "Database" in current page administration
mod/data/tests/behat/edit_templates.feature
+11 -11
View File
@@ -33,7 +33,7 @@ Feature: Users can edit the database templates
| Header | New header! |
| Repeated entry | [[field1]] and [[field2]]! |
| Footer | New footer! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
Then I should see "New header!"
And I should see "Student entry 1 and Some content 1!"
@@ -44,7 +44,7 @@ Feature: Users can edit the database templates
Given I set the field "Templates tertiary navigation" to "Single template"
And I set the following fields to these values:
| Single template | [[field1]] and [[field2]] details! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
And I set the field "View mode tertiary navigation" to "Single view"
Then I should see "Student entry 1 and Some content 1 details!"
@@ -54,7 +54,7 @@ Feature: Users can edit the database templates
Given I set the field "Templates tertiary navigation" to "Add entry template"
And I set the following fields to these values:
| Add entry template | [[field1]] [[field2]] Form extra! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
And I click on "Add entry" "button"
Then I should see "Form extra!"
@@ -64,7 +64,7 @@ Feature: Users can edit the database templates
Given I set the field "Templates tertiary navigation" to "Advanced search template"
And I set the following fields to these values:
| Advanced search template | New advanced search template! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
And I click on "Advanced search" "checkbox"
Then I should see "New advanced search template!"
@@ -74,7 +74,7 @@ Feature: Users can edit the database templates
Given I click on "Enable editor" "checkbox"
And I set the following fields to these values:
| Repeated entry | <span class="d-none">Nope</span>Yep! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
Then I should not see "Nope"
And I should see "Yep!"
@@ -84,11 +84,11 @@ Feature: Users can edit the database templates
Given I click on "Enable editor" "checkbox"
And I set the following fields to these values:
| Repeated entry | <span class="hideme">Nope</span>Yep! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
And I set the field "Templates tertiary navigation" to "CSS template"
And I set the following fields to these values:
| CSS template | .hideme {display: none;} |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
Then I should not see "Nope"
And I should see "Yep!"
@@ -98,11 +98,11 @@ Feature: Users can edit the database templates
Given I click on "Enable editor" "checkbox"
And I set the following fields to these values:
| Repeated entry | <span id="hideme">Nope</span>Yep! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
And I set the field "Templates tertiary navigation" to "Javascript template"
And I set the following fields to these values:
| Javascript template | window.onload = () => document.querySelector('#hideme').style.display = 'none'; |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
When I navigate to "Database" in current page administration
Then I should not see "Nope"
And I should see "Yep!"
@@ -113,7 +113,7 @@ Feature: Users can edit the database templates
| Header | New header! |
| Repeated entry | This is the template content |
| Footer | New footer! |
And I click on "Save template" "button"
And I click on "Save" "button" in the "sticky-footer" "region"
And I navigate to "Database" in current page administration
And I should see "New header!"
And I should see "This is the template content"
@@ -121,7 +121,7 @@ Feature: Users can edit the database templates
And I should not see "Student entry 1"
And I should not see "Some content 1"
When I navigate to "Templates" in current page administration
And I click on "Reset template" "button"
And I click on "Reset" "button" in the "sticky-footer" "region"
And I click on "Reset template" "button" in the "Reset template?" "dialogue"
Then I should see "Template reset"
And I navigate to "Database" in current page administration
mod/data/view.php
+15 -37
View File
@@ -217,8 +217,8 @@ if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
$urlediting = 'on';
$strediting = get_string('blocksediton');
}
$url = new moodle_url($CFG->wwwroot.'/mod/data/view.php', array('id' => $cm->id, 'edit' => $urlediting));
$PAGE->set_button($OUTPUT->single_button($url, $strediting));
$editurl = new moodle_url($CFG->wwwroot.'/mod/data/view.php', ['id' => $cm->id, 'edit' => $urlediting]);
$PAGE->set_button($OUTPUT->single_button($editurl, $strediting));
}
if ($mode == 'asearch') {
@@ -426,8 +426,8 @@ if ($showactivity) {
} else {
// We have some records to print.
$url = new moodle_url('/mod/data/view.php', array('d' => $data->id, 'sesskey' => sesskey()));
echo html_writer::start_tag('form', array('action' => $url, 'method' => 'post'));
$formurl = new moodle_url('/mod/data/view.php', ['d' => $data->id, 'sesskey' => sesskey()]);
echo html_writer::start_tag('form', ['action' => $formurl, 'method' => 'post']);
if ($maxcount != $totalcount) {
$a = new stdClass();
@@ -447,7 +447,6 @@ if ($showactivity) {
$baseurlparams['page'] = $page;
}
$baseurl = new moodle_url($baseurl, $baseurlparams);
echo $OUTPUT->paging_bar($totalcount, $page, $nowperpage, $baseurl);
require_once($CFG->dirroot.'/rating/lib.php');
if ($data->assessed != RATING_AGGREGATE_NONE) {
@@ -474,10 +473,8 @@ if ($showactivity) {
];
$parser = $manager->get_template('singletemplate', $options);
echo $parser->parse_entries($records);
echo $OUTPUT->paging_bar($totalcount, $page, $nowperpage, $baseurl);
} else { // List template
} else {
// List template.
$baseurl = '/mod/data/view.php';
$baseurlparams = ['d' => $data->id, 'advanced' => $advanced, 'paging' => $paging];
if (!empty($search)) {
@@ -485,8 +482,6 @@ if ($showactivity) {
}
$baseurl = new moodle_url($baseurl, $baseurlparams);
echo $OUTPUT->paging_bar($totalcount, $page, $nowperpage, $baseurl);
echo $data->listtemplateheader;
$options = [
'search' => $search,
@@ -497,34 +492,17 @@ if ($showactivity) {
echo $parser->parse_entries($records);
echo $data->listtemplatefooter;
echo $OUTPUT->paging_bar($totalcount, $page, $nowperpage, $baseurl->out());
}
if ($mode != 'single' && $canmanageentries) {
// Build the select/deselect all control.
$selectallid = 'selectall-listview-entries';
$togglegroup = 'listview-entries';
$mastercheckbox = new \core\output\checkbox_toggleall($togglegroup, true, [
'id' => $selectallid,
'name' => $selectallid,
'value' => 1,
'label' => get_string('selectall'),
'classes' => 'btn-secondary mr-1',
], true);
echo $OUTPUT->render($mastercheckbox);
$deleteselected = html_writer::empty_tag('input', array(
'class' => 'btn btn-secondary',
'type' => 'submit',
'value' => get_string('deleteselected'),
'disabled' => true,
'data-action' => 'toggle',
'data-togglegroup' => $togglegroup,
'data-toggle' => 'action',
));
echo $deleteselected;
}
$stickyfooter = new mod_data\output\view_footer(
$manager,
$totalcount,
$page,
$nowperpage,
$baseurl,
$parser
);
echo $OUTPUT->render($stickyfooter);
echo html_writer::end_tag('form');
}