Fixes #44: Bootlex linking and whitespace problems

This commit is contained in:
Justin Mayer
2013-03-30 11:07:58 -07:00
parent 250484f57a
commit dd8c199881
4 changed files with 18 additions and 19 deletions

View File

@@ -1,11 +1,11 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}{{ article.title }}{%endblock%} {% block title %}{{ article.title }}{%endblock%}
{% block content %} {% block content %}
<div id="content"> <div id="content">
<div class="header"> <div class="header">
<h1>{{ article.title }}</h1> <h1>{{ article.title }}</h1>
</div> </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"> <div class="entry-content">
{{ article.content }} {{ article.content }}
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
@@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function() { (function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;

View File

@@ -12,9 +12,9 @@
<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
{% endif %} {% endif %}
{% endblock head %} {% endblock head %}
{% include 'analytics.html' %} {% include 'analytics.html' %}
</head> </head>
<body> <body>
@@ -57,12 +57,12 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
</div><!-- /#menu --> </div><!-- /#menu -->
</div> </div>
</div> </div>
<hr /> <hr />
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
<div id="about"> <div id="about">
@@ -71,12 +71,12 @@
</div><!-- /#contentinfo --> </div><!-- /#contentinfo -->
</div> </div>
</div> </div>
{% if DISQUS_SITENAME %} {% if DISQUS_SITENAME %}
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var s = document.createElement('script'); s.async = true; var s = document.createElement('script'); s.async = true;
@@ -86,6 +86,6 @@
}()); }());
</script> </script>
{% endif %} {% endif %}
</body> </body>
</html> </html>

View File

@@ -1,15 +1,15 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Blog{%endblock%} {% block title %}Blog{%endblock%}
{% block content %} {% block content %}
<div id="content"> <div id="content">
{% block content_title %} {% block content_title %}
<h1>Blog</h1> <h1>Blog</h1>
{% endblock %} {% endblock %}
<ul class="unstyled"> <ul class="unstyled">
{% for article in articles_page.object_list %} {% for article in articles_page.object_list %}
<li> <li>
<div> <div>
<div class="header"> <div class="header">
<h2>{{ article.title }}</h2> <h2>{{ article.title }}</h2>
</div> </div>
@@ -29,12 +29,11 @@
</div> </div>
</div> </div>
</li> </li>
<li><hr /></li> <li><hr /></li>
{% endfor %} {% endfor %}
</ul><!-- /#posts-list --> </ul><!-- /#posts-list -->
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %} {% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %}

View File

@@ -8,7 +8,7 @@ class="active"
{% if tags %} {% if tags %}
<ul> <ul>
{% for tag, articles in tags %} {% for tag, articles in tags %}
<li><a href="{{ SITEURL }}tag/{{ tag }}/">{{ tag }}</a></li> <li><a href="{{ SITEURL }}/tag/{{ tag }}/">{{ tag }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}