Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Matt Bowcock 2012-05-01 23:32:52 -04:00
commit 0d5a1f9cf3
11 changed files with 81 additions and 33 deletions

View file

@ -35,7 +35,7 @@
{% endfor %}
{% endif %}
{% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
</ul></nav>
</header><!-- /#banner -->