aboutsummaryrefslogtreecommitdiffstats
path: root/bootlex
diff options
context:
space:
mode:
authorJustin Mayer <entroP@gmail.com>2013-03-30 11:07:58 -0700
committerJustin Mayer <entroP@gmail.com>2013-03-30 11:07:58 -0700
commitdd8c1998817a3abd707f6db44d193a21292ff462 (patch)
tree7a06c594f68649026130318f8697b3ba39ba080e /bootlex
parent250484f57aeae2cfebe8eca4fb406bc768b71415 (diff)
downloadpelican-themes-dd8c1998817a3abd707f6db44d193a21292ff462.zip
pelican-themes-dd8c1998817a3abd707f6db44d193a21292ff462.tar.gz
pelican-themes-dd8c1998817a3abd707f6db44d193a21292ff462.tar.bz2
Fixes #44: Bootlex linking and whitespace problems
Diffstat (limited to 'bootlex')
-rw-r--r--bootlex/templates/article.html8
-rw-r--r--bootlex/templates/base.html16
-rw-r--r--bootlex/templates/index.html11
-rw-r--r--bootlex/templates/tags.html2
4 files changed, 18 insertions, 19 deletions
diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html
index d2cfda6..7c64418 100644
--- a/bootlex/templates/article.html
+++ b/bootlex/templates/article.html
@@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block title %}{{ article.title }}{%endblock%}
-{% block content %}
-<div id="content">
+{% block content %}
+<div id="content">
<div class="header">
<h1>{{ article.title }}</h1>
</div>
- <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
+ <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}/author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
<div class="entry-content">
{{ article.content }}
</div><!-- /.entry-content -->
@@ -14,7 +14,7 @@
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
-
+
/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html
index 481fb28..ed1bf94 100644
--- a/bootlex/templates/base.html
+++ b/bootlex/templates/base.html
@@ -12,9 +12,9 @@
<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
{% endif %}
{% endblock head %}
-
+
{% include 'analytics.html' %}
-
+
</head>
<body>
@@ -57,12 +57,12 @@
{% endfor %}
{% endif %}
</ul>
- </div><!-- /#menu -->
+ </div><!-- /#menu -->
</div>
</div>
-
+
<hr />
-
+
<div class="row">
<div class="span12">
<div id="about">
@@ -71,12 +71,12 @@
</div><!-- /#contentinfo -->
</div>
</div>
-
+
{% if DISQUS_SITENAME %}
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
-
+
/* * * DON'T EDIT BELOW THIS LINE * * */
(function () {
var s = document.createElement('script'); s.async = true;
@@ -86,6 +86,6 @@
}());
</script>
{% endif %}
-
+
</body>
</html>
diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html
index c76ab3e..517016f 100644
--- a/bootlex/templates/index.html
+++ b/bootlex/templates/index.html
@@ -1,15 +1,15 @@
{% extends "base.html" %}
{% block title %}Blog{%endblock%}
-{% block content %}
+{% block content %}
<div id="content">
{% block content_title %}
<h1>Blog</h1>
{% endblock %}
<ul class="unstyled">
-{% for article in articles_page.object_list %}
+{% for article in articles_page.object_list %}
<li>
- <div>
+ <div>
<div class="header">
<h2>{{ article.title }}</h2>
</div>
@@ -29,12 +29,11 @@
</div>
</div>
</li>
-
+
<li><hr /></li>
-
-
{% endfor %}
</ul><!-- /#posts-list -->
+
<div class="pagination pagination-centered">
<ul>
{% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %}
diff --git a/bootlex/templates/tags.html b/bootlex/templates/tags.html
index 87f134c..a2ebbe3 100644
--- a/bootlex/templates/tags.html
+++ b/bootlex/templates/tags.html
@@ -8,7 +8,7 @@ class="active"
{% if tags %}
<ul>
{% for tag, articles in tags %}
- <li><a href="{{ SITEURL }}tag/{{ tag }}/">{{ tag }}</a></li>
+ <li><a href="{{ SITEURL }}/tag/{{ tag }}/">{{ tag }}</a></li>
{% endfor %}
</ul>
{% else %}