From 0be7b37a5490f982fe835143d9684aa06bfe7be3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 25 Aug 2013 19:50:36 +0200 Subject: Improve window images layout by usinf prettyPhoto (refs #1314) --- 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 ++ 4 files changed, 10 insertions(+), 1 deletion(-) (limited to 'ishtar_common') 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 @@ {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} - {% block css_head %} + {% block header %} {% endblock %} 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}} + + {% endblock %} {% block content %}

{{wizard_label}}

-- cgit v1.2.3