');
+ el.find('label[for="addtagcoll_name"]').html(s[1]);
+ el.find('label[for="addtagcoll_searchable"]').html(s[2]);
+ el.find('#addtagcoll_submit').attr('value', s[3]);
+ el.find('#addtagcoll_cancel').attr('value', s[4]);
+ var panel = new M.core.dialogue ({
+ draggable: true,
+ modal: true,
+ closeButton: true,
+ headerContent: s[0],
+ bodyContent: el.html()
+ });
+ panel.show();
+ $('#addtagcoll_form #addtagcoll_name').focus();
+ $('#addtagcoll_form #addtagcoll_cancel').on('click', function() {
+ panel.destroy();
+ });
+ $('#addtagcoll_form').on('submit', function() {
+ var name = $('#addtagcoll_form #addtagcoll_name').val();
+ var searchable = $('#addtagcoll_form #addtagcoll_searchable').prop('checked') ? 1 : 0;
+ if (String(name).length > 0) {
+ window.location.href = href + "&name=" + encodeURIComponent(name) + "&searchable=" + searchable;
+ }
+ return false;
+ });
+ }
+ );
+
+ });
+
+ $('body').on('click', '.tag-collections-table .action_delete', function(e) {
+ e.preventDefault();
+ var href = $(this).attr('data-url') + '&sesskey=' + M.cfg.sesskey;
+ str.get_strings([
+ {key : 'delete'},
+ {key : 'suredeletecoll', component : 'tag', param : $(this).attr('data-collname') },
+ {key : 'yes'},
+ {key : 'no'},
+ ]).done(function(s) {
+ notification.confirm(s[0], s[1], s[2], s[3], function() {
+ window.location.href = href;
+ });
+ }
+ );
+ });
}
};
});
\ No newline at end of file
diff --git a/lib/classes/output/inplace_editable.php b/lib/classes/output/inplace_editable.php
index b32ed158189..4e0d6d553c2 100644
--- a/lib/classes/output/inplace_editable.php
+++ b/lib/classes/output/inplace_editable.php
@@ -226,4 +226,14 @@ class inplace_editable implements templatable, renderable {
'linkeverything' => $this->get_linkeverything() ? 1 : 0,
);
}
+
+ /**
+ * Renders this element
+ *
+ * @param renderer_base $output typically, the renderer that's calling this function
+ * @return string
+ */
+ public function render(\renderer_base $output) {
+ return $output->render_from_template('core/inplace_editable', $this->export_for_template($output));
+ }
}
diff --git a/tag/classes/collection.php b/tag/classes/collection.php
index 902a1a71086..2dd55d27f63 100644
--- a/tag/classes/collection.php
+++ b/tag/classes/collection.php
@@ -143,7 +143,7 @@ class core_tag_collection {
return get_string($identifier, $component);
}
if (!empty($record->name)) {
- return format_string($record->name, true, $syscontext);
+ return format_string($record->name, true, array('context' => $syscontext));
} else if ($record->isdefault) {
return get_string('defautltagcoll', 'tag');
} else {
@@ -216,7 +216,7 @@ class core_tag_collection {
* Updates the tag collection information
*
* @param stdClass $tagcoll existing record in DB table tag_coll
- * @param stdClass $data data from form core_tag_collection_form
+ * @param stdClass $data data to update
* @return bool wether the record was updated
*/
public static function update($tagcoll, $data) {
diff --git a/tag/classes/collection_form.php b/tag/classes/collection_form.php
deleted file mode 100644
index 04a95b75aeb..00000000000
--- a/tag/classes/collection_form.php
+++ /dev/null
@@ -1,79 +0,0 @@
-.
-
-/**
- * Contains class core_tag_collection_form
- *
- * @package core
- * @copyright 2015 Marina Glancy
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * Form for editing tag collection
- *
- * @package core
- * @copyright 2015 Marina Glancy
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_tag_collection_form extends moodleform {
-
- /**
- * Form definition
- */
- public function definition() {
- $data = fullclone($this->_customdata);
- if (isset($data->id)) {
- $data->tc = $data->id;
- $data->action = 'colledit';
- } else {
- $data = new stdClass();
- $data->action = 'colladd';
- $data->isdefault = false;
- }
-
- $mform = $this->_form;
- $mform->addElement('hidden', 'tc');
- $mform->setType('tc', PARAM_INT);
- $mform->addElement('hidden', 'action');
- $mform->setType('action', PARAM_ALPHA);
-
- $mform->addElement('text', 'name', get_string('name'));
- $mform->setType('name', PARAM_NOTAGS);
- $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
- if (empty($data->isdefault)) {
- $mform->addRule('name', get_string('required'), 'required', null, 'client');
- } else {
- $mform->addElement('static', 'collnameexplained', '', get_string('collnameexplained', 'tag',
- get_string('defautltagcoll', 'tag')));
- }
-
- $mform->addElement('advcheckbox', 'searchable', get_string('searchable', 'tag'));
- $mform->addHelpButton('searchable', 'searchable', 'tag');
- $mform->setDefault('searchable', 1);
- if (!empty($data->isdefault)) {
- $mform->freeze('searchable');
- }
-
- $this->add_action_buttons();
-
- $this->set_data($data);
- }
-}
diff --git a/tag/classes/collections_table.php b/tag/classes/collections_table.php
index 79e08690071..78cdaca9d56 100644
--- a/tag/classes/collections_table.php
+++ b/tag/classes/collections_table.php
@@ -35,6 +35,7 @@ class core_tag_collections_table extends html_table {
/**
* Constructor
+ * @global \core_renderer $OUTPUT
* @param string|moodle_url $pageurl
*/
public function __construct($pageurl) {
@@ -63,25 +64,23 @@ class core_tag_collections_table extends html_table {
// Move up.
if ($idx > 1) {
$url->param('action', 'collmoveup');
- $actions .= $OUTPUT->action_icon($url, new pix_icon('t/up', get_string('moveup')));
+ $actions .= $OUTPUT->action_icon($url, new pix_icon('t/up', get_string('moveup')), null,
+ array('class' => 'action-icon action_moveup'));
}
// Move down.
if ($idx < count($tagcolls) - 1) {
$url->param('action', 'collmovedown');
- $actions .= $OUTPUT->action_icon($url, new pix_icon('t/down', get_string('movedown')));
+ $actions .= $OUTPUT->action_icon($url, new pix_icon('t/down', get_string('movedown')), null,
+ array('class' => 'action-icon action_movedown'));
}
}
- if (empty($tagcoll->component)) {
- // Edit.
- $url->param('action', 'colledit');
- $actions .= $OUTPUT->action_icon($url, new pix_icon('t/edit', get_string('edittagcoll', 'tag', $name)));
- }
if (!$tagcoll->isdefault && empty($tagcoll->component)) {
// Delete.
$url->param('action', 'colldelete');
- $actions .= $OUTPUT->action_icon($url, new pix_icon('t/delete', get_string('delete')));
+ $actions .= $OUTPUT->action_icon('#', new pix_icon('t/delete', get_string('delete')), null,
+ array('data-url' => $url, 'data-collname' => $name,
+ 'class' => 'action-icon action_delete'));
}
- $manageurl = new moodle_url('/tag/manage.php', array('tc' => $tagcoll->id));
$component = '';
if ($tagcoll->component) {
$component = ($tagcoll->component === 'core' || preg_match('/^core_/', $tagcoll->component)) ?
@@ -94,11 +93,13 @@ class core_tag_collections_table extends html_table {
(array_key_exists($key, $validareas) ? "" : "class=\"hidden\"") .
">{$allareas[$key]}";
}, array_keys($allareas));
+ $displayname = new \core_tag\output\tagcollname($tagcoll);
+ $searchable = new \core_tag\output\tagcollsearchable($tagcoll);
$this->data[] = array(
- html_writer::link($manageurl, $name),
+ $displayname->render($OUTPUT),
$component,
"