Merge branch 'dev' for v0.5.1

6 files changed, 50 insertions, 18 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bbb5917..854300b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -28,22 +28,6 @@
     </div>
   </div>
   <footer>
-    {{ if (isset .Params "nocomments")  }}
-    {{ else }}
-      {{ with .Site.Params.disqus }}
-        <div class="delimiter"></div>
-        <div id="disqus_thread"></div>
-        <script type="text/javascript">
-          var disqus_shortname = '{{ . }}';
-          (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-          })();
-        </script>
-        <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-      {{ end }}
-    {{ end }}
     {{ if and (isset $data "authors") (isset .Params "author") }}
       {{ $author := index $data.authors .Params.author }}
         <div class="delimiter"></div>
@@ -71,6 +55,26 @@
           </div>
         </section>
       {{ end }}
+	{{ if .Site.Params.UseCommento }}
+	  <div class="delimiter"></div>
+	  <h2 class="text-primary">Kommentare</h2>
+	  <div id="commento"></div>
+	  <script src="https://cdn.commento.io/js/commento.js"></script>
+    {{ else if (isset .Site.Params "disqus") }}
+      {{ with .Site.Params.disqus }}
+        <div class="delimiter"></div>
+        <div id="disqus_thread"></div>
+        <script type="text/javascript">
+          var disqus_shortname = '{{ . }}';
+          (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+          })();
+        </script>
+        <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+      {{ end }}
+    {{ end }}
     <div class="delimiter"></div>
     <div class="pager-container">
       {{ if .Next }}
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index e195301..bf6bcdc 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -19,7 +19,7 @@
 	<figcaption>
 		<h4>
 			<center>
-				{{ $subtitle }}
+				{{ $subtitle }} ({{ printf "%.*f" 2 (div (len $image.Content) 1000000.0) }}MB)
 			</center>
 		</h4>
 	</figcaption>
diff --git a/layouts/shortcodes/imgScale.html b/layouts/shortcodes/imgScale.html
index e8600c1..fb7816e 100644
--- a/layouts/shortcodes/imgScale.html
+++ b/layouts/shortcodes/imgScale.html
@@ -23,7 +23,7 @@
 	<figcaption>
 		<h4>
 			<center>
-				{{ $subtitle }}
+				{{ $subtitle }} ({{ printf "%.*f" 2 (div (len $originalImage.Content) 1000000.0) }}MB)
 			</center>
 		</h4>
 	</figcaption>
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
new file mode 100644
index 0000000..22fcaf4
--- /dev/null
+++ b/layouts/shortcodes/note.html
@@ -0,0 +1,5 @@
+{{ $note := (index .Params 0) }}
+
+<div class="note note-border">
+	{{ $note | markdownify }}
+</div>
diff --git a/static/css/color-theme.css b/static/css/color-theme.css
index b7ce984..9423607 100644
--- a/static/css/color-theme.css
+++ b/static/css/color-theme.css
@@ -153,3 +153,14 @@ a.btn-primary.disabled:focus {
 .embedded-image:focus {
     border: 1px solid #9ccc65;
 }
+
+/* Bootstrap adjustions */
+blockquote {
+	border-left: 3px solid #bdbdbd;
+}
+
+/* Note box */
+.note {
+	border: 1px solid #dcedc8;
+	border-left: 3px solid #9ccc65;
+}
diff --git a/static/css/main.css b/static/css/main.css
index a70f1c4..ffce049 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -274,6 +274,12 @@ article section img {
     border-radius: 0px;
 }
 
+blockquote {
+	padding: 20px;
+	margin: 15px 0px;
+	font-size: unset;
+}
+
 /*
 XXX Maybe but this in? Somethimes it's not smooth and that makes it ugly...
 .btn, .btn-primary, a.btn-default, a {
@@ -347,3 +353,9 @@ I don't use the default pager-class because I want to use the normal buttons wit
 .embedded-image {
 	padding: 5px;
 }
+
+/* Note box */
+.note {
+	padding: 20px;
+	margin: 15px 0px;
+}