backport islink support to base theme, re-jinjify

Roberto Alsina · Roberto Alsina · commit 493a1b8ed8c3 · 2017-12-26T13:15:45.000-03:00
diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl
@@ -26,10 +26,16 @@
         <script src="/assets/js/baguetteBox.min.js"></script>
     {% endif %}
     {% block extra_js %}{% endblock %}
-    <script>baguetteBox.run('a.reference', {
+    <script>
+    baguetteBox.run('a.reference:not(.islink)', {
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
-    }});</script>
+    }});
+    baguetteBox.run('img:not(.islink)', {
+        captions: function(element) {
+            return element.alt;
+    }});
+    </script>
     {{ body_end }}
     {{ template_hooks['body_end']() }}
 </body>
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
@@ -26,10 +26,16 @@ ${template_hooks['extra_head']()}
         <script src="/assets/js/baguetteBox.min.js"></script>
     % endif
     <%block name="extra_js"></%block>
-    <script>baguetteBox.run('a.reference', {
+    <script>
+    baguetteBox.run('a.reference:not(.islink)', {
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
-    }});</script>
+    }});
+    baguetteBox.run('img:not(.islink)', {
+        captions: function(element) {
+            return element.alt;
+    }});
+    </script>
     ${body_end}
     ${template_hooks['body_end']()}
 </body>
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
@@ -87,10 +87,16 @@
     </script>
     <!-- end fancy dates -->
     {% block extra_js %}{% endblock %}
-    <script>baguetteBox.run('a.reference', {
+    <script>
+    baguetteBox.run('a.reference:not(.islink)', {
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
-    }});</script>
+    }});
+    baguetteBox.run('img:not(.islink)', {
+        captions: function(element) {
+            return element.alt;
+    }});
+    </script>
 {{ body_end }}
 {{ template_hooks['body_end']() }}
 </body>
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl
@@ -96,6 +96,8 @@ $("#gallery_container").flowr({
             }
         }
     });
-$('a.image-reference[href="'+window.location.hash.substring(1,1000)+'"]').click();
-</script>
+    baguetteBox.run('#gallery_container', {
+        captions: function(element) {
+            return element.getElementsByTagName('img')[0].alt;
+    }});</script>
 {% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ $("#gallery_container").flowr({`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`});`
`99`		`-$('a.image-reference[href="'+window.location.hash.substring(1,1000)+'"]').click();`
`100`		`-</script>`
	`99`	`+ baguetteBox.run('#gallery_container', {`
	`100`	`+ captions: function(element) {`
	`101`	`+ return element.getElementsByTagName('img')[0].alt;`
	`102`	`+ }});</script>`
`101`	`103`	`{% endblock %}`