blocks editing: MDL-19889 edit tag_flickr block form.

diff --git a/blocks/tag_flickr/config_instance.html b/blocks/tag_flickr/config_instance.html
deleted file mode 100644 (file)
index 2e9fde8..0000000
--- a/blocks/tag_flickr/config_instance.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<table cellpadding="9" cellspacing="0">
-<tr valign="top">
-    <td align="right"><?php print_string('configtitle', 'block_tag_flickr'); ?>:</td>
-    <td><input type="text" name="title" size="30" value="<?php echo isset($this->config->title)?p($this->config->title):''; ?>" /></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('numberofphotos', 'block_tag_flickr'); ?>:</td>
-    <td>
-        <input type="text" name="numberofphotos" size="5" value="<?php echo isset($this->config->numberofphotos)?p($this->config->numberofphotos):''; ?>" />    
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('includerelatedtags', 'block_tag_flickr'); ?>:</td>
-    <td>
-        <?php 
-                if (isset($this->config) && isset($this->config->includerelatedtags)) {
-                        $selected = $this->config->includerelatedtags;
-                } else {
-                       $selected = '0';
-                }
-                $options = array ( '0'  => get_string('no'),
-                                   '1' => get_string('yes') );
-
-                choose_from_menu ($options, 'includerelatedtags', $selected);
-        ?>       
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('sortby', 'block_tag_flickr'); ?>:</td>
-    <td>
-        <?php 
-                if (isset($this->config) && isset($this->config->sortby)) {
-                        $selected = $this->config->sortby;
-                } else {
-                       $selected = 'relevance';
-                }
-                $options = array ( 'date-posted-asc'  => get_string('date-posted-asc', 'block_tag_flickr'),
-                                   'date-posted-desc' => get_string('date-posted-desc', 'block_tag_flickr'),
-                                   'date-taken-asc' => get_string('date-taken-asc', 'block_tag_flickr'),
-                                   'date-taken-desc' => get_string('date-taken-desc', 'block_tag_flickr'),
-                                   'interestingness-asc' => get_string('interestingness-asc', 'block_tag_flickr'),
-                                   'interestingness-desc' => get_string('interestingness-desc', 'block_tag_flickr'),
-                                   'relevance' => get_string('relevance', 'block_tag_flickr'),
-                                   );
-
-                choose_from_menu ($options, 'sortby', $selected);
-        ?>    
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('getfromphotoset', 'block_tag_flickr'); ?>:</td>
-    <td><input type="text" name="photoset" size="20" value="<?php echo isset($this->config->photoset)?p($this->config->photoset):''; ?>" /></td>
-</tr>
-<tr>
-    <td colspan="3" align="center">
-    <input type="submit" value="<?php print_string('savechanges') ?>" /></td>
-</tr>
-</table>

diff --git a/blocks/tag_flickr/edit_form.php b/blocks/tag_flickr/edit_form.php
new file mode 100644 (file)
index 0000000..4f7a855
--- /dev/null
+++ b/blocks/tag_flickr/edit_form.php
@@ -0,0 +1,60 @@
+<?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/>.
+
+/**
+ * Form for editing tag_flickr block instances.
+ *
+ * @package   moodlecore
+ * @copyright 2009 Tim Hunt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Form for editing tag_flickr block instances.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_tag_flickr_edit_form extends block_edit_form {
+    protected function specific_definition($mform) {
+        $mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
+
+        $mform->addElement('text', 'config_title', get_string('configtitle', 'block_tag_flickr'));
+        $mform->setType('config_title', PARAM_MULTILANG);
+
+        $mform->addElement('text', 'config_numberofphotos', get_string('numberofphotos', 'block_tag_flickr'), array('size' => 5));
+        $mform->setType('config_numberofvideos', PARAM_INTEGER);
+
+        $mform->addElement('selectyesno', 'config_includerelatedtags', get_string('includerelatedtags', 'block_tag_flickr'));
+        $mform->setDefault('config_includerelatedtags', 0);
+
+        $sortoptions = array(
+            'date-posted-asc'  => get_string('date-posted-asc', 'block_tag_flickr'),
+            'date-posted-desc' => get_string('date-posted-desc', 'block_tag_flickr'),
+            'date-taken-asc' => get_string('date-taken-asc', 'block_tag_flickr'),
+            'date-taken-desc' => get_string('date-taken-desc', 'block_tag_flickr'),
+            'interestingness-asc' => get_string('interestingness-asc', 'block_tag_flickr'),
+            'interestingness-desc' => get_string('interestingness-desc', 'block_tag_flickr'),
+            'relevance' => get_string('relevance', 'block_tag_flickr'),
+        );
+        $mform->addElement('select', 'config_sortby', get_string('sortby', 'block_tag_flickr'), $sortoptions);
+        $mform->setDefault('config_sortby', 'relevance');
+
+        $mform->addElement('text', 'config_photoset', get_string('getfromphotoset', 'block_tag_flickr'));
+        $mform->setType('config_photoset', PARAM_ALPHANUM);
+    }
+}