fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d982930
)
Added button to fold unfolded category list on main page.
author
Marek Stępniowski
<marek@stepniowski.com>
Thu, 25 Sep 2008 12:11:55 +0000
(14:11 +0200)
committer
Marek Stępniowski
<marek@stepniowski.com>
Thu, 25 Sep 2008 12:11:55 +0000
(14:11 +0200)
wolnelektury/media/css/master.css
patch
|
blob
|
history
wolnelektury/media/js/catalogue.js
patch
|
blob
|
history
wolnelektury/templates/catalogue/folded_tag_list.html
patch
|
blob
|
history
wolnelektury/templates/catalogue/main_page.html
patch
|
blob
|
history
diff --git
a/wolnelektury/media/css/master.css
b/wolnelektury/media/css/master.css
index
59588a8
..
7dc433b
100644
(file)
--- a/
wolnelektury/media/css/master.css
+++ b/
wolnelektury/media/css/master.css
@@
-242,12
+242,12
@@
p .ac_input {
display: none;
}
display: none;
}
-div.shown-tags p {
+div.shown-tags p
, div.all-tags p
{
margin: -1em 0 1em 0;
text-align: right;
}
margin: -1em 0 1em 0;
text-align: right;
}
-.show-all-tags {
+.show-all-tags
, .hide-all-tags
{
text-decoration: underline;
padding-right: 1em;
}
text-decoration: underline;
padding-right: 1em;
}
diff --git
a/wolnelektury/media/js/catalogue.js
b/wolnelektury/media/js/catalogue.js
index
87aee5d
..
f86788b
100644
(file)
--- a/
wolnelektury/media/js/catalogue.js
+++ b/
wolnelektury/media/js/catalogue.js
@@
-42,6
+42,13
@@
return false;
});
return false;
});
+ $('.hide-all-tags').click(function() {
+ $(this).parent().parent().fadeOut(function() {
+ $(this).prev().fadeIn();
+ });
+ return false;
+ });
+
$('#registration-form').ajaxForm({
dataType: 'json',
beforeSubmit: function() {
$('#registration-form').ajaxForm({
dataType: 'json',
beforeSubmit: function() {
diff --git
a/wolnelektury/templates/catalogue/folded_tag_list.html
b/wolnelektury/templates/catalogue/folded_tag_list.html
index
e66c109
..
62896fc
100644
(file)
--- a/
wolnelektury/templates/catalogue/folded_tag_list.html
+++ b/
wolnelektury/templates/catalogue/folded_tag_list.html
@@
-16,7
+16,8
@@
<ul>
{% for tag in tags %}
<li><a href="{% catalogue_url choices tag %}">{{ tag }} ({{ tag.count }})</a></li>
<ul>
{% for tag in tags %}
<li><a href="{% catalogue_url choices tag %}">{{ tag }} ({{ tag.count }})</a></li>
- {% endfor %}
+ {% endfor %}
</ul>
</ul>
+ <p><a href="#" class="hide-all-tags">Zwiń</a></p>
</div>
{% endif %}
</div>
{% endif %}
diff --git
a/wolnelektury/templates/catalogue/main_page.html
b/wolnelektury/templates/catalogue/main_page.html
index
1c4e1e9
..
107d27d
100644
(file)
--- a/
wolnelektury/templates/catalogue/main_page.html
+++ b/
wolnelektury/templates/catalogue/main_page.html
@@
-236,6
+236,7
@@
<li>żywioły
<span class="subcategories"><a href="/katalog/zywioly">Żywioły</a>, <a href="/katalog/ogien">Ogień</a>, <a href="/katalog/ziemia">Ziemia</a>, <a href="/katalog/wiatr">Wiatr</a>, <a href="/katalog/woda">Woda</a>, <a href="/katalog/przestrzen">Przestrzeń</a></span></li>
</ol>
<li>żywioły
<span class="subcategories"><a href="/katalog/zywioly">Żywioły</a>, <a href="/katalog/ogien">Ogień</a>, <a href="/katalog/ziemia">Ziemia</a>, <a href="/katalog/wiatr">Wiatr</a>, <a href="/katalog/woda">Woda</a>, <a href="/katalog/przestrzen">Przestrzeń</a></span></li>
</ol>
+ <p><a href="#" class="hide-all-tags">Zwiń</a></p>
</div>
</div>
<div class="clearboth"></div>
</div>
</div>
<div class="clearboth"></div>