From 0be7b37a5490f982fe835143d9684aa06bfe7be3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Sun, 25 Aug 2013 19:50:36 +0200
Subject: Improve window images layout by usinf prettyPhoto (refs #1314)

---
 archaeological_files/templates/ishtar/sheet_file_pdf.html           | 2 +-
 archaeological_finds/models.py                                      | 4 ----
 archaeological_finds/templates/ishtar/sheet_find.html               | 4 ++--
 archaeological_operations/templates/ishtar/sheet_operation_pdf.html | 2 +-
 ishtar_common/static/js/ishtar.js                                   | 1 +
 ishtar_common/static/media/style.css                                | 6 ++++++
 ishtar_common/templates/ishtar/sheet.html                           | 2 +-
 ishtar_common/templates/ishtar/wizard/search.html                   | 2 ++
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/archaeological_files/templates/ishtar/sheet_file_pdf.html b/archaeological_files/templates/ishtar/sheet_file_pdf.html
index f7535fb35..a63234ccd 100644
--- a/archaeological_files/templates/ishtar/sheet_file_pdf.html
+++ b/archaeological_files/templates/ishtar/sheet_file_pdf.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet_file.html" %}
-{% block css_head %}
+{% block header %}
 <link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" />
 {% endblock %}
 {% block main_head %}
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 8fb18385b..e047e21cf 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -145,10 +145,6 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms):
     order = models.IntegerField(_(u"Order"))
     label = models.CharField(_(u"ID"), max_length=60)
     description = models.TextField(_(u"Description"), blank=True, null=True)
-    """
-    image = models.ImageField(upload_to="finds/", blank=True, null=True)
-    thumbnail = models.ImageField(upload_to='finds/thumbs/', blank=True,
-                                  null=True)"""
     material_type = models.ForeignKey(MaterialType,
                               verbose_name = _(u"Material type"))
     volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True)
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 208447905..9111eb409 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -1,13 +1,13 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n %}
+
 {% block content %}
 <div class='tool'>{%trans "Export as:"%} <a href='{% url show-find item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-find item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
 
 <h3>{% trans "Find"%}</h3>
 
 {% if item.image %}
-plouf
-<img href='{{item.image.url}}' alt="{{image.label}}"/>
+<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}"><img src='{{item.thumbnail.url}}'/></a>
 {% endif%}
 
 <p><label>{%trans "Name"%}{% trans ":"%}</label>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation_pdf.html b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html
index ec771459c..f23b0d489 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation_pdf.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet_operation.html" %}
-{% block css_head %}
+{% block header %}
 <link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" />
 {% endblock %}
 {% block main_head %}
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index cba6f0044..caa28089c 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -63,6 +63,7 @@ function load_window(url, speed){
         success:function(html){
             $("#window").append(html);
             $("#"+last_window).show();
+            $("a[rel^='prettyPhoto']").prettyPhoto({'social_tools':''});
         },
         error:function(XMLHttpRequest, textStatus, errorThrows){
         }
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index bd406edc5..22f6d1402 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -432,6 +432,12 @@ table.confirm tr.spacer td:last-child{
     text-align:center;
 }
 
+#window a img{
+    display:block;
+    margin-left:auto;
+    margin-right:auto;
+}
+
 .dashboard table th{
     text-align:left;
     padding:0.5em 1em;
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index ff21f26e9..9ce038ae9 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -6,7 +6,7 @@
 <head>
     <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
     </title>
-    {% block css_head %}
+    {% block header %}
     <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" />
     {% endblock %}
 </head>
diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html
index 53455a7b4..1d43a80c1 100644
--- a/ishtar_common/templates/ishtar/wizard/search.html
+++ b/ishtar_common/templates/ishtar/wizard/search.html
@@ -2,6 +2,8 @@
 {% load i18n range %}
 {% block extra_head %}
 {{wizard.form.media}}
+<link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" />
+<script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/prettyPhoto/js/jquery.prettyPhoto.js"></script>
 {% endblock %}
 {% block content %}
 <h2>{{wizard_label}}</h2>
-- 
cgit v1.2.3