Imported Upstream version 7.0.1upstream/7.0.1

53 files changed, 366 insertions, 169 deletions

diff --git a/nikola/data/themes/bootstrap/assets/css/colorbox.css b/nikola/data/themes/bootstrap/assets/css/colorbox.css
index 13c3308..5f8b3b0 100644..120000
--- a/nikola/data/themes/bootstrap/assets/css/colorbox.css
+++ b/nikola/data/themes/bootstrap/assets/css/colorbox.css
@@ -1,69 +1 @@
-/*
-    Colorbox Core Style:
-    The following CSS is consistent between example themes and should not be altered.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative;}
-#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
-.cboxIframe{width:100%; height:100%; display:block; border:0;}
-#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
-
-/* 
-    User Style:
-    Change the following styles to modify the appearance of Colorbox.  They are
-    ordered & tabbed in a way that represents the nesting of the generated HTML.
-*/
-#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
-#colorbox{outline:0;}
-    #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
-    #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}
-    #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;}
-    #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;}
-    #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}
-    #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}
-    #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}
-    #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}
-    #cboxContent{background:#fff; overflow:hidden;}
-        .cboxIframe{background:#fff;}
-        #cboxError{padding:50px; border:1px solid #ccc;}
-        #cboxLoadedContent{margin-bottom:28px;}
-        #cboxTitle{position:absolute; bottom:4px; right: 29px; text-align: right; width:100%; color:#949494;}
-        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
-        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
-        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
-
-        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
-        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
-        
-        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
-        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
-
-        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
-        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
-        #cboxPrevious:hover{background-position:-75px -25px;}
-        #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
-        #cboxNext:hover{background-position:-50px -25px;}
-        #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
-        #cboxClose:hover{background-position:-25px -25px;}
-
-/*
-  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
-  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
-  See: http://jacklmoore.com/notes/ie-transparency-problems/
-*/
-.cboxIE #cboxTopLeft,
-.cboxIE #cboxTopCenter,
-.cboxIE #cboxTopRight,
-.cboxIE #cboxBottomLeft,
-.cboxIE #cboxBottomCenter,
-.cboxIE #cboxBottomRight,
-.cboxIE #cboxMiddleLeft,
-.cboxIE #cboxMiddleRight {
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
-}
+../../../../../../bower_components/jquery-colorbox/example3/colorbox.css
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/css/images/border.png b/nikola/data/themes/bootstrap/assets/css/images/border.png
deleted file mode 100644
index f463a10..0000000
--- a/nikola/data/themes/bootstrap/assets/css/images/border.png
+++ /dev/null
diff --git a/nikola/data/themes/bootstrap/assets/css/images/controls.png b/nikola/data/themes/bootstrap/assets/css/images/controls.png
index dcfd6fb..841a726 100644..120000
--- a/nikola/data/themes/bootstrap/assets/css/images/controls.png
+++ b/nikola/data/themes/bootstrap/assets/css/images/controls.png
diff --git a/nikola/data/themes/bootstrap/assets/css/images/loading.gif b/nikola/data/themes/bootstrap/assets/css/images/loading.gif
index b4695d8..b192a75 100644..120000
--- a/nikola/data/themes/bootstrap/assets/css/images/loading.gif
+++ b/nikola/data/themes/bootstrap/assets/css/images/loading.gif
diff --git a/nikola/data/themes/bootstrap/assets/css/images/loading_background.png b/nikola/data/themes/bootstrap/assets/css/images/loading_background.png
deleted file mode 100644
index 6ae83e6..0000000
--- a/nikola/data/themes/bootstrap/assets/css/images/loading_background.png
+++ /dev/null
diff --git a/nikola/data/themes/bootstrap/assets/css/images/overlay.png b/nikola/data/themes/bootstrap/assets/css/images/overlay.png
deleted file mode 100644
index 53ea98f..0000000
--- a/nikola/data/themes/bootstrap/assets/css/images/overlay.png
+++ /dev/null
diff --git a/nikola/data/themes/bootstrap/assets/css/theme.css b/nikola/data/themes/bootstrap/assets/css/theme.css
index 952073f..ccdfda2 100644
--- a/nikola/data/themes/bootstrap/assets/css/theme.css
+++ b/nikola/data/themes/bootstrap/assets/css/theme.css
@@ -101,3 +101,74 @@ h4, h5, h6 {
     margin-top: -50px;
     padding-top: 60px;
 }
+
+.image-block {
+    display: inline-block;
+}
+
+.flowr_row {
+    width: 100%;
+}
+
+.tags {
+    padding-left: 0;
+    margin-left: -5px;
+    list-style: none;
+    text-align: center;
+
+}
+
+.tags > li {
+    display: inline-block;
+    min-width: 10px;
+    padding: 3px 7px;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 1;
+    color: #fff;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    background-color: #999;
+    border-radius: 10px;
+}
+
+.tags > li a {
+    color: #fff;
+}
+
+.metadata p:before,
+.postlist .listdate:before {
+    content: " — ";
+}
+
+.metadata p:first-of-type:before {
+    content: "";
+}
+
+.metadata p {
+    display: inline;
+}
+
+.posttranslations h3 {
+    display: inline;
+    font-size: 1em;
+    font-weight: bold;
+}
+
+.posttranslations h3:last-child {
+    display: none;
+}
+
+.entry-content {
+    margin-top: 1em;
+}
+
+.navbar .brand {
+    padding: 0 20px;
+}
+
+.navbar .brand #blog-title {
+    padding: 10px 0;
+    display: inline-block;
+}
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
new file mode 120000
index 0000000..f83073f
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ar.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ar.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
new file mode 120000
index 0000000..bafc4e0
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-bg.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-bg.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
new file mode 120000
index 0000000..a749232
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ca.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ca.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
new file mode 120000
index 0000000..e4a595c
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-cs.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-cs.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
new file mode 120000
index 0000000..1e9a1d6
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-da.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-da.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
new file mode 120000
index 0000000..748f53b
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-de.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-de.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
new file mode 120000
index 0000000..1154fb5
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-es.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-es.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
new file mode 120000
index 0000000..483e192
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-et.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-et.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
new file mode 120000
index 0000000..a30b13c
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fa.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fa.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
new file mode 120000
index 0000000..2a7e8ad
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fi.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fi.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
new file mode 120000
index 0000000..e359290
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-fr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-fr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
new file mode 120000
index 0000000..04fa276
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gl.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gl.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
new file mode 120000
index 0000000..d8105ab
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-gr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-gr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
new file mode 120000
index 0000000..72dddf5
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-he.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-he.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
new file mode 120000
index 0000000..34aa3c0
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
new file mode 120000
index 0000000..a87f03c
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-hu.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-hu.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
new file mode 120000
index 0000000..31053b8
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-id.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-id.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
new file mode 120000
index 0000000..aad9d22
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-it.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-it.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
new file mode 120000
index 0000000..3ea27c2
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ja.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ja.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
new file mode 120000
index 0000000..3e23b4a
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-kr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-kr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
new file mode 120000
index 0000000..374b9bb
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lt.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lt.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
new file mode 120000
index 0000000..101b476
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-lv.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-lv.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
new file mode 120000
index 0000000..8e14f15
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-my.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-my.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
new file mode 120000
index 0000000..2d03d48
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-nl.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-nl.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
new file mode 120000
index 0000000..9af0ba7
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-no.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-no.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
new file mode 120000
index 0000000..34f8ab1
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pl.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pl.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js
new file mode 120000
index 0000000..76f289e
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-pt-br.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-pt-br.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
new file mode 120000
index 0000000..555f2e6
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ro.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ro.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
new file mode 120000
index 0000000..bac4855
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-ru.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-ru.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
new file mode 120000
index 0000000..65b0492
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-si.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-si.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
new file mode 120000
index 0000000..99859fd
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sk.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sk.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
new file mode 120000
index 0000000..c4fd9d5
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
new file mode 120000
index 0000000..d7f26e0
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-sv.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-sv.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
new file mode 120000
index 0000000..86fd98f
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-tr.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-tr.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
new file mode 120000
index 0000000..7cd1336
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-uk.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-uk.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
new file mode 120000
index 0000000..e6c5965
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-CN.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-CN.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
new file mode 120000
index 0000000..bd2254c
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/colorbox-i18n/jquery.colorbox-zh-TW.js
@@ -0,0 +1 @@
+../../../../../../../bower_components/jquery-colorbox/i18n/jquery.colorbox-zh-TW.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js b/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
new file mode 120000
index 0000000..5ee7a90
--- /dev/null
+++ b/nikola/data/themes/bootstrap/assets/js/jquery.colorbox.js
@@ -0,0 +1 @@
+../../../../../../bower_components/jquery-colorbox/jquery.colorbox.js
\ No newline at end of file
diff --git a/nikola/data/themes/bootstrap/bundles b/nikola/data/themes/bootstrap/bundles
index 14124a3..089b036 100644
--- a/nikola/data/themes/bootstrap/bundles
+++ b/nikola/data/themes/bootstrap/bundles
@@ -1,4 +1,4 @@
 assets/css/all-nocdn.css=bootstrap.css,bootstrap-responsive.css,rst.css,code.css,colorbox.css,theme.css,custom.css
 assets/css/all.css=rst.css,code.css,colorbox.css,theme.css,custom.css
-assets/js/all-nocdn.js=jquery-1.10.2.min.js,bootstrap.min.js,jquery.colorbox-min.js
+assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js
 assets/js/all.js=jquery.colorbox-min.js
diff --git a/nikola/data/themes/bootstrap/templates/base.tmpl b/nikola/data/themes/bootstrap/templates/base.tmpl
index 65132b7..a469098 100644
--- a/nikola/data/themes/bootstrap/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap/templates/base.tmpl
@@ -1,28 +1,17 @@
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="base_helper.tmpl" import="*" />
-<%namespace name="bootstrap" file="bootstrap_helper.tmpl" import="*" />
 <%namespace name="notes" file="annotation_helper.tmpl" import="*" />
 ${set_locale(lang)}
-<!DOCTYPE html>
-<html
-%if comment_system == 'facebook':
-xmlns:fb="http://ogp.me/ns/fb#"
-%endif
-lang="${lang}">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    ${bootstrap.html_head()}
-    <%block name="extra_head">
-    </%block>
-    % if annotations and post and not post.meta('noannotations'):
-        ${notes.css()}
-    % elif not annotations and post and post.meta('annotations'):
-        ${notes.css()}
-    % endif
-    ${extra_head_data}
+${base.html_headstart()}
+<%block name="extra_head">
+### Leave this block alone.
+</%block>
+${template_hooks['extra_head']()}
 </head>
 <body>
+
 <!-- Menubar -->
+
 <div class="navbar navbar-fixed-top" id="navbar">
     <div class="navbar-inner">
         <div class="container">
@@ -35,12 +24,19 @@ lang="${lang}">
         </a>
 
             <a class="brand" href="${abs_link('/')}">
-            ${blog_title}
+            %if logo_url:
+                <img src="${logo_url}" alt="${blog_title}" id="logo">
+            %endif
+
+            % if show_blog_title:
+                <span id="blog-title">${blog_title}</span>
+            % endif
             </a>
             <!-- Everything you want hidden at 940px or less, place within here -->
             <div class="nav-collapse collapse">
                 <ul class="nav">
-                    ${bootstrap.html_navigation_links()}
+                    ${base.html_navigation_links()}
+                    ${template_hooks['menu']()}
                 </ul>
                 %if search_form:
                     ${search_form}
@@ -51,9 +47,10 @@ lang="${lang}">
                     <li>${base.html_translations()}</li>
                 %endif
                 </%block>
-                % if not hide_sourcelink:
+                % if show_sourcelink:
                     <li><%block name="sourcelink"></%block></li>
                 %endif
+                ${template_hooks['menu_alt']()}
                 </ul>
             </div>
         </div>
@@ -65,6 +62,7 @@ lang="${lang}">
     <div class="row-fluid">
     <div class="span2"></div>
     <div class="span8">
+    ${template_hooks['page_header']()}
     <%block name="content"></%block>
     </div>
     </div>
@@ -72,23 +70,17 @@ lang="${lang}">
 </div>
 <div class="footerbox">
     ${content_footer}
+    ${template_hooks['page_footer']()}
 </div>
-${bootstrap.late_load_js()}
-${base.html_social()}
-    <script type="text/javascript">jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
-    $(window).on('hashchange', function(){
-        if (location.hash && $(location.hash)[0]) {
-            $('body').animate({scrollTop: $(location.hash).offset().top - $('#navbar').outerHeight(true)*1.2 }, 1);
-        }
-    });
-    $(document).ready(function(){$(window).trigger('hashchange')});
-    </script>
+${base.late_load_js()}
+    <script>jQuery("a.image-reference").colorbox({rel:"gal",maxWidth:"100%",maxHeight:"100%",scalePhotos:true});</script>
     <%block name="extra_js"></%block>
     % if annotations and post and not post.meta('noannotations'):
         ${notes.code()}
     % elif not annotations and post and post.meta('annotations'):
         ${notes.code()}
     % endif
-    ${body_end}
+${body_end}
+${template_hooks['body_end']()}
 </body>
 </html>
diff --git a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
index c041e50..2dcc138 100644
--- a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl
+++ b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
@@ -1,77 +1,117 @@
-## Override only the functions that differ from base_helper.tmpl
-<%def name="html_head()">
+## -*- coding: utf-8 -*-
+
+<%def name="html_headstart()">
+<!DOCTYPE html>
+<html
+\
+% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'):
+prefix='\
+%if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']):
+og: http://ogp.me/ns# \
+%endif
+%if use_open_graph:
+article: http://ogp.me/ns/article# \
+%endif
+%if comment_system == 'facebook':
+fb: http://ogp.me/ns/fb# \
+%endif
+'\
+%endif
+\
+% if is_rtl:
+dir="rtl" \
+% endif
+\
+lang="${lang}">
+    <head>
     <meta charset="utf-8">
     %if description:
     <meta name="description" content="${description}">
     %endif
-    <meta name="author" content="${blog_author}">
+    <meta name="viewport" content="width=device-width">
     <title>${title|striphtml} | ${blog_title|striphtml}</title>
+
+    ${html_stylesheets()}
+    ${html_feedlinks()}
+    %if permalink:
+      <link rel="canonical" href="${abs_link(permalink)}">
+    %endif
+
+    %if favicons:
+        %for name, file, size in favicons:
+            <link rel="${name}" href="${file}" sizes="${size}"/>
+        %endfor
+    %endif
+
+    % if comment_system == 'facebook':
+        <meta property="fb:app_id" content="${comment_system_id}">
+    % endif
+
     ${mathjax_config}
+    %if use_cdn:
+        <!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+    %else:
+        <!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]-->
+    %endif
+
+    ${extra_head_data}
+</%def>
+
+
+<%def name="late_load_js()">
     %if use_bundles:
         %if use_cdn:
-            <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet">
-            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
+            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+            <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+            <script src="/assets/js/all.js"></script>
         %else:
-            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
+            <script src="/assets/js/all-nocdn.js"></script>
         %endif
     %else:
         %if use_cdn:
-            <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet">
-        %else:
-            <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-            <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css">
-        %endif
-        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css"/>
-        <link href="/assets/css/theme.css" rel="stylesheet" type="text/css"/>
-        %if has_custom_css:
-            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
-        %endif
-    %endif
-    %if permalink:
-      <link rel="canonical" href="${abs_link(permalink)}">
-    %endif
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
-    <![endif]-->
-    %if rss_link:
-        ${rss_link}
-    %else:
-        %if len(translations) > 1:
-            %for language in translations:
-                <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
-            %endfor
+            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+            <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
         %else:
-            <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
+            <script src="/assets/js/jquery.min.js"></script>
+            <script src="/assets/js/bootstrap.min.js"></script>
         %endif
+        <script src="/assets/js/jquery.colorbox-min.js"></script>
     %endif
-    %if favicons:
-        %for name, file, size in favicons:
-            <link rel="${name}" href="${file}" sizes="${size}"/>
-        %endfor
+    %if colorbox_locales[lang]:
+        <script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
     %endif
+    ${social_buttons_code}
 </%def>
 
-<%def name="late_load_js()">
+
+<%def name="html_stylesheets()">
     %if use_bundles:
         %if use_cdn:
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript"></script>
-            <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
-            <script src="/assets/js/all.js" type="text/javascript"></script>
+            <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
+            <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
         %else:
-            <script src="/assets/js/all-nocdn.js" type="text/javascript"></script>
+            <link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
         %endif
     %else:
         %if use_cdn:
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" type="text/javascript"></script>
-            <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
+            <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
         %else:
-            <script src="/assets/js/jquery-1.10.2.min.js" type="text/javascript"></script>
-            <script src="/assets/js/bootstrap.min.js" type="text/javascript"></script>
+            <link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
+            <link href="/assets/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css">
+        %endif
+        <link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/code.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
+        %if has_custom_css:
+            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         %endif
-        <script src="/assets/js/jquery.colorbox-min.js" type="text/javascript"></script>
     %endif
+    % if annotations and post and not post.meta('noannotations'):
+        ${notes.css()}
+    % elif not annotations and post and post.meta('annotations'):
+        ${notes.css()}
+    % endif
 </%def>
 
 
@@ -97,3 +137,25 @@
         % endif
     %endfor
 </%def>
+
+<%def name="html_feedlinks()">
+    %if rss_link:
+        ${rss_link}
+    %elif generate_rss:
+        %if len(translations) > 1:
+            %for language in translations:
+                <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
+            %endfor
+        %else:
+            <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
+        %endif
+    %endif
+</%def>
+
+<%def name="html_translations()">
+    %for langname in translations.keys():
+        %if langname != lang:
+            <li><a href="${_link("index", None, langname)}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
+        %endif
+    %endfor
+</%def>
diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl
index 7b0d505..8ad4eb4 100644
--- a/nikola/data/themes/bootstrap/templates/gallery.tmpl
+++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl
@@ -9,38 +9,37 @@
     %if title:
     <h1>${title}</h1>
     %endif
-    %if text:
+    %if post:
     <p>
-        ${text}
+        ${post.text()}
     </p>
     %endif
     %if folders:
     <ul>
     % for folder, ftitle in folders:
-        <li><a href="${folder}"><i
-        class="icon-folder-open"></i>&nbsp;${ftitle}</a></li>
+        <li><a href="${folder}"><i class="icon-folder-open"></i>&nbsp;${ftitle}</a></li>
     % endfor
     </ul>
     %endif
 
-    <div id="gallery_container"></div>
-    %if photo_array:
-    <noscript>
-    <ul class="thumbnails">
-        %for image in photo_array:
-            <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}">
-                <img src="${image['url_thumb']}" alt="${image['title']}" /></a>
-        %endfor
-    </ul>
-    </noscript>
-    %endif
-%if enable_comments:
-    ${comments.comment_form(None, permalink, title)}
+<div id="gallery_container"></div>
+%if photo_array:
+<noscript>
+<ul class="thumbnails">
+    %for image in photo_array:
+        <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}">
+            <img src="${image['url_thumb']}" alt="${image['title']}" /></a>
+    %endfor
+</ul>
+</noscript>
+%endif
+%if site_has_comments and enable_comments:
+${comments.comment_form(None, permalink, title)}
 %endif
 </%block>
 
-
 <%block name="extra_head">
+${parent.extra_head()}
 <style type="text/css">
     .image-block {
         display: inline-block;
diff --git a/nikola/data/themes/bootstrap/templates/listing.tmpl b/nikola/data/themes/bootstrap/templates/listing.tmpl
new file mode 100644
index 0000000..f03ea23
--- /dev/null
+++ b/nikola/data/themes/bootstrap/templates/listing.tmpl
@@ -0,0 +1,28 @@
+## -*- coding: utf-8 -*-
+<%inherit file="base.tmpl"/>
+<%namespace name="ui" file="crumbs.tmpl" import="bar"/>
+
+<%block name="content">
+${ui.bar(crumbs)}
+%if folders or files:
+<ul class="list-unstyled">
+% for name in folders:
+    <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a>
+% endfor
+% for name in files:
+    <li><a href="${name}.html"><i class="icon-file"></i> ${name}</a>
+% endfor
+</ul>
+%endif
+% if code:
+    ${code}
+% endif
+</%block>
+
+<%block name="sourcelink">
+% if source_link:
+    <li>
+    <a href="${source_link}" id="sourcelink">${messages("Source")}</a>
+    </li>
+% endif
+</%block>
diff --git a/nikola/data/themes/bootstrap/templates/post.tmpl b/nikola/data/themes/bootstrap/templates/post.tmpl
new file mode 100644
index 0000000..29a5b75
--- /dev/null
+++ b/nikola/data/themes/bootstrap/templates/post.tmpl
@@ -0,0 +1,47 @@
+## -*- coding: utf-8 -*-
+<%namespace name="helper" file="post_helper.tmpl"/>
+<%namespace name="pheader" file="post_header.tmpl"/>
+<%namespace name="comments" file="comments_helper.tmpl"/>
+<%inherit file="base.tmpl"/>
+
+<%block name="extra_head">
+    ${parent.extra_head()}
+    % if post.meta('keywords'):
+        <meta name="keywords" content="${post.meta('keywords')|h}">
+    % endif
+    <meta name="author" content="${post.author()}">
+    ${helper.open_graph_metadata(post)}
+    ${helper.twitter_card_information(post)}
+    ${helper.meta_translations(post)}
+</%block>
+
+<%block name="content">
+<article class="post-${post.meta('type')} h-entry hentry postpage" itemscope="itemscope" itemtype="http://schema.org/Article">
+    ${pheader.html_post_header()}
+    <div class="e-content entry-content" itemprop="articleBody text">
+    ${post.text()}
+    </div>
+    <aside class="postpromonav">
+    <nav>
+    ${helper.html_tags(post)}
+    ${helper.html_pager(post)}
+    </nav>
+    </aside>
+    % if not post.meta('nocomments') and site_has_comments:
+        <section class="comments">
+        <h2>${messages("Comments")}</h2>
+        ${comments.comment_form(post.permalink(absolute=True), post.title(), post._base_path)}
+        </section>
+    % endif
+    ${helper.mathjax_script(post)}
+</article>
+${comments.comment_link_script()}
+</%block>
+
+<%block name="sourcelink">
+% if show_sourcelink:
+    <li>
+    <a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a>
+    </li>
+% endif
+</%block>
diff --git a/nikola/data/themes/bootstrap/templates/slides.tmpl b/nikola/data/themes/bootstrap/templates/slides.tmpl
index 14983ad..048fb7e 100644
--- a/nikola/data/themes/bootstrap/templates/slides.tmpl
+++ b/nikola/data/themes/bootstrap/templates/slides.tmpl
@@ -1,6 +1,7 @@
+<%block name="content">
 <div id="${carousel_id}" class="carousel slide">
     <ol class="carousel-indicators">
-    % for i in range(len(content)):
+    % for i in range(len(slides_content)):
         % if i == 0:
             <li data-target="#${carousel_id}" data-slide-to="${i}" class="active"></li>
         % else:
@@ -9,7 +10,7 @@
     % endfor
     </ol>
     <div class="carousel-inner">
-        % for i, image in enumerate(content):
+        % for i, image in enumerate(slides_content):
             % if i == 0:
                 <div class="item active"><img src="${image}" alt="" style="margin: 0 auto 0 auto;"></div>
             % else:
@@ -20,3 +21,4 @@
     <a class="left carousel-control" href="#${carousel_id}" data-slide="prev">&lsaquo;</a>
     <a class="right carousel-control" href="#${carousel_id}" data-slide="next">&rsaquo;</a>
 </div>
+</%block>
diff --git a/nikola/data/themes/bootstrap/templates/tags.tmpl b/nikola/data/themes/bootstrap/templates/tags.tmpl
new file mode 100644
index 0000000..9afeca7
--- /dev/null
+++ b/nikola/data/themes/bootstrap/templates/tags.tmpl
@@ -0,0 +1,26 @@
+## -*- coding: utf-8 -*-
+<%inherit file="base.tmpl"/>
+
+<%block name="content">
+<h1>${title}</h1>
+% if cat_items:
+    <h2>${messages("Categories")}</h2>
+    <ul class="unstyled">
+    % for text, link in cat_items:
+        % if text:
+            <li><a class="reference badge" href="${link}">${text}</a></li>
+        % endif
+    % endfor
+    </ul>
+    % if items:
+        <h2>${messages("Tags")}</h2>
+    % endif
+%endif
+% if items:
+    <ul class="list-inline">
+    % for text, link in items:
+        <li><a class="reference badge" href="${link}">${text}</a></li>
+    % endfor
+    </ul>
+% endif
+</%block>