Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

[wolnelektury.git] / wolnelektury / templates / catalogue / picture_detail.html

diff --git a/wolnelektury/templates/catalogue/picture_detail.html b/wolnelektury/templates/catalogue/picture_detail.html
index dbea337..b8b70c6 100644 (file)
--- a/wolnelektury/templates/catalogue/picture_detail.html
+++ b/wolnelektury/templates/catalogue/picture_detail.html
@@ -4,15 +4,12 @@
 {% load thumbnail %}
 
 
-{% block title %}{{ picture.title }} {% trans "on WolneLektury.pl" %}{% endblock %}
+{% block titleextra %}{{ picture.title }}{% endblock %}
 
 {% block bodyid %}picture-detail{% endblock %}
 
 {% block body %}
     <h1>{{picture.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">
         <div id='breadcrumbs'>
@@ -25,7 +22,7 @@
         </div>
 
        {% thumbnail picture.image_file "400x500" upscale="false" as im %}
-       <img style="margin:{{ im|margin:"400x500" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
+       <img style="margin:{{ im|margin:"500x500" }}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
        {% endthumbnail %}
 
         {% if picture.info.license %}
@@ -35,7 +32,7 @@
         {% if picture.info.description %}
             <div id="description">
                 <div id='description-long'>{{ picture.info.description|safe }}</div>
-                <div id='description-short'>{{ picture.info.description|safe|truncatewords_html:30 }}</div>
+{%comment%}                <div id='description-short'>{{ picture.info.description|safe|truncatewords_html:30 }}</div>{%endcomment%}
             </div>
             <div id="toggle-description"><p></p></div>
         {% endif %}
@@ -94,10 +91,4 @@
         </div>
         <div class="clearboth"></div>
     </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>
 {% endblock %}