summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/static/js/ishtar.js1
-rw-r--r--ishtar_common/static/media/style.css6
-rw-r--r--ishtar_common/templates/ishtar/sheet.html2
-rw-r--r--ishtar_common/templates/ishtar/wizard/search.html2
4 files changed, 10 insertions, 1 deletions
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>