Imported Upstream version 5.1upstream/5.1

author: Agustin Henze <tin@sluc.org.ar> 2013-01-02 08:35:03 -0300
committer: Agustin Henze <tin@sluc.org.ar> 2013-01-02 08:35:03 -0300
commit: 9c5708cc92af894e414bc76ee35ec2230de5d288 (patch)
tree: 61bd56b5517a4713626c254981143e008c719469 /nikola/data/themes/default/templates
parent: 0f2c04e70a0ffdd0892d6970cafbcd952d221db5 (diff)
9 files changed, 195 insertions, 121 deletions
diff --git a/nikola/data/themes/default/templates/base.tmpl b/nikola/data/themes/default/templates/base.tmpl
index cb5e0dd..9c134b7 100644
--- a/nikola/data/themes/default/templates/base.tmpl
+++ b/nikola/data/themes/default/templates/base.tmpl
@@ -1,40 +1,9 @@
 ## -*- coding: utf-8 -*-
+<%namespace file="base_helper.tmpl" import="*"/>
 <!DOCTYPE html>
 <html lang="${lang}">
 <head>
-    <meta charset="utf-8">
-    <meta name="title" content="${title} | ${blog_title}" >
-    <meta name="description" content="${description}" >
-    <meta name="author" content="${blog_author}">
-    <title>${title} | ${blog_title}</title>
-    <!-- Le styles -->
-    %if use_bundles:
-        <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
-        <script src="/assets/js/all.js" type="text/javascript"></script>
-    %else:
-        <link href="/assets/css/bootstrap.css" rel="stylesheet" type="text/css">
-        <link href="/assets/css/bootstrap-responsive.css" rel="stylesheet" type="text/css">
-        <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 exists("files/assets/css/custom.css", not_empty=True):
-            <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
-        %endif
-        <script src="/assets/js/jquery-1.7.2.min.js" type="text/javascript"></script>
-        <script src="/assets/js/jquery.colorbox-min.js" type="text/javascript"></script>
-    %endif
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[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:
-        %for language in translations:
-            <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS (${language})" href="${_link("rss", None, lang)}">
-        %endfor
-    %endif
+    ${html_head()}
     <%block name="extra_head">
     </%block>
 </head>
@@ -54,18 +23,14 @@
         %if len(translations) > 1:
         <small>
             ${(messages[lang][u"Also available in"])}:&nbsp;
-            %for langname in translations.keys():
-                %if langname != lang:
-                    <a href="${_link("index", None, langname)}">${messages[langname]["LANGUAGE"]}</a>
-                %endif
-            %endfor
+            ${html_translations()}
         </small>
         %endif
         </%block>
         <hr>
         </div>
     <!-- End of banner-like substance !-->
-    <div class="row" id="contentrow">
+    <div class="row-fluid" id="contentrow">
         <div class="span10" id="contentcolumn">
             <!--Body content-->
             <%block name="content"></%block>
@@ -77,23 +42,8 @@
             <!--Sidebar content-->
             <ul class="unstyled">
             <li>${license}
-            <!-- social buttons -->
-            %if add_this_buttons:
-            <li>
-                <div id="addthisbox" class="addthis_toolbox addthis_default_style">
-                <a class="addthis_button_preferred_1"></a>
-                <a class="addthis_button_preferred_2"></a>
-                <a class="addthis_button_preferred_3"></a>
-                <a class="addthis_button_preferred_4"></a>
-                <a class="addthis_button_compact"></a>
-                <a class="addthis_counter addthis_bubble_style"></a>
-                </div>
-                <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4f7088a56bb93798"></script>
-            <!-- End of social buttons -->
-            % endif
-            %for url, text in sidebar_links[lang]:
-                <li><a href="${url}">${text}</a>
-            %endfor
+            ${html_social()}
+            ${html_sidebar_links()}
             <li>${search_form}
             </ul>
             <!--End of sidebar content-->
diff --git a/nikola/data/themes/default/templates/base_helper.tmpl b/nikola/data/themes/default/templates/base_helper.tmpl
new file mode 100644
index 0000000..3f27f23
--- /dev/null
+++ b/nikola/data/themes/default/templates/base_helper.tmpl
@@ -0,0 +1,74 @@
+<%def name="html_head()">
+    <meta charset="utf-8">
+    <meta name="title" content="${title} | ${blog_title}" >
+    <meta name="description" content="${description}" >
+    <meta name="author" content="${blog_author}">
+    <title>${title} | ${blog_title}</title>
+    <!-- Le styles -->
+    %if use_bundles:
+        <link href="/assets/css/all.css" rel="stylesheet" type="text/css">
+        <script src="/assets/js/all.js" type="text/javascript"></script>
+    %else:
+        <link href="/assets/css/bootstrap.css" rel="stylesheet" type="text/css">
+        <link href="/assets/css/bootstrap-responsive.css" rel="stylesheet" type="text/css">
+        <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/slides.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-1.7.2.min.js" type="text/javascript"></script>
+        <script src="/assets/js/jquery.colorbox-min.js" type="text/javascript"></script>
+        <script src="/assets/js/slides.min.jquery.js" type="text/javascript"></script>
+    %endif
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[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:
+        %for language in translations:
+            <link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, lang)}">
+        %endfor
+    %endif
+</%def>
+
+
+<%def name="html_social()">
+%if add_this_buttons:
+    <!-- Social buttons -->
+    <div id="addthisbox" class="addthis_toolbox addthis_peekaboo_style addthis_default_style addthis_label_style addthis_32x32_style">
+    <a class="addthis_button_more">Share</a>
+    <ul><li><a class="addthis_button_facebook"></a></li>
+    <li><a class="addthis_button_google_plusone_share"></a></li>
+    <li><a class="addthis_button_linkedin"></a></li>
+    <li><a class="addthis_button_twitter"></a></li>
+    </ul>
+    </div>
+    <script type="text/javascript" src="http://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4f7088a56bb93798"></script>
+    <!-- End of social buttons -->
+%endif
+</%def>
+
+
+<%def name="html_sidebar_links()">
+    %for url, text in sidebar_links[lang]:
+        % if rel_link(permalink, url) == "#":
+            <li class="active"><a href="${url}">${text}</a>
+        %else:
+            <li><a href="${url}">${text}</a>
+        %endif
+    %endfor
+</%def>
+
+
+<%def name="html_translations()">
+    %for langname in translations.keys():
+        %if langname != lang:
+            <a href="${_link("index", None, langname)}">${messages[langname]["LANGUAGE"]}</a>
+        %endif
+    %endfor
+</%def>
diff --git a/nikola/data/themes/default/templates/index.tmpl b/nikola/data/themes/default/templates/index.tmpl
index 2c7b4be..03dd1f8 100644
--- a/nikola/data/themes/default/templates/index.tmpl
+++ b/nikola/data/themes/default/templates/index.tmpl
@@ -1,36 +1,18 @@
 ## -*- coding: utf-8 -*-
+<%namespace name="helper" file="index_helper.tmpl"/>
 <%inherit file="base.tmpl"/>
 <%block name="content">
     % for post in posts:
         <div class="postbox">
         <h1><a href="${post.permalink(lang)}">${post.title(lang)}</a>
         <small>&nbsp;&nbsp;
-             ${messages[lang]["Posted"]}: ${post.date}
+             ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)}
         </small></h1>
         <hr>
         ${post.text(lang, index_teasers)}
-        <p>
-        %if disqus_forum:
-            <a href="${post.permalink()}#disqus_thread">Comments</a>
-        %endif
+        ${helper.html_disqus_link(post)}
         </div>
     % endfor
-    <div>
-<ul class="pager">
-  %if prevlink:
-    <li class="previous">
-        <a href="${prevlink}">&larr; ${messages[lang]["Newer posts"]}</a>
-    </li>
-  %endif
-  %if nextlink:
-    <li class="next">
-        <a href="${nextlink}">${messages[lang]["Older posts"]} &rarr;</a>
-    </li>
-  %endif
-</ul>
-
-    </div>
-    %if disqus_forum:
-       <script type="text/javascript">var disqus_shortname="${disqus_forum}";(function(){var a=document.createElement("script");a.async=true;a.type="text/javascript";a.src="http://"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("HEAD")[0]||document.getElementsByTagName("BODY")[0]).appendChild(a)}());</script>
-    %endif
+    ${helper.html_pager()}
+    ${helper.html_disqus_script()}
 </%block>
diff --git a/nikola/data/themes/default/templates/index_helper.tmpl b/nikola/data/themes/default/templates/index_helper.tmpl
new file mode 100644
index 0000000..cfecdf3
--- /dev/null
+++ b/nikola/data/themes/default/templates/index_helper.tmpl
@@ -0,0 +1,31 @@
+<%def name="html_pager()">
+<div>
+<ul class="pager">
+  %if prevlink:
+    <li class="previous">
+        <a href="${prevlink}">&larr; ${messages[lang]["Newer posts"]}</a>
+    </li>
+  %endif
+  %if nextlink:
+    <li class="next">
+        <a href="${nextlink}">${messages[lang]["Older posts"]} &rarr;</a>
+    </li>
+  %endif
+</ul>
+</div>
+</%def>
+
+
+<%def name="html_disqus_link(post)">
+    <p>
+    %if disqus_forum:
+        <a href="${post.permalink()}#disqus_thread">Comments</a>
+    %endif
+</%def>
+
+
+<%def name="html_disqus_script()">
+    %if disqus_forum:
+       <script type="text/javascript">var disqus_shortname="${disqus_forum}";(function(){var a=document.createElement("script");a.async=true;a.type="text/javascript";a.src="http://"+disqus_shortname+".disqus.com/count.js";(document.getElementsByTagName("HEAD")[0]||document.getElementsByTagName("BODY")[0]).appendChild(a)}());</script>
+    %endif
+</%def>
diff --git a/nikola/data/themes/default/templates/list_post.tmpl b/nikola/data/themes/default/templates/list_post.tmpl
new file mode 100644
index 0000000..1a1cdee
--- /dev/null
+++ b/nikola/data/themes/default/templates/list_post.tmpl
@@ -0,0 +1,14 @@
+## -*- coding: utf-8 -*-
+<%inherit file="base.tmpl"/>
+<%block name="content">
+        <!--Body content-->
+        <div class="postbox">
+        <h1>${title}</h1>
+        <ul class="unstyled">
+        % for post in posts:
+            <li><a href="${post.permalink(lang)}">[${post.date.strftime(date_format)}] ${post.title(lang)}</a>
+        % endfor
+        </ul>
+        </div>
+        <!--End of body content-->
+</%block>
diff --git a/nikola/data/themes/default/templates/post.tmpl b/nikola/data/themes/default/templates/post.tmpl
index 6bbb460..306192d 100644
--- a/nikola/data/themes/default/templates/post.tmpl
+++ b/nikola/data/themes/default/templates/post.tmpl
@@ -1,51 +1,20 @@
 ## -*- coding: utf-8 -*-
+<%namespace name="helper" file="post_helper.tmpl"/>
 <%inherit file="base.tmpl"/>
 <%block name="content">
     <div class="postbox">
-    <h1><a href='${permalink}'>${title}</a></h1>
-    % if link:
-            <p><a href='${link}'>${messages[lang]["Original site"]}</a></p>
-    % endif
+    ${helper.html_title()}
     <hr>
     <small>
-        ${messages[lang]["Posted"]}: ${post.date}&nbsp;&nbsp;|&nbsp;&nbsp;
-
-        %if len(translations) > 1:
-            %for langname in translations.keys():
-                %if langname != lang:
-                    <a href="${post.permalink(langname)}">${messages[langname][u"Read in English"]}</a>
-                    &nbsp;&nbsp;|&nbsp;&nbsp;
-                %endif
-            %endfor
-        %endif
-
-        <a href="${post.pagenames[lang]+".txt"}">${messages[lang]["Source"]}</a>
-        %if post.tags:
-            &nbsp;&nbsp;|&nbsp;&nbsp;${messages[lang]["More posts about"]}
-            %for tag in post.tags:
-                <a href="${_link("tag", tag, lang)}"><span class="badge badge-info">${tag}</span></a>
-            %endfor
-        %endif
+        ${messages[lang]["Posted"]}: ${post.date.strftime(date_format)}
+        ${helper.html_translations(post)}
+        &nbsp;&nbsp;|&nbsp;&nbsp;
+        <a href="${post.pagenames[lang]+'.txt'}">${messages[lang]["Source"]}</a>
+        ${helper.html_tags(post)}
     </small>
     <hr>
     ${post.text(lang)}
-    <ul class="pager">
-    %if post.prev_post:
-        <li class="previous">
-            <a href="${post.prev_post.permalink(lang)}">&larr; ${messages[lang]["Previous post"]}</a>
-        </li>
-    %endif
-    %if post.next_post:
-        <li class="next">
-            <a href="${post.next_post.permalink(lang)}">${messages[lang]["Next post"]}  &rarr;</a>
-        </li>
-    %endif
-    </ul>
-    %if disqus_forum:
-        <div id="disqus_thread"></div>
-        <script type="text/javascript">var disqus_shortname="${disqus_forum}";var disqus_url="${post.permalink(absolute=True)}";(function(){var a=document.createElement("script");a.type="text/javascript";a.async=true;a.src="http://"+disqus_shortname+".disqus.com/embed.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)})();        </script>
-        <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-        <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-    %endif
+    ${helper.html_pager(post)}
+    ${helper.html_disqus(post)}
     </div>
 </%block>
diff --git a/nikola/data/themes/default/templates/post_helper.tmpl b/nikola/data/themes/default/templates/post_helper.tmpl
new file mode 100644
index 0000000..3e874e9
--- /dev/null
+++ b/nikola/data/themes/default/templates/post_helper.tmpl
@@ -0,0 +1,54 @@
+<%def name="html_title()">
+    <h1>${title}</h1>
+    % if link:
+            <p><a href='${link}'>${messages[lang]["Original site"]}</a></p>
+    % endif
+</%def>
+
+
+<%def name="html_translations(post)">
+    %if len(translations) > 1:
+        %for langname in translations.keys():
+            %if langname != lang:
+                &nbsp;&nbsp;|&nbsp;&nbsp;
+                <a href="${post.permalink(langname)}">${messages[langname]["Read in English"]}</a>
+            %endif
+        %endfor
+    %endif
+</%def>
+
+
+<%def name="html_tags(post)">
+    %if post.tags:
+        &nbsp;&nbsp;|&nbsp;&nbsp;${messages[lang]["More posts about"]}
+        %for tag in post.tags:
+            <a class="tag" href="${_link('tag', tag, lang)}"><span class="badge badge-info">${tag}</span></a>
+        %endfor
+    %endif
+</%def>
+
+
+<%def name="html_disqus(post)">
+    %if disqus_forum:
+        <div id="disqus_thread"></div>
+        <script type="text/javascript">var disqus_shortname="${disqus_forum}";var disqus_url="${post.permalink(absolute=True)}";(function(){var a=document.createElement("script");a.type="text/javascript";a.async=true;a.src="http://"+disqus_shortname+".disqus.com/embed.js";(document.getElementsByTagName("head")[0]||document.getElementsByTagName("body")[0]).appendChild(a)})();        </script>
+        <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+        <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+    %endif
+</%def>
+
+
+<%def name="html_pager(post)">
+    <ul class="pager">
+    %if post.prev_post:
+        <li class="previous">
+            <a href="${post.prev_post.permalink(lang)}">&larr; ${messages[lang]["Previous post"]}</a>
+        </li>
+    %endif
+    %if post.next_post:
+        <li class="next">
+            <a href="${post.next_post.permalink(lang)}">${messages[lang]["Next post"]} &rarr;</a>
+        </li>
+    %endif
+    </ul>
+</%def>
diff --git a/nikola/data/themes/default/templates/tag.tmpl b/nikola/data/themes/default/templates/tag.tmpl
index ac97829..7c89ad1 100644
--- a/nikola/data/themes/default/templates/tag.tmpl
+++ b/nikola/data/themes/default/templates/tag.tmpl
@@ -1,5 +1,5 @@
 ## -*- coding: utf-8 -*-
-<%inherit file="list.tmpl"/>
+<%inherit file="list_post.tmpl"/>
 <%block name="extra_head">
         %for language in translations:
             <link rel="alternate" type="application/rss+xml" type="application/rss+xml" title="RSS for tag ${tag} (${language})" href="${_link("tag_rss", tag, lang)}">
diff --git a/nikola/data/themes/default/templates/tags.tmpl b/nikola/data/themes/default/templates/tags.tmpl
index 10040ca..369a3d5 100644
--- a/nikola/data/themes/default/templates/tags.tmpl
+++ b/nikola/data/themes/default/templates/tags.tmpl
@@ -6,7 +6,7 @@
         <h1>${title}</h1>
         <ul class="unstyled">
         % for text, link in items:
-            <li><a href="${link}"><span class="badge badge-info">${text}</span></a>
+            <li><a class="tag" href="${link}"><span class="badge badge-info">${text}</span></a>
         % endfor
         </ul>
         <!--End of body content-->
author	Agustin Henze <tin@sluc.org.ar>	2013-01-02 08:35:03 -0300
committer	Agustin Henze <tin@sluc.org.ar>	2013-01-02 08:35:03 -0300
commit	9c5708cc92af894e414bc76ee35ec2230de5d288 (patch)
tree	61bd56b5517a4713626c254981143e008c719469 /nikola/data/themes/default/templates
parent	0f2c04e70a0ffdd0892d6970cafbcd952d221db5 (diff)