1 files changed, 26 insertions, 4 deletions
diff --git a/templates/shortcodes/video.html b/templates/shortcodes/video.html
index c6bd867..1839376 100644
--- a/templates/shortcodes/video.html
+++ b/templates/shortcodes/video.html
@@ -1,7 +1,29 @@
-<video controls>
-  {% for source in sources -%}
-    {% set type = source | split(pat=".") | last -%}
-    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'video/' ~ type }}" />
+{%- if caption %}<figure class="fi{% if class %} {{class}}{% endif %}">{% endif -%}
+<video controls{% if class %} class="{{class}}"{% endif %}{% if w %} width="{{w}}"{% endif %}{% if h %} height="{{h}}"{% endif %}{% if autoplay %} autoplay{% endif %}{% if loop %} loop=true{% endif %}{% if muted %} muted=true{% endif %}>
+  {% for src in sources -%}
+
+  {%- set video = src | split(pat="/") | last %}
+  {%- set dirtest = src | trim_start_matches(pat="./") %}
+  {%- if dirtest is containing("/") %} {%- set reldir = true %} {%- endif %}
+  {%- if page.path %}{%- set pagepath = page.path %}{%- elif section.path %}{%- set pagepath = section.path %}{%- endif %}
+
+  {%- if src is starting_with("./") and reldir %} {# Relative Path #}
+    {%- set path = src | trim_start_matches(pat="./") | split(pat="/") | slice(end=-1) | join(sep="/") | trim_start_matches(pat="/") %}
+    {%- set path = path ~ "/" %}
+
+  {%- elif src is starting_with("/") %} {# Root Path #}
+    {%- set rootpath = src | split(pat="/") | slice(end=-1) | join(sep="/") %}
+    {%- set path = config.base_url ~ rootpath ~ "/"  %}
+
+  {%- else %} {# Same Directory Path #}
+    {%- set path = "" %}
+
+  {%- endif %}
+
+  {%- set type = src | split(pat=".") | last -%}
+  {%- if type is matching("^mov$") %}{% set type = "quicktime" %}{% endif -%}
+  <source src="{{ path | safe }}{{ video | safe }}" type="{{ 'video/' ~ type }}" />
   {% endfor -%}
   Your browser doesn't support the video tag and/or the video formats in use here – sorry!
 </video>
+{%- if caption %}<figcaption>{{caption}}</figcaption></figure>{% endif -%}