From edcd42cff2f41ebea0f49df0390a17886d32bd38 Mon Sep 17 00:00:00 2001 From: jordan Date: Sun, 27 Mar 2011 21:10:14 +0000 Subject: [PATCH] OSQA-533, fixed some W3C validation errors: closing tags, removed some unnecessary characters from the By-SA license image, closing the tags, etc. There is still one validation error with the autocomplete attribute. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@904 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/skins/default/templates/base_content.html | 8 ++++---- forum/skins/default/templates/footer.html | 2 +- forum/skins/default/templates/questions.html | 2 +- forum/utils/pagination.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index 19a6d73..374e2a3 100644 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html @@ -4,8 +4,8 @@ {% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %} - - + + {% block meta %}{% endblock %} {% if settings.GOOGLE_SITEMAP_CODE %} @@ -44,7 +44,7 @@ character: "{% trans "character" %}", characters: "{% trans "characters" %}" } - /* ]] */ + /* ]]> */ @@ -76,7 +76,7 @@ {% endfor %} {% endif %} {% endautoescape %} - × + × {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html index 38a980f..f5090aa 100644 --- a/forum/skins/default/templates/footer.html +++ b/forum/skins/default/templates/footer.html @@ -13,7 +13,7 @@
diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html index 3be2c97..8d4ee0a 100644 --- a/forum/skins/default/templates/questions.html +++ b/forum/skins/default/templates/questions.html @@ -8,7 +8,7 @@ {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %} {% block meta %} - + {% endblock %} {% block content %} diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py index 1d36b42..094a595 100644 --- a/forum/utils/pagination.py +++ b/forum/utils/pagination.py @@ -204,7 +204,7 @@ def _paginated(request, objects, context): if get_params: base_path += "?" + get_params - url_joiner = "?" in base_path and "&" or "?" + url_joiner = "?" in base_path and "&" or "?" def get_page(): @@ -240,7 +240,7 @@ def _paginated(request, objects, context): page_numbers = [] if sort: - url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (base_path, url_joiner, context.SORT, sort, context.PAGE, n)) + url_builder = lambda n: mark_safe("%s%s%s=%s&%s=%s" % (base_path, url_joiner, context.SORT, sort, context.PAGE, n)) else: url_builder = lambda n: mark_safe("%s%s%s=%s" % (base_path, url_joiner, context.PAGE, n)) @@ -273,7 +273,7 @@ def _paginated(request, objects, context): if pagesize: def page_sizes(): if sort: - url_builder = lambda s: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGESIZE, s)) + url_builder = lambda s: mark_safe("%s%s%s=%s&%s=%s" % (escape(base_path), url_joiner, context.SORT, sort, context.PAGESIZE, s)) else: url_builder = lambda s: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGESIZE, s)) -- 2.45.1