layout changes

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 288a189..f92ebd3 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -513,7 +513,7 @@ class Book(models.Model):
             for ebook_format in self.ebook_formats:
                 if self.has_media(ebook_format):
                     formats.append(u'<a href="%s">%s</a>' % (
             for ebook_format in self.ebook_formats:
                 if self.has_media(ebook_format):
                     formats.append(u'<a href="%s">%s</a>' % (

-                        "", #self.get_media(ebook_format).url,
+                        self.get_media(ebook_format).url,

                         ebook_format.upper()
                     ))
 
                         ebook_format.upper()
                     ))
 

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 0ba4476..b4a3ec5 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -263,6 +263,14 @@ def tag_list(tags, choices=None):
         one_tag = tags[0]
     return locals()
 
         one_tag = tags[0]
     return locals()
 

+@register.inclusion_tag('catalogue/inline_tag_list.html')
+def inline_tag_list(tags, choices=None):
+    if choices is None:
+        choices = []
+    if len(tags) == 1:
+        one_tag = tags[0]
+    return locals()
+

 
 @register.inclusion_tag('catalogue/book_info.html')
 def book_info(book):
 
 @register.inclusion_tag('catalogue/book_info.html')
 def book_info(book):

diff --git a/apps/reporting/templates/reporting/main.html b/apps/reporting/templates/reporting/main.html
index c629f10..3960e79 100755 (executable)
--- a/apps/reporting/templates/reporting/main.html
+++ b/apps/reporting/templates/reporting/main.html
@@ -14,10 +14,10 @@
 
     <table class="stats">
         <tr><th>Utwory</th></tr>
 
     <table class="stats">
         <tr><th>Utwory</th></tr>

-        <tr><td>Wszystkie utwory:</td><td>{% count_books_all %}</td></tr>
-        <tr><td>Utwory z własną treścią:</td><td>{% count_books_nonempty %}</td></tr>
-        <tr><td>Utwory bez własnej treści:</td><td>{% count_books_empty %}</td></tr>
+        <tr><td>Utwory:</td><td>{% count_books %}</td></tr>

         <tr><td>Niezależne książki:</td><td>{% count_books_root %}</td></tr>
         <tr><td>Niezależne książki:</td><td>{% count_books_root %}</td></tr>

+        <tr><td>Utwory nadrzędne:</td><td>{% count_books_parent %}</td></tr>
+        <tr><td>Wszystkie utwory:</td><td>{% count_books_all %}</td></tr>

 
         <tr><th>Media</th><th>Liczba</th><th>Rozmiar</th><th>Do wymiany</th></tr>
         {% for mt in media_types %}
 
         <tr><th>Media</th><th>Liczba</th><th>Rozmiar</th><th>Do wymiany</th></tr>
         {% for mt in media_types %}

diff --git a/apps/reporting/templatetags/reporting_stats.py b/apps/reporting/templatetags/reporting_stats.py
index dceee00..6f20c08 100755 (executable)
--- a/apps/reporting/templatetags/reporting_stats.py
+++ b/apps/reporting/templatetags/reporting_stats.py
@@ -49,11 +49,11 @@ def count_books_all():
     return Book.objects.all().count()
 
 @register_counter
     return Book.objects.all().count()
 
 @register_counter

-def count_books_nonempty():
+def count_books():

     return Book.objects.exclude(html_file='').count()
 
 @register_counter
     return Book.objects.exclude(html_file='').count()
 
 @register_counter

-def count_books_empty():
+def count_books_parent():

     return Book.objects.filter(html_file='').count()
 
 @register_counter
     return Book.objects.filter(html_file='').count()
 
 @register_counter

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index e476d13..18e8d75 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -201,6 +201,7 @@ COMPRESS_JS = {
             'js/locale.js',
             'js/dialogs.js',
             'js/sponsors.js',
             'js/locale.js',
             'js/dialogs.js',
             'js/sponsors.js',

+            'js/base.js',

             'js/pdcounter.js',
 
             #~ 'js/jquery.autocomplete.js',
             'js/pdcounter.js',
 
             #~ 'js/jquery.autocomplete.js',

diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css
index 35aed2e..f55a39e 100755 (executable)
--- a/wolnelektury/static/css/base.css
+++ b/wolnelektury/static/css/base.css
@@ -18,16 +18,32 @@ html {
 body {
     margin: 0;
     background: #f7f7f7;
 body {
     margin: 0;
     background: #f7f7f7;

-    font-size: .9em;
-    line-height: 1.4em;
+    font-size: .625em;
+    font-family: Georgia;
+    /*line-height: 1.4em;*/

 }
 
 
 a {
 }
 
 
 a {

-    color: #02adb7;
+    color: #01adba;

     text-decoration: none;
 }
 
     text-decoration: none;
 }
 

+h1 {
+    font-size: 3.5em;
+    font-weight: normal;
+    margin-top: .4em
+}
+
+.left-column {
+    width: 48em;
+    float: left;
+}
+.right-column {
+    float:right;
+    width: 48em;
+}
+

 h2 {
     margin: 0;
     font-size: 1em;
 h2 {
     margin: 0;
     font-size: 1em;


@@ -35,15 +51,8 @@ h2 {
 }
 
 
 }
 
 

-.grid-line {
-    height: 2.6em;
-    padding-top: 1.4em;
-    padding-bottom: 0;
-}
-
-.mono, .mono-small {
+.mono {

     font-family: "Lucida Sans Typewriter", courier;
     font-family: "Lucida Sans Typewriter", courier;

-    font-size: .9em;

 }
 
 
 }
 
 


@@ -52,15 +61,88 @@ h2 {
 }
 
 #header-content, div#main-content, div#half-header-content {
 }
 
 #header-content, div#main-content, div#half-header-content {

-    width: 75em;
+    width: 97.5em;

     margin: auto;
 }
 
 
     margin: auto;
 }
 
 

+.page-desc {
+    margin-left: 1.5em;
+}
+.inline-tag-lists {
+    font-size: 1.1em;
+}
+#themes-list-toggle:after {
+    padding-left: 1em;
+    content: "↓";
+    font-family: WL-Nav;
+    vertical-align: middle;
+}
+#themes-list-wrapper {
+    position: relative;
+}
+#themes-list {
+    position: absolute;
+    display: none;
+    border: 1px solid #ddd;
+    padding: 1em;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 2px #ddd;
+    -webkit-box-shadow: 2px 2px 2px #ddd;
+    box-shadow: 2px 2px 2px #ddd;
+}
+#themes-list ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    font-size: 1.1em;
+    -moz-column-width: 12em;
+    width: 48em;
+}
+
+
+a.cite {
+    display: block;
+    color: black;
+    background: white;
+    padding: 3em 2em .1em 8em;
+}
+.cite-body {
+    font-size: 1.8em;
+    line-height: 1.3em;
+}
+.cite p {
+    color: #444;
+    font-size: 1.1em;
+    margin-top: 1.6em;
+}
+
+.see-also {
+    margin-left: 8em;
+    float: left;
+    width: 14.3em;
+}
+.download {
+    margin-left: 2em;
+    float: left;
+}
+
+.see-also, .download {
+    margin-top: 2em;
+    margin-bottom: 2em;
+}
+.see-also h2, .download h2 {
+    font-size: 1.1em;
+}
+.see-also ul, .download ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    font-size: 1.1em;
+}

 
 
 #footer {
 
 
 #footer {

-    font-size: .75em;

     color: #777;
     border-top: 1px solid #ddd;
     margin-top: 2.5em;
     color: #777;
     border-top: 1px solid #ddd;
     margin-top: 2.5em;

diff --git a/wolnelektury/static/css/book_box.css b/wolnelektury/static/css/book_box.css
index 2faa1a2..ca2e726 100755 (executable)
--- a/wolnelektury/static/css/book_box.css
+++ b/wolnelektury/static/css/book_box.css
@@ -6,11 +6,11 @@
 
 
 .book-box {
 
 
 .book-box {

-    width: 37.5em;
+    width: 48.75em;

 }
 
 .book-mini-box {
 }
 
 .book-mini-box {

-    width: 12.5em;
+    width: 16.15em;

 }
 
 .book-mini-box a, .book-box-inner {
 }
 
 .book-mini-box a, .book-box-inner {


@@ -18,69 +18,97 @@
     color: black;
     border: 1px solid #ddd;
     height: 20em;
     color: black;
     border: 1px solid #ddd;
     height: 20em;

-    padding: .75em;
+    padding: .8em 1em;

     margin: .1em;
     background: #fff;
     -moz-box-shadow: 2px 2px 2px #ddd;
     -webkit-box-shadow: 2px 2px 2px #ddd;
     box-shadow: 2px 2px 2px #ddd;
     margin: .1em;
     background: #fff;
     -moz-box-shadow: 2px 2px 2px #ddd;
     -webkit-box-shadow: 2px 2px 2px #ddd;
     box-shadow: 2px 2px 2px #ddd;

-    overflow: hidden;

 }
 
 .book-mini-box a {
 }
 
 .book-mini-box a {

-    height: 20em;
+    height: 27.1em;

     margin: .1em;
     margin: .1em;

+    overflow: hidden;

 }
 .book-box-inner {
 }
 .book-box-inner {

-    height: 14.4em;
+    height: 19.75em;

     margin: .5em;
 }
 
 .book-mini-box img, .book-box img {
     margin: .5em;
 }
 
 .book-mini-box img, .book-box img {

-    width: 10.8em;
-    height: 14.4em;
+    width: 13.9em;
+    height: 19.3em;

 }
 .book-mini-box img {
 }
 .book-mini-box img {

-    margin-bottom: .3em;
+    margin-bottom: 1.8em;

 }
 .book-box img {
     float: left;
     margin-right: 1.5em;
 }
 
 }
 .book-box img {
     float: left;
     margin-right: 1.5em;
 }
 

+.book-mini-box .desc {
+    margin-left:0em;
+}

 .book-mini-box .author {
 .book-mini-box .author {

+    font-size: 1.1em;

     color: #777;
     color: #777;

+    display: block;
+}
+.book-mini-box .title {
+    font-size: 1.4em;

 }
 
 
 .book-box-body {
 }
 
 
 .book-box-body {

-    height: 13em;
+    height: 17em;

     overflow: hidden;
 }
 .book-box-head {
     min-height: 7em;
     overflow: hidden;
 }
 .book-box-head {
     min-height: 7em;

+    margin-top: 1.4em;
+    margin-bottom: 1em;
+}
+.book-box-head .author {
+    font-size: 1.1em;
+}
+.book-box-head .title {
+    font-size: 2.4em;
+    margin-top: .3em;
+}
+.book-box-body .tags {
+    font-size: 1.1em;

 }
 .book-box-tag {
 }
 .book-box-tag {

-    font-size: .8em;

     margin-right: .5em;
     margin-right: .5em;

+    margin-left: .4em;

 }
 .book-box-download {
     position: relative;
 }
 .book-box-formats {
     display: none;
 }
 .book-box-download {
     position: relative;
 }
 .book-box-formats {
     display: none;

-    top: -2em;

     position: absolute;
     position: absolute;

-    height: 2em;
-    width: 100em;
+
+    border: 1px solid #ddd;
+    padding: .8em 1em;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 2px #ddd;
+    -webkit-box-shadow: 2px 2px 2px #ddd;
+    box-shadow: 2px 2px 2px #ddd;
+    

 }
 .book-box-formats a {
 }
 .book-box-formats a {

-    margin-right: 1em;
+    display: block;

 }
 .book-box-download:hover .book-box-formats {
     display: block;
 }
 
 }
 .book-box-download:hover .book-box-formats {
     display: block;
 }
 

+.book-box-tools {
+    font-size: 1.1em;
+}

 .book-box-tools a:before {
     content: "⇩";
     font-family: WL-Nav;
 .book-box-tools a:before {
     content: "⇩";
     font-family: WL-Nav;


@@ -89,11 +117,11 @@
     vertical-align: middle;
 }
 .book-box-read {
     vertical-align: middle;
 }
 .book-box-read {

-    width: 10em;
+    width: 11em;

 }
 .book-box-download {
 }
 .book-box-download {

-    width: 6em;
+    width: 8em;

 }
 .book-box-audiobook {
 }
 .book-box-audiobook {

-    width: 6em;
+    width: 8em;

 }
 }

diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css
index 9e81463..79e8815 100755 (executable)
--- a/wolnelektury/static/css/header.css
+++ b/wolnelektury/static/css/header.css
@@ -11,11 +11,15 @@
 
 
 #header {
 
 
 #header {

+    height: 3em;
+    padding-top: 1.9em;
+    padding-bottom: 0;

     color: #969696;
     background: #191919;
 }
 
 #half-header {
     color: #969696;
     background: #191919;
 }
 
 #half-header {

+    padding-bottom: 0;

     background: url('/static/img/bg-header.png');
     background-position: center;
     background-size: 100%;
     background: url('/static/img/bg-header.png');
     background-position: center;
     background-size: 100%;


@@ -33,43 +37,45 @@
 
 #logo {
     position: absolute;
 
 #logo {
     position: absolute;

-    top: 4em;
+    top: 1.9em;
+    margin-left: 1.6em;

 }
 
 #logo a {
     font-family: WL-Logo;
 }
 
 #logo a {
     font-family: WL-Logo;

-    font-size: 1.9em;
+    font-size: 2.05em;

     color:#f7f7f7;
 }
 
     color:#f7f7f7;
 }
 

-#logo img {
-    max-width: 15em;
-}
-

 #tagline {
     display: inline-block;
 #tagline {
     display: inline-block;

-    margin-left: 16em;
+    margin-left: 24em;
+}
+#tagline span {
+    font-size: 1.1em;

 }
 
 }
 

-#search {
+#search-area {

     margin: 0;
     background: #444;
     margin: 0;
     background: #444;

-    margin-left: 16em;
-    width: 59em;
+    margin-left: 24em;
+    width: 73.5em;

 }
 
 #search-field {
     display: inline-block;
 }
 
 #search-field {
     display: inline-block;

-    width: 50em;
-    padding-left: .5;
-    padding-right: .5;
-    padding: .1em .5em 0 .5em;
+    width: 63.1em;
+    padding-left: .5em;
+    padding-right: .5em;
+    padding-top: 0;
+    padding-bottom: 0;

 }
 
 #search-field input {
 }
 
 #search-field input {

-    height: 2.8em;
+    padding: 0;
+    height: 3.3em;

     border: none;
     border: none;

-    width: 49.5em;
+    width: 62.6em;

     font-size: 1em;
     padding-left: .5em;
     -webkit-border-radius: .5em;
     font-size: 1em;
     padding-left: .5em;
     -webkit-border-radius: .5em;


@@ -85,12 +91,11 @@
     background: #02adb7;
     padding: 0;
     margin: 0;
     background: #02adb7;
     padding: 0;
     margin: 0;

-    width: 8em;
+    width: 9.4em;

 }
 #search-button button {
     font-size: 1em;
 }
 #search-button button {
     font-size: 1em;

-    /* should match grid-line */
-    height: 4em;
+    height: 4.5em;

     border: none;
     background: #02adb7;
     color: white;
     border: none;
     background: #02adb7;
     color: white;


@@ -99,20 +104,20 @@
 }
 
 #search-button button span {
 }
 
 #search-button button span {

+    font-size: 1.1em;

     position:relative;
     position:relative;

-    top: -.2em;

 }
 
 
 #nav-line {
     background-color: #e2e2e2;
 }
 
 
 #nav-line {
     background-color: #e2e2e2;

-    height: 3.95em;
+    height: 4.9em;

 }
 
 ul#catalogue {
     list-style: none;
     padding: 0;
 }
 
 ul#catalogue {
     list-style: none;
     padding: 0;

-    margin: 0;
+    margin: 0 0 0 .6em;

 }
 ul#catalogue li {
     background-color: #e2e2e2;
 }
 ul#catalogue li {
     background-color: #e2e2e2;


@@ -120,17 +125,22 @@ ul#catalogue li {
 }
 ul#catalogue a {
     display: block;
 }
 ul#catalogue a {
     display: block;

-    padding-left: 1.5em;
-    padding-right: 1.5em;
+    padding-left: 1.4em;
+    padding-right: 1.4em;

     /* must match grid-line */
     /* must match grid-line */

-    height: 2.7em;
-    padding-top: 1.3em;
+    height: 3.1em;
+    padding-top: 1.8em;
+}
+ul#catalogue span {
+    font-size: 1.1em;

 }
 
 
 }
 
 

-
+#lang-button {
+    color: #aaa;
+}

 #lang-button:after {
 #lang-button:after {

-    padding-left: .5em;
+    padding-left: 1em;

     content: "↓";
     font-family: WL-Nav;
     vertical-align: middle;
     content: "↓";
     font-family: WL-Nav;
     vertical-align: middle;


@@ -139,18 +149,18 @@ ul#catalogue a {
     position: relative;
     float: right;
     display: block;
     position: relative;
     float: right;
     display: block;

-    padding-left: 1.5em;
-    padding-right: 1.5em;
+    padding-left: 2.5em;
+    padding-right: 2em;

     /* must match grid-line */
     /* must match grid-line */

-    height: 2.7em;
-    padding-top: 1.3em;
+    height: 3em;
+    padding-top: 1.9em;

     background: #f7f7f7;
 }
 
 #lang-menu-items button {
     display: none;
     background: #f7f7f7;
     background: #f7f7f7;
 }
 
 #lang-menu-items button {
     display: none;
     background: #f7f7f7;

-    color: #444;
+    color: #777;

     cursor: pointer;
     width: 100%;
     border: solid #ddd;
     cursor: pointer;
     width: 100%;
     border: solid #ddd;


@@ -173,5 +183,5 @@ ul#catalogue a {
 }
 
 #lang-menu .active {
 }
 
 #lang-menu .active {

-    font-weight: bold;
+    color: #000;

 }
 }

diff --git a/wolnelektury/static/css/main_page.css b/wolnelektury/static/css/main_page.css
index 94401cb..d2ee5d4 100755 (executable)
--- a/wolnelektury/static/css/main_page.css
+++ b/wolnelektury/static/css/main_page.css
@@ -1,6 +1,6 @@
 #big-cite {
     background-color: white;
 #big-cite {
     background-color: white;

-    padding: 4em 12em;
+    padding: 10.75em 10em 8.5em 18.2em;

     margin: 0;
 }
 
     margin: 0;
 }
 


@@ -11,68 +11,101 @@
 
 #big-cite h2 {
     margin: 0;
 
 #big-cite h2 {
     margin: 0;

+    font-size: 1.1em;

 }
 
 
 #big-cite-text {
 }
 
 
 #big-cite-text {

-    margin: .5em 0;
-    font-size: 1.75em;
-    line-height: 1.3em;
+    margin: .05em;
+    font-size: 2.8em;
+    line-height: 1.2em;

 }
 
 
 #big-cite-source {
     color: #02adb7;
     margin: 0;
 }
 
 
 #big-cite-source {
     color: #02adb7;
     margin: 0;

+    font-size: 1.1em;
+    margin: 1.1em 0.2em;

 }
 
 
 #promo-box {
     float: right;
 }
 
 
 #promo-box {
     float: right;

-    width: 24em;
-    /* should match grid-line */
-    margin-top: -4em;
+    width: 32em;
+    margin-top: -5.1em;

 }
 #promo-box-header {
 }
 #promo-box-header {

-    padding-left: 2em;
-    padding-right: 2em;
+    padding-top: 2em;
+    height: 3.1em;
+    padding-bottom: 0;
+    padding-left: 2.5em;
+    padding-right: 2.5em;

     background: #191919;
     color: white;
 }
     background: #191919;
     color: white;
 }

+#promo-box-header h2 {
+    font-size: 1.1em;
+    padding-top: .1em;
+}

 #promo-box-body {
     border-bottom: 2px solid #efefef;
 #promo-box-body {
     border-bottom: 2px solid #efefef;

-    padding: 1.3em 2em;
-    height: 23em;
+    padding: 2em 2.8em;
+    height: 30em;

     background: #efefef;
 }
 #promo-box-title {
     color: #02ADB7;
     background: #efefef;
 }
 #promo-box-title {
     color: #02ADB7;

-    height: 2.7em;
+    height: 2.75em;

     margin: 0;
 }
     margin: 0;
 }

+#promo-box-title span {
+    font-size: 1.1em;
+}

 #promo-box-body p {
     margin-top: 0;
 }
 #promo-box-body p {
     margin-top: 0;
 }

+#promo-box-content {
+    font-size: 1.2em;
+    line-height: 1.55em;
+    color: #666;
+}
+
+.main-last {
+    padding-top: 1.9em;
+    height: 3.2em;
+    padding-left: 1.9em;
+}
+.main-last span {
+    font-size: 1.1em;
+}
+

 
 .infopages-box {
 
 .infopages-box {

-    width: 16.75em;
+    width: 20.6em;

     display: inline-block;
     margin: .5em 0 0 0;
     display: inline-block;
     margin: .5em 0 0 0;

-    padding: 0 1em;
+    padding: 0 1.7em;

     vertical-align: top;
 }
 .infopages-box h2 {
     color: #02ADB7;
     vertical-align: top;
 }
 .infopages-box h2 {
     color: #02ADB7;

+    height: 2.8em;
+    padding-top: 2.5em;
+}
+.infopages-box h2 span {
+    font-size: 1.1em;

 }
 .infopages-box a {
     color: black;
 }
 
 .infopages-box ol, .infopages-box ul {
 }
 .infopages-box a {
     color: black;
 }
 
 .infopages-box ol, .infopages-box ul {

-    font-size: .8em;
+    font-size: 1.1em;

     list-style: none;
     padding: 0;
     margin: 0;
     list-style: none;
     padding: 0;
     margin: 0;

+    line-height: 1.45em;

 }
 
 .social-links {
 }
 
 .social-links {

diff --git a/wolnelektury/static/js/base.js b/wolnelektury/static/js/base.js
new file mode 100755 (executable)
index 0000000..b569383
--- /dev/null
+++ b/wolnelektury/static/js/base.js
@@ -0,0 +1,13 @@
+(function($) {
+    $(function() {
+
+
+$('#themes-list-toggle').click(function(event) {
+    event.preventDefault();
+    $('#themes-list').toggle('slow');
+});
+
+
+    });
+})(jQuery)
+

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 534f5cf..4409486 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -2,6 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
        {% load i18n compressed catalogue_tags sponsor_tags %}
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
        {% load i18n compressed catalogue_tags sponsor_tags %}

+    {% load reporting_stats %}

     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta http-equiv="Content-Style-Type" content="text/css" />
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <meta http-equiv="Content-Style-Type" content="text/css" />


@@ -20,7 +21,7 @@
 
         {% block bodycontent %}
 
 
         {% block bodycontent %}
 

-        <div id="header" class="grid-line">
+        <div id="header">

 
         <div id="header-content">
             <div id="logo">
 
         <div id="header-content">
             <div id="logo">


@@ -29,7 +30,16 @@
             </div>
 
             <div id="tagline">
             </div>
 
             <div id="tagline">

-                <a href=''>1666</a> darmowych lektur do których masz <a href=''>prawo</a>
+                <span>
+                {% count_books book_count %}
+                {% url book_list as b %}
+                {% url book_list as r %}
+                {% blocktrans count book_count as c %}
+                <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
+                {% plural %}
+                <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
+                {% endblocktrans %}
+                </span>

             </div>
 
             <p id="user-info" class="mono">
             </div>
 
             <p id="user-info" class="mono">


@@ -62,9 +72,9 @@
 
 
 
 
 
 

-            <form id="search">
+            <form id="search-area">

                 
                 

-                <span id="search-field" class="grid-line">
+                <span id="search-field">

                     <input title="np. Leśmian" name="q" autocomplete="off">
                 </span><span id="search-button">
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
                     <input title="np. Leśmian" name="q" autocomplete="off">
                 </span><span id="search-button">
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>


@@ -84,24 +94,24 @@
 
             <div id="nav-line">
             <ul id="catalogue">
 
             <div id="nav-line">
             <ul id="catalogue">

-                <li><a href="{% url book_list %}"><span class='mono'>{% trans "All books" %}</span></a></li>
-                <li><a href="{% url audiobook_list %}"><span class='mono'>{% trans "Audiobooks" %}</span></a></li>
-                <li><a href="{% url daisy_list %}"><span class='mono'>{% trans "DAISY" %}</span></a></li>

                 <li><a href="{% url catalogue %}#autorzy"><span class='mono'>{% trans "Authors" %}</span></a></li>
                 <li><a href="{% url catalogue %}#autorzy"><span class='mono'>{% trans "Authors" %}</span></a></li>

-                <li><a href="{% url catalogue %}#epoki"><span class='mono'>{% trans "Epochs" %}</span></a></li>
-                <li><a href="{% url catalogue %}#rodzaje"><span class='mono'>{% trans "Kinds" %}</span></a></li>

                 <li><a href="{% url catalogue %}#gatunki"><span class='mono'>{% trans "Genres" %}</span></a></li>
                 <li><a href="{% url catalogue %}#gatunki"><span class='mono'>{% trans "Genres" %}</span></a></li>

+                <li><a href="{% url catalogue %}#rodzaje"><span class='mono'>{% trans "Kinds" %}</span></a></li>
+                <li><a href="{% url catalogue %}#epoki"><span class='mono'>{% trans "Epochs" %}</span></a></li>

                 <li><a href="{% url catalogue %}#motywy"><span class='mono'>{% trans "Themes" %}</span></a></li>
                 <li><a href="{% url catalogue %}#motywy"><span class='mono'>{% trans "Themes" %}</span></a></li>

+                <li><a href="{% url book_list %}"><span class='mono'>{% trans "All books" %}</span></a></li>
+                <li><a href="{% url audiobook_list %}"><span class='mono'>{% trans "Audiobooks" %}</span></a></li>
+                <li><a href="{% url daisy_list %}"><span class='mono'>{% trans "DAISY" %}</span></a></li>

             </ul>
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
             <div id="lang-menu">
             </ul>
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
             <div id="lang-menu">

-                <span id='lang-button' class='mono-small'>
+                <span id='lang-button' class='mono'>

                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     <button type="submit" name="language"
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     <button type="submit" name="language"

-                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} {% if forloop.last %}last{% endif %}"
+                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"

                         value="{{ lang.0 }}">{{ lang.1 }}</button>
                 {% endfor %}
                 </div>
                         value="{{ lang.0 }}">{{ lang.1 }}</button>
                 {% endfor %}
                 </div>

diff --git a/wolnelektury/templates/catalogue/book_mini_box.html b/wolnelektury/templates/catalogue/book_mini_box.html
index 9b61283..58abaa6 100755 (executable)
--- a/wolnelektury/templates/catalogue/book_mini_box.html
+++ b/wolnelektury/templates/catalogue/book_mini_box.html
@@ -11,8 +11,10 @@
             " alt="Cover" />
         {% endif %}
         {% for author in authors %}
             " alt="Cover" />
         {% endif %}
         {% for author in authors %}

-            <div class="mono author">{{ author }}</div>
-            {{ book.title }}
+            <div class="desc">
+                <span class="mono author">{{ author }}</span>
+                <span class="title">{{ book.title }}</span>
+            </div>

         {% endfor %}
     </a>
 </div>
         {% endfor %}
     </a>
 </div>

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 1b64666..c80efff 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -25,22 +25,19 @@
         <div class="tags">
             {% spaceless %}
 
         <div class="tags">
             {% spaceless %}
 

-            <span class="mono">{% trans "Epoch" %}:&nbsp;</span>
-            <span class="book-box-tag">
+            <span class="mono">{% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">

                 {% for tag in tags.epoch %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}
             </span>
 
                 {% for tag in tags.epoch %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}
             </span>
 

-            <span class="mono">{% trans "Kind" %}:&nbsp;</span>
-            <span class="book-box-tag">
+            <span class="mono">{% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">

                 {% for tag in tags.kind %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}
             </span>
 
                 {% for tag in tags.kind %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}
             </span>
 

-            <span class="mono">{% trans "Genre" %}:&nbsp;</span>
-            <span class="book-box-tag">
+            <span class="mono">{% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">

                 {% for tag in tags.genre %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}
                 {% for tag in tags.genre %}
                     <a href="{{ tag.get_absolute_url }}">{{ tag.name }} </a>
                 {% endfor %}


@@ -52,7 +49,7 @@
     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}
     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}

-            <a href="" class="mono">{% trans "Read online" %}</a>
+            <a href="{% url book_text book.urlid %}" class="mono">{% trans "Read online" %}</a>

         {% endif %}
         </li>
         <li class="book-box-download">
         {% endif %}
         </li>
         <li class="book-box-download">

diff --git a/wolnelektury/templates/catalogue/inline_tag_list.html b/wolnelektury/templates/catalogue/inline_tag_list.html
new file mode 100755 (executable)
index 0000000..d42f3f9
--- /dev/null
+++ b/wolnelektury/templates/catalogue/inline_tag_list.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+{% load catalogue_tags %}
+{% if one_tag %}
+    {% trans "See full category" %} <a href="{% catalogue_url one_tag %}">{{ one_tag }}</a>
+{% else %}
+    {% for tag in tags %}
+        <a href="{% catalogue_url choices tag %}">{{ tag }}&nbsp;({{ tag.book_count }})</a>
+    {% endfor %}
+{% endif %}

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index 1744c33..fce00dc 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -7,53 +7,94 @@
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}
 {% block bodyid %}tagged-object-list{% endblock %}
 
 {% block body %}

+    <div class="left-column">
+    <div class="page-desc">

     <h1>{% title_from_tags tags %}</h1>
 
     <h1>{% title_from_tags tags %}</h1>
 

-    {% if only_shelf and not object_list %}
-    <div id="books-list">
-        <h2>{% trans "Your shelf is empty" %}</h2>
-        <p>{% trans "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." %}</p>
+    {% with tags|last as last_tag %}
+    {% if last_tag.has_description %}
+        <div id="description">
+            <div id='description-long'>{{ last_tag.description|safe }}</div>
+            <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:30 }}</div>
+        </div>
+        <div class="clearboth"></div>
+        <div id="toggle-description"><p></p></div>
+    {% endif %}
+
+
+    <div class="inline-tag-lists">
+    {% if categories.author %}
+        <p><span class="mono">{% trans "Authors" %}:</span>
+        {% inline_tag_list categories.author tags %}
+        </p>
+    {% endif %}
+    {% if categories.kind %}
+        <p><span class="mono">{% trans "Kinds" %}:</span>
+        {% inline_tag_list categories.kind tags %}
+        </p>
+    {% endif %}
+    {% if categories.genre %}
+        <p><span class="mono">{% trans "Genres" %}:</span>
+        {% inline_tag_list categories.genre tags %}
+        </p>
+    {% endif %}
+    {% if categories.epoch %}
+        <p><span class="mono">{% trans "Epochs" %}:</span>
+        {% inline_tag_list categories.epoch tags %}
+        </p>
+    {% endif %}

     </div>
     </div>

-    {% else %}
-    {% autopaginate object_list 10 %}
-    <div id="books-list">
-        {% with tags|last as last_tag %}
-        {% if last_tag.has_description %}
-            <div id="description">
-                <div id='description-long'>{{ last_tag.description|safe }}</div>
-                <div id='description-short'>{{ last_tag.description|safe|truncatewords_html:30 }}</div>
-            </div>
-            <div class="clearboth"></div>
-            <div id="toggle-description"><p></p></div>
-        {% endif %}
-        {% if only_shelf %}
-            <a id="download-shelf" href="{% url download_shelf last_tag.slug %}">
-                {% trans "Download all books from this shelf" %}
-            </a>
-            <div id="download-shelf-menu" style="display:none;">
-                <form action="{% url download_shelf last_tag.slug %}" method="get" accept-charset="utf-8" id="download-formats-form" data-formats-feed="{% url shelf_book_formats last_tag.slug %}">
-                    <p>{% trans "Choose books' formats which you want to download:" %}</p>
-                    <li data-format="pdf"><label for="id_formats_2"><input type="checkbox" name="formats" value="pdf" id="id_formats_2" /> PDF</label> <em><strong>{% trans "for reading" %}</strong> {% trans "and printing using" %} <a href="http://get.adobe.com/reader/">Adobe Reader</a></em></li>
-                    <li data-format="epub"><label for="id_formats_5"><input type="checkbox" name="formats" value="epub" id="id_formats_5" /> EPUB</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on mobile devices" %}</em></li>
-                    <li data-format="mobi"><label for="id_formats_7"><input type="checkbox" name="formats" value="mobi" id="id_formats_7" /> MOBI</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on mobile devices" %}</em></li>
-                    <li data-format="odt"><label for="id_formats_3"><input type="checkbox" name="formats" value="odt" id="id_formats_3" /> ODT</label> <em><strong>{% trans "for reading" %}</strong> {% trans "and editing using" %} <a href="http://pl.openoffice.org/">OpenOffice.org</a></em></li>
-                    <li data-format="txt"><label for="id_formats_4"><input type="checkbox" name="formats" value="txt" id="id_formats_4" /> TXT</label> <em><strong>{% trans "for reading" %}</strong> {% trans "on small displays, for example mobile phones" %}</em></li>
-                    <li data-format="mp3"><label for="id_formats_0"><input type="checkbox" name="formats" value="mp3" id="id_formats_0" /> MP3</label> <em><strong>{% trans "for listening" %}</strong> {% trans "on favourite MP3 player" %}</em></li>
-                    <li data-format="ogg"><label for="id_formats_1"><input type="checkbox" name="formats" value="ogg" id="id_formats_1" /> Ogg Vorbis</label> <em><strong>{% trans "for listening" %}</strong> &mdash; {% trans "open format" %} <a href="http://www.vorbis.com/">{% trans "Xiph.org Foundation" %}</a></em></li>
-                    <li data-format="daisy"><label for="id_formats_6"><input type="checkbox" name="formats" value="daisy" id="id_formats_6" /> DAISY</label> </li>
-                    <li id="download-formats-form-submit-li"><label><input type="submit" name="submit" value="{% trans "Download" %}" id="download-formats-form-submit" disabled="disabled" />&nbsp;<img src="{{ STATIC_URL }}img/indicator.gif" /></label> <span id="updating-formats">{% trans "Updating list of books' formats on the shelf" %}</span><span id="formats-updated" style="display:none;">{% trans "or" %} <a href="#" id="download-formats-form-cancel">{% trans "cancel" %}</a></span></li>
-                    <div class="clearboth"></div>
-                </form>
+
+    {% if categories.theme %}
+        <div id="themes-list-wrapper">
+            <p><a href="#" id="themes-list-toggle" class="mono">{% trans "Motifs and themes" %}</a></p>
+            <div id="themes-list">
+                {% tag_list categories.theme tags %}

             </div>
             </div>

-            {% if only_my_shelf %}
-            <div id="toggle-share-shelf"><p>{% trans "Share this shelf" %}</p></div>
-            <div id="share-shelf">
-                <p>{% trans "Copy this link and share it with other people to let them see your shelf." %}
-                <input id="share-shelf-url" value='http://{{ request.META.HTTP_HOST }}{{ request.path }}' />
-                </p>
+        </div>
+    {% endif %}
+
+    </div>
+    </div>
+
+
+    <div class="right-column">
+        <a href="" class="cite">
+            <div class="cite-body">
+            Dobranoc, obróć jeszcze raz na mnie oczęta,<br/>
+            (…) Daj mi pierś ucałować<br/>
+            Dobranoc, zapięta.

             </div>
             </div>

-                       {% endif %}
-        {% endif %}
+            <p class="mono">Adam Mickiewicz, Dziady część III</p>
+        </a>
+
+        <div class="see-also">
+            <h2 class='mono'>{% trans "See also" %}:</h2>
+            <ul>
+                <li><a href="">Wiki</a></li>
+                <li><a href="">Gazeta</a></li>
+            </ul>
+        </div>
+
+        <div class="download">
+            <h2 class='mono'>{% trans "Download" %}:</h2>
+            <ul>
+                <li><a href="">wszystko</a></li>
+                <li><a href="">część</a></li>
+            </ul>
+        </div>
+
+    </div>
+
+    <div class="clearboth"></div>
+
+
+
+
+    {% autopaginate object_list 10 %}
+    <div id="books-list">
+
+

         {% if last_tag.gazeta_link %}
         <p><a href="{{ last_tag.gazeta_link }}">
             {% switch last_tag.category %}
         {% if last_tag.gazeta_link %}
         <p><a href="{{ last_tag.gazeta_link }}">
             {% switch last_tag.category %}


@@ -108,36 +149,5 @@
     </div>
        {% if object_list %}
        {% comment %} If we didn't find anything there will be nothing on the right side as well {% endcomment %}
     </div>
        {% if object_list %}
        {% comment %} If we didn't find anything there will be nothing on the right side as well {% endcomment %}

-    <div id="tags-list">
-        <div id="categories-list">
-            {% if categories.author %}
-                <h2>{% trans "Authors" %}</h2>
-                {% tag_list categories.author tags %}
-            {% endif %}
-            {% if categories.kind %}
-                <h2>{% trans "Kinds" %}</h2>
-                {% tag_list categories.kind tags %}
-            {% endif %}
-            {% if categories.genre %}
-                <h2>{% trans "Genres" %}</h2>
-                {% tag_list categories.genre tags %}
-            {% endif %}
-            {% if categories.epoch %}
-                <h2>{% trans "Epochs" %}</h2>
-                {% tag_list categories.epoch tags %}
-            {% endif %}
-            {% if only_shelf %}
-                <p><a href="{% url poem_from_set tags.0.slug %}">Miksuj utwory z tej półki</a>
-            {% endif %}
-        </div>
-        <div id="themes-list">
-            {% if categories.theme %}
-                <h2>{% trans "Themes" %}</h2>
-                {% tag_list categories.theme tags %}
-            {% endif %}
-        </div>
-        <div class="clearboth"></div>
-    </div>

        {% endif %}
        {% endif %}

-    {% endif %}

 {% endblock %}
 {% endblock %}

diff --git a/wolnelektury/templates/info/join_us.html b/wolnelektury/templates/info/join_us.html
index 415b13a..1b98051 100644 (file)
--- a/wolnelektury/templates/info/join_us.html
+++ b/wolnelektury/templates/info/join_us.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load reporting_stats %}
 
 {% load i18n %}
 {% load reporting_stats %}
 

-{% count_books_nonempty book_count %}
+{% count_books book_count %}

 <p>
 {% blocktrans count book_count as c %}
 We have {{c}} work published in Wolne Lektury!
 <p>
 {% blocktrans count book_count as c %}
 We have {{c}} work published in Wolne Lektury!

diff --git a/wolnelektury/templates/main_page.html b/wolnelektury/templates/main_page.html
index 3e0692a..2a63ed5 100755 (executable)
--- a/wolnelektury/templates/main_page.html
+++ b/wolnelektury/templates/main_page.html
@@ -25,14 +25,16 @@
             <h2 class="mono">Trwa konkurs</h2>
         </div>
         <div id="promo-box-body">
             <h2 class="mono">Trwa konkurs</h2>
         </div>
         <div id="promo-box-body">

-            <p id="promo-box-title" class="mono">Konkurs poezji automatycznej</p>
+            <p id="promo-box-title" class="mono"><span>Konkurs poezji automatycznej</span></p>
+            <div id="promo-box-content">

             <p>Znacie Leśmianatora? To niewielki skrypt miskujący na życzenie
             wiersze z Wolnych Lektur.</p>
             <p>Znacie Leśmianatora? To niewielki skrypt miskujący na życzenie
             wiersze z Wolnych Lektur.</p>

+            </div>

         </div>
     </div>
 
 
         </div>
     </div>
 
 

-    <h2 class="grid-line"><span class="mono">Ostatnie publikacje</span></h2>
+    <h2 class="main-last"><span class="mono">Ostatnie publikacje</span></h2>

         {% for book in last_published %}
             {{ book.mini_box }}
         {% endfor %}
         {% for book in last_published %}
             {{ book.mini_box }}
         {% endfor %}


@@ -40,7 +42,7 @@
     <div class="clearboth"></div>
 
     <div class="infopages-box">
     <div class="clearboth"></div>
 
     <div class="infopages-box">

-        <h2 class="grid-line"><span class='mono'>Aktualności</span></h2>
+        <h2><span class='mono'>Aktualności</span></h2>

         {% cache 1800 latest-blog-posts %}
             {% latest_blog_posts "http://nowoczesnapolska.org.pl/category/wolne-lektury/feed/" %}
         {% endcache %}
         {% cache 1800 latest-blog-posts %}
             {% latest_blog_posts "http://nowoczesnapolska.org.pl/category/wolne-lektury/feed/" %}
         {% endcache %}


@@ -48,7 +50,7 @@
 
 
     <div class="infopages-box">
 
 
     <div class="infopages-box">

-        <h2 class="grid-line"><span class='mono'>Narzędzia</span></h2>
+        <h2><span class='mono'>Narzędzia</span></h2>

 
         <ul>
             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
 
         <ul>
             <li><a href="{% url suggest %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>


@@ -63,7 +65,7 @@
 
 
     <div class="infopages-box">
 
 
     <div class="infopages-box">

-        <h2 class="grid-line"><span class='mono'>Informacje</span></h2>
+        <h2><span class='mono'>Informacje</span></h2>

 
         {% infopages_on_main %}
 
 
         {% infopages_on_main %}