diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-10-07 15:45:08 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-10-07 15:45:08 -0300 |
| commit | 5d670774fbcf041e75b19f4ff9fe9ac04b1f0d67 (patch) | |
| tree | 2a55d283b08217d3fc42ca8ec993afd558036a57 | |
| parent | de7b62a3fae7e9553a683a0e41c246f61613b0a5 (diff) | |
| download | askbot-5d670774fbcf041e75b19f4ff9fe9ac04b1f0d67.tar.gz askbot-5d670774fbcf041e75b19f4ff9fe9ac04b1f0d67.tar.bz2 askbot-5d670774fbcf041e75b19f4ff9fe9ac04b1f0d67.zip | |
split html head into separate sub-templates
| -rw-r--r-- | askbot/skins/default/templates/base.html | 37 | ||||
| -rw-r--r-- | askbot/skins/default/templates/head/javascript.html | 10 | ||||
| -rw-r--r-- | askbot/skins/default/templates/head/meta.html | 8 | ||||
| -rw-r--r-- | askbot/skins/default/templates/head/stylesheets.html | 16 |
4 files changed, 37 insertions, 34 deletions
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 636d42a6..4f34a8b5 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -4,44 +4,13 @@ {% spaceless %} <head> <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title> - <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 %} + {% include "head/meta.html" %} <link rel="shortcut icon" href="{{ settings.SITE_FAVICON|media }}" /> - <link href="{{"/style/style.css"|media }}" rel="stylesheet/less" type="text/css" /> - <script type="text/javascript" src="{{"/js/less.min.js"|media}}"></script> - {{ skin.get_extra_css_link() }} - {% if settings.USE_CUSTOM_CSS %} - <link - href="{% url "custom_css" %}?v={{settings.MEDIA_RESOURCE_REVISION}}" - rel="stylesheet" - type="text/css" - /> - {% endif %} - {% block forestyle %}{% endblock %} - {% if user_messages %} - <style type="text/css"> - body { margin-top:2.4em; } - </style> - {% endif %} + {% include "head/stylesheets.html" %} + {% include "head/javascript.html" %} {% if settings.USE_CUSTOM_HTML_HEAD %} {{ settings.CUSTOM_HTML_HEAD }} {% 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 %} <body class="{% block body_class %}{% endblock %}{% if page_class %} {{page_class}}{% endif %}"> diff --git a/askbot/skins/default/templates/head/javascript.html b/askbot/skins/default/templates/head/javascript.html new file mode 100644 index 00000000..f960d11d --- /dev/null +++ b/askbot/skins/default/templates/head/javascript.html @@ -0,0 +1,10 @@ +<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 #} diff --git a/askbot/skins/default/templates/head/meta.html b/askbot/skins/default/templates/head/meta.html new file mode 100644 index 00000000..352ffb53 --- /dev/null +++ b/askbot/skins/default/templates/head/meta.html @@ -0,0 +1,8 @@ +<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 %} diff --git a/askbot/skins/default/templates/head/stylesheets.html b/askbot/skins/default/templates/head/stylesheets.html new file mode 100644 index 00000000..916978c2 --- /dev/null +++ b/askbot/skins/default/templates/head/stylesheets.html @@ -0,0 +1,16 @@ +<link href="{{"/style/style.css"|media }}" rel="stylesheet/less" type="text/css" /> +<script type="text/javascript" src="{{"/js/less.min.js"|media}}"></script> +{{ skin.get_extra_css_link() }} +{% if settings.USE_CUSTOM_CSS %} + <link + href="{% url "custom_css" %}?v={{settings.MEDIA_RESOURCE_REVISION}}" + rel="stylesheet" + type="text/css" + /> +{% endif %} +{% block forestyle %}{% endblock %} +{% if user_messages %} +<style type="text/css"> + body { margin-top:2.4em; } +</style> +{% endif %} |