projects
/
snf-cloudcms
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3158d6f
)
Add reset categories button
author
Kostas Papadimitriou
<kpap@grnet.gr>
Wed, 28 Mar 2012 08:59:29 +0000
(11:59 +0300)
committer
Kostas Papadimitriou
<kpap@grnet.gr>
Wed, 28 Mar 2012 08:59:29 +0000
(11:59 +0300)
cloudcms/static/cloudcms/css/styles.css
patch
|
blob
|
history
cloudcms/static/cloudcms/less/resources.less
patch
|
blob
|
history
cloudcmsresources/static/cloudcmsresources/js/resources_list.js
patch
|
blob
|
history
cloudcmsresources/templates/content/resources_list.html
patch
|
blob
|
history
diff --git
a/cloudcms/static/cloudcms/css/styles.css
b/cloudcms/static/cloudcms/css/styles.css
index
b0a2dfa
..
ca00d2a
100644
(file)
--- 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;
}
#cboxClose:hover {
background-position: bottom center;
}
+.resources .categories .clear {
+ float: right;
+ margin-right: 4px;
+ color: #000000;
+}
.resources .categories ul {
zoom: 1;
}
.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
(file)
--- a/
cloudcms/static/cloudcms/less/resources.less
+++ b/
cloudcms/static/cloudcms/less/resources.less
@@
-4,6
+4,12
@@
.resources {
.categories {
.resources {
.categories {
+
+ .clear {
+ float: right;
+ margin-right: 4px;
+ color: @black;
+ }
ul { .clearfix() }
ul li { float: left; }
.title {
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
(file)
--- 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) {
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+"]");
}
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");
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() {
}
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
(file)
--- a/
cloudcmsresources/templates/content/resources_list.html
+++ b/
cloudcmsresources/templates/content/resources_list.html
@@
-11,6
+11,7
@@
<div class="categories">
<h2 class="title">{{ content.filter_title }}</h2>
<div class="categories">
<h2 class="title">{{ content.filter_title }}</h2>
+ <a href="#" class="clear">show all</a>
<ul>
{% for cat in categories %}
<li class="{{ cat.get_css_class }} filter-item" data-id="{{ cat.pk }}">
<ul>
{% for cat in categories %}
<li class="{{ cat.get_css_class }} filter-item" data-id="{{ cat.pk }}">