Merge branch 'production' into pretty

[wolnelektury.git] / wolnelektury / templates / pdcounter / book_stub_detail.html

diff --git a/wolnelektury/templates/pdcounter/book_stub_detail.html b/wolnelektury/templates/pdcounter/book_stub_detail.html
index 2537087..6e77a78 100644 (file)
--- a/wolnelektury/templates/pdcounter/book_stub_detail.html
+++ b/wolnelektury/templates/pdcounter/book_stub_detail.html
@@ -1,15 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 
 {% extends "base.html" %}
 {% load i18n %}
 

-{% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}
+{% block titleextra %}{{ book.title }}{% endblock %}
+
+{% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %}

 
 {% block bodyid %}book-stub-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.author }}, {{ book.title }}</h1>
 
 {% block bodyid %}book-stub-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.author }}, {{ book.title }}</h1>

-    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>
-    </form>

 
     <div id="books-list">
     {% if book.in_pd %}
 
     <div id="books-list">
     {% if book.in_pd %}


@@ -17,7 +16,7 @@
        {% else %}
            {% if book.pd %}
                        <p>{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}</p>
        {% else %}
            {% if book.pd %}
                        <p>{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}</p>

-                   {% include "pdcounter/pd_counter.html" %}
+            <div id='countdown' data-year='{{ pd_counter }}'></div>

                        <p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}</p>
                {% else %}
                    <p>{% trans "This work is copyrighted." %}
                        <p>{% trans "<a href='http://domenapubliczna.org/co-to-jest-domena-publiczna/'>Find out</a> why Internet libraries can't publish this work." %}</p>
                {% else %}
                    <p>{% trans "This work is copyrighted." %}


@@ -27,10 +26,7 @@
     {% include "info/join_us.html" %}
     </div>
 
     {% include "info/join_us.html" %}
     </div>
 

-    <div id="set-window">
-        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
-        <div class="target">
-            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
-        </div>
+    <div class="column-right block-form">
+        {% include "publishing_suggest.html" %}

     </div>
     </div>

-{% endblock %}
\ No newline at end of file
+{% endblock %}