From d5a71e2e1fa8d11cbbf26706f8ac0e03b8fe2f50 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 21 Dec 2010 02:34:27 -0500 Subject: simplified template base.html, added options to hide default footer and the logo --- askbot/conf/skin_general_settings.py | 26 +++++ askbot/skins/default/templates/base.html | 116 +-------------------- askbot/skins/default/templates/blocks/README | 2 + .../default/templates/blocks/bottom_scripts.html | 79 ++++++++++++++ .../skins/default/templates/blocks/forum_body.html | 14 +++ askbot/skins/default/templates/blocks/head.html | 25 +++++ .../templates/blocks/header_meta_links.html | 55 ++++++++++ askbot/skins/default/templates/header.html | 58 +---------- 8 files changed, 208 insertions(+), 167 deletions(-) create mode 100644 askbot/skins/default/templates/blocks/README create mode 100644 askbot/skins/default/templates/blocks/bottom_scripts.html create mode 100644 askbot/skins/default/templates/blocks/forum_body.html create mode 100644 askbot/skins/default/templates/blocks/head.html create mode 100644 askbot/skins/default/templates/blocks/header_meta_links.html diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py index a3b22a0a..8d8c679f 100644 --- a/askbot/conf/skin_general_settings.py +++ b/askbot/conf/skin_general_settings.py @@ -31,6 +31,20 @@ settings.register( ) ) +settings.register( + BooleanValue( + GENERAL_SKIN_SETTINGS, + 'SHOW_LOGO', + description = _('Show logo'), + help_text = _( + 'Check if you want to show logo in the forum header ' + 'or uncheck in the case you do not want the logo to ' + 'appear in the default location' + ), + default = True + ) +) + settings.register( ImageValue( GENERAL_SKIN_SETTINGS, @@ -65,6 +79,18 @@ settings.register( ) ) +settings.register( + BooleanValue( + GENERAL_SKIN_SETTINGS, + 'SHOW_FOOTER', + description = _('Show footer'), + help_text = _( + 'Check if you want to show the footer on each forum page' + ), + default = True + ) +) + settings.register( BooleanValue( GENERAL_SKIN_SETTINGS, diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 90ea1568..22578ca0 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -4,121 +4,13 @@ {% spaceless %} {% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }} - - {% block meta_description %} - - {% endblock %} - - {% if settings.GOOGLE_SITEMAP_CODE %} - - {% endif %} - - - {% block forestyle %}{% endblock %} - {% if user_messages %} - - {% endif %} - - {% block forejs %} - {% endblock %} + {% include "blocks/head.html" %} + {# avoid adding javascript here so that pages load faster #} {% endspaceless %} - - {% include "header.html" %} - {% block body %} - {% endblock %} - {% include "footer.html" %} - - - - - - {% if settings.ENABLE_MATHJAX %} - - {% endif %} - {% block endjs %} - {% endblock %} - - {% if settings.GOOGLE_ANALYTICS_KEY %} - - - {% endif %} + {% include "blocks/forum_body.html" %} + {% include "blocks/bottom_scripts.html" %} diff --git a/askbot/skins/default/templates/blocks/README b/askbot/skins/default/templates/blocks/README new file mode 100644 index 00000000..88537d0a --- /dev/null +++ b/askbot/skins/default/templates/blocks/README @@ -0,0 +1,2 @@ +this directory should contain block templates that +are included within other templates diff --git a/askbot/skins/default/templates/blocks/bottom_scripts.html b/askbot/skins/default/templates/blocks/bottom_scripts.html new file mode 100644 index 00000000..93800b2c --- /dev/null +++ b/askbot/skins/default/templates/blocks/bottom_scripts.html @@ -0,0 +1,79 @@ +{# most, if not all javascripts should go here + this template is included at the very bottow of the + main template "base.html" +#} + + + + + +{% if settings.ENABLE_MATHJAX %} + +{% endif %} +{% block endjs %} +{% endblock %} + +{% if settings.GOOGLE_ANALYTICS_KEY %} + + +{% endif %} diff --git a/askbot/skins/default/templates/blocks/forum_body.html b/askbot/skins/default/templates/blocks/forum_body.html new file mode 100644 index 00000000..c36b48cd --- /dev/null +++ b/askbot/skins/default/templates/blocks/forum_body.html @@ -0,0 +1,14 @@ + +{% include "header.html" %} +{% block body %} +{% endblock %} +{% if settings.SHOW_FOOTER %} + {% include "footer.html" %} +{% endif %} diff --git a/askbot/skins/default/templates/blocks/head.html b/askbot/skins/default/templates/blocks/head.html new file mode 100644 index 00000000..1e3060f3 --- /dev/null +++ b/askbot/skins/default/templates/blocks/head.html @@ -0,0 +1,25 @@ + +{% block meta_description %} + +{% endblock %} + +{% if settings.GOOGLE_SITEMAP_CODE %} + +{% endif %} + + +{% block forestyle %}{% endblock %} +{% if user_messages %} + +{% endif %} + +{% block forejs %} +{% endblock %} diff --git a/askbot/skins/default/templates/blocks/header_meta_links.html b/askbot/skins/default/templates/blocks/header_meta_links.html new file mode 100644 index 00000000..ecdcde6a --- /dev/null +++ b/askbot/skins/default/templates/blocks/header_meta_links.html @@ -0,0 +1,55 @@ +{% if request.user.is_authenticated() %} + {{ request.user.username }} + {% spaceless %} + {% if request.user.new_response_count > 0 or request.user.seen_response_count > 0 %} + + {% trans username=request.user.username %}responses for {{username}}{% endtrans %} 0 %} + src="{{ "/images/mail-envelope-full.png"|media }}" + title="{% trans response_count=request.user.new_response_count %}you have a new response{% pluralize %}you nave {{response_count}} new responses{% endtrans %}" + {% elif request.user.seen_response_count > 0 %} + src="{{ "/images/mail-envelope-empty.png"|media }}" + title="{% trans %}no new responses yet{% endtrans %}" + {% endif %} + /> + + {% endif %} + {% if moderation_items %} + + {% if moderation_items['new_count'] > 0 %} + 0 %} + alt="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}" + title="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}" + {% else %} + alt="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}" + title="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}" + {% endif %} + /> + {% elif moderation_items['seen_count'] > 0 %} + {% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %} + {% endif %} + + {% endif %} + {# + {% endif %} + {% else if moderation_items['seen_count'] > 0 %} + {% endif %} + {% endif %#} + {% endspaceless %} + ({{ macros.user_long_score_and_badge_summary(user) }}) + {% trans %}logout{% endtrans %} +{% else %} + {% trans %}login{% endtrans %} +{% endif %} +{% trans %}about{% endtrans %} +{% trans %}faq{% endtrans %} +{% if request.user.is_administrator %} +{% trans %}settings{% endtrans %} +{% endif %} diff --git a/askbot/skins/default/templates/header.html b/askbot/skins/default/templates/header.html index 6b1251f8..917e3a4f 100644 --- a/askbot/skins/default/templates/header.html +++ b/askbot/skins/default/templates/header.html @@ -3,64 +3,11 @@