11 files changed, 34 insertions, 1 deletions
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
index 7c6cc35..8a90349 100644
--- a/nikola/data/themes/base/templates/base.tmpl
+++ b/nikola/data/themes/base/templates/base.tmpl
@@ -30,11 +30,16 @@ lang="${lang}">
     <small>${content_footer}</small>
     <!--Sidebar content-->
     <ul class="unstyled">
+    %if license:
     <li>${license}
+    %endif
     ${base.html_social()}
     ${base.html_navigation_links()}
+    %if search_form:
     <li>${search_form}
+    %endif
     </ul>
     ${base.late_load_js()}
     ${social_buttons_code}
 </body>
+</html>
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index 880a998..501c06e 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -21,7 +21,9 @@
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         %endif
     %endif
-    <link rel="canonical" href="${abs_link(permalink)}">
+    %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]-->
diff --git a/nikola/data/themes/base/templates/crumbs.tmpl b/nikola/data/themes/base/templates/crumbs.tmpl
index c458cbe..8fbafcf 100644
--- a/nikola/data/themes/base/templates/crumbs.tmpl
+++ b/nikola/data/themes/base/templates/crumbs.tmpl
@@ -1,9 +1,11 @@
 ## -*- coding: utf-8 -*-
 
 <%def name="bar(crumbs)">
+%if crumbs:
 <ul class="breadcrumb">
     % for link, text in crumbs:
         <li><a href="${link}">${text}</a></li>
     % endfor
 </ul>
+%endif
 </%def>
diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl
index e4eab27..731a75a 100644
--- a/nikola/data/themes/base/templates/gallery.tmpl
+++ b/nikola/data/themes/base/templates/gallery.tmpl
@@ -14,18 +14,22 @@
         ${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>
     % endfor
     </ul>
+    %endif
+    %if photo_array:
     <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>
+    %endif
 %if enable_comments:
     ${comments.comment_form(None, permalink, title)}
 %endif
diff --git a/nikola/data/themes/base/templates/index_helper.tmpl b/nikola/data/themes/base/templates/index_helper.tmpl
index 56f5127..c925559 100755..100644
--- a/nikola/data/themes/base/templates/index_helper.tmpl
+++ b/nikola/data/themes/base/templates/index_helper.tmpl
@@ -20,6 +20,11 @@
 
 <%def name="mathjax_script(posts)">
     %if any(post.is_mathjax for post in posts):
+        <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+          tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}
+        });
+        </script>
         <script src="/assets/js/mathjax.js"></script>
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/list.tmpl b/nikola/data/themes/base/templates/list.tmpl
index a60b508..4136eb9 100644
--- a/nikola/data/themes/base/templates/list.tmpl
+++ b/nikola/data/themes/base/templates/list.tmpl
@@ -4,11 +4,13 @@
         <!--Body content-->
         <div class="postbox">
         <h1>${title}</h1>
+        %if items:
         <ul class="unstyled">
         % for text, link in items:
             <li><a href="${link}">${text}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>
diff --git a/nikola/data/themes/base/templates/list_post.tmpl b/nikola/data/themes/base/templates/list_post.tmpl
index f0e159d..b27f230 100644
--- a/nikola/data/themes/base/templates/list_post.tmpl
+++ b/nikola/data/themes/base/templates/list_post.tmpl
@@ -4,11 +4,13 @@
         <!--Body content-->
         <div class="postbox">
         <h1>${title}</h1>
+        %if posts:
         <ul class="unstyled">
         % for post in posts:
             <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>
diff --git a/nikola/data/themes/base/templates/listing.tmpl b/nikola/data/themes/base/templates/listing.tmpl
index b6ca83f..0662360 100644
--- a/nikola/data/themes/base/templates/listing.tmpl
+++ b/nikola/data/themes/base/templates/listing.tmpl
@@ -3,6 +3,7 @@
 <%namespace name="ui" file="crumbs.tmpl" import="bar"/>
 <%block name="content">
 ${ui.bar(crumbs)}
+%if folders or files:
 <ul class="unstyled">
 % for name in folders:
     <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a>
@@ -11,6 +12,7 @@ ${ui.bar(crumbs)}
     <li><a href="${name}.html"><i class="icon-file"></i> ${name}</a>
 % endfor
 </ul>
+%endif
 % if code:
     ${code}
 % endif
diff --git a/nikola/data/themes/base/templates/post_helper.tmpl b/nikola/data/themes/base/templates/post_helper.tmpl
index 69784ea..391350d 100755..100644
--- a/nikola/data/themes/base/templates/post_helper.tmpl
+++ b/nikola/data/themes/base/templates/post_helper.tmpl
@@ -85,6 +85,11 @@
 
 <%def name="mathjax_script(post)">
     %if post.is_mathjax:
+        <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+          tex2jax: {inlineMath: [['$latex ','$'], ['\\(','\\)']]}
+        });
+        </script>
         <script src="/assets/js/mathjax.js"></script>
     %endif
 </%def>
diff --git a/nikola/data/themes/base/templates/post_list_directive.tmpl b/nikola/data/themes/base/templates/post_list_directive.tmpl
index 3345ae4..b31d242 100644
--- a/nikola/data/themes/base/templates/post_list_directive.tmpl
+++ b/nikola/data/themes/base/templates/post_list_directive.tmpl
@@ -1,6 +1,7 @@
 ## -*- coding: utf-8 -*-
 <!-- Begin post-list ${post_list_id} -->
 <div id="${post_list_id}" class="post-list">
+    %if posts:
     <ul class="post-list">
         % for post in posts:
             <li class="post-list-item">
@@ -10,5 +11,6 @@
 	    </li>
         % endfor
     </ul>
+    %endif
 </div>
 <!-- End post-list ${post_list_id} -->
diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl
index 2ca9db4..43afd54 100644
--- a/nikola/data/themes/base/templates/tag.tmpl
+++ b/nikola/data/themes/base/templates/tag.tmpl
@@ -22,11 +22,13 @@
             <a href="${_link(kind + "_rss", tag)}">RSS</a>
         %endif
         <br>
+        %if posts:
         <ul class="unstyled">
         % for post in posts:
             <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>