]> git.openstreetmap.org Git - osqa.git/commitdiff
projects / osqa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a949e58)
OSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnece...
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Sun, 27 Mar 2011 21:10:14 +0000 (21:10 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Sun, 27 Mar 2011 21:10:14 +0000 (21:10 +0000)
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@904 0cfe37f9-358a-4d5e-be75-b63607b5c754

forum/skins/default/templates/base_content.html patch | blob | history
forum/skins/default/templates/footer.html patch | blob | history
forum/skins/default/templates/questions.html patch | blob | history
forum/utils/pagination.py patch | blob | history

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 19a6d738cfa90afc3a91034a647550cbc83578dd..374e2a3741cf93221cd8f1a33b237eb3cd40fc05 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -4,8 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %}</title>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block fulltitle %}{% block title %}{% endblock %} - {{ settings.APP_SHORT_NAME }}{% endblock %}</title>
-        <meta name="description" content="{% block metadescription %}{{ settings.APP_DESCRIPTION }}{% endblock %}">
-        <meta name="keywords" content="{% block metakeywords %}{{ settings.APP_KEYWORDS }}{% endblock %}">
+        <meta name="description" content="{% block metadescription %}{{ settings.APP_DESCRIPTION }}{% endblock %}" />
+        <meta name="keywords" content="{% block metakeywords %}{{ settings.APP_KEYWORDS }}{% endblock %}" />
         {% block meta %}{% endblock %}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% if settings.GOOGLE_SITEMAP_CODE %}
         {% block meta %}{% endblock %}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% if settings.GOOGLE_SITEMAP_CODE %}
@@ -44,7 +44,7 @@
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
                 character: "{% trans "character" %}",
                 characters: "{% trans "characters" %}"
             }
-        /* ]] */
+        /* ]]> */
         </script>
         <script type='text/javascript' src='{% media  "/media/js/osqa.main.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/jquery.copy.js" %}'></script>
         </script>
         <script type='text/javascript' src='{% media  "/media/js/osqa.main.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/jquery.copy.js" %}'></script>
@@ -76,7 +76,7 @@
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
+            <a id="close-notify" onclick="notify.close(true)">&#215;</a>
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
         </div>
         {% if settings.USE_CUSTOM_HEADER|or_preview:request %}
             <div id="custom_header">
diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 38a980f48c0d0fa89cc036b5acb9d78e59fb8220..f5090aa6322acea722c145db93539cdf165e76dc 100644 (file)
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -13,7 +13,7 @@
 </div>
  <div id="licenseLogo">
   <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
 </div>
  <div id="licenseLogo">
   <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
-            <img src="{% media  "/media/images/by-sa-88x31.png" %}"" title="Creative Commons: Attribution - Share Alike" alt="cc-by-sa" width="88" height="31" />
+            <img src="{% media  "/media/images/by-sa-88x31.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-by-sa" width="88" height="31" />
   </a>
  </div>
 
   </a>
  </div>
 
diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 3be2c975d9fb68f6b33ee65b9314c0d0fd1ef4a5..8d4ee0ad63fa0160598273a336a8e05c02e2c19f 100644 (file)
--- 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 %}\r
 \r
 {% block meta %}\r
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 \r
 {% block meta %}\r
-    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}">\r
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}" />\r
 {% endblock %}\r
 \r
 {% block content %}\r
 {% endblock %}\r
 \r
 {% block content %}\r
diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py
index 1d36b42d704a08d6e37f7f108fd2481611cc4bc1..094a595b13ab1fcc9a9514d9ba30763bec83dca2 100644 (file)
--- 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
 
         if get_params:
             base_path += "?" + get_params
 
-    url_joiner = "?" in base_path and "&" or "?"
+    url_joiner = "?" in base_path and "&amp" or "?"
 
 
     def get_page():
 
 
     def get_page():
@@ -240,7 +240,7 @@ def _paginated(request, objects, context):
             page_numbers = []
 
             if sort:
             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&amp;%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))
 
             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:
     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&amp;%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))
 
             else:
                 url_builder = lambda s: mark_safe("%s%s%s=%s" % (escape(base_path), url_joiner, context.PAGESIZE, s))
 
OSQA