diff options
Diffstat (limited to 'templates/base_content.html')
| -rw-r--r-- | templates/base_content.html | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/templates/base_content.html b/templates/base_content.html index a05198f5..12297215 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -1,24 +1,36 @@ <!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" /> +<<<<<<< HEAD:templates/base_content.html <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" /> +======= + {% if settings.GOOGLE_SITEMAP_CODE %} + <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" /> + {% endif %} +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/base_content.html + <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 %} <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"> +<<<<<<< HEAD:templates/base_content.html var i18nLang = '{{ settings.LANGUAGE_CODE }}'; +======= + var i18nLang = '{{ settings.LANGUAGE_CODE }}'; + var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}' +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/base_content.html </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 +51,7 @@ </script>--> <!-- todo move this to settings--> - {% if messages %} + {% if user_messages %} <style type="text/css"> body { margin-top:2.4em; } </style> @@ -58,8 +70,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 %} |