diff options
Diffstat (limited to 'tuxlite_tbs/templates')
| -rw-r--r-- | tuxlite_tbs/templates/article.html | 2 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/base.html | 26 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/disqus.html | 19 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/index.html | 6 |
4 files changed, 25 insertions, 28 deletions
diff --git a/tuxlite_tbs/templates/article.html b/tuxlite_tbs/templates/article.html index 23e3c86..d2ceffd 100644 --- a/tuxlite_tbs/templates/article.html +++ b/tuxlite_tbs/templates/article.html @@ -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..1689827 100644 --- a/tuxlite_tbs/templates/base.html +++ b/tuxlite_tbs/templates/base.html @@ -13,7 +13,7 @@ <!-- 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"> @@ -22,7 +22,7 @@ <body> {% include "github.html" %} -<div class="navbar navbar-static"> +<div class="navbar"> <div class="navbar-inner"> <div class="container"> @@ -42,7 +42,11 @@ {% endif %} </ul> - <p class="pull-right"><a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/tags.html">Tags</a></p> + <ul class="nav pull-right"> + <li><a href="{{ SITEURL }}/archives.html">Archives</a> + <li class="divider-vertical"></li> + <li><a href="{{ SITEURL }}/tags.html">Tags</a> + </ul> </div> </div> @@ -60,7 +64,7 @@ {% 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> @@ -74,7 +78,7 @@ {% 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> @@ -89,7 +93,7 @@ {% 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> @@ -107,15 +111,6 @@ </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 #} @@ -128,7 +123,6 @@ </div> <!-- /container --> {% include "analytics.html" %} -{% include "disqus.html" %} </body> </html> 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..8b7dd93 100644 --- a/tuxlite_tbs/templates/index.html +++ b/tuxlite_tbs/templates/index.html @@ -13,7 +13,9 @@ <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a> {% include "metadata.html" %} </div> + <div>{{ article.content }}</div> + <hr /> </div> {% if loop.length == 1 %} @@ -21,8 +23,6 @@ {% endif %} {% if loop.length > 1 %} - <hr /> - <br /> <h2>Other Entries</h2> {% endif %} @@ -32,7 +32,7 @@ <div class='article'> <a href="{{ SITEURL }}/{{ article.url }}"><h3>{{ article.title }}</h3></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) %} |