From 88b670cb4143bbf7f3e07efaaca7b08be3ea2a95 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 14:50:11 +0200
Subject: [PATCH 01/49] Fixes #1079

---
 less/_wpckan.less | 2 +-
 style.css         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/less/_wpckan.less b/less/_wpckan.less
index 37882c88..9bb0a676 100644
--- a/less/_wpckan.less
+++ b/less/_wpckan.less
@@ -98,7 +98,7 @@
 
     td:first-child p{
       font-weight: bold;
-      min-width: 80px;
+      min-width: 260px;
     }
 
     td p{
diff --git a/style.css b/style.css
index 1878450b..89ebe552 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author: Open Development Mekong
 Author URI: http://github.com/OpenDevelopmentMekong
 Description: Open Development Mekong's wordpress theme. Based on JEO child theme
 Template: jeo
-Version: 2.2.66
+Version: 2.2.67
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */

From 2387c6615c630e34a0104e14e5b9c214558d2c62 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 15:29:33 +0200
Subject: [PATCH 02/49] Fixes #1061

---
 gulpfile.js             |  2 ++
 less/_typography.less   |  1 +
 lib/js/expandible.js    | 35 +++++++++++++++++++++++++++++++++++
 page-dataset-detail.php |  4 +++-
 style.css               |  2 +-
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 lib/js/expandible.js

diff --git a/gulpfile.js b/gulpfile.js
index 51492003..d336bdd9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,6 +7,7 @@ var gulp = require('gulp'),
 
 var LESS_PATH = 'less/';
 var JS_PATH = 'js/';
+var LIB_PATH = 'lib/';
 var CSS_PATH = 'css/';
 var DEST_PATH = 'dist/'; //Temp path will change later
 var CSS_DIST_PATH = DEST_PATH + 'css/';
@@ -63,4 +64,5 @@ gulp.task('watch', function(){
 	gulp.watch(LESS_PATH + '/*less', ['build-less', 'build-styles']);
 	gulp.watch(CSS_PATH + '/*.css', ['build-styles']);
 	gulp.watch(JS_PATH + '/*.js', ['build-scripts']);
+	gulp.watch(LIB_PATH + '/js/*.js', ['build-scripts']);
 });
diff --git a/less/_typography.less b/less/_typography.less
index b9c19cf6..243463af 100644
--- a/less/_typography.less
+++ b/less/_typography.less
@@ -136,3 +136,4 @@ blockquote {
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+
diff --git a/lib/js/expandible.js b/lib/js/expandible.js
new file mode 100644
index 00000000..78354f73
--- /dev/null
+++ b/lib/js/expandible.js
@@ -0,0 +1,35 @@
+const MAX_LENGTH = 200;
+
+(function($) {
+
+	$(document).ready(collapseAll);
+	
+	function collapseAll() {
+		$(".expandible").each(function( index ) {
+			collapse($(this));
+		});
+	}
+	
+	function collapse(paragraph) {
+		var contents = paragraph.html();
+		if (contents.length > MAX_LENGTH){
+			var choppedContents = contents.substring(0, MAX_LENGTH);				
+			var showMore = $('<a> More...</a> ');
+			showMore.on('click', function(e){
+				expand(paragraph,contents);				
+			});
+			paragraph.html(choppedContents);
+			paragraph.append(showMore);
+		}
+	}
+	
+	function expand(paragraph,allContents) {		
+		var showLess = $('<a> Less...</a> ');
+		showLess.on('click', function(e){
+			collapse(paragraph);
+		});
+		paragraph.html(allContents);
+		paragraph.append(showLess);
+	}
+
+})(jQuery);
diff --git a/page-dataset-detail.php b/page-dataset-detail.php
index 1c061238..f0d263f2 100644
--- a/page-dataset-detail.php
+++ b/page-dataset-detail.php
@@ -24,7 +24,9 @@
 			</div>
 
 			<aside id="sidebar" class="four columns offset-by-one">
-
+        <p class="expandible">
+          The dataset describes hectare forest cover by province in Cambodia in 1973, 1989, 2000, 2004, 2009, 2013 and 2014. This dataset was derived from ODC forest cover in Cambodia (1973-2014). Provincial boundaries are based on the Cambodian Economic Census (2011) administrative boundary data. Data is available for download in xlsx and csv. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. 
+        </p>
 				<?php
 					if (is_user_logged_in()): ?>
 						<div class="sixteen columns widgets">
diff --git a/style.css b/style.css
index 89ebe552..8cc6c684 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author: Open Development Mekong
 Author URI: http://github.com/OpenDevelopmentMekong
 Description: Open Development Mekong's wordpress theme. Based on JEO child theme
 Template: jeo
-Version: 2.2.67
+Version: 2.2.68
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */

From 51bd2fba860bc517a3a780eac7b3b93cb68de9cd Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 15:30:17 +0200
Subject: [PATCH 03/49] Fixes #1061

---
 page-dataset-detail.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/page-dataset-detail.php b/page-dataset-detail.php
index f0d263f2..14c5ec85 100644
--- a/page-dataset-detail.php
+++ b/page-dataset-detail.php
@@ -24,9 +24,7 @@
 			</div>
 
 			<aside id="sidebar" class="four columns offset-by-one">
-        <p class="expandible">
-          The dataset describes hectare forest cover by province in Cambodia in 1973, 1989, 2000, 2004, 2009, 2013 and 2014. This dataset was derived from ODC forest cover in Cambodia (1973-2014). Provincial boundaries are based on the Cambodian Economic Census (2011) administrative boundary data. Data is available for download in xlsx and csv. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. 
-        </p>
+      
 				<?php
 					if (is_user_logged_in()): ?>
 						<div class="sixteen columns widgets">

From e063668ebb0f2aa9a1bb5c127c721d75cc72275a Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:10:40 +0200
Subject: [PATCH 04/49] Fixes #1061

---
 lib/js/expandible.js    | 9 ++++++---
 page-dataset-detail.php | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 78354f73..cb99fad2 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,10 +11,10 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();
+		var contents = paragraph.html();		
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
-			var showMore = $('<a> More...</a> ');
+			var showMore = $('<a class="collapse"> More...</a> ');
 			showMore.on('click', function(e){
 				expand(paragraph,contents);				
 			});
@@ -24,10 +24,13 @@ const MAX_LENGTH = 200;
 	}
 	
 	function expand(paragraph,allContents) {		
-		var showLess = $('<a> Less...</a> ');
+		var showLess = $('<a class="collapse> Less...</a> ');
 		showLess.on('click', function(e){
 			collapse(paragraph);
 		});
+		if (allContents.indexOf('<a class="collapse> Less...</a> ') > -1){
+			allContents.replace('<a class="collapse> Less...</a> ','');
+		}
 		paragraph.html(allContents);
 		paragraph.append(showLess);
 	}
diff --git a/page-dataset-detail.php b/page-dataset-detail.php
index 14c5ec85..f0d263f2 100644
--- a/page-dataset-detail.php
+++ b/page-dataset-detail.php
@@ -24,7 +24,9 @@
 			</div>
 
 			<aside id="sidebar" class="four columns offset-by-one">
-      
+        <p class="expandible">
+          The dataset describes hectare forest cover by province in Cambodia in 1973, 1989, 2000, 2004, 2009, 2013 and 2014. This dataset was derived from ODC forest cover in Cambodia (1973-2014). Provincial boundaries are based on the Cambodian Economic Census (2011) administrative boundary data. Data is available for download in xlsx and csv. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. 
+        </p>
 				<?php
 					if (is_user_logged_in()): ?>
 						<div class="sixteen columns widgets">

From 629fd119698bd7c424e1410fceacf7d56501eba2 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:12:50 +0200
Subject: [PATCH 05/49] Fixes #1061

---
 lib/js/expandible.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index cb99fad2..27c9adf0 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,7 +11,10 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();		
+		var contents = paragraph.html();
+		if (contents.indexOf('<a class="collapse> Less...</a> ') > -1){
+			contents.replace('<a class="collapse> Less...</a> ','');
+		}
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
@@ -27,10 +30,7 @@ const MAX_LENGTH = 200;
 		var showLess = $('<a class="collapse> Less...</a> ');
 		showLess.on('click', function(e){
 			collapse(paragraph);
-		});
-		if (allContents.indexOf('<a class="collapse> Less...</a> ') > -1){
-			allContents.replace('<a class="collapse> Less...</a> ','');
-		}
+		});		
 		paragraph.html(allContents);
 		paragraph.append(showLess);
 	}

From 6920622c58d80e55621c3a9652ae3bf5f0ba7938 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:14:21 +0200
Subject: [PATCH 06/49] Fixes #1061

---
 lib/js/expandible.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 27c9adf0..55644e77 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,14 +11,14 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();
-		if (contents.indexOf('<a class="collapse> Less...</a> ') > -1){
-			contents.replace('<a class="collapse> Less...</a> ','');
-		}
+		var contents = paragraph.html();		
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
 			showMore.on('click', function(e){
+				if (contents.indexOf('<a class="collapse> Less...</a> ') > -1){
+					contents.replace('<a class="collapse> Less...</a> ','');
+				}
 				expand(paragraph,contents);				
 			});
 			paragraph.html(choppedContents);

From e239c42c47d64da967d6de5fc66b9012310812b3 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:14:56 +0200
Subject: [PATCH 07/49] Fixes #1061

---
 lib/js/expandible.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 55644e77..103b3e31 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -15,10 +15,7 @@ const MAX_LENGTH = 200;
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
-			showMore.on('click', function(e){
-				if (contents.indexOf('<a class="collapse> Less...</a> ') > -1){
-					contents.replace('<a class="collapse> Less...</a> ','');
-				}
+			showMore.on('click', function(e){				
 				expand(paragraph,contents);				
 			});
 			paragraph.html(choppedContents);

From 82ae6353a22e73652c87708d2cfba95eb1e14048 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:15:50 +0200
Subject: [PATCH 08/49] Fixes #1061

---
 lib/js/expandible.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 103b3e31..3c28d4d5 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -12,6 +12,9 @@ const MAX_LENGTH = 200;
 	
 	function collapse(paragraph) {
 		var contents = paragraph.html();		
+		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
+			contents.replace('<a class="collapse"> Less...</a> ','');
+		}
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
@@ -24,7 +27,7 @@ const MAX_LENGTH = 200;
 	}
 	
 	function expand(paragraph,allContents) {		
-		var showLess = $('<a class="collapse> Less...</a> ');
+		var showLess = $('<a class="collapse"> Less...</a> ');
 		showLess.on('click', function(e){
 			collapse(paragraph);
 		});		

From e5c32d41f793133aad62451dbf7b10811ae49fd9 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:16:56 +0200
Subject: [PATCH 09/49] Fixes #1061

---
 lib/js/expandible.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 3c28d4d5..592e67a0 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -12,9 +12,6 @@ const MAX_LENGTH = 200;
 	
 	function collapse(paragraph) {
 		var contents = paragraph.html();		
-		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
-			contents.replace('<a class="collapse"> Less...</a> ','');
-		}
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');

From 5345c2ae313fc4cb6c60034bfad9ffd62e585985 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:17:34 +0200
Subject: [PATCH 10/49] Fixes #1061

---
 lib/js/expandible.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 592e67a0..45f62ddf 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,7 +11,10 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();		
+		var contents = paragraph.html();
+		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
+			contents.replace('<a class="collapse"> Less...</a> ','');
+		}		
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');

From d69066348867346ea7c732b3d4ff3c41d0ec1b56 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:18:31 +0200
Subject: [PATCH 11/49] Fixes #161

---
 lib/js/expandible.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 45f62ddf..f259bd3a 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,10 +11,7 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();
-		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
-			contents.replace('<a class="collapse"> Less...</a> ','');
-		}		
+		var contents = paragraph.html();			
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
@@ -31,6 +28,9 @@ const MAX_LENGTH = 200;
 		showLess.on('click', function(e){
 			collapse(paragraph);
 		});		
+		if (allContents.indexOf('<a class="collapse"> Less...</a> ') > -1){
+			allContents.replace('<a class="collapse"> Less...</a> ','');
+		}	
 		paragraph.html(allContents);
 		paragraph.append(showLess);
 	}

From 1ac95884b9691f94887d2e46fac6e495b5e1f355 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:19:51 +0200
Subject: [PATCH 12/49] Fixes #1061

---
 lib/js/expandible.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index f259bd3a..11d1c5a3 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -12,6 +12,9 @@ const MAX_LENGTH = 200;
 	
 	function collapse(paragraph) {
 		var contents = paragraph.html();			
+		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
+			contents.replace('<a class="collapse"> Less...</a> ','');
+		}	
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
@@ -27,10 +30,7 @@ const MAX_LENGTH = 200;
 		var showLess = $('<a class="collapse"> Less...</a> ');
 		showLess.on('click', function(e){
 			collapse(paragraph);
-		});		
-		if (allContents.indexOf('<a class="collapse"> Less...</a> ') > -1){
-			allContents.replace('<a class="collapse"> Less...</a> ','');
-		}	
+		});				
 		paragraph.html(allContents);
 		paragraph.append(showLess);
 	}

From f2c4f246597108c797db495949bc5cb8657aea59 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:22:12 +0200
Subject: [PATCH 13/49] Fixes #1061

---
 lib/js/expandible.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 11d1c5a3..45298447 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,7 +11,8 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();			
+		var contents = paragraph.html();	
+		console.log(contents);
 		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
 			contents.replace('<a class="collapse"> Less...</a> ','');
 		}	

From 28846739a5228efcfaf749e02c9e0936d700ec82 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:23:52 +0200
Subject: [PATCH 14/49] Fixes #1061

---
 lib/js/expandible.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 45298447..98a45745 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -12,14 +12,14 @@ const MAX_LENGTH = 200;
 	
 	function collapse(paragraph) {
 		var contents = paragraph.html();	
-		console.log(contents);
-		if (contents.indexOf('<a class="collapse"> Less...</a> ') > -1){
-			contents.replace('<a class="collapse"> Less...</a> ','');
-		}	
+		console.log(contents);		
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
-			showMore.on('click', function(e){				
+			showMore.on('click', function(e){		
+				if (contents.indexOf('<a class="collapse"> Less...</a>') > -1){
+					contents.replace('<a class="collapse"> Less...</a>','');
+				}			
 				expand(paragraph,contents);				
 			});
 			paragraph.html(choppedContents);
@@ -28,7 +28,7 @@ const MAX_LENGTH = 200;
 	}
 	
 	function expand(paragraph,allContents) {		
-		var showLess = $('<a class="collapse"> Less...</a> ');
+		var showLess = $('<a class="collapse"> Less...</a>');
 		showLess.on('click', function(e){
 			collapse(paragraph);
 		});				

From 2fa7d898a459357f3381af7ee9abc06a3e355cdc Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:25:55 +0200
Subject: [PATCH 15/49] Fixes #1061

---
 lib/js/expandible.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index 98a45745..e7afca7c 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -11,12 +11,12 @@ const MAX_LENGTH = 200;
 	}
 	
 	function collapse(paragraph) {
-		var contents = paragraph.html();	
-		console.log(contents);		
+		var contents = paragraph.html();			
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
-			showMore.on('click', function(e){		
+			showMore.on('click', function(e){
+				console.log(contents.indexOf('<a class="collapse"> Less...</a>'));
 				if (contents.indexOf('<a class="collapse"> Less...</a>') > -1){
 					contents.replace('<a class="collapse"> Less...</a>','');
 				}			

From 3e0444fd4bbb8171d8c38315a48afd80954a74d2 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:27:01 +0200
Subject: [PATCH 16/49] Fixes #1061

---
 lib/js/expandible.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index e7afca7c..d29b2a0f 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -15,10 +15,9 @@ const MAX_LENGTH = 200;
 		if (contents.length > MAX_LENGTH){
 			var choppedContents = contents.substring(0, MAX_LENGTH);				
 			var showMore = $('<a class="collapse"> More...</a> ');
-			showMore.on('click', function(e){
-				console.log(contents.indexOf('<a class="collapse"> Less...</a>'));
+			showMore.on('click', function(e){				
 				if (contents.indexOf('<a class="collapse"> Less...</a>') > -1){
-					contents.replace('<a class="collapse"> Less...</a>','');
+					contents = contents.replace('<a class="collapse"> Less...</a>','');
 				}			
 				expand(paragraph,contents);				
 			});

From 0e33da2434a5186b6a678420faa014376e624a79 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Mon, 10 Jul 2017 22:27:40 +0200
Subject: [PATCH 17/49] Fixes #1061

---
 page-dataset-detail.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/page-dataset-detail.php b/page-dataset-detail.php
index f0d263f2..1c061238 100644
--- a/page-dataset-detail.php
+++ b/page-dataset-detail.php
@@ -24,9 +24,7 @@
 			</div>
 
 			<aside id="sidebar" class="four columns offset-by-one">
-        <p class="expandible">
-          The dataset describes hectare forest cover by province in Cambodia in 1973, 1989, 2000, 2004, 2009, 2013 and 2014. This dataset was derived from ODC forest cover in Cambodia (1973-2014). Provincial boundaries are based on the Cambodian Economic Census (2011) administrative boundary data. Data is available for download in xlsx and csv. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. Display other content from other post types tagged with the same categories as the one where the widget is integrated. 
-        </p>
+
 				<?php
 					if (is_user_logged_in()): ?>
 						<div class="sixteen columns widgets">

From 62208c8fc9c13e563721562a318e5f15c5f3f46d Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:33:44 +0200
Subject: [PATCH 18/49] Fixes #1062

---
 lib/js/expandible.js | 20 ++++++++++----------
 lib/js/slideable.js  | 29 +++++++++++++++++++++++++++++
 style.css            |  2 +-
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 lib/js/slideable.js

diff --git a/lib/js/expandible.js b/lib/js/expandible.js
index d29b2a0f..29a55799 100644
--- a/lib/js/expandible.js
+++ b/lib/js/expandible.js
@@ -3,34 +3,34 @@ const MAX_LENGTH = 200;
 (function($) {
 
 	$(document).ready(collapseAll);
-	
+
 	function collapseAll() {
 		$(".expandible").each(function( index ) {
 			collapse($(this));
 		});
 	}
-	
+
 	function collapse(paragraph) {
-		var contents = paragraph.html();			
+		var contents = paragraph.html();
 		if (contents.length > MAX_LENGTH){
-			var choppedContents = contents.substring(0, MAX_LENGTH);				
+			var choppedContents = contents.substring(0, MAX_LENGTH);
 			var showMore = $('<a class="collapse"> More...</a> ');
-			showMore.on('click', function(e){				
+			showMore.on('click', function(e){
 				if (contents.indexOf('<a class="collapse"> Less...</a>') > -1){
 					contents = contents.replace('<a class="collapse"> Less...</a>','');
-				}			
-				expand(paragraph,contents);				
+				}
+				expand(paragraph,contents);
 			});
 			paragraph.html(choppedContents);
 			paragraph.append(showMore);
 		}
 	}
-	
-	function expand(paragraph,allContents) {		
+
+	function expand(paragraph,allContents) {
 		var showLess = $('<a class="collapse"> Less...</a>');
 		showLess.on('click', function(e){
 			collapse(paragraph);
-		});				
+		});
 		paragraph.html(allContents);
 		paragraph.append(showLess);
 	}
diff --git a/lib/js/slideable.js b/lib/js/slideable.js
new file mode 100644
index 00000000..3bc3e109
--- /dev/null
+++ b/lib/js/slideable.js
@@ -0,0 +1,29 @@
+(function($) {
+
+	$(document).ready(slideUpAll);
+
+	function slideUpAll() {
+		$(".slideable").each(function( index ) {
+			slideUp($(this));
+		});
+	}
+
+	function slideUp(div) {
+		var heading = div.find(":header");
+		var content = div.find(".slideable-content");
+		content.slideUp();
+		heading.on("click", function(item){
+			slideDown(div);
+		});
+	}
+
+	function slideDown(div) {
+		var heading = div.find(":header");
+		var content = div.find(".slideable-content");
+		content.slideDown();
+		heading.on("click", function(item){
+			slideUp(div);
+		});
+	}
+
+})(jQuery);
diff --git a/style.css b/style.css
index 8cc6c684..dbbd49e7 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author: Open Development Mekong
 Author URI: http://github.com/OpenDevelopmentMekong
 Description: Open Development Mekong's wordpress theme. Based on JEO child theme
 Template: jeo
-Version: 2.2.68
+Version: 2.2.69
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */

From ee103941d09c2ea50dc35e974f067547478fca65 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:41:04 +0200
Subject: [PATCH 19/49] Fixes #1062

---
 lib/js/slideable.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index 3bc3e109..c58387ae 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -12,7 +12,7 @@
 		var heading = div.find(":header");
 		var content = div.find(".slideable-content");
 		content.slideUp();
-		heading.on("click", function(item){
+		heading.on('click', function(item){
 			slideDown(div);
 		});
 	}
@@ -21,7 +21,8 @@
 		var heading = div.find(":header");
 		var content = div.find(".slideable-content");
 		content.slideDown();
-		heading.on("click", function(item){
+		heading.off('click');
+		heading.on('click', function(item){
 			slideUp(div);
 		});
 	}

From 8c0235bcc947ab8ff54cc2091e6b6aca330ef24c Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:45:47 +0200
Subject: [PATCH 20/49] Fixes #1062

---
 lib/js/slideable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index c58387ae..c505cc64 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -15,13 +15,13 @@
 		heading.on('click', function(item){
 			slideDown(div);
 		});
+		heading.off('click');
 	}
 
 	function slideDown(div) {
 		var heading = div.find(":header");
 		var content = div.find(".slideable-content");
 		content.slideDown();
-		heading.off('click');
 		heading.on('click', function(item){
 			slideUp(div);
 		});

From 36ae51db299a8b21eabdb33accf8837dda574721 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:46:27 +0200
Subject: [PATCH 21/49] Fixes #1062

---
 lib/js/slideable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index c505cc64..c58387ae 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -15,13 +15,13 @@
 		heading.on('click', function(item){
 			slideDown(div);
 		});
-		heading.off('click');
 	}
 
 	function slideDown(div) {
 		var heading = div.find(":header");
 		var content = div.find(".slideable-content");
 		content.slideDown();
+		heading.off('click');
 		heading.on('click', function(item){
 			slideUp(div);
 		});

From 2cbf0dd39a98b9367cdce7def9b161d60a4877a1 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:49:35 +0200
Subject: [PATCH 22/49] Fixes #1062

---
 lib/js/slideable.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index c58387ae..2d91fa8e 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -9,7 +9,11 @@
 	}
 
 	function slideUp(div) {
+		var slideArrow = $('<i class="fa fa-caret-down"></i>');
 		var heading = div.find(":header");
+		if (heading.indexOf('<i class="fa fa-caret-down"></i>') == -1){
+			heading.append(slideArrow);
+		}
 		var content = div.find(".slideable-content");
 		content.slideUp();
 		heading.on('click', function(item){

From 20fd4ddbcf584ac954950b862b6e386df5a3d134 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:51:29 +0200
Subject: [PATCH 23/49] Fixes #1062

---
 lib/js/slideable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index 2d91fa8e..3bd32aed 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -11,7 +11,7 @@
 	function slideUp(div) {
 		var slideArrow = $('<i class="fa fa-caret-down"></i>');
 		var heading = div.find(":header");
-		if (heading.indexOf('<i class="fa fa-caret-down"></i>') == -1){
+		if (heading.html().indexOf('<i class="fa fa-caret-down"></i>') == -1){
 			heading.append(slideArrow);
 		}
 		var content = div.find(".slideable-content");

From c7405da9697a1a590267e439f097388323e87129 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:52:18 +0200
Subject: [PATCH 24/49] Fixes #1062

---
 lib/js/slideable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index 3bd32aed..c2761677 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -9,9 +9,9 @@
 	}
 
 	function slideUp(div) {
-		var slideArrow = $('<i class="fa fa-caret-down"></i>');
+		var slideArrow = $(' <i class="fa fa-caret-down"></i>');
 		var heading = div.find(":header");
-		if (heading.html().indexOf('<i class="fa fa-caret-down"></i>') == -1){
+		if (heading.html().indexOf(' <i class="fa fa-caret-down"></i>') == -1){
 			heading.append(slideArrow);
 		}
 		var content = div.find(".slideable-content");

From 7f5e8c234ee2c3d64774d426156fd7af8292c0de Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:52:57 +0200
Subject: [PATCH 25/49] Fixes #1062

---
 lib/js/slideable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index c2761677..bd779fb5 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -11,7 +11,7 @@
 	function slideUp(div) {
 		var slideArrow = $(' <i class="fa fa-caret-down"></i>');
 		var heading = div.find(":header");
-		if (heading.html().indexOf(' <i class="fa fa-caret-down"></i>') == -1){
+		if (heading.html().indexOf('<i class="fa fa-caret-down"></i>') == -1){
 			heading.append(slideArrow);
 		}
 		var content = div.find(".slideable-content");

From 2dd19d83277b2aafd155c7676150cb31df0162e4 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 12:53:51 +0200
Subject: [PATCH 26/49] Fixes #1062

---
 lib/js/slideable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index bd779fb5..b762a703 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -9,9 +9,10 @@
 	}
 
 	function slideUp(div) {
-		var slideArrow = $(' <i class="fa fa-caret-down"></i>');
+		var slideArrow = $('<i class="fa fa-caret-down"></i>');
 		var heading = div.find(":header");
 		if (heading.html().indexOf('<i class="fa fa-caret-down"></i>') == -1){
+			heading.append(" ");
 			heading.append(slideArrow);
 		}
 		var content = div.find(".slideable-content");

From 16d84ca0f56b04fcc71a45800f96b8a857107d58 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 15:44:04 +0200
Subject: [PATCH 27/49] increasing version to v2.3.0

---
 style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style.css b/style.css
index dbbd49e7..631df392 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author: Open Development Mekong
 Author URI: http://github.com/OpenDevelopmentMekong
 Description: Open Development Mekong's wordpress theme. Based on JEO child theme
 Template: jeo
-Version: 2.2.69
+Version: 2.3.0
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */

From 69680fcd4b1491393bcde8af755c933e1288418e Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 16:08:24 +0200
Subject: [PATCH 28/49] adding CSS properties for slideable

---
 less/_wpckan.less   | 6 ++++++
 lib/js/slideable.js | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/less/_wpckan.less b/less/_wpckan.less
index 9bb0a676..1cf4a142 100644
--- a/less/_wpckan.less
+++ b/less/_wpckan.less
@@ -188,3 +188,9 @@
   }
 
 }
+
+.slideable{
+	h1:hover,h2:hover,h3:hover,h4:hover,h5:hover{
+		cursor: pointer;
+	}
+}
diff --git a/lib/js/slideable.js b/lib/js/slideable.js
index b762a703..6674abb7 100644
--- a/lib/js/slideable.js
+++ b/lib/js/slideable.js
@@ -10,7 +10,7 @@
 
 	function slideUp(div) {
 		var slideArrow = $('<i class="fa fa-caret-down"></i>');
-		var heading = div.find(":header");
+		var heading = div.find(":header").first();
 		if (heading.html().indexOf('<i class="fa fa-caret-down"></i>') == -1){
 			heading.append(" ");
 			heading.append(slideArrow);
@@ -23,7 +23,7 @@
 	}
 
 	function slideDown(div) {
-		var heading = div.find(":header");
+		var heading = div.find(":header").first();
 		var content = div.find(".slideable-content");
 		content.slideDown();
 		heading.off('click');

From 156a6c66f9dfa475c66a29793f59d8e8e76b27f3 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Tue, 11 Jul 2017 17:07:12 +0200
Subject: [PATCH 29/49] moving metadata download buttons to template on wpckan

---
 page-dataset-detail.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/page-dataset-detail.php b/page-dataset-detail.php
index 1c061238..e00d452e 100644
--- a/page-dataset-detail.php
+++ b/page-dataset-detail.php
@@ -38,13 +38,6 @@
 					endif;?>
 
 				<div class="sixteen columns widgets">
-					<div class="widget">
-						<h2 class="widget-title"><?php _e('Download metadata','odm') ?></h2>
-						</br>
-						<a target="_blank" class="button download" href="<?php echo wpckan_get_ckan_domain(); ?>/dataset/<?php echo $dataset_id;?>.xml"><?php _e('XML', 'odm')?></a>
-						<a target="_blank" class="button download" href="<?php echo wpckan_get_ckan_domain(); ?>/api/3/action/package_show?id=<?php echo $dataset_id;?>"><?php _e('JSON', 'odm')?></a>
-						<a target="_blank" class="button download" href="<?php echo wpckan_get_ckan_domain(); ?>/dataset/<?php echo $dataset_id;?>.rdf"><?php _e('RDF', 'odm')?></a>
-					</div>
 
           <?php
             if (isset($search_query)):

From c6420d8e11ac4d5feb6ff21ee571ee3648b7b1c2 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:32:49 +0700
Subject: [PATCH 30/49] Rename Posts to Blogs on bradcrumbs

---
 inc/utils/breadcrumbs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/utils/breadcrumbs.php b/inc/utils/breadcrumbs.php
index fef9fe11..f4058944 100644
--- a/inc/utils/breadcrumbs.php
+++ b/inc/utils/breadcrumbs.php
@@ -58,7 +58,8 @@ function echo_the_breadcrumbs()
     if (is_single()):
         $post_type_name = get_post_type(get_the_ID());
         $post_type = get_post_type_object($post_type_name);
-        echo '<li class="item-post-type"><a class="bread-current bread-'.$post_type_name.'" href="/'. $post_type->rewrite['slug'] .'" title="'.$post_type->labels->name.'">'.__($post_type->labels->name, "odm").'</a></li>';
+        $post_type_lable = ($post_type->labels->name =="Posts")? __("Blogs", "odm") : $post_type->labels->name;
+        echo '<li class="item-post-type"><a class="bread-current bread-'.$post_type_name.'" href="/'. $post_type->rewrite['slug'] .'" title="'.$post_type_lable.'">'.__($post_type_lable, "odm").'</a></li>';
         echo the_separated_breadcrumb($separator, '', 'post-type');
         if ($post_type_name  == 'topic'):
           echo_the_breadcrumb_single_topic($separator);

From 31cf52138d8f34363a88f47a0f22249e6c12fbfe Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:33:35 +0700
Subject: [PATCH 31/49] Add link to the three dots

---
 inc/utils/content.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/utils/content.php b/inc/utils/content.php
index 01bff9f4..8301bb95 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -473,11 +473,11 @@ function odm_excerpt($the_post, $num = 45, $read_more = '')
 		  		$excerpt_content = implode("&#8203;", $excerpt_zeo_space); //implode by zerowidthspace
 				endif;
 
-				$excerpt_words = $excerpt_content.' ...';
-
+				$color_name = odm_country_manager()->get_current_country().'-color';
 				if ($read_more != ''):
-					 $color_name = odm_country_manager()->get_current_country().'-color';
-					 $excerpt_words .=  " (<a href='".get_permalink($post->ID)." ' class='".$color_name."'>".__($read_more, 'odm').'</a>)';
+					$excerpt_words =  $excerpt_content." ... <a href='".get_permalink($post->ID)." ' class='".$color_name."'>".__($read_more, 'odm').'</a>';
+				else:
+					$excerpt_words = $excerpt_content." <a href='".get_permalink($post->ID)." ' class='".$color_name."'>...</a>";
 				endif;
 				return '<p>' . $excerpt_words . '</p>';
 			endif;

From 526f435f28713ef204a122c275c04e1758cbbb75 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:36:25 +0700
Subject: [PATCH 32/49] Updates should_open_row() for blog template

---
 inc/utils/layout.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/utils/layout.php b/inc/utils/layout.php
index 244c23ec..f531c6b5 100644
--- a/inc/utils/layout.php
+++ b/inc/utils/layout.php
@@ -81,6 +81,8 @@ function should_open_row($layout_type,$index){
     return true;
   }else if ($layout_type == 'list-1-cols'){
     return true;
+  }else if ($layout_type == 'blog-layout-2-cols' && ($index-1)%2 == 1){
+    return true;
   }
   return false;
 }

From 8ff75da6ccb47080b0118df12dff3b869c1f6979 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:37:11 +0700
Subject: [PATCH 33/49] Add new blog template

---
 inc/templates/post-blog-layout-2-cols.php | 191 ++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100644 inc/templates/post-blog-layout-2-cols.php

diff --git a/inc/templates/post-blog-layout-2-cols.php b/inc/templates/post-blog-layout-2-cols.php
new file mode 100644
index 00000000..e07a0ae6
--- /dev/null
+++ b/inc/templates/post-blog-layout-2-cols.php
@@ -0,0 +1,191 @@
+<?php
+	$post = isset($params["post"]) ? $params["post"] : null;
+	$show_meta = isset($params["show_meta"]) ? $params["show_meta"] : true;
+	$meta_fields = isset($params["meta_fields"]) ? $params["meta_fields"] : array("date");
+	$max_num_topics = isset($params["max_num_topics"]) ? $params["max_num_topics"] : null;
+	$max_num_tags = isset($params["max_num_tags"]) ? $params["max_num_tags"] : null;
+	$show_thumbnail = isset($params["show_thumbnail"]) ? $params["show_thumbnail"] : true;
+	$show_excerpt = isset($params["show_excerpt"]) ? $params["show_excerpt"] : false;
+	$show_source_meta = isset($params["show_source_meta"]) ? $params["show_source_meta"] : false;
+	$show_solr_meta = isset($params["show_solr_meta"]) ? $params["show_solr_meta"] : false;
+	$highlight_words_query = isset($params["highlight_words_query"]) ? $params["highlight_words_query"] : null;
+	$solr_search_result = isset($params["solr_search_result"]) ? $params["solr_search_result"] : null;
+	$show_post_type = isset($params["show_post_type"]) ? $params["show_post_type"] : false;
+	$show_summary_translated_by_odc_team = isset($params["show_summary_translated_by_odc_team"]) ? $params["show_summary_translated_by_odc_team"] : false;
+	$header_tag = isset($params["header_tag"]) ? $params["header_tag"] : false;
+	$order = isset($params["order"]) ? $params["order"] : "metadata_created";
+	$extra_classes = isset($params["extra_classes"]) ? $params["extra_classes"] : null;
+	$index = isset($params["index"]) ? $params["index"] : 0;
+
+	$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
+	$localized_title = !empty($localized_title) ? $localized_title : strip_shortcodes($post->post_title);
+?>
+<?php
+
+	if($index == 1):?>
+	<div class="sixteen columns<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
+		<div class="post-list-item post-blog-layout-2-cols single_result_container">
+			<?php if ($header_tag): ?>
+	      <?php
+	      $link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID); ?>
+				<h5>
+					<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $localized_title; ?>">
+						<?php
+							if ($show_post_type):
+								$post_type_name = get_post_type($post->ID); ?>
+								<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
+							<?php
+							endif; ?>
+						<?php echo $localized_title; ?>
+					</a>
+				</h5>
+			<?php else: ?>
+				<h5>
+					<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
+					<?php
+						if ($show_post_type):
+							$post_type_name = get_post_type($post->ID); ?>
+							<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
+						<?php
+						endif; ?>
+
+						<?php echo $localized_title; ?>
+					</a>
+				</h5>
+			<?php endif; ?>
+
+			<?php
+				if ($show_meta):
+					echo_post_meta($post,$meta_fields,$order,$max_num_topics,$max_num_tags);
+				endif;
+			?>
+
+			<section class="content item-content section-content blog-content">
+				<div class="float-left">
+					<?php
+					if ($show_thumbnail):
+						$thumb_src = odm_get_thumbnail($post->ID, false, array( 535, 350), true);
+						if (isset($thumb_src)):
+							echo '<div class="blog-layout-img"><div class="blog-layout-thumb">'.$thumb_src.'</div></div>';
+						else:
+							echo_documents_cover($post->ID);
+						endif;
+					endif;
+					?>
+				</div>
+
+					<?php
+						if ($show_excerpt || $show_source_meta): ?>
+						<?php
+							if ($show_excerpt): ?>
+							<div class="post-excerpt">
+								<?php
+									$excerpt = odm_excerpt($post, 160);
+									if (isset($highlight_words_query) && function_exists('wp_odm_solr_highlight_search_words')):
+										$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
+									endif;
+									echo $excerpt;?>
+							</div>
+							<?php
+							endif;
+							if ($show_source_meta):
+								odm_echo_extras();
+							endif;
+
+							echo_downloaded_documents();
+
+						endif;
+						?>
+			</section>
+
+			<?php
+				if ($show_solr_meta && isset($solr_search_result)):
+					odm_echo_solr_meta($solr_search_result);
+				endif; ?>
+
+		</div>
+	</div>
+<?php
+	else:
+?>
+	<div class="eight columns<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
+	<div class="post-list-item post-blog-layout-2-cols single_result_container">
+		<?php if ($header_tag): ?>
+      <?php
+      $link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID); ?>
+			<h5>
+				<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $localized_title; ?>">
+					<?php
+						if ($show_post_type):
+							$post_type_name = get_post_type($post->ID); ?>
+							<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
+						<?php
+						endif; ?>
+					<?php echo $localized_title; ?>
+				</a>
+			</h5>
+		<?php else: ?>
+			<h5>
+				<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
+				<?php
+					if ($show_post_type):
+						$post_type_name = get_post_type($post->ID); ?>
+						<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
+					<?php
+					endif; ?>
+
+					<?php echo $localized_title; ?>
+				</a>
+			</h5>
+		<?php endif; ?>
+
+		<?php
+			if ($show_meta):
+				echo_post_meta($post,$meta_fields,$order,$max_num_topics,$max_num_tags);
+			endif; ?>
+
+		<section class="content item-content section-content blog-content">
+			<?php
+			if ($show_thumbnail):
+				$thumb_src = odm_get_thumbnail($post->ID, false, array( 535, 350));
+				if (isset($thumb_src)):
+					echo '<div class="blog-layout-img"><div class="blog-layout-thumb">'.$thumb_src.'</div></div>';
+				else:
+					echo_documents_cover($post->ID);
+				endif;
+			endif;
+			?>
+			<?php
+				if ($show_excerpt || $show_source_meta): ?>
+				<?php
+					if ($show_excerpt): ?>
+					<div class="post-excerpt">
+						<?php
+							$excerpt = odm_excerpt($post);
+							if (isset($highlight_words_query) && function_exists('wp_odm_solr_highlight_search_words')):
+								$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
+							endif;
+							echo $excerpt;?>
+					</div>
+					<?php
+					endif;
+					if ($show_source_meta):
+						odm_echo_extras();
+					endif;
+
+					echo_downloaded_documents();
+
+				endif;
+				?>
+		</section>
+
+		<?php
+			if ($show_solr_meta && isset($solr_search_result)):
+				odm_echo_solr_meta($solr_search_result);
+			endif; ?>
+
+	</div>
+</div>
+<?php
+	endif;
+?>

From 19c7944185ad17ade41b9542c1b77f4cdd9875c4 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:37:49 +0700
Subject: [PATCH 34/49] Add new template to widget

---
 inc/widgets/odm-contents-same-category-widget.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/widgets/odm-contents-same-category-widget.php b/inc/widgets/odm-contents-same-category-widget.php
index 56beb642..6c558c01 100644
--- a/inc/widgets/odm-contents-same-category-widget.php
+++ b/inc/widgets/odm-contents-same-category-widget.php
@@ -19,7 +19,8 @@ public function __construct() {
 			"grid-1-cols" => "post-grid-single-1-cols",
 			"list-4-cols" => "post-list-single-4-cols",
 			"list-2-cols" => "post-list-single-2-cols",
-			"list-1-cols" => "post-list-single-1-cols"
+			"list-1-cols" => "post-list-single-1-cols",
+			"blog-layout-2-cols" => "post-blog-layout-2-cols"
 		);
 
 		$this->order_options = array(
@@ -111,7 +112,8 @@ public function widget( $args, $instance ) {
 								"show_source_meta" => $show_source_meta,
 								"show_excerpt" => $show_excerpt,
 								"show_thumbnail" => $show_thumbnail,
-								"order" => $order
+								"order" => $order,
+								"index" => $index
 							),true);
 							if (should_close_row($layout_type,$index)): ?>
 								</div>

From d8106f7cbcba80896d285af87fdfd59731ea9089 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:37:54 +0700
Subject: [PATCH 35/49] Add new template to widget

---
 inc/widgets/odm-custom-posts-widget.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/widgets/odm-custom-posts-widget.php b/inc/widgets/odm-custom-posts-widget.php
index aa8e5c99..76764117 100644
--- a/inc/widgets/odm-custom-posts-widget.php
+++ b/inc/widgets/odm-custom-posts-widget.php
@@ -22,7 +22,8 @@ public function __construct() {
 			"grid-1-cols" => "post-grid-single-1-cols",
 			"list-4-cols" => "post-list-single-4-cols",
 			"list-2-cols" => "post-list-single-2-cols",
-			"list-1-cols" => "post-list-single-1-cols"
+			"list-1-cols" => "post-list-single-1-cols",
+			"blog-layout-2-cols" => "post-blog-layout-2-cols"
 		);
 
 		$this->order_options = array(
@@ -105,7 +106,8 @@ public function widget( $args, $instance ) {
 									"show_source_meta" => $show_source_meta,
 									"show_excerpt" => $show_excerpt,
 									"show_thumbnail" => $show_thumbnail,
-									"order" => $order
+									"order" => $order,
+									"index" => $index
 								),true);
 								if (should_close_row($layout_type,$index)): ?>
 							</div>

From 27b8be6a5961de168e185258603375d3bd60b0d0 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:38:25 +0700
Subject: [PATCH 36/49] Add new less for blog

---
 less/_blog.less | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 less/_blog.less

diff --git a/less/_blog.less b/less/_blog.less
new file mode 100644
index 00000000..2614ccb2
--- /dev/null
+++ b/less/_blog.less
@@ -0,0 +1,53 @@
+.blog-content {
+  img {
+     margin-top:  0;
+     border:1px solid @light-gray;
+     padding: @small-padd;
+     max-width: 100%;
+     height: auto;
+     float: left;
+   }
+
+  .blog-layout-img {
+    display: inline-block;
+    border: 1px solid #c8c8c8;
+    padding: @small-padd;
+    margin-top: @xsmall-padd;
+    margin-bottom: @small-padd;;
+    margin-right: 20px;
+
+    .blog-layout-thumb{
+      max-height: 300px;
+      overflow: hidden;
+
+    }
+    img{
+      border: none;
+      margin: 0;
+      padding: 0;
+    }
+  }
+}
+
+.single{
+  #post-content{
+    .blog-content {
+      img {
+         margin-top:  0;
+         border:1px solid @light-gray;
+         padding: @small-padd;
+         max-width: 100%;
+         height: auto;
+         float: left;
+       }
+
+       .wp-caption{
+         img {
+          border: 0;
+          margin: 0;
+          padding: 0 0 @xsmall-padd;
+         }
+       }
+    }
+  }
+}

From 9cb37054b4161d602a2a7f5f6f3076a467c49981 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:39:06 +0700
Subject: [PATCH 37/49] update the popup enlarge image for using everywhere

---
 less/_layout.less | 96 +++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/less/_layout.less b/less/_layout.less
index 6785fa77..486aad98 100644
--- a/less/_layout.less
+++ b/less/_layout.less
@@ -12,6 +12,13 @@ body{
 .clear, #clear{
  clear:both;
 }
+
+.clear-left, #clear-left{
+ clear:left;
+}
+.clear-right, #clear-right{
+ clear:right;
+}
 .float-right {
   float: right
 }
@@ -147,55 +154,55 @@ body{
 			left: 0px;
 			z-index: 10;
 		}
-    .popup-overlay {
-    	position: fixed !important;
-    	bottom: 0;
-    	height: auto !important;
-    	left: 0;
-    	right: 0;
-    	top: 0;
-    	width: auto !important;
-    	z-index: 9999999;
-    	margin-bottom: 0;
-    	background:  rgba(0, 0, 0, 0.9) ;
-      width: 100%;
-    	padding: 1em;
-      display: none;
-
-      img.popup-enlarge {
-        display: inline;
-        position: absolute;
-        width: 90% !important;
-        height: 90%;
-        margin: auto;
-        right: 0;
-        left: 0;
-        top: 0;
-        bottom: 0;
-        border: 10px solid;
-        background: #fff url('../../img/loading.gif') no-repeat center center;
-        background-size: 30px 30px;
-
-        &:hover {
-          -webkit-transform: none;
-          transform: none;
-        }
-      }
+	}
 
-      .fa-times-circle {
-				cursor: pointer;
-				float: right;
-				font-size: 20px;
-				margin-right: -5px;
+}
 
-				&:hover{
-					color: lightcoral;
-				}
-			}
+.popup-overlay {
+  position: fixed !important;
+  bottom: 0;
+  height: auto !important;
+  left: 0;
+  right: 0;
+  top: 0;
+  width: auto !important;
+  z-index: 9999999;
+  margin-bottom: 0;
+  background:  rgba(0, 0, 0, 0.9) ;
+  width: 100%;
+  padding: 1em;
+  display: none;
 
+  img.popup-enlarge {
+    display: inline;
+    position: absolute;
+    width: 90% !important;
+    height: 90%;
+    margin: auto !important;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    border: 10px solid;
+    background: #fff url('../../img/loading.gif') no-repeat center center;
+    background-size: 30px 30px;
+
+    &:hover {
+      -webkit-transform: none;
+      transform: none;
     }
+  }
 
-	}
+  .fa-times-circle {
+    cursor: pointer;
+    float: right;
+    font-size: 20px;
+    margin-right: -5px;
+
+    &:hover{
+      color: lightcoral;
+    }
+  }
 
 }
 
@@ -340,7 +347,6 @@ body{
   }
 
 }
-
 #documents_download {
   img {
     margin: 0!important;

From 3c1745717b5ee17f386543364206a62b894612ba Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:39:59 +0700
Subject: [PATCH 38/49] Update for new blog less

---
 less/_posts.less  | 26 +++++++++++++++++---------
 less/odm.less     |  1 +
 less/opendev.less |  4 +++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/less/_posts.less b/less/_posts.less
index b369d913..32efab73 100644
--- a/less/_posts.less
+++ b/less/_posts.less
@@ -218,7 +218,6 @@
 }
 
 .single {
-	
 	.documents_cover {
 		padding-right: @med-padd;
 		width: 150px;
@@ -227,16 +226,25 @@
     float: left;
 	}
 
-	#post-content img {
-		margin-top:  @xsmall-padd;
-		border:1px solid @light-gray;
-		padding: @xsmall-padd;
-		max-width: 140px;
-    height: auto;
-    float: left;
-    margin-right: 20px;
+	#post-content {
+			.fa-image-container img{
+				border: none;
+			}
+
+			img {
+				margin-top:  @xsmall-padd;
+				border:1px solid @light-gray;
+				padding: @xsmall-padd;
+				max-width: 140px;
+		    height: auto;
+		    float: left;
+		    margin-right: 20px;
+			}
 	}
 
+
+
+
 }
 /*
  * Page
diff --git a/less/odm.less b/less/odm.less
index 130f3996..5cbe9ef2 100644
--- a/less/odm.less
+++ b/less/odm.less
@@ -20,6 +20,7 @@
 @import "_feature-box.less";
 @import "_search.less";
 @import "_news.less";
+@import "_blog.less";
 @import "_posts.less";
 @import "_sidebar-widget.less";
 @import "_sticky-posts.less";
diff --git a/less/opendev.less b/less/opendev.less
index ac23cd2a..1c13d2e0 100644
--- a/less/opendev.less
+++ b/less/opendev.less
@@ -75,6 +75,8 @@ td{
     max-width: 100%;
     margin-bottom: 24px;
     border: 1px solid #DDD;
+    padding: @small-padd;
+    padding-right: 0;
     background: #F4F4F4 none repeat scroll 0%;
 
     img {
@@ -145,7 +147,7 @@ td{
 }
 
 .section-content {
-  
+
 	.post-categories li {
 		margin-bottom: 0;
 	}

From 459b93938e1c242c73aa7644a5239f7d8a1fcdc6 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:41:15 +0700
Subject: [PATCH 39/49] replace get_the_content() with the_content()

---
 single.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/single.php b/single.php
index ff1ea239..e686ce7a 100644
--- a/single.php
+++ b/single.php
@@ -34,13 +34,13 @@
 									endif;
 
 									if(get_the_content()):
-										echo "<p>".get_the_content()."</p>";
+											the_content();
 									endif;
 
 									odm_echo_extras();
 
 									echo_downloaded_documents();
-									
+
 									?>
 								</div>
 							</section>

From 5b96cd10132ec8c7160162458c1fabc51f191194 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:41:46 +0700
Subject: [PATCH 40/49] Add new page template and single page for blog.

---
 page-blog.php   | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 single-post.php | 58 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 page-blog.php
 create mode 100644 single-post.php

diff --git a/page-blog.php b/page-blog.php
new file mode 100644
index 00000000..d083a1d7
--- /dev/null
+++ b/page-blog.php
@@ -0,0 +1,67 @@
+<?php
+/*
+Template Name: Blog Page
+*/
+?>
+<?php get_header(); ?>
+<?php
+  $options = get_option('odm_options');
+  $date_to_show = isset($options['single_page_date']) ? $options['single_page_date'] : "metadata_created";
+?>
+
+  <section class="container section-title main-title">
+   <header class="row">
+     <div class="eight columns">
+       <h1><?php the_title(); ?></h1>
+     </div>
+   </header>
+  </section>
+<?php
+  global $paged;
+	$paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
+?>
+<?php query_posts('post_type=post&post_status=publish&posts_per_page=20&paged='. $paged); ?>
+
+<?php if( have_posts() ): ?>
+  <section id="blog" class="container">
+    <div id="post-content" class="row">
+      <div class="sixteen columns">
+        <?php
+  				$index = 1;
+  				while (have_posts()) : the_post();
+  				if (should_open_row("blog-layout-2-cols",$index)): ?>
+  					<div class="row">
+  				<?php endif;
+  				odm_get_template('post-blog-layout-2-cols',array(
+  					"post" => get_post(),
+  					"show_meta" => true,
+  					"meta_fields" => array("date","categories","tags"),
+  					"show_source_meta" => true,
+  					"show_thumbnail" => true,
+  					"show_excerpt" => true,
+  					"show_summary_translated_by_odc_team" => true,
+  					"header_tag" => true,
+  					"order" => $date_to_show,
+  					"index" => $index
+  			),true);
+  			if (should_close_row("blog-layout-2-cols",$index)): ?>
+  				</div>
+  			<?php endif;
+  			$index++;
+  			endwhile; ?>
+        </div>
+      </div>
+    </section>
+  <?php endif; ?>
+
+  <section class="container">
+  	<div class="row">
+  		<div class="sixteen columns">
+  			<?php odm_get_template('pagination',array(),true); ?>
+  		</div>
+  	</div>
+  </section>
+
+              <?php if(function_exists('wp_page_numbers')) : wp_page_numbers(); endif; ?>
+  <?php wp_reset_query(); ?>
+  <?php get_footer(); ?>
diff --git a/single-post.php b/single-post.php
new file mode 100644
index 00000000..098928d3
--- /dev/null
+++ b/single-post.php
@@ -0,0 +1,58 @@
+<?php get_header(); ?>
+
+<?php if (have_posts()) : the_post();
+	$options = get_option('odm_options');
+	$date_to_show = isset($options['single_page_date']) ? $options['single_page_date'] : "metadata_created";
+	?>
+
+  <article id="content" class="single-post single-blog">
+
+    <section class="container section-title main-title">
+        <div class="eleven columns post-title">
+          <header class="row">
+          <h1><?php the_title(); ?></h1>
+          <?php echo_post_meta(get_post(),array('date','categories','tags'),$date_to_show); ?>
+					</header>
+					<section class="content section-content">
+							<section id="post-content" class="row">
+								<div class="item-content blog-content">
+									<?php
+									if(get_the_content()):
+										the_content();
+									endif;
+
+									odm_echo_extras();
+
+									echo_downloaded_documents();
+									?>
+								</div>
+							</section>
+            <?php
+              wp_link_pages(array(
+                      'before' => '<div class="page-links"><span class="page-links-title">'.__('Pages:', 'odm').'</span>',
+                      'after' => '</div>',
+                      'link_before' => '<span>',
+                      'link_after' => '</span>',
+              ));
+              ?>
+          </section>
+        </div>
+        <div class="four columns">
+          <div class="widget share-widget">
+            <?php odm_get_template('social-share',array(),true); ?>
+          </div>
+
+					<div>
+	          <aside id="sidebar">
+	            <ul class="widgets">
+	              <?php dynamic_sidebar('post'); ?>
+	            </ul>
+	          </aside>
+	        </div>
+        </div>
+    </section>
+  </article>
+
+<?php endif; ?>
+
+<?php get_footer(); ?>

From 337893029deb7a1e8dfbfcc36500989b70c9e6b2 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 18:55:21 +0700
Subject: [PATCH 41/49] Enhances responsive

---
 less/_mobile.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/less/_mobile.less b/less/_mobile.less
index d9c6f440..b0e45214 100644
--- a/less/_mobile.less
+++ b/less/_mobile.less
@@ -4,7 +4,7 @@ and (min-device-width: 768px)
 and (max-device-width: 1024px)
 and (orientation : landscape) {
   .float-left {
-    width: 83% !important;
+    max-width: 83% !important;
   }
 }
 
@@ -13,7 +13,7 @@ and (min-device-width: 768px)
 and (max-device-width: 1024px)
 and (orientation : portrait) {
   .float-left {
-    width: 77% !important;
+    max-width: 77% !important;
   }
 }
 

From 3443cea177ce5643280dcbc9b7ddc79916138fb5 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 13:58:02 +0200
Subject: [PATCH 42/49] Initial implementation of #1086

---
 functions.php         | 235 ++++++++++++++++++------------------------
 header.php            |  13 +--
 inc/utils/content.php |  44 ++++++++
 style.css             |   2 +-
 4 files changed, 146 insertions(+), 148 deletions(-)

diff --git a/functions.php b/functions.php
index 37413f3e..a13755ea 100644
--- a/functions.php
+++ b/functions.php
@@ -209,28 +209,27 @@ function odm_jeo_scripts()
   wp_register_script('jquery-ui', 'https://code.jquery.com/ui/1.11.4/jquery-ui.js');
   $site_name =  odm_country_manager()->get_current_country();
 
-  if (is_home()) {
+  if (is_home()):
       wp_enqueue_script('opendev-sticky', get_stylesheet_directory_uri().'/inc/jeo-scripts/sticky-posts.js', array('jeo.markers', 'jquery'), '0.1.2');
-  }
+  endif;
 
   if (is_page( array( 'map-explorer', 'embed' )) || is_singular('map') || is_singular('map-layer') || is_singular('profiles') || is_home()){
-      if ( file_exists( STYLESHEETPATH . '/inc/jeo-scripts/jeo.js')) {
-         wp_deregister_script('jeo');
-         wp_enqueue_script('jeo', get_stylesheet_directory_uri() . '/inc/jeo-scripts/jeo.js', array('mapbox-js', 'underscore', 'jquery'), '0.5.0');
-      }
-
-      if ( file_exists( STYLESHEETPATH . '/inc/jeo-scripts/fullscreen.js')){
-         wp_deregister_script('jeo.fullscreen');
-         wp_enqueue_script('jeo.fullscreen', get_stylesheet_directory_uri() . '/inc/jeo-scripts/fullscreen.js',array('jeo'), '0.2.0');
-      }
+    if ( file_exists( STYLESHEETPATH . '/inc/jeo-scripts/jeo.js')) {
+       wp_deregister_script('jeo');
+       wp_enqueue_script('jeo', get_stylesheet_directory_uri() . '/inc/jeo-scripts/jeo.js', array('mapbox-js', 'underscore', 'jquery'), '0.5.0');
+    }
 
-      wp_enqueue_script('BetterWMS', get_stylesheet_directory_uri() . '/inc/jeo-scripts/L.TileLayer.BetterWMS.js', array('jeo', 'jquery'), '1.0.0');
-      wp_enqueue_script('jeo.clearscreen', get_stylesheet_directory_uri() . '/inc/jeo-scripts/clearscreen.js', array('jeo'), '1.0.0');
-      wp_enqueue_script('mapping-script', get_stylesheet_directory_uri() . '/inc/jeo-scripts/mapping.js', array('jeo','jquery-ui'), '1.0.0');
-			wp_enqueue_script('html2canvas', get_stylesheet_directory_uri() . '/inc/html2canvas/html2canvas.js', array('jquery'), '0.34');
-			wp_enqueue_script('plugin.html2canvas', get_stylesheet_directory_uri() . '/inc/html2canvas/jquery.plugin.html2canvas.js', array('jquery'), '0.33');
-			wp_enqueue_script('printmap', get_stylesheet_directory_uri() . '/inc/jeo-scripts/printmap.js', array('jeo'), '1.1.0');
+    if ( file_exists( STYLESHEETPATH . '/inc/jeo-scripts/fullscreen.js')){
+       wp_deregister_script('jeo.fullscreen');
+       wp_enqueue_script('jeo.fullscreen', get_stylesheet_directory_uri() . '/inc/jeo-scripts/fullscreen.js',array('jeo'), '0.2.0');
+    }
 
+    wp_enqueue_script('BetterWMS', get_stylesheet_directory_uri() . '/inc/jeo-scripts/L.TileLayer.BetterWMS.js', array('jeo', 'jquery'), '1.0.0');
+    wp_enqueue_script('jeo.clearscreen', get_stylesheet_directory_uri() . '/inc/jeo-scripts/clearscreen.js', array('jeo'), '1.0.0');
+    wp_enqueue_script('mapping-script', get_stylesheet_directory_uri() . '/inc/jeo-scripts/mapping.js', array('jeo','jquery-ui'), '1.0.0');
+		wp_enqueue_script('html2canvas', get_stylesheet_directory_uri() . '/inc/html2canvas/html2canvas.js', array('jquery'), '0.34');
+		wp_enqueue_script('plugin.html2canvas', get_stylesheet_directory_uri() . '/inc/html2canvas/jquery.plugin.html2canvas.js', array('jquery'), '0.33');
+		wp_enqueue_script('printmap', get_stylesheet_directory_uri() . '/inc/jeo-scripts/printmap.js', array('jeo'), '1.1.0');
   }
 
   if ( file_exists(STYLESHEETPATH . '/inc/jeo-scripts/share-widget.js')) {
@@ -396,11 +395,11 @@ function odm_category_pre_get_posts($query)
 
 function odm_posts_clauses_join($join)
 {
-    global $wpdb;
-    if (get_post_type() == 'map' && get_post_type() == 'map-group'){
-      $join = " INNER JOIN {$wpdb->postmeta} m_maps ON ({$wpdb->posts}.ID = m_maps.post_id) ";
-    return $join;
-    }
+  global $wpdb;
+  if (get_post_type() == 'map' && get_post_type() == 'map-group'){
+    $join = " INNER JOIN {$wpdb->postmeta} m_maps ON ({$wpdb->posts}.ID = m_maps.post_id) ";
+  return $join;
+  }
 }
 add_filter('jeo_posts_clauses_join', 'odm_posts_clauses_join');
 
@@ -409,34 +408,33 @@ function odm_posts_clauses_where($where)
   if (get_post_type() == 'map' && get_post_type() == 'map-group'){
     $map_id = jeo_get_map_id();
     $where = '';
-     // MAP
-     if (get_post_type($map_id) == 'map') {
-         $where = " AND ( m_maps.meta_key = 'maps' AND CAST(m_maps.meta_value AS CHAR) = '{$map_id}' ) ";
-
-     // MAPGROUP
-     } elseif (get_post_type($map_id) == 'map-group') {
-       $groupdata = get_post_meta($map_id, 'mapgroup_data', true);
+    // MAP
+    if (get_post_type($map_id) == 'map') {
+      $where = " AND ( m_maps.meta_key = 'maps' AND CAST(m_maps.meta_value AS CHAR) = '{$map_id}' ) ";
+    // MAPGROUP
+    } elseif (get_post_type($map_id) == 'map-group') {
+      $groupdata = get_post_meta($map_id, 'mapgroup_data', true);
 
-       if (isset($groupdata['maps']) && is_array($groupdata['maps'])) {
-           $where = ' AND ( ';
+      if (isset($groupdata['maps']) && is_array($groupdata['maps'])) {
+        $where = ' AND ( ';
 
-           $size = count($groupdata['maps']);
-           $i = 1;
+        $size = count($groupdata['maps']);
+        $i = 1;
 
-           foreach ($groupdata['maps'] as $m) {
-               $c_map_id = $m['id'];
+        foreach ($groupdata['maps'] as $m) {
+          $c_map_id = $m['id'];
 
-               $where .= " ( m_maps.meta_key = 'maps' AND CAST(m_maps.meta_value AS CHAR) = '{$c_map_id}' ) ";
+          $where .= " ( m_maps.meta_key = 'maps' AND CAST(m_maps.meta_value AS CHAR) = '{$c_map_id}' ) ";
 
-               if ($i < $size) {
-                   $where .= ' OR ';
-               }
+          if ($i < $size) {
+            $where .= ' OR ';
+          }
 
-               ++$i;
-           }
-           $where .= ' ) ';
+          ++$i;
+        }
+        $where .= ' ) ';
        }
-     }
+    }
     return $where;
   }
 }
@@ -444,25 +442,25 @@ function odm_posts_clauses_where($where)
 
 function odm_ignore_sticky($query)
 {
-    if ($query->is_main_query()) {
-        $query->set('ignore_sticky_posts', true);
-    }
+  if ($query->is_main_query()) {
+    $query->set('ignore_sticky_posts', true);
+  }
 }
 add_action('pre_get_posts', 'odm_ignore_sticky');
 
 function my_mce_buttons_2($buttons)
 {
-    array_unshift($buttons, 'fontselect', 'fontsizeselect');
-    $buttons[] = 'superscript';
-    $buttons[] = 'subscript';
+  array_unshift($buttons, 'fontselect', 'fontsizeselect');
+  $buttons[] = 'superscript';
+  $buttons[] = 'subscript';
 
-    return $buttons;
+  return $buttons;
 }
 add_filter('mce_buttons_2', 'my_mce_buttons_2');
 
 function hide_other_country_page_template($pages_templates)
 {
-   return $pages_templates;
+  return $pages_templates;
 }
 add_filter('theme_page_templates', 'hide_other_country_page_template');
 
@@ -471,10 +469,10 @@ function hide_other_country_page_template($pages_templates)
  *****/
 function add_iframe($initArray)
 {
-    $initArray['extended_valid_elements'] = 'iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width|allowtransparency|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|oallowfullscreen|msallowfullscreen]';
-    $initArray['extended_valid_elements_div'] = 'div[id|style]';
+  $initArray['extended_valid_elements'] = 'iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width|allowtransparency|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|oallowfullscreen|msallowfullscreen]';
+  $initArray['extended_valid_elements_div'] = 'div[id|style]';
 
-    return $initArray;
+  return $initArray;
 }
 // this function alters the way the WordPress editor filters your code
 add_filter('tiny_mce_before_init', 'add_iframe');
@@ -488,24 +486,23 @@ function add_iframe($initArray)
 if (!function_exists('tmce_replace')) {
     function tmce_replace()
     {
-        $tadv_options = get_option('tadv_options', array());
-        $tadv_plugins = get_option('tadv_plugins', array());
-
-        ?>
-        <script type="text/javascript">
-            if ( typeof(jQuery) != 'undefined' ) {
-              jQuery('body').bind('afterPreWpautop', function(e, o){
-                o.data = o.unfiltered
-                .replace(/caption\]\ +?<\/object>/g, function(a) {
-                  return a.replace(/[\r\n]+/g, ' ');
-                });
-              }).bind('afterWpautop', function(e, o){
-                o.data = o.unfiltered;
-              });
-            }
-        </script>
+      $tadv_options = get_option('tadv_options', array());
+      $tadv_plugins = get_option('tadv_plugins', array());
+
+      ?>
+      <script type="text/javascript">
+        if ( typeof(jQuery) != 'undefined' ) {
+          jQuery('body').bind('afterPreWpautop', function(e, o){
+            o.data = o.unfiltered
+            .replace(/caption\]\ +?<\/object>/g, function(a) {
+              return a.replace(/[\r\n]+/g, ' ');
+            });
+          }).bind('afterWpautop', function(e, o){
+            o.data = o.unfiltered;
+          });
+        }
+      </script>
 <?php
-
     }//end function
   add_action('after_wp_tiny_mce', 'tmce_replace');
 }
@@ -513,85 +510,53 @@ function tmce_replace()
 // http://tinymce.moxiecode.com/wiki.php/Configuration
 function teslina_tinymce_config($init)
 {
-    // Change code cleanup/content filtering config
-    // Don't remove line breaks
-    $init['remove_linebreaks'] = false;
-    // Convert newline characters to BR tags
-    //$init['convert_newlines_to_brs'] = true;
-    //$init['force_br_newlines '] = true;
-
-    // With this option set to false, the line breaks are stripped from the HTML source.
-    $init['apply_source_formatting'] = true;
-    // Preserve tab/space whitespace
-    $init['preformatted'] = true;
-    // Do not remove redundant BR tags
-    $init['remove_redundant_brs'] = false;
-
-    return $init;
+  // Change code cleanup/content filtering config
+  // Don't remove line breaks
+  $init['remove_linebreaks'] = false;
+  // Convert newline characters to BR tags
+  //$init['convert_newlines_to_brs'] = true;
+  //$init['force_br_newlines '] = true;
+
+  // With this option set to false, the line breaks are stripped from the HTML source.
+  $init['apply_source_formatting'] = true;
+  // Preserve tab/space whitespace
+  $init['preformatted'] = true;
+  // Do not remove redundant BR tags
+  $init['remove_redundant_brs'] = false;
+
+  return $init;
 }
 add_filter('tiny_mce_before_init', 'teslina_tinymce_config');
 
 function migrate_tags_to_related() {
-
-		ob_start();
-		include( dirname(__FILE__) . '/admin-scripts/migrate-tags-to-related.php' );
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
+	ob_start();
+	include( dirname(__FILE__) . '/admin-scripts/migrate-tags-to-related.php' );
+	$output = ob_get_contents();
+	ob_end_clean();
+	return $output;
 }
 add_shortcode( 'admin_scripts_migrate_tags_to_related', 'migrate_tags_to_related' );
 
 function convert_keywords_to_related() {
-
-		ob_start();
-		include( dirname(__FILE__) . '/admin-scripts/convert-keywords-to-related.php' );
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
+	ob_start();
+	include( dirname(__FILE__) . '/admin-scripts/convert-keywords-to-related.php' );
+	$output = ob_get_contents();
+	ob_end_clean();
+	return $output;
 }
 add_shortcode( 'admin_scripts_convert_keywords_to_related', 'convert_keywords_to_related' );
 
 function posts_by_category_and_type() {
-
-		ob_start();
-		include( dirname(__FILE__) . '/admin-scripts/posts-by-category-and-type.php' );
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
+	ob_start();
+	include( dirname(__FILE__) . '/admin-scripts/posts-by-category-and-type.php' );
+	$output = ob_get_contents();
+	ob_end_clean();
+	return $output;
 }
 add_shortcode( 'admin_scripts_posts_by_category_and_type', 'posts_by_category_and_type' );
 
-function add_custom_meta_tags() {
-    global $post;
-
-    ?>
-
-    <!-- ODM -->
-    <meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
-    <!-- ODC -->
-    <meta name="google-site-verification" content="Wj4wmK5q6lq4Rk0x4iqDhuBFaZxfTY2luq9p09Qr2kM" />
-    <!-- ODMM -->
-    <meta name="google-site-verification" content="BXhPDDG3ECyUWrdJqbsVr0eba3buOb8XEjV9nudDSk4" />
-    <!-- ODV -->
-    <meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
-    <!-- ODL -->
-    <meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
-    <!-- ODT -->
-    <meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
-    <?php
-    if(is_single()) {
-
-    ?>
-
-    <meta property="odm_spatial_range" content="<?php echo odm_country_manager()->get_current_country_code(); ?>"/>
-    <meta property="odm_language" content="<?php echo odm_language_manager()->get_current_language(); ?>"/>
-    <meta property="odm_type" content="<?php echo get_post_type(); ?>"/>
-    <meta property="odm_license" content="CC-BY-SA-4.0"/>
-
-    <?php
-    } else {
-      return;
-    }
+function add_custom_meta_tags() {    
+  set_site_meta();
 }
 add_action('wp_head', 'add_custom_meta_tags', 5);
 
diff --git a/header.php b/header.php
index 3df0343e..dbd2b320 100644
--- a/header.php
+++ b/header.php
@@ -16,18 +16,7 @@
 <title>
 
   <?php
-    wp_title('|', true, 'right');
-
-    bloginfo('name');
-
-    $site_description = get_bloginfo('description', 'display');
-    if ($site_description && (is_home() || is_front_page())) {
-        echo " | $site_description";
-    }
-
-    if ($paged >= 2 || $page >= 2) {
-        echo ' | '.__('Page', 'odm').max($paged, $page);
-    } ?>
+    set_site_title(); ?>
 
 </title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
diff --git a/inc/utils/content.php b/inc/utils/content.php
index 01bff9f4..2677089a 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -1,5 +1,49 @@
 <?php
 
+function set_site_title(){
+	global $post, $page, $paged;
+	wp_title('|', true, 'right');
+
+	bloginfo('name');
+
+	$site_description = get_bloginfo('description', 'display');
+	if ($site_description && (is_home() || is_front_page())) {
+			echo " | $site_description";
+	}
+
+	if ($paged >= 2 || $page >= 2) {
+			echo ' | '.__('Page', 'odm').max($paged, $page);
+	} 
+}
+
+function set_site_meta(){ ?>
+	
+	<!-- ODM -->
+	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
+	<!-- ODC -->
+	<meta name="google-site-verification" content="Wj4wmK5q6lq4Rk0x4iqDhuBFaZxfTY2luq9p09Qr2kM" />
+	<!-- ODMM -->
+	<meta name="google-site-verification" content="BXhPDDG3ECyUWrdJqbsVr0eba3buOb8XEjV9nudDSk4" />
+	<!-- ODV -->
+	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
+	<!-- ODL -->
+	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
+	<!-- ODT -->
+	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
+<?php
+	if(is_single()): ?>
+
+		<meta property="odm_spatial_range" content="<?php echo odm_country_manager()->get_current_country_code(); ?>"/>
+		<meta property="odm_language" content="<?php echo odm_language_manager()->get_current_language(); ?>"/>
+		<meta property="odm_type" content="<?php echo get_post_type(); ?>"/>
+		<meta property="odm_license" content="CC-BY-SA-4.0"/>
+
+<?php
+	else:
+		return;
+	endif;
+}
+
 function get_post_type_icon_class($type){
 
 	$icon = "fa fa-database";
diff --git a/style.css b/style.css
index 631df392..1e1297f7 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author: Open Development Mekong
 Author URI: http://github.com/OpenDevelopmentMekong
 Description: Open Development Mekong's wordpress theme. Based on JEO child theme
 Template: jeo
-Version: 2.3.0
+Version: 2.3.1
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */

From c150a1dde78fc3414cbafaf88ecb6a0849427c53 Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 19:01:31 +0700
Subject: [PATCH 43/49] Improve responsive for wp-caption

---
 less/_mobile.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/less/_mobile.less b/less/_mobile.less
index b0e45214..5db3ca67 100644
--- a/less/_mobile.less
+++ b/less/_mobile.less
@@ -6,6 +6,9 @@ and (orientation : landscape) {
   .float-left {
     max-width: 83% !important;
   }
+  .wp-caption{
+    padding: 10px;
+  }
 }
 
 @media screen
@@ -15,6 +18,9 @@ and (orientation : portrait) {
   .float-left {
     max-width: 77% !important;
   }
+  .wp-caption{
+    padding: 10px;
+  }
 }
 
 @media screen and (min-device-width: 320px) and (max-device-width: 768px) {

From fc47fe99a583fcb31293dc586ad42e5add951387 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 15:32:05 +0200
Subject: [PATCH 44/49] Fixes #1086

---
 functions.php         |  2 +-
 inc/utils/content.php | 76 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/functions.php b/functions.php
index a13755ea..b1691e90 100644
--- a/functions.php
+++ b/functions.php
@@ -555,7 +555,7 @@ function posts_by_category_and_type() {
 }
 add_shortcode( 'admin_scripts_posts_by_category_and_type', 'posts_by_category_and_type' );
 
-function add_custom_meta_tags() {    
+function add_custom_meta_tags() {
   set_site_meta();
 }
 add_action('wp_head', 'add_custom_meta_tags', 5);
diff --git a/inc/utils/content.php b/inc/utils/content.php
index 2677089a..99bf7be2 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -2,22 +2,30 @@
 
 function set_site_title(){
 	global $post, $page, $paged;
-	wp_title('|', true, 'right');
+
+	if (is_page() && is_page_template('page-dataset-detail.php')):
+		$dataset_id = isset($_GET["id"]) ? $_GET["id"] : null;
+		$dataset_title = wpckan_get_dataset_title($dataset_id);
+		echo "$dataset_title | ";
+	else:
+		wp_title('|', true, 'right');
+	endif;
 
 	bloginfo('name');
 
 	$site_description = get_bloginfo('description', 'display');
-	if ($site_description && (is_home() || is_front_page())) {
-			echo " | $site_description";
-	}
+	if ($site_description && (is_home() || is_front_page())):
+		echo " | $site_description";
+	endif;
 
-	if ($paged >= 2 || $page >= 2) {
-			echo ' | '.__('Page', 'odm').max($paged, $page);
-	} 
+	if ($paged >= 2 || $page >= 2):
+		echo ' | '.__('Page', 'odm'). " " . max($paged, $page);
+	endif;
 }
 
-function set_site_meta(){ ?>
-	
+function set_site_meta(){
+	global $post; ?>
+
 	<!-- ODM -->
 	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
 	<!-- ODC -->
@@ -30,18 +38,56 @@ function set_site_meta(){ ?>
 	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
 	<!-- ODT -->
 	<meta name="google-site-verification" content="wSjmxxjHngo-qyApV6i_ACDJ6EgX6bkl1VthAXS0s_I" />
+
+	<!-- ODM Metadata -->
+	<meta property="odm_spatial_range" content="<?php echo odm_country_manager()->get_current_country_code(); ?>"/>
+	<meta property="odm_language" content="<?php echo odm_language_manager()->get_current_language(); ?>"/>
+	<meta property="odm_license" content="CC-BY-SA-4.0"/>
+
 <?php
 	if(is_single()): ?>
 
-		<meta property="odm_spatial_range" content="<?php echo odm_country_manager()->get_current_country_code(); ?>"/>
-		<meta property="odm_language" content="<?php echo odm_language_manager()->get_current_language(); ?>"/>
 		<meta property="odm_type" content="<?php echo get_post_type(); ?>"/>
-		<meta property="odm_license" content="CC-BY-SA-4.0"/>
+		<meta property="og:title" content="<?php echo get_the_title(); ?>" />
+		<meta name="twitter:title" content="<?php echo get_the_title(); ?>" />
+
+		<meta property="og:image" content="<?php echo wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full');?>" />
+		<meta name="twitter:image" content="<?php echo wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full');?>" />
+		<meta property="og:url" content="<?php echo get_permalink(); ?>" />
 
 <?php
-	else:
-		return;
-	endif;
+	elseif (is_page() && is_page_template('page-dataset-detail.php')):
+		$dataset_id = isset($_GET["id"]) ? $_GET["id"] : null;
+		$dataset_title = wpckan_get_dataset_title($dataset_id); ?>
+
+		<meta property="og:title" content="<?php echo $dataset_title; ?>" />
+		<meta name="twitter:title" content="<?php echo $dataset_title; ?>" />
+
+		<meta property="og:url" content="<?php echo get_site_url() . wpckan_get_link_to_dataset($dataset_id); ?>" />
+
+	<?php
+	endif; ?>
+
+	<?php
+	 	$excerpt = get_the_excerpt();
+		if (!empty($excerpt)): ?>
+			<meta name="description" content="<?php echo strip_tags($excerpt); ?>" />
+			<meta name="twitter:description" content="<?php echo strip_tags($excerpt); ?>" />
+			<meta property="og:description" content="<?php echo strip_tags($excerpt); ?>" />
+	<?php
+    endif;	?>
+
+	<?php
+	 	$tags = get_the_tags();
+		if (!empty($tags)): ?>
+			<meta name="keywords" content="<?php echo implode(",",$tags); ?>" />
+	<?php
+    endif;	?>
+
+	<meta property="og:type" content="article" />
+	<meta name="twitter:card" content="summary" />
+
+	<?php
 }
 
 function get_post_type_icon_class($type){

From 29f11d4f1439fc2675c64a40092b435c7bcede0c Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 15:38:24 +0200
Subject: [PATCH 45/49] Fixes #1086

---
 header.php            | 15 +--------------
 inc/utils/content.php |  2 ++
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/header.php b/header.php
index dbd2b320..b2224470 100644
--- a/header.php
+++ b/header.php
@@ -5,20 +5,7 @@
 <?php global $post, $page, $paged; ?>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta charset="<?php bloginfo('charset'); ?>" />
-<meta property="og:title" content="<?php the_title(); ?>" />
-<meta property="og:description" content="<?php echo odm_excerpt($post); ?>" />
-<meta property="og:site_name" content="<?php bloginfo('name'); ?>"/>
-<meta property="og:type" content="opendevelopment:<?php echo get_post_type(); ?>" />
-<?php if(isset($post) && has_post_thumbnail( $post->ID )) { ?>
-<meta property="og:image" content="<?php $img_src = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full', false); echo $img_src[0]; ?>" />
-<?php } ?>
-<meta property="og:url" content="<?php echo get_permalink()?>" />
-<title>
-
-  <?php
-    set_site_title(); ?>
-
-</title>
+<title><?php set_site_title(); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
diff --git a/inc/utils/content.php b/inc/utils/content.php
index 99bf7be2..6490defa 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -68,6 +68,8 @@ function set_site_meta(){
 	<?php
 	endif; ?>
 
+	<meta property="og:site_name" content="<?php bloginfo('name'); ?>"/>
+
 	<?php
 	 	$excerpt = get_the_excerpt();
 		if (!empty($excerpt)): ?>

From 3b7989ac01732b8364f4d7f8b97a89d62119b749 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 15:42:10 +0200
Subject: [PATCH 46/49] Fixes #1086

---
 inc/utils/content.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/inc/utils/content.php b/inc/utils/content.php
index 6490defa..41e9ba00 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -51,8 +51,15 @@ function set_site_meta(){
 		<meta property="og:title" content="<?php echo get_the_title(); ?>" />
 		<meta name="twitter:title" content="<?php echo get_the_title(); ?>" />
 
-		<meta property="og:image" content="<?php echo wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full');?>" />
-		<meta name="twitter:image" content="<?php echo wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'full');?>" />
+	<?php
+	 	$img_array = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'thumbnail');
+		$img_url = $img_array["url"];
+		if (!empty($img_url)): ?>
+			<meta property="og:image" content="<?php echo $img_url; ?>" />
+			<meta name="twitter:image" content="<?php echo $img_url; ?>" />
+	<?php
+		endif; ?>
+
 		<meta property="og:url" content="<?php echo get_permalink(); ?>" />
 
 <?php

From a5895f9831616127baaf6f456af1eb36c191fe86 Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 15:44:27 +0200
Subject: [PATCH 47/49] Fixes #1086

---
 inc/utils/content.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/utils/content.php b/inc/utils/content.php
index 41e9ba00..2ef1b949 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -53,7 +53,7 @@ function set_site_meta(){
 
 	<?php
 	 	$img_array = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'thumbnail');
-		$img_url = $img_array["url"];
+		$img_url = $img_array[0];
 		if (!empty($img_url)): ?>
 			<meta property="og:image" content="<?php echo $img_url; ?>" />
 			<meta name="twitter:image" content="<?php echo $img_url; ?>" />

From e16785b73fa6b09c17571f805179e68da900c01e Mon Sep 17 00:00:00 2001
From: Alex Corbi <a.corbi@gmail.com>
Date: Wed, 12 Jul 2017 15:48:49 +0200
Subject: [PATCH 48/49] Fixes #1086

---
 inc/utils/content.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/inc/utils/content.php b/inc/utils/content.php
index 2ef1b949..fd553408 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -51,6 +51,15 @@ function set_site_meta(){
 		<meta property="og:title" content="<?php echo get_the_title(); ?>" />
 		<meta name="twitter:title" content="<?php echo get_the_title(); ?>" />
 
+	<?php
+	 	$excerpt = get_the_excerpt();
+		if (!empty($excerpt)): ?>
+			<meta name="description" content="<?php echo strip_tags($excerpt); ?>" />
+			<meta name="twitter:description" content="<?php echo strip_tags($excerpt); ?>" />
+			<meta property="og:description" content="<?php echo strip_tags($excerpt); ?>" />
+	<?php
+    endif;	?>
+
 	<?php
 	 	$img_array = wp_get_attachment_image_src( get_post_thumbnail_id($post->ID), 'thumbnail');
 		$img_url = $img_array[0];
@@ -65,11 +74,14 @@ function set_site_meta(){
 <?php
 	elseif (is_page() && is_page_template('page-dataset-detail.php')):
 		$dataset_id = isset($_GET["id"]) ? $_GET["id"] : null;
-		$dataset_title = wpckan_get_dataset_title($dataset_id); ?>
+		$dataset_title = wpckan_get_dataset_title($dataset_id);
+		$dataset_description = wpckan_get_dataset_notes($dataset_id); ?>
 
 		<meta property="og:title" content="<?php echo $dataset_title; ?>" />
 		<meta name="twitter:title" content="<?php echo $dataset_title; ?>" />
-
+		<meta name="description" content="<?php echo $dataset_description; ?>" />
+		<meta name="twitter:description" content="<?php echo $dataset_description; ?>" />
+		<meta property="og:description" content="<?php echo $dataset_description; ?>" />
 		<meta property="og:url" content="<?php echo get_site_url() . wpckan_get_link_to_dataset($dataset_id); ?>" />
 
 	<?php
@@ -77,14 +89,7 @@ function set_site_meta(){
 
 	<meta property="og:site_name" content="<?php bloginfo('name'); ?>"/>
 
-	<?php
-	 	$excerpt = get_the_excerpt();
-		if (!empty($excerpt)): ?>
-			<meta name="description" content="<?php echo strip_tags($excerpt); ?>" />
-			<meta name="twitter:description" content="<?php echo strip_tags($excerpt); ?>" />
-			<meta property="og:description" content="<?php echo strip_tags($excerpt); ?>" />
-	<?php
-    endif;	?>
+
 
 	<?php
 	 	$tags = get_the_tags();

From 521969bfd9d39a38c59afd5f8acaf1d97ab9679e Mon Sep 17 00:00:00 2001
From: huyeng <huyeng.heng8@gmail.com>
Date: Wed, 12 Jul 2017 22:27:23 +0700
Subject: [PATCH 49/49] Prevents display the P tag or 3 dots if post has no
 content

---
 inc/utils/content.php | 8 ++++----
 single-post.php       | 2 +-
 single.php            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/utils/content.php b/inc/utils/content.php
index 8301bb95..df176cd7 100644
--- a/inc/utils/content.php
+++ b/inc/utils/content.php
@@ -457,10 +457,10 @@ function odm_excerpt($the_post, $num = 45, $read_more = '')
 		endif;
 
 		$translated_content = apply_filters('translate_text', $post_content, odm_language_manager()->get_current_language());
+
 		$stripped_content = strip_tags($translated_content);
 		$stripped_content = strip_shortcodes($stripped_content);
-
-		if($stripped_content):
+		if(trim($stripped_content)):
 			$stripped_content = preg_replace( "/\&hellip;/",'', trim($stripped_content));
 			$stripped_content_arr = explode(' ', trim($stripped_content), $num+1);
 
@@ -481,9 +481,9 @@ function odm_excerpt($the_post, $num = 45, $read_more = '')
 				endif;
 				return '<p>' . $excerpt_words . '</p>';
 			endif;
-		endif;
 
-		return '<p>' . $stripped_content . '</p>';
+			return '<p>' . $stripped_content . '</p>';
+		endif;
  }
 
 function echo_post_translated_by_od_team($postID, $current_lang = "en", $taxonomy ="language") {
diff --git a/single-post.php b/single-post.php
index 098928d3..abe6b450 100644
--- a/single-post.php
+++ b/single-post.php
@@ -17,7 +17,7 @@
 							<section id="post-content" class="row">
 								<div class="item-content blog-content">
 									<?php
-									if(get_the_content()):
+									if(trim(strip_tags(get_the_content()))):
 										the_content();
 									endif;
 
diff --git a/single.php b/single.php
index e686ce7a..1770d0fa 100644
--- a/single.php
+++ b/single.php
@@ -33,8 +33,8 @@
 										echo_documents_cover();
 									endif;
 
-									if(get_the_content()):
-											the_content();
+									if(trim(strip_tags(get_the_content()))):
+										the_content();
 									endif;
 
 									odm_echo_extras();