aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap2
diff options
context:
space:
mode:
authorStéphane Raimbault <stephane.raimbault@gmail.com>2012-04-06 01:47:30 +0200
committerStéphane Raimbault <stephane.raimbault@gmail.com>2012-04-06 01:47:30 +0200
commit6c0150ce773e764c8775e6b2a37bcd4132da3127 (patch)
treef1f040a269316fe8c90dd3769ba08350363c4eed /bootstrap2
parent20b80f5c9b5e918c10451e28515afb2bbcb2d0c4 (diff)
downloadpelican-themes-6c0150ce773e764c8775e6b2a37bcd4132da3127.zip
pelican-themes-6c0150ce773e764c8775e6b2a37bcd4132da3127.tar.gz
pelican-themes-6c0150ce773e764c8775e6b2a37bcd4132da3127.tar.bz2
Trailing whitespaces cleanup in bootstrap2
Diffstat (limited to 'bootstrap2')
-rw-r--r--bootstrap2/templates/article.html70
-rw-r--r--bootstrap2/templates/article_infos.html6
-rw-r--r--bootstrap2/templates/base.html66
-rw-r--r--bootstrap2/templates/comments.html2
-rw-r--r--bootstrap2/templates/index.html78
-rw-r--r--bootstrap2/templates/page.html16
-rw-r--r--bootstrap2/templates/search_sidebar.html4
-rw-r--r--bootstrap2/templates/taglist.html2
-rw-r--r--bootstrap2/templates/twitter.html2
9 files changed, 120 insertions, 126 deletions
diff --git a/bootstrap2/templates/article.html b/bootstrap2/templates/article.html
index 8b9e0ab..638655c 100644
--- a/bootstrap2/templates/article.html
+++ b/bootstrap2/templates/article.html
@@ -1,40 +1,40 @@
{% extends "base.html" %}
{% block title %}{{ article.title }}{% endblock %}
{% block content %}
-<section id="content">
- <article>
- <header>
- <h1>
- <a href="{{ pagename }}"
- rel="bookmark"
- title="Permalink to {{ article.title }}">
- {{ article.title}}
- </a>
- {% include 'twitter.html' %}
- </h1>
- </header>
- <div class="entry-content">
- <div class="well">
- {% include 'article_infos.html' %}
- </div>
- {{ article.content }}
- </div><!-- /.entry-content -->
- {% if DISQUS_SITENAME %}
- <div class="comments">
- <h2>Comments !</h2>
- <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);
- })();
- </script>
- </div>
- {% endif %}
- </article>
+<section id="content">
+ <article>
+ <header>
+ <h1>
+ <a href="{{ pagename }}"
+ rel="bookmark"
+ title="Permalink to {{ article.title }}">
+ {{ article.title}}
+ </a>
+ {% include 'twitter.html' %}
+ </h1>
+ </header>
+ <div class="entry-content">
+ <div class="well">
+ {% include 'article_infos.html' %}
+ </div>
+ {{ article.content }}
+ </div><!-- /.entry-content -->
+ {% if DISQUS_SITENAME %}
+ <div class="comments">
+ <h2>Comments !</h2>
+ <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);
+ })();
+ </script>
+ </div>
+ {% endif %}
+ </article>
</section>
{% endblock %}
diff --git a/bootstrap2/templates/article_infos.html b/bootstrap2/templates/article_infos.html
index 0a6ce7a..a720b96 100644
--- a/bootstrap2/templates/article_infos.html
+++ b/bootstrap2/templates/article_infos.html
@@ -1,21 +1,21 @@
<footer class="post-info">
<span class="label">Date</span>
<abbr class="published" title="{{ article.date.isoformat() }}">
- <i class="icon-calendar"></i>{{ article.locale_date }}
+ <i class="icon-calendar"></i>{{ article.locale_date }}
</abbr>
{% if article.author %}
<span class="label">By</span>
<a href="{{ SITEURL }}/{{ article.author.url }}"><i class="icon-user"></i>{{ article.author }}</a>
{% endif %}
<span class="label">Category</span>
-<a href="{{ SITEURL }}/{{ article.category.url }}"><i class="icon-folder-open"></i>{{ article.category }}</a>.
+<a href="{{ SITEURL }}/{{ article.category.url }}"><i class="icon-folder-open"></i>{{ article.category }}</a>.
{% if PDF_PROCESSOR %}
<span class="label">
<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a>
</span>
{% endif %}
-
+
{% include 'taglist.html' %}
{% include 'translations.html' %}
</footer><!-- /.post-info -->
diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html
index 3e42e65..0eb0e40 100644
--- a/bootstrap2/templates/base.html
+++ b/bootstrap2/templates/base.html
@@ -17,27 +17,22 @@
.sidebar-nav {
padding: 9px 0;
}
-
- .tag-1 {
- font-size: 13pt;
- }
-
- .tag-2 {
- font-size: 10pt;
- }
-
- .tag-2 {
- font-size: 8pt;
- }
-
- .tag-4 {
- font-size: 6pt;
- }
-
+ .tag-1 {
+ font-size: 13pt;
+ }
+ .tag-2 {
+ font-size: 10pt;
+ }
+ .tag-2 {
+ font-size: 8pt;
+ }
+ .tag-4 {
+ font-size: 6pt;
+ }
</style>
<link href="{{ SITEURL }}/theme/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="{{ SITEURL }}/theme/css/font-awesome.css" rel="stylesheet">
-
+ <link href="{{ SITEURL }}/theme/css/font-awesome.css" rel="stylesheet">
+
<link href="{{ SITEURL }}/theme/css/pygments.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
@@ -78,20 +73,20 @@
{% for page in PAGES %}
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
- <li class="divider-vertical"></li>
+ <li class="divider-vertical"></li>
{% endif %}
{% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}>
<a href="{{ SITEURL }}/category/{{ cat }}.html">
- <i class="icon-folder-open icon-large"></i>{{ cat }}
- </a>
+ <i class="icon-folder-open icon-large"></i>{{ cat }}
+ </a>
</li>
{% endfor %}
-
- <ul class="nav pull-right">
- <li><a href="{{ SITEURL }}/archives.html"><i class="icon-th-list"></i>Archives</a></li>
- </ul>
-
+
+ <ul class="nav pull-right">
+ <li><a href="{{ SITEURL }}/archives.html"><i class="icon-th-list"></i>Archives</a></li>
+ </ul>
+
</ul>
<!--<p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>-->
</div><!--/.nav-collapse -->
@@ -105,8 +100,8 @@
{% block content %}
{% endblock %}
</div><!--/span-->
-
- <div class="span3 well sidebar-nav" id="sidebar">
+
+ <div class="span3 well sidebar-nav" id="sidebar">
{% include 'sidebar.html' %}
</div><!--/.well -->
@@ -117,11 +112,11 @@
<footer>
<address id="about">
Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican <i class="icon-external-link"></i></a>,
- which takes great advantage of <a href="http://python.org">Python <i class="icon-external-link"></i></a>.
+ which takes great advantage of <a href="http://python.org">Python <i class="icon-external-link"></i></a>.
</address><!-- /#about -->
- <p>The theme is from <a href="http://twitter.github.com/bootstrap/">Bootstrap from Twitter <i class="icon-external-link"></i></a>,
- and <a href="http://fortawesome.github.com/Font-Awesome/">Font-Awesome <i class="icon-external-link"></i></a>, thanks!</p>
+ <p>The theme is from <a href="http://twitter.github.com/bootstrap/">Bootstrap from Twitter <i class="icon-external-link"></i></a>,
+ and <a href="http://fortawesome.github.com/Font-Awesome/">Font-Awesome <i class="icon-external-link"></i></a>, thanks!</p>
</footer>
</div><!--/.fluid-container-->
@@ -129,7 +124,7 @@
{% include 'analytics.html' %}
{% include 'piwik.html' %}
- {% include 'disqus_script.html' %}
+ {% include 'disqus_script.html' %}
<!-- Le javascript
@@ -148,8 +143,7 @@
<script src="{{ SITEURL }}/theme/js/bootstrap-collapse.js"></script>
<script src="{{ SITEURL }}/theme/js/bootstrap-carousel.js"></script>
<script src="{{ SITEURL }}/theme/js/bootstrap-typeahead.js"></script>
-
- <!--<script src="{{ SITEURL }}/theme/js/autosidebar.js"></script>-->
+
+ <!--<script src="{{ SITEURL }}/theme/js/autosidebar.js"></script>-->
</body>
</html>
-
diff --git a/bootstrap2/templates/comments.html b/bootstrap2/templates/comments.html
index 806d9a0..8d25e1e 100644
--- a/bootstrap2/templates/comments.html
+++ b/bootstrap2/templates/comments.html
@@ -1,5 +1,5 @@
{% if DISQUS_SITENAME %}
- <p>There are
+ <p>There are
<a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">
comments
</a>.
diff --git a/bootstrap2/templates/index.html b/bootstrap2/templates/index.html
index f1a75d9..db92ac6 100644
--- a/bootstrap2/templates/index.html
+++ b/bootstrap2/templates/index.html
@@ -1,47 +1,47 @@
{% extends "base.html" %}
{% block content_title %}{% endblock %}
-{% block content %}
+{% block content %}
{% if articles %}
- {% for article in (articles_page.object_list if articles_page else articles) %}
- <div class='article'>
- <h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
- <div class="well small">{% include "article_infos.html" %}</div>
- <div class="summary">{{ article.summary }}
- <a class="btn primary xsmall" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
- </div>
- </div>
- <hr />
- {% endfor %}
-{%endif%}
+ {% for article in (articles_page.object_list if articles_page else articles) %}
+ <div class="article">
+ <h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+ <div class="well small">{% include "article_infos.html" %}</div>
+ <div class="summary">{{ article.summary }}
+ <a class="btn primary xsmall" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
+ </div>
+ </div>
+ <hr />
+ {% endfor %}
+{% endif %}
- {% if articles_page and articles_paginator.num_pages > 1 %}
- <div class="pagination">
- <ul>
- {% if articles_page.has_previous() %}
- {% set num = articles_page.previous_page_number() %}
- <li class="prev"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">&larr; Previous</a></li>
- {% else %}
- <li class="prev disabled"><a href="#">&larr; Previous</a></li>
- {% endif %}
- {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
- <li class="{{ 'active' if num == articles_page.number else '' }}"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
- {% endfor %}
- {% if articles_page.has_next() %}
- <li class="next"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &rarr;</a></li>
- {% else %}
- <li class="next disabled"><a href="#">&rarr; Next</a></li>
- {% endif %}
- </ul>
- </div>
+ {% if articles_page and articles_paginator.num_pages > 1 %}
+ <div class="pagination">
+ <ul>
+ {% if articles_page.has_previous() %}
+ {% set num = articles_page.previous_page_number() %}
+ <li class="prev"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">&larr; Previous</a></li>
+ {% else %}
+ <li class="prev disabled"><a href="#">&larr; Previous</a></li>
+ {% endif %}
+ {% for num in range( 1, 1 + articles_paginator.num_pages ) %}
+ <li class="{{ 'active' if num == articles_page.number else '' }}"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
+ {% endfor %}
+ {% if articles_page.has_next() %}
+ <li class="next"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &rarr;</a></li>
+ {% else %}
+ <li class="next disabled"><a href="#">&rarr; Next</a></li>
+ {% endif %}
+ </ul>
+ </div>
{% else %}
- {% if PAGES %}
- <section id="content" class="body">
- <h1>Pages</h1>
- {% for page in PAGES %}
- <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
- {% endfor %}
- </section>
- {% endif %}
+ {% if PAGES %}
+ <section id="content" class="body">
+ <h1>Pages</h1>
+ {% for page in PAGES %}
+ <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+ {% endfor %}
+ </section>
+ {% endif %}
{% endif %}
{% endblock content %}
diff --git a/bootstrap2/templates/page.html b/bootstrap2/templates/page.html
index 8d51188..223b52c 100644
--- a/bootstrap2/templates/page.html
+++ b/bootstrap2/templates/page.html
@@ -1,13 +1,13 @@
{% extends "base.html" %}
{% block title %}{{ page.title }}{% endblock %}
{% block content %}
-<section id="content" class="body">
- <h1 class="entry-title">{{ page.title }}</h1>
- {% if PDF_PROCESSOR %}
- <a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">
- get the pdf
- </a>
- {% endif %}
- {{ page.content }}
+<section id="content" class="body">
+ <h1 class="entry-title">{{ page.title }}</h1>
+ {% if PDF_PROCESSOR %}
+ <a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">
+ get the pdf
+ </a>
+ {% endif %}
+ {{ page.content }}
</section>
{% endblock %}
diff --git a/bootstrap2/templates/search_sidebar.html b/bootstrap2/templates/search_sidebar.html
index 00c81e3..24fdaad 100644
--- a/bootstrap2/templates/search_sidebar.html
+++ b/bootstrap2/templates/search_sidebar.html
@@ -2,7 +2,7 @@
<li class="nav-header"><h4><i class="icon-search"></i>Google Search</h4></li>
<div id="cse" style="width: 100%;">Loading</div>
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
-<script type="text/javascript">
+<script type="text/javascript">
google.load('search', '1');
google.setOnLoadCallback(function() {
var customSearchOptions = {}; var customSearchControl = new google.search.CustomSearchControl(
@@ -12,4 +12,4 @@
}, true);
</script>
<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
-{% endif %} \ No newline at end of file
+{% endif %}
diff --git a/bootstrap2/templates/taglist.html b/bootstrap2/templates/taglist.html
index c87ec0e..b553f7f 100644
--- a/bootstrap2/templates/taglist.html
+++ b/bootstrap2/templates/taglist.html
@@ -1,5 +1,5 @@
{% if article.tags %}
-<span class="label">Tags</span>
+<span class="label">Tags</span>
{% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}"><i class="icon-tag"></i>{{ tag }}</a>
{% endfor %}
diff --git a/bootstrap2/templates/twitter.html b/bootstrap2/templates/twitter.html
index b758853..ada18ff 100644
--- a/bootstrap2/templates/twitter.html
+++ b/bootstrap2/templates/twitter.html
@@ -1,5 +1,5 @@
{% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button"
+<a href="http://twitter.com/share" class="twitter-share-button"
data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a>
<script type="text/javascript" src="http://platform.twitter.com/widgets.js">
</script>