From fdf3a06cc08c3f0c0880b02d41822ded29afd332 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Wed, 28 Mar 2012 11:59:29 +0300 Subject: [PATCH] Add reset categories button --- cloudcms/static/cloudcms/css/styles.css | 5 +++++ cloudcms/static/cloudcms/less/resources.less | 6 ++++++ cloudcmsresources/static/cloudcmsresources/js/resources_list.js | 6 +++++- cloudcmsresources/templates/content/resources_list.html | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cloudcms/static/cloudcms/css/styles.css b/cloudcms/static/cloudcms/css/styles.css index b0a2dfa..ca00d2a 100644 --- a/cloudcms/static/cloudcms/css/styles.css +++ b/cloudcms/static/cloudcms/css/styles.css @@ -636,6 +636,11 @@ a.button:hover { #cboxClose:hover { background-position: bottom center; } +.resources .categories .clear { + float: right; + margin-right: 4px; + color: #000000; +} .resources .categories ul { zoom: 1; } diff --git a/cloudcms/static/cloudcms/less/resources.less b/cloudcms/static/cloudcms/less/resources.less index 619032b..2dc35d0 100644 --- a/cloudcms/static/cloudcms/less/resources.less +++ b/cloudcms/static/cloudcms/less/resources.less @@ -4,6 +4,12 @@ .resources { .categories { + + .clear { + float: right; + margin-right: 4px; + color: @black; + } ul { .clearfix() } ul li { float: left; } .title { diff --git a/cloudcmsresources/static/cloudcmsresources/js/resources_list.js b/cloudcmsresources/static/cloudcmsresources/js/resources_list.js index 0b6b8a1..829f0b5 100644 --- a/cloudcmsresources/static/cloudcmsresources/js/resources_list.js +++ b/cloudcmsresources/static/cloudcmsresources/js/resources_list.js @@ -87,7 +87,10 @@ ResourcesModule.prototype.animate_els = function(els) { ResourcesModule.prototype.update_selected_category = function() { if (!this.selected_category) { - this.categories.removeClass("inactive").removeClass("active"); + this.categories.removeClass("inactive").removeClass("active"); + this.categories.show(); + this.el.find(".categories a.clear").hide(); + return; } var to_hide = this.categories.filter("[data-id="+this.selected_category+"]"); @@ -95,6 +98,7 @@ ResourcesModule.prototype.update_selected_category = function() { to_show.removeClass("active").addClass("inactive"); to_hide.removeClass("inactive").addClass("active"); + this.el.find(".categories a.clear").show(); } ResourcesModule.prototype.update_page_objects = function() { diff --git a/cloudcmsresources/templates/content/resources_list.html b/cloudcmsresources/templates/content/resources_list.html index e5efa5b..8715d76 100644 --- a/cloudcmsresources/templates/content/resources_list.html +++ b/cloudcmsresources/templates/content/resources_list.html @@ -11,6 +11,7 @@

{{ content.filter_title }}

+ show all