From eedf838d1f1f35116d9ad80abf6d5838f2f38e52 Mon Sep 17 00:00:00 2001
From: Fernando Ribeiro <pinguim.ribeiro@gmail.com>
Date: Fri, 7 Oct 2016 21:45:59 +0100
Subject: [PATCH 1/4] add image helper for easier image insertion in posts

---
 _includes/image | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 _includes/image

diff --git a/_includes/image b/_includes/image
new file mode 100644
index 000000000000..1c619bd710bd
--- /dev/null
+++ b/_includes/image
@@ -0,0 +1,14 @@
+{% include base_path %}
+
+<figure class="{{ include.class }}">
+  <img src=
+    {% if include.image_path contains "://" %}
+      "{{ include.image_path }}"
+    {% else %}
+      "{{ include.image_path | prepend: "/assets/images/" | prepend: base_path }}"
+    {% endif %}
+    alt="{% if include.alt %}{{ include.alt }}{% endif %}">
+  {% if include.caption %}
+    <figcaption>{{ include.caption | markdownify | remove: "<p>" | remove: "</p>" }}</figcaption>
+  {% endif %}
+</figure>

From 37d4eb8807465f964046680417dce9bd10060610 Mon Sep 17 00:00:00 2001
From: Fernando Ribeiro <pinguim.ribeiro@gmail.com>
Date: Sat, 5 Nov 2016 21:27:59 +0000
Subject: [PATCH 2/4] Update image

---
 _includes/image | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/_includes/image b/_includes/image
index 1c619bd710bd..fb8d9d238bf3 100644
--- a/_includes/image
+++ b/_includes/image
@@ -1,11 +1,9 @@
-{% include base_path %}
-
 <figure class="{{ include.class }}">
   <img src=
     {% if include.image_path contains "://" %}
       "{{ include.image_path }}"
     {% else %}
-      "{{ include.image_path | prepend: "/assets/images/" | prepend: base_path }}"
+      "{{ include.image_path | prepend: "/assets/images/" | prepend: absolute_url }}"
     {% endif %}
     alt="{% if include.alt %}{{ include.alt }}{% endif %}">
   {% if include.caption %}

From 637e5d99343cceeae9bd93cb0ea7231be5dcd10e Mon Sep 17 00:00:00 2001
From: Fernando Ribeiro <pinguim.ribeiro@gmail.com>
Date: Sat, 5 Nov 2016 21:46:02 +0000
Subject: [PATCH 3/4] Replace base_path with `absolute_url` filter

---
 _includes/image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/image b/_includes/image
index fb8d9d238bf3..63fe593dadb8 100644
--- a/_includes/image
+++ b/_includes/image
@@ -3,7 +3,7 @@
     {% if include.image_path contains "://" %}
       "{{ include.image_path }}"
     {% else %}
-      "{{ include.image_path | prepend: "/assets/images/" | prepend: absolute_url }}"
+      "{{ include.image_path | prepend: "/assets/images/" | absolute_url }}"
     {% endif %}
     alt="{% if include.alt %}{{ include.alt }}{% endif %}">
   {% if include.caption %}

From da9525974307e85bae3f4f676f7d20fc79541cfc Mon Sep 17 00:00:00 2001
From: Fernando Ribeiro <pinguim.ribeiro@gmail.com>
Date: Tue, 8 Nov 2016 20:15:41 +0000
Subject: [PATCH 4/4] Do not assume images would be placed in `/assets/images/`

In order to add an image to a post, just use the following syntax:

{% include image image_path="/full/path/to/MyPostImage.png" caption="The optional image caption" %}

or

{% include image image_path="https://example.com/images/MyPostImage.png" caption="The optional image caption" alt="The optional alt text" %}
---
 _includes/image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/image b/_includes/image
index 63fe593dadb8..da829e48fad7 100644
--- a/_includes/image
+++ b/_includes/image
@@ -3,7 +3,7 @@
     {% if include.image_path contains "://" %}
       "{{ include.image_path }}"
     {% else %}
-      "{{ include.image_path | prepend: "/assets/images/" | absolute_url }}"
+      "{{ include.image_path | absolute_url }}"
     {% endif %}
     alt="{% if include.alt %}{{ include.alt }}{% endif %}">
   {% if include.caption %}