From 1ea0382f5346c2fb1a2388a8a53adfe40078dc10 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 25 Nov 2008 22:38:11 +0000 Subject: Moving right along on tags. Now the threshold for which tags can be changed. The default is to show all the tags (i.e. count >= the minimum frequency) by clicking on the "See Less" link, the tag cloud will not show the minimum frequency, so the number of tags shown is smaller. The "See More" link works the opposite way. --- modules/tag/controllers/tag.php | 76 ++++++++++++++++++++++++++++++++++++ modules/tag/helpers/tag.php | 5 ++- modules/tag/helpers/tag_block.php | 10 ++++- modules/tag/js/tag.js | 24 ++++++++++++ modules/tag/views/tag_block.html.php | 15 ++++++- 5 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 modules/tag/controllers/tag.php create mode 100644 modules/tag/js/tag.js (limited to 'modules') diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php new file mode 100644 index 00000000..e6bdbfe4 --- /dev/null +++ b/modules/tag/controllers/tag.php @@ -0,0 +1,76 @@ += tag::$NUMBER_OF_BUCKETS ? tag::$NUMBER_OF_BUCKETS - 1 : $filter); + print tag_block::sidebar_blocks(null, $filter); + } + + /** + * @see Rest_Controller::_form_add($parameters) + */ + public function _form_add($parameters) { + throw new Exception("@todo Comment_Controller::_form NOT IMPLEMENTED"); + } + + /** + * @see Rest_Controller::_form_edit($resource) + */ + public function _form_edit($tag) { + throw new Exception("@todo Comment_Controller::_form NOT IMPLEMENTED"); + } + + public function _show($tag) { + throw new Exception("@todo Tag_Controller::_show NOT IMPLEMENTED"); + } + + public function _create($tag) { + // @todo Productionize this code + // 1) Add security checks + throw new Exception("@todo Tag_Controller::_create NOT IMPLEMENTED"); + } + + public function _delete($tag) { + // @todo Production this code + // 1) Add security checks + throw new Exception("@todo Tag_Controller::_delete NOT IMPLEMENTED"); + } + + public function _update($tag) { + // @todo Productionize this + // 1) Figure out how to do the right validation here. Validate the form input and apply it to + // the model as appropriate. + // 2) Figure out how to dispatch according to the needs of the client. Ajax requests from + // jeditable will want the changed field back, and possibly the whole item in json. + // + // For now let's establish a simple protocol where the client passes in a __return parameter + // that specifies which field it wants back from the item. Later on we can expand that to + // include a data format, etc. + + throw new Exception("@todo Tag_Controller::_update NOT IMPLEMENTED"); + } +} diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php index 6dfbcf38..70448527 100644 --- a/modules/tag/helpers/tag.php +++ b/modules/tag/helpers/tag.php @@ -57,7 +57,8 @@ class tag_Core { * * @param int $filter Minimum frequency to be included in the tag cloud * @return array List of tags each entry has the following format: - * array("name" => "tag_name", "count" => "frequency", "class" => "bucket") + * array("id" => "tag_id", "name" => "tag_name", "count" => "frequency", + * "class" => "bucket") */ public static function load_buckets($filter=1) { $tag_list = array(); @@ -84,7 +85,7 @@ class tag_Core { } // Set the tag to the current class - $tag_list[$key] = array("name" => $tag->name, "count" => $tag->count, + $tag_list[$key] = array("id" => $tag->id, "name" => $tag->name, "count" => $tag->count, "class" => "$bucket_count"); $bucket_items++; $tags_set++; diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php index 629008b6..23a9e276 100644 --- a/modules/tag/helpers/tag_block.php +++ b/modules/tag/helpers/tag_block.php @@ -19,12 +19,18 @@ */ class tag_block_Core { - public static function sidebar_blocks($theme) { + public static function head($theme) { + $url = url::file("modules/tag/js/tag.js"); + return ""; + } + + public static function sidebar_blocks($theme, $filter=1) { $block = new Block(); $block->id = "gTag"; $block->title = _("Tags"); $block->content = new View("tag_block.html"); - $block->content->tag_list = tag::load_buckets(); + $block->content->tag_list = tag::load_buckets($filter); + $block->content->filter = $filter; return $block; } } \ No newline at end of file diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js new file mode 100644 index 00000000..6157b81b --- /dev/null +++ b/modules/tag/js/tag.js @@ -0,0 +1,24 @@ +$("document").ready(function() { + $("#gTagLess").click(function(event){ + event.preventDefault(); + get_tag_block($("#gTagLess").attr("href")); + }); + $("#gTagMore").click(function(event){ + event.preventDefault(); + get_tag_block($("#gTagMore").attr("href")); + }); +}); + +function get_tag_block(url) { + $.get(url, function(data) { + $('#gTag').html(data); + $("#gTagLess").click(function(event){ + event.preventDefault(); + get_tag_block($("#gTagLess").attr("href")); + }); + $("#gTagMore").click(function(event){ + event.preventDefault(); + get_tag_block($("#gTagMore").attr("href")); + }); + }); +} diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php index 68ae48d5..9334a5ce 100644 --- a/modules/tag/views/tag_block.html.php +++ b/modules/tag/views/tag_block.html.php @@ -1,9 +1,22 @@ +
+ + + ">See Less + + 1): ?> + + ">See More + + +
Resizing Tag Cloud...
+
+
-- cgit v1.2.3