From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 26 Jul 2009 22:33:56 -0400 Subject: merged in latest Mikes changes --- templates/base_content.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'templates/base_content.html') diff --git a/templates/base_content.html b/templates/base_content.html index 98a09150..39627a0e 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -1,9 +1,8 @@ +{% load i18n %} - -{% load i18n %} - {% block title %}{% endblock %} - {% trans "site title" %} - {% trans "site slogan" %} + {% block title %}{% endblock %} - {{ APP_TITLE }} @@ -83,4 +82,3 @@ {% endblock %} - -- cgit v1.2.3-1-g7c22 From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 5 Aug 2009 22:50:08 -0400 Subject: added anonymous posting, per-question subscription and fixes by Pothers and some more, see development.log --- templates/base_content.html | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'templates/base_content.html') 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 %} + +{% load i18n %} - {% block title %}{% endblock %} - {{ APP_TITLE }} + {% block title %}{% endblock %} - {{ settings.APP_TITLE }} - + {% spaceless %} @@ -13,7 +14,7 @@ @@ -38,29 +39,32 @@ --> - {% with request.user.get_messages as messages%} {% if messages %} {% endif %} - {% endwith %} {% block forejs %} {% endblock %} {% include "header.html" %}
@@ -82,3 +86,4 @@ {% endblock %} + -- cgit v1.2.3-1-g7c22 From 1eacc7a42618e84766477fbcc2c32a1da3547115 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 10 Aug 2009 21:40:01 -0400 Subject: untested commit. merged Adolfos mods, validated most of html, slugify urls, fixed IE issues in openid signin --- templates/base_content.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'templates/base_content.html') diff --git a/templates/base_content.html b/templates/base_content.html index 4ee9675f..a05198f5 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -1,18 +1,18 @@ - + {% load i18n %} - + {% block title %}{% endblock %} - {{ settings.APP_TITLE }} - + - + {% spaceless %} {% block forestyle %}{% endblock %} {% endspaceless %} - - + + -- cgit v1.2.3-1-g7c22 From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Nov 2009 20:18:55 -0500 Subject: better comments, email subscriptions, corrected view counter, some ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes --- templates/base_content.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'templates/base_content.html') diff --git a/templates/base_content.html b/templates/base_content.html index a05198f5..52cc6134 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -1,13 +1,14 @@ {% load i18n %} +{% load extra_tags %} {% block title %}{% endblock %} - {{ settings.APP_TITLE }} - - + + {% spaceless %} {% block forestyle %}{% endblock %} {% endspaceless %} @@ -16,9 +17,9 @@ - - - + + + - {% if messages %} + {% if user_messages %} @@ -58,8 +59,8 @@