summaryrefslogtreecommitdiffstats
path: root/templates/base_content.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/base_content.html')
-rw-r--r--templates/base_content.html17
1 files changed, 9 insertions, 8 deletions
diff --git a/templates/base_content.html b/templates/base_content.html
index a05198f5..52cc6134 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,13 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!-- base_content.html -->
{% load i18n %}
+{% load extra_tags %}
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
- <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" />
{% spaceless %}
{% block forestyle %}{% endblock %}
{% endspaceless %}
@@ -16,9 +17,9 @@
<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";
@@ -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>
@@ -58,8 +59,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 %}