From 561e05d12e85f2efc4b49f1078dd45656d490488 Mon Sep 17 00:00:00 2001
From: John Martin <me@johnmart.in>
Date: Tue, 11 Jun 2013 11:33:40 +0100
Subject: [PATCH 1/2] [#852] Added OG meta information to the dataset and
 resource pages

---
 ckan/templates/package/read_base.html     | 7 +++++++
 ckan/templates/package/resource_read.html | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index e3845a35202..ece96487471 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -7,6 +7,13 @@
     <link rel="alternate" type="application/rdf+xml" href="{{ h.url_for(controller='package', action='read', id=pkg.id, format='rdf', qualified=True) }}"/>
 {% endblock -%}
 
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.markdown_extract(pkg.notes, extract_length=200)|forceescape %}
+  <meta property="og:title" content="{{ h.dataset_display_name(pkg) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape }}">
+{% endblock -%}
+
 {% block actions_content %}
   {# NOTE: Not implemented in stage 1 #}
   {# <li>{% link_for _('History'), controller='package', action='history', id=pkg.name, class_='btn', icon='undo' %}</li> #}
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 6e607ea3407..441745bfdac 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -2,6 +2,13 @@
 
 {% set res = c.resource %}
 
+{% block head_extras -%}
+  {{ super() }}
+  {% set description = h.markdown_extract(res.description, extract_length=200) if res.description else h.markdown_extract(c.package.notes, extract_length=200) %}
+  <meta property="og:title" content="{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
+  <meta property="og:description" content="{{ description|forceescape }}">
+{% endblock -%}
+
 {% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
 
 {% block breadcrumb_content_selected %}{% endblock %}

From 45aa47a341777d6412ed024fe9d1d498ebe77f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Filipe=20de=20Assun=C3=A7=C3=A3o=20e=20Brito?=
 <decko@birosca.mobi>
Date: Mon, 17 Jun 2013 10:57:08 -0300
Subject: [PATCH 2/2] Update .gitmodules

Update .gitmodules to get sphinx through https on github
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 4f9656fb641..157e28cb1d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "doc/_themes/sphinx-theme-okfn"]
 	path = doc/_themes/sphinx-theme-okfn
-	url = git://github.com/okfn/sphinx-theme-okfn.git
+	url = https://github.com/okfn/sphinx-theme-okfn.git