diff options
| author | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
|---|---|---|
| committer | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
| commit | 98f0d46f2bbddf86e8d202b533af35fa79da2d2f (patch) | |
| tree | 297d677cfa76bb20d4e80803343c69b99c939e37 /bootstrap/templates/base.html | |
| parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
| parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
| download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz | |
[dev-random] resolved conflicts
Diffstat (limited to 'bootstrap/templates/base.html')
| -rw-r--r-- | bootstrap/templates/base.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html index 5710a5e..9458d6e 100644 --- a/bootstrap/templates/base.html +++ b/bootstrap/templates/base.html @@ -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> <p class="pull-right"><a href="{{ SITEURL }}/archives.html">[archives]</a> <a href="{{ SITEURL }}/tags.html">[tags]</a></p> @@ -73,4 +73,4 @@ </div> </body> -</html>
\ No newline at end of file +</html> |