diff options
Diffstat (limited to 'tuxlite_tbs/templates')
-rw-r--r-- | tuxlite_tbs/templates/archives.html | 26 | ||||
-rw-r--r-- | tuxlite_tbs/templates/article.html | 4 | ||||
-rw-r--r-- | tuxlite_tbs/templates/base.html | 69 | ||||
-rw-r--r-- | tuxlite_tbs/templates/categories.html | 2 | ||||
-rw-r--r-- | tuxlite_tbs/templates/disqus.html | 19 | ||||
-rw-r--r-- | tuxlite_tbs/templates/index.html | 15 | ||||
-rw-r--r-- | tuxlite_tbs/templates/metadata.html | 8 | ||||
-rw-r--r-- | tuxlite_tbs/templates/tags.html | 2 |
8 files changed, 78 insertions, 67 deletions
diff --git a/tuxlite_tbs/templates/archives.html b/tuxlite_tbs/templates/archives.html index 2d02e12..1520943 100644 --- a/tuxlite_tbs/templates/archives.html +++ b/tuxlite_tbs/templates/archives.html @@ -1,15 +1,19 @@ {% extends "base.html" %} {% block title %}{{ SITENAME }} <small>[archive]</small>{% endblock %} {% block content %} -{% for year, date_year in dates|groupby( 'date.year' ) %} -<h2>{{ year }}</h2> -{% for month, articles in date_year|groupby( 'date.month' ) %} -<h3>{{ articles[ 0 ].date.strftime( '%B' ) }}</h3> -<ul> -{% for article in articles %} - <li><a href="{{ article.url }}">{{ article.title }}</li> -{% endfor %} -</ul> -{% endfor %} -{% endfor %} + +<h1>Archives</h1> + +<table class="table"> + <tbody> + {% for article in dates %} + <tr> + <td>{{ article.date.strftime("%d %b %Y") }}</td> + <td><a href='{{ article.url }}'>{{ article.title }}</a></td> + </tr> + {% endfor %} + </tbody> +</table> + + {% endblock %} diff --git a/tuxlite_tbs/templates/article.html b/tuxlite_tbs/templates/article.html index 23e3c86..766de73 100644 --- a/tuxlite_tbs/templates/article.html +++ b/tuxlite_tbs/templates/article.html @@ -2,7 +2,7 @@ {% block content %} <div class='article'> <div class="content-title"> - <h2>{{ article.title }}</h2> + <h1>{{ article.title }}</h1> {% include "metadata.html" %} </div> @@ -12,6 +12,6 @@ <h2>Comments</h2> {% include "twitter.html" %} - {% if DISQUS_SITENAME %}<div id="disqus_thread"></div>{% endif %} + {% include 'disqus.html' %} </div> {% endblock %} diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html index 346837a..ec9e5ea 100644 --- a/tuxlite_tbs/templates/base.html +++ b/tuxlite_tbs/templates/base.html @@ -13,21 +13,27 @@ <!-- Le styles --> <link href="{{ SITEURL }}/theme/bootstrap.min.css" rel="stylesheet"> - <link href="{{ SITEURL }}/theme/bootstrap-responsive.min.css" rel="stylesheet"> + <link href="{{ SITEURL }}/theme/bootstrap.min.responsive.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> </head> <body> - {% include "github.html" %} -<div class="navbar navbar-static"> +<div class="navbar"> <div class="navbar-inner"> <div class="container"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + <a class="brand" href="{{ SITEURL }}">{{ SITENAME }}</a> + <div class="nav-collapse"> <ul class="nav"> {% for title, link in MENUITEMS %} <li><a href="{{ link }}">{{ title }}</a></li> @@ -35,14 +41,11 @@ {% if DISPLAY_PAGES_ON_MENU %} {% for page in PAGES %} - {% if page.category|lower != "documentation" %} - <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li> - {% endif %} + <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li> {% endfor %} {% endif %} </ul> - - <p class="pull-right"><a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/tags.html">Tags</a></p> + </div> </div> </div> @@ -58,23 +61,40 @@ <div class="span3"> + <div class="well" style="padding: 8px 0; background-color: #FBFBFB;"> + <ul class="nav nav-list"> + <li class="nav-header"> + Site + </li> + + <li><a href="{{ SITEURL }}/archives.html">Archives</a> + <li><a href="{{ SITEURL }}/tags.html">Tags</a> + <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Atom feed</a></li> + {% if FEED_RSS %} + <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li> + {% endif %} + </ul> + </div> + + {% if categories %} <div class="well" style="padding: 8px 0; background-color: #FBFBFB;"> - <ul class="nav list"> + <ul class="nav nav-list"> <li class="nav-header"> Categories </li> {% for cat, null in categories %} - <li><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li> + <li><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> {% endfor %} </ul> </div> {% endif %} + {% if LINKS %} <div class="well" style="padding: 8px 0; background-color: #FBFBFB;"> - <ul class="nav list"> + <ul class="nav nav-list"> <li class="nav-header"> Links </li> @@ -86,19 +106,15 @@ </div> {% endif %} + {% if SOCIAL %} <div class="social"> <div class="well" style="padding: 8px 0; background-color: #FBFBFB;"> - <ul class="nav list"> + <ul class="nav nav-list"> <li class="nav-header"> Social </li> - - <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li> - {% if FEED_RSS %} - <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li> - {% endif %} - + {% for name, link in SOCIAL %} <li><a href="{{ link }}">{{ name }}</a></li> {% endfor %} @@ -107,28 +123,19 @@ </div> {% endif %} - {# <h3>Documentation</h3> #} - {# <ul> #} - {# {% for page in PAGES %} #} - {# {% if page.category|lower == "documentation" %} #} - {# <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li> #} - {# {% endif %} #} - {# {% endfor %} #} - {# </ul> #} - </div> {# End span3 #} </div> {# End row #} </div> {# End content #} <footer> <br /> -<p>{{ SITENAME }} © {{ AUTHOR }} 2012</p> +<p><a href="{{ SITEURL }}">{{ SITENAME }}</a> © {{ AUTHOR }} 2012</p> </footer> </div> <!-- /container --> - +<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> +<script src="http://twitter.github.com/bootstrap/assets/js/bootstrap-collapse.js"></script> {% include "analytics.html" %} -{% include "disqus.html" %} - +{% include "github.html" %} </body> </html> diff --git a/tuxlite_tbs/templates/categories.html b/tuxlite_tbs/templates/categories.html index c96774d..2b95d34 100644 --- a/tuxlite_tbs/templates/categories.html +++ b/tuxlite_tbs/templates/categories.html @@ -3,7 +3,7 @@ {% block content %} <ul> {% for category, articles in categories %} - <li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</li> + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</li> {% endfor %} </ul> diff --git a/tuxlite_tbs/templates/disqus.html b/tuxlite_tbs/templates/disqus.html index 9ba2e42..5aa9f62 100644 --- a/tuxlite_tbs/templates/disqus.html +++ b/tuxlite_tbs/templates/disqus.html @@ -1,10 +1,13 @@ -{% if DISQUS_SITENAME and article %} +{% if DISQUS_SITENAME %} +<div id="disqus_thread"></div> <script type="text/javascript"> - var disqus_identifier = "{{ article.url }}"; - (function() { - var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js'; - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); - })(); + var disqus_shortname = '{{ DISQUS_SITENAME }}'; + + (function() { + var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; + dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); </script> -{% endif %}
\ No newline at end of file +<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> +{% endif %} diff --git a/tuxlite_tbs/templates/index.html b/tuxlite_tbs/templates/index.html index 45a491d..da1c3e0 100644 --- a/tuxlite_tbs/templates/index.html +++ b/tuxlite_tbs/templates/index.html @@ -10,29 +10,25 @@ <div class='article'> <div class="content-title"> - <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a> + <a href="{{ SITEURL }}/{{ article.url }}"><h1>{{ article.title }}</h1></a> {% include "metadata.html" %} </div> + <div>{{ article.content }}</div> + <hr /> </div> {% if loop.length == 1 %} {% include 'pagination.html' %} {% endif %} - {% if loop.length > 1 %} - <hr /> - <br /> - <h2>Other Entries</h2> - {% endif %} - {# other items #} {% else %} <div class='article'> - <a href="{{ SITEURL }}/{{ article.url }}"><h3>{{ article.title }}</h3></a> + <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a> <div class= "well small"> {% include "metadata.html" %} </div> - <div class="summary">{{ article.summary }} <a class="btn primary xsmall" href="{{ SITEURL }}/{{ article.url }}">read more</a></div> + <div class="summary">{{ article.summary }} <a class="btn btn-info xsmall" href="{{ SITEURL }}/{{ article.url }}">read more</a></div> </div> {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %} @@ -45,3 +41,4 @@ {% endif %} {# If articles #} {% endblock content %} + diff --git a/tuxlite_tbs/templates/metadata.html b/tuxlite_tbs/templates/metadata.html index cb04053..3f7e987 100644 --- a/tuxlite_tbs/templates/metadata.html +++ b/tuxlite_tbs/templates/metadata.html @@ -1,13 +1,13 @@ -{{ article.date.strftime("%d %b %Y") }} +{{ article.locale_date }} {% if article.author %} -by <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a> +by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> {% endif %} -{# Filed under <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a> #} +{# Filed under <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> #} {# {% if article.tags %} - Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %} + Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %} {% endif %} #} diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html index df6f55f..dea6672 100644 --- a/tuxlite_tbs/templates/tags.html +++ b/tuxlite_tbs/templates/tags.html @@ -3,7 +3,7 @@ {% block content %} <ul> {% for tag, articles in tags %} - <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</li> + <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</li> {% endfor %} </ul> {% endblock %} |