From 7c9e0b08e057248224eb009199c07834c8fe75d1 Mon Sep 17 00:00:00 2001
From: Kasper Brandt <kasperbrandt87@gmail.com>
Date: Tue, 18 Aug 2015 16:00:49 +0300
Subject: [PATCH 1/2] [#1713] Use the meta name='Description' tag

---
 akvo/templates/base.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/akvo/templates/base.html b/akvo/templates/base.html
index 20e666ce25..2f8b4bf8a1 100644
--- a/akvo/templates/base.html
+++ b/akvo/templates/base.html
@@ -12,6 +12,7 @@
     {% if update %}
     <meta property="og:title" content="{{update.title}} - {{project.title}}"/>
     <meta property="og:description" content="{{update.text|truncatechars_html:500}}"/>
+    <meta name="Description" content="{{update.text|truncatechars_html:500}}"/>
     {% if update.photo %}
     <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{update.photo.url}}"/>
     {% else %}
@@ -20,6 +21,7 @@
     {% elif project %}
     <meta property="og:title" content="{{project.title}}"/>
     <meta property="og:description" content="{{project.subtitle}}"/>
+    <meta name="Description" content="{{project.subtitle}}"/>
     {% if project.current_image %}
     <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{project.current_image.url}}"/>
     {% else %}
@@ -29,6 +31,7 @@
     <meta property="og:title" content="Akvo RSR"/>
     <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
     <meta property="og:description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
+    <meta name="Description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
     {% endif %}
     {% if facebook_app_id %}
     <meta property="fb:app_id" content="{{facebook_app_id}}"/>

From bcee84389bbb2afe8fb3183fda9f21fad0b33b1f Mon Sep 17 00:00:00 2001
From: Gabriel von Heijne <gabriel@akvo.org>
Date: Mon, 24 Aug 2015 22:38:09 +0200
Subject: [PATCH 2/2] [#1713] Add indentation to meta tags section

Just a few indents to make it easier to follow the logic.
---
 akvo/templates/base.html | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/akvo/templates/base.html b/akvo/templates/base.html
index 2f8b4bf8a1..2c48d61659 100644
--- a/akvo/templates/base.html
+++ b/akvo/templates/base.html
@@ -10,28 +10,28 @@
     <meta property="og:site_name" content="Akvo RSR"/>
     <meta property="og:url" content="http://{{request.META.HTTP_HOST}}{{request.path}}"/>
     {% if update %}
-    <meta property="og:title" content="{{update.title}} - {{project.title}}"/>
-    <meta property="og:description" content="{{update.text|truncatechars_html:500}}"/>
-    <meta name="Description" content="{{update.text|truncatechars_html:500}}"/>
-    {% if update.photo %}
-    <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{update.photo.url}}"/>
-    {% else %}
-    <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
-    {% endif %}
+      <meta property="og:title" content="{{update.title}} - {{project.title}}"/>
+      <meta property="og:description" content="{{update.text|truncatechars_html:500}}"/>
+      <meta name="Description" content="{{update.text|truncatechars_html:500}}"/>
+      {% if update.photo %}
+        <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{update.photo.url}}"/>
+      {% else %}
+        <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
+      {% endif %}
     {% elif project %}
-    <meta property="og:title" content="{{project.title}}"/>
-    <meta property="og:description" content="{{project.subtitle}}"/>
-    <meta name="Description" content="{{project.subtitle}}"/>
-    {% if project.current_image %}
-    <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{project.current_image.url}}"/>
-    {% else %}
-    <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
-    {% endif %}
+      <meta property="og:title" content="{{project.title}}"/>
+      <meta property="og:description" content="{{project.subtitle}}"/>
+      <meta name="Description" content="{{project.subtitle}}"/>
+      {% if project.current_image %}
+        <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{project.current_image.url}}"/>
+      {% else %}
+        <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
+      {% endif %}
     {% else %}
-    <meta property="og:title" content="Akvo RSR"/>
-    <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
-    <meta property="og:description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
-    <meta name="Description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
+      <meta property="og:title" content="Akvo RSR"/>
+      <meta property="og:image" content="http://{{request.META.HTTP_HOST}}{{STATIC_URL}}images/rsrLogo.svg"/>
+      <meta property="og:description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
+      <meta name="Description" content="{% trans 'Akvo Really Simple Reporting is a web and Android-based system that makes it easy for development aid teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.' %}"/>
     {% endif %}
     {% if facebook_app_id %}
     <meta property="fb:app_id" content="{{facebook_app_id}}"/>