From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 26 Jan 2012 15:28:04 +0000 (+0100)
Subject: display fixes
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/d006c3ee8a6305e89f723cb6d84497817ae2050c
display fixes
---
diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index c23f606ab..b9ef8f286 100755
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -142,6 +142,7 @@
}
.book-box-head .author {
font-size: 1.1em;
+ max-width: 24em;
}
.book-box-head .title {
font-size: 2.4em;
diff --git a/wolnelektury/static/css/jquery.countdown.css b/wolnelektury/static/css/jquery.countdown.css
index 4b8a4cc5b..3eca47676 100644
--- a/wolnelektury/static/css/jquery.countdown.css
+++ b/wolnelektury/static/css/jquery.countdown.css
@@ -2,7 +2,7 @@
.hasCountdown {
/*border: 1px solid #ccc;
background-color: #eee;*/
- margin: 20px 0 50px 0;
+ margin: 1em 0 7em 0;
}
.countdown_rtl {
direction: rtl;
@@ -44,8 +44,8 @@
text-align: center;
}
.countdown_amount {
- font-size: 350%;
- line-height: 32px;
+ font-size: 3.5em;
+ line-height: 1.4em;
}
.countdown_descr {
display: block;
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 6696892e2..2477726fb 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -31,7 +31,7 @@
<div id="tagline">
<span>
- {% cache 300 tagline LANGUAGE_CODE %}
+ {% cache 60 tagline LANGUAGE_CODE %}
{% url book_list as b %}
{% url book_list as r %}
{% count_books book_count %}
@@ -96,7 +96,7 @@
<div id="main-content">
<div id="nav-line">
- {% cache 300 catalogue-menu LANGUAGE_CODE %}
+ {% cache 60 catalogue-menu LANGUAGE_CODE %}
{% catalogue_menu %}
{% endcache %}
diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 383b1efa2..6173d7c29 100644
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -45,28 +45,27 @@
<div class="title"><a href="{{ main_link }}">{{ book.title }}</a></div>
</div>
<div class="tags">
- {% spaceless %}
-
- <span class="mono">{% trans "Epoch" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.epoch %}
- <a href="{% tag_url 'epoch' slug %}">{{ name }} </a>
+ <span class="mono"> {% trans "Epoch" %}:</span> <span class="book-box-tag">
+ {% for name, slug in related.tags.epoch %}
+ <a href="{% tag_url 'epoch' slug %}">{{ name }}</a>
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
</span>
- <span class="mono">{% trans "Kind" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.kind %}
- <a href="{% tag_url 'kind' slug %}">{{ name }} </a>
+ <span class="mono"> {% trans "Kind" %}:</span> <span class="book-box-tag">
+ {% for name, slug in related.tags.kind %}
+ <a href="{% tag_url 'kind' slug %}">{{ name }}</a>
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
</span>
- <span class="mono">{% trans "Genre" %}:</span> <span class="book-box-tag">
- {% for name, slug in related.tags.genre %}
- <a href="{% tag_url 'genre' slug %}">{{ name }} </a>
+ <span class="mono"> {% trans "Genre" %}:</span> <span class="book-box-tag">
+ {% for name, slug in related.tags.genre %}
+ <a href="{% tag_url 'genre' slug %}">{{ name }}</a>
+ {% if not forloop.last %}<span>, </span>{% endif %}
{% endfor %}
</span>
- {% endspaceless %}
-
{% shelf_tags book %}
</div>
</div>
diff --git a/wolnelektury/templates/catalogue/tag_list.html b/wolnelektury/templates/catalogue/tag_list.html
index 3f842acc7..a5ce71e37 100644
--- a/wolnelektury/templates/catalogue/tag_list.html
+++ b/wolnelektury/templates/catalogue/tag_list.html
@@ -4,8 +4,14 @@
<p>{% trans "See full category" %} <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a></p>
{% else %}
<ul>
+ {% if choices %}
{% for tag in tags %}
- <li><a href="{% catalogue_url choices tag %}">{{ tag }} ({{ tag.book_count }})</a></li>
+ <li><a href="{% catalogue_url choices tag %}">{{ tag }} ({{ tag.count }})</a></li>
{% endfor %}
+ {% else %}
+ {% for tag in tags %}
+ <li><a href="{{ tag.get_absolute_url }}">{{ tag }} ({{ tag.book_count }})</a></li>
+ {% endfor %}
+ {% endif %}
</ul>
{% endif %}
diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index d2dc57b30..c12674690 100755
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -52,7 +52,7 @@
<div class="infopages-box">
<h2><span class='mono'>Informacje</span></h2>
- {% cache 300 infopages-on-main LANGUAGE_CODE %}
+ {% cache 60 infopages-on-main LANGUAGE_CODE %}
{% infopages_on_main %}
{% endcache %}
diff --git a/wolnelektury/templates/pdcounter/author_detail.html b/wolnelektury/templates/pdcounter/author_detail.html
index 7cdcf2abd..3810a4578 100644
--- a/wolnelektury/templates/pdcounter/author_detail.html
+++ b/wolnelektury/templates/pdcounter/author_detail.html
@@ -8,9 +8,10 @@
{% block bodyid %}author-detail{% endblock %}
{% block body %}
- <h1>{{ author.name }}</h1>
- <div id="books-list">
+ <div class="left-column">
+ <h1>{{ author.name }}</h1>
+ <div class="normal-text white-box">
{% if author.has_description %}
<div id="description">
<div id='description-long'>{{ author.description|safe }}</div>
@@ -46,8 +47,9 @@
{% endif %}
{% include "info/join_us.html" %}
</div>
+ </div>
- <div class="column-right block-form">
+ <div class="right-column block-form">
{% include "publishing_suggest.html" %}
</div>
{% endblock %}
diff --git a/wolnelektury/templates/pdcounter/book_stub_detail.html b/wolnelektury/templates/pdcounter/book_stub_detail.html
index 6e77a7865..f76edd17a 100644
--- a/wolnelektury/templates/pdcounter/book_stub_detail.html
+++ b/wolnelektury/templates/pdcounter/book_stub_detail.html
@@ -8,9 +8,10 @@
{% block bodyid %}book-stub-detail{% endblock %}
{% block body %}
+ <div class="left-column">
<h1>{{ book.author }}, {{ book.title }}</h1>
+ <div class="normal-text white-box">
- <div id="books-list">
{% if book.in_pd %}
<p>{% trans "This work is in public domain and will be published on Internet school library of Wolne Lektury soon." %}</p>
{% else %}
@@ -25,8 +26,9 @@
{% endif %}
{% include "info/join_us.html" %}
</div>
+ </div>
- <div class="column-right block-form">
+ <div class="right-column block-form">
{% include "publishing_suggest.html" %}
</div>
{% endblock %}