From a6c6c1b1aa9ef0595daad5aa912d3a074757d7e8 Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Wed, 12 Oct 2011 16:50:47 -0300 Subject: renamed head -> html_head --- askbot/skins/default/templates/base.html | 6 +++--- askbot/skins/default/templates/head/javascript.html | 10 ---------- askbot/skins/default/templates/head/meta.html | 8 -------- askbot/skins/default/templates/head/stylesheets.html | 15 --------------- askbot/skins/default/templates/html_head/javascript.html | 10 ++++++++++ askbot/skins/default/templates/html_head/meta.html | 8 ++++++++ askbot/skins/default/templates/html_head/stylesheets.html | 15 +++++++++++++++ 7 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 askbot/skins/default/templates/head/javascript.html delete mode 100644 askbot/skins/default/templates/head/meta.html delete mode 100644 askbot/skins/default/templates/head/stylesheets.html create mode 100644 askbot/skins/default/templates/html_head/javascript.html create mode 100644 askbot/skins/default/templates/html_head/meta.html create mode 100644 askbot/skins/default/templates/html_head/stylesheets.html diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 9d767067..c5c05679 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -4,11 +4,11 @@ {% spaceless %} {% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }} - {% include "head/meta.html" %} + {% include "html_head/meta.html" %} - {% include "head/stylesheets.html" %} + {% include "html_head/stylesheets.html" %} {% block forestyle %}{% endblock %} - {% include "head/javascript.html" %} + {% include "html_head/javascript.html" %} {% if settings.USE_CUSTOM_HTML_HEAD %} {{ settings.CUSTOM_HTML_HEAD }} {% endif %} diff --git a/askbot/skins/default/templates/head/javascript.html b/askbot/skins/default/templates/head/javascript.html deleted file mode 100644 index f960d11d..00000000 --- a/askbot/skins/default/templates/head/javascript.html +++ /dev/null @@ -1,10 +0,0 @@ - -{% 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 deleted file mode 100644 index 352ffb53..00000000 --- a/askbot/skins/default/templates/head/meta.html +++ /dev/null @@ -1,8 +0,0 @@ - -{% block meta_description %} - -{% endblock %} - -{% if settings.GOOGLE_SITEMAP_CODE %} - -{% endif %} diff --git a/askbot/skins/default/templates/head/stylesheets.html b/askbot/skins/default/templates/head/stylesheets.html deleted file mode 100644 index 9d5aebad..00000000 --- a/askbot/skins/default/templates/head/stylesheets.html +++ /dev/null @@ -1,15 +0,0 @@ - - -{{ skin.get_extra_css_link() }} -{% if settings.USE_CUSTOM_CSS %} - -{% endif %} -{% if user_messages %} - -{% endif %} diff --git a/askbot/skins/default/templates/html_head/javascript.html b/askbot/skins/default/templates/html_head/javascript.html new file mode 100644 index 00000000..f960d11d --- /dev/null +++ b/askbot/skins/default/templates/html_head/javascript.html @@ -0,0 +1,10 @@ + +{% block forejs %} +{% endblock %} +{# avoid adding javascript here so that pages load faster #} diff --git a/askbot/skins/default/templates/html_head/meta.html b/askbot/skins/default/templates/html_head/meta.html new file mode 100644 index 00000000..352ffb53 --- /dev/null +++ b/askbot/skins/default/templates/html_head/meta.html @@ -0,0 +1,8 @@ + +{% block meta_description %} + +{% endblock %} + +{% if settings.GOOGLE_SITEMAP_CODE %} + +{% endif %} diff --git a/askbot/skins/default/templates/html_head/stylesheets.html b/askbot/skins/default/templates/html_head/stylesheets.html new file mode 100644 index 00000000..9d5aebad --- /dev/null +++ b/askbot/skins/default/templates/html_head/stylesheets.html @@ -0,0 +1,15 @@ + + +{{ skin.get_extra_css_link() }} +{% if settings.USE_CUSTOM_CSS %} + +{% endif %} +{% if user_messages %} + +{% endif %} -- cgit v1.2.3-1-g7c22