From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 26 Jan 2012 11:55:38 +0000 (+0100)
Subject: pretty cite on main
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f2056dbaafa8f6a5bf72ef25ecf77060693ba35d?ds=sidebyside
pretty cite on main
---
diff --git a/apps/social/templates/social/cite_promo.html b/apps/social/templates/social/cite_promo.html
index ab4e6dd73..0554d23af 100755
--- a/apps/social/templates/social/cite_promo.html
+++ b/apps/social/templates/social/cite_promo.html
@@ -3,12 +3,12 @@
{% if cite %}
<a href="{{ cite.link }}" class="cite{% if cite.small %} cite-small{% endif %}">
{% if cite.vip %}
- <p class='vip mono'>{{ cite.vip }} {% trans "recommends" %}:</p>
+ <p class='vip mono'><span>{{ cite.vip }} {% trans "recommends" %}:</span></p>
{% endif %}
<blockquote class="cite-body">
- {{ cite.text|linebreaks|safe }}
+ <span>{{ cite.text|linebreaksbr|safe }}</span>
</blockquote>
- <p class="source mono">{{ cite.book.pretty_title }}</p>
+ <p class="source mono"><span>{{ cite.book.pretty_title }}</span></p>
</a>
{% else %}
{% if fallback %}
diff --git a/lib/librarian b/lib/librarian
index 05843e29b..b24b166cc 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 05843e29b4fffcc676da0e67b7a840a24d7b91d4
+Subproject commit b24b166cc4de6ba7e9b1559717bb5ff6e27bdacd
diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index cd59f69a6..a89116abf 100755
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -178,8 +178,7 @@ h2 {
#footer {
- color: #777;
- eborder-top: 1px solid #ddd;
+ color: #767676;
margin-top: 5em;
padding-top:3em;
background: #fff;
diff --git a/wolnelektury/static/css/cite.css b/wolnelektury/static/css/cite.css
index c06777f7e..4335f2ee6 100755
--- a/wolnelektury/static/css/cite.css
+++ b/wolnelektury/static/css/cite.css
@@ -4,16 +4,19 @@ a.cite {
background: white;
padding: 3em 2em .1em 8em;
}
-.cite-body {
+.book-wide-box .cite-body,
+#tagged-object-list .cite-body
+ {
font-size: 1.8em;
line-height: 1.3em;
}
-.cite p {
+.book-wide-box .source,
+#tagged-object-list .source
+{
color: #444;
font-size: 1.1em;
margin-top: 1.6em;
}
-
.cite .vip {
margin: 0;
color: #575C63;
@@ -22,20 +25,26 @@ a.cite {
/* a long cite displays smaller */
-.cite-small .cite-body {
+.cite-small .cite-body span {
font-size: 1.4em;
}
#big-cite {
- background-color: white;
+ background-color: #5f3e1c; /* average image color */
+ color: white;
padding: 0;
margin: 0;
+ background-image: url(/static/img/backdrop/boltron-3212284622.jpg);
+ background-size: 100%;
+ background-position: 50% 50%;
}
#big-cite .cite {
- padding: 10.75em 10em 8.5em 18.2em;
+ padding: 4.6em 4em 4.8em 0;
+ background: none;
+ color: white;
}
#big-cite h2 {
@@ -46,27 +55,53 @@ a.cite {
#big-cite .cite-body {
- margin: .05em;
- font-size: 2.8em;
- line-height: 1.2em;
- color: #191919;
+ margin: .05em .05em .05em 17.5em;
+}
+#big-cite .cite-body span {
+ font-size: 3em;
+ line-height: 1.16em;
+}
+
+#big-cite .vip {
+ float:left;
+ text-align:right;
+ width: 14.7em;
+ margin-top: .25em;
+}
+
+#big-cite .vip span {
+ font-size:1.1em;
+}
+
+#big-cite .cite-body span,
+#big-cite .vip span,
+#big-cite .source span
+{
+ color: white;
+ background-color: rgb(0, 0, 0);
+ background-color: rgba(0, 0, 0, 0.6);
+ /* For IE 5.5 - 7*/
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);
+ /* For IE 8*/
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";
}
/* a long cite displays smaller */
-#big-cite .cite-small .cite-body {
+#big-cite .cite-small .cite-body span {
font-size: 2em;
}
#big-cite .source {
- color: #00a1ac;
- margin: 0;
+ margin: 1.6em 0.2em 1.6em 17.5em;
+}
+#big-cite .source span {
font-size: 1.1em;
- margin: 1.1em 0.2em;
}
+
.cite blockquote p {
margin: 0;
}
@@ -81,7 +116,7 @@ a.cite {
top: -0.8em;
right: -1em;
background-color: #f7f7f7;
- vertical-align: center;
+ vertical-align: middle;
width: 39.5em;
margin: 0;
padding: 1em;
diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 9435ad7c0..f8cf7568b 100755
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -27,6 +27,7 @@
#half-header-content {
background: #191919;
+ color: #989898;
}
@@ -58,6 +59,7 @@
#search-area {
margin: 0;
background: #444;
+ color: white;
margin-left: 24em;
width: 73.5em;
}
@@ -108,6 +110,7 @@
#search-button {
display: inline-block;
background: #02adb7;
+ color: white;
padding: 0;
margin: 0;
width: 9.4em;
diff --git a/wolnelektury/static/img/backdrop/boltron-3212284622.jpg b/wolnelektury/static/img/backdrop/boltron-3212284622.jpg
new file mode 100644
index 000000000..3fa342d8a
Binary files /dev/null and b/wolnelektury/static/img/backdrop/boltron-3212284622.jpg differ
diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index dfe9ac5c6..383b1efa2 100644
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -71,8 +71,6 @@
</div>
</div>
- {% block book-box-extra-info %}{% endblock %}
-
<ul class="book-box-tools">
<li class="book-box-read">
{% if book.html_file %}
@@ -102,6 +100,7 @@
{% endif %}
</li>
</ul>
+ {% block book-box-extra-info %}{% endblock %}
{% block box-append %}
{% endblock %}
<div class="clearboth"></div>
diff --git a/wolnelektury/templates/catalogue/fragment_promo.html b/wolnelektury/templates/catalogue/fragment_promo.html
index 979fff4f8..cf817ae7c 100755
--- a/wolnelektury/templates/catalogue/fragment_promo.html
+++ b/wolnelektury/templates/catalogue/fragment_promo.html
@@ -1,10 +1,8 @@
-{% load removewholetags from catalogue_tags %}
-
{% if fragment %}
<a href="{{ fragment.get_absolute_url }}" class="cite">
<blockquote class="cite-body">
{{ fragment.get_short_text|safe }}
</blockquote>
- <p class="mono">{{ fragment.book.pretty_title }}</p>
+ <p class="mono source">{{ fragment.book.pretty_title }}</p>
</a>
{% endif %}
diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index fc5217c32..d2dc57b30 100755
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -68,3 +68,12 @@
{% endspaceless %}
{% endblock %}
+
+
+{% block add_footer %}
+<p>{% trans "Image used:" %}
+<a href="http://www.flickr.com/photos/boltron/3212284622/">Everyone loves booksâ¦</a>,
+boltron-@Flickr,
+<a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pl">CC BY-SA</a>.
+</p>
+{% endblock %}