diff options
author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
---|---|---|
committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
commit | 0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch) | |
tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/base_content.html | |
parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
parent | 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff) | |
download | askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2 askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts.
* Custom colors for preguntalo project
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/content/style/style.css
Diffstat (limited to 'templates/base_content.html')
-rw-r--r-- | templates/base_content.html | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/templates/base_content.html b/templates/base_content.html index 39627a0e..4ee9675f 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -1,10 +1,11 @@ -{% load i18n %} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<!-- base_content.html --> +{% load i18n %} <html> <head> - <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title> + <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta name="verify-v1" content="55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=" /> + <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" /> {% spaceless %} @@ -13,7 +14,7 @@ <script src="http://www.google.com/jsapi"></script> <script>google.load("jquery", "1.2.6");</script> <script type="text/javascript"> - var i18nLang = 'en'; + 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> @@ -38,29 +39,32 @@ </script>--> <!-- todo move this to settings--> - {% with request.user.get_messages as messages%} {% if messages %} <style type="text/css"> body { margin-top:2.4em; } </style> <script type="text/javascript"> $().ready(function() { + var element = $('#validate_email_alert') + element.click(function(){notify.close(true);setTimeout(function(){},1000)}) notify.show(); }); </script> {% endif %} - {% endwith %} {% block forejs %} {% endblock %} </head> <body> <div class="notify" style="display:none"> - <span>{% if request.user.get_messages %} - {% trans "congratulations, community gave you a badge" %}:{% for message in request.user.get_messages %} - <font class="darkred">{{ message }}</font>, {% endfor %}{% trans "see" %} - <a href="{{ request.user.get_profile_url }}">{% trans "profile" %}</a>{% endif %}</span> - <a class="close-notify" onclick="notify.close(true)">×</a> + {% autoescape off %} + {% if messages %} + {% for message in messages %} + <p class="darkred">{{ message }}<p> + {% endfor %} + {% endif %} + {% endautoescape %} + <a id="close-notify" onclick="notify.close(true)">×</a> </div> {% include "header.html" %} <div id="wrapper"> @@ -82,3 +86,4 @@ {% endblock %} </body> </html> +<!-- end template base_content.html --> |