]> 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: d95cb74)
Removes duplicate meta description from question page.
authorhernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Mon, 31 May 2010 12:00:37 +0000 (12:00 +0000)
committerhernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Mon, 31 May 2010 12:00:37 +0000 (12:00 +0000)
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@346 0cfe37f9-358a-4d5e-be75-b63607b5c754

forum/skins/default/templates/base_content.html patch | blob | history
forum/skins/default/templates/question.html patch | blob | history

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 3e9c19f765d6e73ed7d0da5e0a01ff8a47927fb4..ac6b9da3063755dc1a9db69f3ba209c2e9257032 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -5,8 +5,8 @@
 <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="{{ settings.APP_DESCRIPTION }}">
-        <meta name="keywords" content="{{ settings.APP_KEYWORDS }}">
+        <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 %}
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index b8798742ac5d298709d1b15271ea7779a5d8c36c..4ffc481eaa6eb41275c55875359cec2660b3d73e 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -8,12 +8,12 @@
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r
+{% block metadescription %}{{question.summary}}{% endblock %}\r
+{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
 {% block forejs %}\r
-        <meta name="description" content="{{question.summary}}" />\r
-        <meta name="keywords" content="{{question.tagname_meta_generator}}" />\r
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r
-        {% if not question.closed %}\r
+        {% if not question.nis.closed %}\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>\r
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />\r
OSQA