summaryrefslogtreecommitdiffstats
path: root/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/base.html')
-rw-r--r--templates/base.html17
1 files changed, 9 insertions, 8 deletions
diff --git a/templates/base.html b/templates/base.html
index 0f568f73..2b933c4a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- template base.html -->
{% load extra_filters %}
+{% load extra_tags %}
{% load i18n %}
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -12,16 +13,16 @@
{% if settings.GOOGLE_SITEMAP_CODE %}
<meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
{% endif %}
- <link rel="shortcut icon" href="/content/images/favicon.ico" />
- <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+ <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">google.load("jquery", "1.2.6");</script>
<script type="text/javascript">
var i18nLang = '{{settings.LANGUAGE_CODE}}';
</script>
- <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
- <script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
- <script type='text/javascript' src='/content/js/com.cnprog.utils.js'></script>
+ <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
<!--<script type="text/javascript">
var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
@@ -39,7 +40,7 @@
})
</script>-->
<!-- todo move this to settings -->
- {% if messages %}
+ {% if user_messages %}
<style type="text/css">
body { margin-top:2.4em; }
</style>
@@ -57,8 +58,8 @@
<body>
<div class="notify" style="display:none">
{% autoescape off %}
- {% if messages %}
- {% for message in messages %}
+ {% if user_messages %}
+ {% for message in user_messages %}
<p class="darkred">{{ message }}<p>
{% endfor %}
{% endif %}