Fix #2177 -- don’t mix isso embed and count

Kwpolska · Kwpolska · commit cf14ca913af6 · 2015-11-21T10:53:19.000+01:00
Signed-off-by: Chris Warrick &lt;kwpolska@gmail.com&gt;
diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_isso.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_isso.tmpl
@@ -14,7 +14,7 @@
 
 
 {% macro comment_link_script() %}
-    {% if comment_system_id %}
+    {% if comment_system_id and 'index' in pagekind %}
         <script src="{{ comment_system_id }}js/count.min.js" data-isso="{{ comment_system_id }}"></script>
     {% endif %}
 {% endmacro %}
diff --git a/nikola/data/themes/base/templates/comments_helper_isso.tmpl b/nikola/data/themes/base/templates/comments_helper_isso.tmpl
@@ -14,7 +14,7 @@
 
 
 <%def name="comment_link_script()">
-    %if comment_system_id:
+    %if comment_system_id and 'index' in pagekind:
         <script src="${comment_system_id}js/count.min.js" data-isso="${comment_system_id}"></script>
     %endif
 </%def>
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl
@@ -90,5 +90,6 @@ $("#gallery_container").flowr({
         }
     });
 $("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
+$('a.image-reference[href="'+window.location.hash.substring(1,1000)+'"]').click();
 </script>
 {% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,6 @@ $("#gallery_container").flowr({`
`90`	`90`	`}`
`91`	`91`	`});`
`92`	`92`	`$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});`
	`93`	`+$('a.image-reference[href="'+window.location.hash.substring(1,1000)+'"]').click();`
`93`	`94`	`</script>`
`94`	`95`	`{% endblock %}`