diff options
Diffstat (limited to 'bootlex/templates')
| -rw-r--r-- | bootlex/templates/article.html | 2 | ||||
| -rw-r--r-- | bootlex/templates/base.html | 9 | ||||
| -rw-r--r-- | bootlex/templates/index.html | 22 |
3 files changed, 17 insertions, 16 deletions
diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html index 5a533fe..18ba9a3 100644 --- a/bootlex/templates/article.html +++ b/bootlex/templates/article.html @@ -5,7 +5,7 @@ <div class="header"> <h1>{{ article.title }}</h1> </div> - <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ 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 --> diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html index bbb8797..711bda6 100644 --- a/bootlex/templates/base.html +++ b/bootlex/templates/base.html @@ -14,13 +14,6 @@ </head> <body> - <div class="navbar"> - <div class="navbar-inner"> - <div class="container"> - <h1><a class="brand" href="{{ SITEURL }}">{{ SITENAME }}</a></h1> - </div> - </div> - </div> <div class="container"> <div class="row"> <div class="span8"> @@ -69,7 +62,7 @@ <div class="row"> <div class="span12"> <div id="about"> - <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/pages/about">Alex</a>!</p> + <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/about/">Alex</a>!</p> </div><!-- /#about --> </div><!-- /#contentinfo --> </div> diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html index 9da666a..02ff0ee 100644 --- a/bootlex/templates/index.html +++ b/bootlex/templates/index.html @@ -13,7 +13,7 @@ <div class="header"> <h2>{{ article.title }}</h2> </div> - <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ 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.summary }} </div><!-- /.entry-content --> @@ -32,20 +32,28 @@ </ul><!-- /#posts-list --> <div class="pagination pagination-centered"> <ul> - {% if articles_page.has_previous() %} - <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">←</a></li> - {% endif %} {% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %} <li><a href="{{ SITEURL }}">1</a></li> + {% endif %} + {% if articles_page.previous_page_number() - 1 == 2 %} + <li><a href="{{ articles_page.previous_page_number() - 1}}">{{ articles_page.previous_page_number() - 1}}</a></li> + {% elif articles_page.previous_page_number() - 1 > 1 %} <li class="disabled"><a href="#">...</a></li> {% endif %} + {% if articles_page.has_previous() %} + <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">{{ articles_page.previous_page_number() }}</a></li> + {% endif %} <li class="active"><a href="#">{{ articles_page.number }}</a></li> {% if articles_page.has_next() %} - <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">→</a></li> + <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">{{ articles_page.next_page_number() }}</a></li> {% endif %} - {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %} + {% if articles_paginator.num_pages - articles_page.next_page_number() == 2 %} + <li><a href="{{ articles_page.next_page_number() + 1}}">{{ articles_page.next_page_number() + 1}}</a></li> + {% elif articles_paginator.num_pages - articles_page.next_page_number() > 2 %} <li class="disabled"><a href="#">...</a></li> - <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.num_pages }}/">{{ articles_paginator.num_pages }}</a></li> + {% endif %} + {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %} + <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_paginator.num_pages }}/">{{ articles_paginator.num_pages }}</a></li> {% endif %} </ul> </div> |