HTML5 Validation & Cleanup

8 files changed, 11 insertions, 13 deletions

diff --git a/templates/shortcodes/audio.html b/templates/shortcodes/audio.html
index 3f9368e..2dbce68 100644
--- a/templates/shortcodes/audio.html
+++ b/templates/shortcodes/audio.html
@@ -1,7 +1,7 @@
 <audio controls>
   {% for source in sources -%}
     {% set type = source | split(pat=".") | last -%}
-    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'audio/' ~ type }}">
+    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'audio/' ~ type }}" />
   {% endfor -%}
   Your browser doesn't support the audio tag and/or the audio formats in use here – sorry!
 </audio>
diff --git a/templates/shortcodes/gif.html b/templates/shortcodes/gif.html
index 3ae56fd..a49a879 100644
--- a/templates/shortcodes/gif.html
+++ b/templates/shortcodes/gif.html
@@ -1,7 +1,7 @@
 <video autoplay loop muted playsinline>
   {% for source in sources -%}
     {% set type = source | split(pat=".") | last -%}
-    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'video/' ~ type }}">
+    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'video/' ~ type }}" />
   {% endfor -%}
   Your browser doesn't support the video tag, which I use in place of .gifs, and/or the video formats in use here – sorry!
 </video>
diff --git a/templates/shortcodes/image.html b/templates/shortcodes/image.html
index 3653c8a..8452ce9 100644
--- a/templates/shortcodes/image.html
+++ b/templates/shortcodes/image.html
@@ -1,7 +1,7 @@
 <picture>
   {% for source in sources -%}
     {% set type = source | split(pat=".") | last -%}
-    <source srcset="{{ config.base_url | safe}}{{ page.path | safe }}{{ source | safe }}" type="{{ 'img/' ~ type }}">
+    <source srcset="{{ config.base_url | safe}}{{ page.path | safe }}{{ source | safe }}" type="{{ 'img/' ~ type }}" />
   {% endfor -%}
-  <img src="{{ fpath }}" alt="{{ falt | default(value='Image') }}" {% if fw %}width="{{fw}}" {% endif %}{% if fh %}height="{{fh}}" {% endif %}/>
+  <img src="{{ fpath }}" alt="{{ falt | default(value='Image') }}"{% if fw %} width="{{fw}}"{% endif %}{% if fh %} height="{{fh}}"{% endif %} />
 </picture>
diff --git a/templates/shortcodes/img.html b/templates/shortcodes/img.html
index 46fb39d..4645569 100644
--- a/templates/shortcodes/img.html
+++ b/templates/shortcodes/img.html
@@ -1,5 +1,3 @@
-{# {{ img(src="ferris.svg" class="" alt="" w=600 h=400) }} #}
-
 {%- set dirtest = src | trim_start_matches(pat="./") %}
 {%- if dirtest is containing("/") %}
   {%- set reldir = true %}
@@ -20,4 +18,4 @@
 
 {%- set img = src | split(pat="/") | last %}
 {%- set name = img | split(pat=".") | first %}
-<img src="{{ path | safe }}{{ img | safe }}" {% if class %}class="{{class}}" {% endif %}{% if alt %}alt="{{alt}}" {% endif %}{% if w %}width="{{w}}" {% endif %}{% if h %}height="{{h}}" {% endif %}/>
+<img src="{{ path | safe }}{{ img | safe }}"{% if class %} class="{{class}}"{% endif %}{% if alt %} alt="{{alt}}"{% endif %}{% if w %} width="{{w}}"{% endif %}{% if h %} height="{{h}}"{% endif %} />
diff --git a/templates/shortcodes/imghover.html b/templates/shortcodes/imghover.html
index 4bda6da..b1af3f9 100644
--- a/templates/shortcodes/imghover.html
+++ b/templates/shortcodes/imghover.html
@@ -29,7 +29,7 @@
     {%- set_global bg = source | split(pat="/") | last %}
   {%- else %}
     <div id="{{ sourcename }}"><b>{{ sourcename }} on hover</b></div>
-    <div id="{{ sourcename }}image" alt="{{ sourcename }}"> </div>
+    <div id="{{ sourcename }}image" title="{{ sourcename }}"> </div>
   {%- endif %}
 
 {%- endfor %}
diff --git a/templates/shortcodes/video.html b/templates/shortcodes/video.html
index a1a2f31..c6bd867 100644
--- a/templates/shortcodes/video.html
+++ b/templates/shortcodes/video.html
@@ -1,7 +1,7 @@
 <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 }}">
+    <source src="{{ config.base_url | safe }}{{ page.path | safe }}{{ source | safe }}" type="{{ 'video/' ~ type }}" />
   {% endfor -%}
   Your browser doesn't support the video tag and/or the video formats in use here – sorry!
 </video>
diff --git a/templates/shortcodes/vm.html b/templates/shortcodes/vm.html
index 9b593e8..f222682 100644
--- a/templates/shortcodes/vm.html
+++ b/templates/shortcodes/vm.html
@@ -1,3 +1,3 @@
-<div {% if class %}class="{{class}}" {% endif %}style="position:relative;padding-bottom:56.25%;height:0;overflow:hidden;">
-	<iframe src="https://player.vimeo.com/video/{{id}}?embedded=true{% if autoplay %}&autoplay=1{% endif %}{% if loop %}&loop=1{% endif %}{% if noautopause %}&autopause=0{% endif %}{% if not cookie %}&dnt=1{% endif %}" title="{{title | default(value="Vimeo") }}" style="position:absolute;top:0;left:0;" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<div{% if class %} class="{{class}}"{% endif %} style="position:relative;padding-bottom:56.25%;height:0;overflow:hidden;">
+	<iframe src="https://player.vimeo.com/video/{{id}}?embedded=true{% if autoplay %}&autoplay=1{% endif %}{% if loop %}&loop=1{% endif %}{% if noautopause %}&autopause=0{% endif %}{% if not cookie %}&dnt=1{% endif %}" title="{{title | default(value='Vimeo') }}" style="position:absolute;top:0;left:0;" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 </div>
diff --git a/templates/shortcodes/yt.html b/templates/shortcodes/yt.html
index d865602..748f6ae 100644
--- a/templates/shortcodes/yt.html
+++ b/templates/shortcodes/yt.html
@@ -1,3 +1,3 @@
-<div{% if class %}class="{{class}}"{% endif %} style="position:relative;padding-bottom:56.25%;height:0;overflow:hidden;">
-	<iframe src="https://www.youtube{% if not cookie %}-nocookie{% endif %}.com/embed/{{id}}{% if playlist %}?list={{playlist}}{% endif %}{% if autoplay %}?autoplay=1{% endif %}" title="{{title | default(value="Youtube") }}" style="position:absolute;top:0;left:0;" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<div{% if class %} class="{{class}}"{% endif %} style="position:relative;padding-bottom:56.25%;height:0;overflow:hidden;">
+	<iframe src="https://www.youtube{% if not cookie %}-nocookie{% endif %}.com/embed/{{id}}{% if playlist %}?list={{playlist}}{% endif %}{% if autoplay %}?autoplay=1{% endif %}" title="{{title | default(value='Youtube') }}" style="position:absolute;top:0;left:0;" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 </div>