Zmieniamy sie navigation popup added

[wolnelektury.git] / src / picture / templates / picture / picture_viewer.html

diff --git a/src/picture/templates/picture/picture_viewer.html b/src/picture/templates/picture/picture_viewer.html
index 75be359..7a13650 100644 (file)
--- a/src/picture/templates/picture/picture_viewer.html
+++ b/src/picture/templates/picture/picture_viewer.html
@@ -1,9 +1,8 @@
 {% extends "catalogue/viewer_base.html" %}
 {% load i18n %}
 {% extends "catalogue/viewer_base.html" %}
 {% load i18n %}

-{% load static from staticfiles %}
+{% load static from static %}

 {% load catalogue_tags %}
 {% load thumbnail %}
 {% load catalogue_tags %}
 {% load thumbnail %}

-{% load ssi_include from ssify %}

 
 
 {% block title %}{{ picture.pretty_title }}{% endblock %}
 
 
 {% block title %}{{ picture.pretty_title }}{% endblock %}


@@ -42,8 +41,8 @@
 
   <li>
     <a href="{{ picture.get_absolute_url }}" id="menu-book" data-box="book-short">
 
   <li>
     <a href="{{ picture.get_absolute_url }}" id="menu-book" data-box="book-short">

-      <img src="{% thumbnail picture.image_file '80x200' as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}"
-           width="80"
+      <img src="{% thumbnail picture.image_file '120x300' as thumb %}{{ thumb.url }}{% empty %}{{ picture.image_file.url }}{% endthumbnail %}"
+           width="120"

            alt="{{ picture.pretty_title }}"
            title="{{ picture.pretty_title }}">
     </a>
            alt="{{ picture.pretty_title }}"
            title="{{ picture.pretty_title }}">
     </a>


@@ -60,7 +59,7 @@
 
   <li id="sponsors">
     {% for sponsor in sponsors %}
 
   <li id="sponsors">
     {% for sponsor in sponsors %}

-      {% thumbnail sponsor.logo "80x200" as logo %}
+      {% thumbnail sponsor.logo "120x300" as logo %}

         <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}" /></a>
       {% endthumbnail %}
     {% endfor %}
         <a href="{{ sponsor.url }}" target="_blank"><img src="{{ logo.url }}" alt="{{ sponsor.name }}" /></a>
       {% endthumbnail %}
     {% endfor %}


@@ -81,7 +80,7 @@
 
 
 {% block footer %}
 
 
 {% block footer %}

-  {{ picture.html_file.read|safe }}
+  {{ picture.html_file.read.decode|safe }}

 
   <div id="info" class="box">
     <div class="sponsors">
 
   <div id="info" class="box">
     <div class="sponsors">


@@ -99,6 +98,6 @@
   </div>
 
   <div class="box Picture-item" id="book-short">
   </div>
 
   <div class="box Picture-item" id="book-short">

-    {% ssi_include 'picture_short' pk=picture.pk %}
+    {% include 'picture/picture_short.html' %}

   </div>
 {% endblock %}
   </div>
 {% endblock %}