diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-21 23:21:08 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-21 23:21:08 -0500 |
| commit | b4608a0dc03b545c186e800c8e67a39b5d928de6 (patch) | |
| tree | 615b00dd065e57a2add889fb61fba0502c0eb718 | |
| parent | c684703f37a611f30142d9e68803c43011143ecf (diff) | |
| download | askbot-b4608a0dc03b545c186e800c8e67a39b5d928de6.tar.gz askbot-b4608a0dc03b545c186e800c8e67a39b5d928de6.tar.bz2 askbot-b4608a0dc03b545c186e800c8e67a39b5d928de6.zip | |
reverted some more template changes from yesterday
| -rw-r--r-- | askbot/skins/default/templates/base.html | 29 | ||||
| -rw-r--r-- | askbot/skins/default/templates/blocks/bottom_scripts.html | 2 |
2 files changed, 28 insertions, 3 deletions
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index cf777157..bc1ab94b 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -4,7 +4,32 @@ {% spaceless %} <head> <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title> - {% include "blocks/head.html" %} + {#% include "blocks/head.html" %#} + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + {% block meta_description %} + <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" /> + {% endblock %} + <meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" /> + {% if settings.GOOGLE_SITEMAP_CODE %} + <meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" /> + {% endif %} + <link rel="shortcut icon" href="{{ "/images/favicon.gif"|media }}" /> + <link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" /> + {% block forestyle %}{% endblock %} + {% if user_messages %} + <style type="text/css"> + body { margin-top:2.4em; } + </style> + {% endif %} + <script type="text/javascript"> + var askbot = {}; + askbot['data'] = {}; + askbot['urls'] = {}; + askbot['settings'] = {}; + askbot['messages'] = {}; + </script> + {% block forejs %} + {% endblock %} {# avoid adding javascript here so that pages load faster #} </head> {% endspaceless %} @@ -25,6 +50,8 @@ {% include "footer.html" %} {% endif %} {% include "blocks/bottom_scripts.html" %} + {% block endjs %} + {% endblock %} </body> </html> <!-- end template base.html --> diff --git a/askbot/skins/default/templates/blocks/bottom_scripts.html b/askbot/skins/default/templates/blocks/bottom_scripts.html index 93800b2c..51dff2c9 100644 --- a/askbot/skins/default/templates/blocks/bottom_scripts.html +++ b/askbot/skins/default/templates/blocks/bottom_scripts.html @@ -38,8 +38,6 @@ }); </script> {% endif %} -{% block endjs %} -{% endblock %} <script type="text/javascript"> {% if active_tab != "tags" and active_tab != "users" %} {# start asking question with title from search query #} |