summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-11-09 19:21:35 -0600
committerIsmael Carnales <icarnales@gmail.com>2009-11-10 17:52:29 -0200
commitc126492aba5b11415c9310f11c57f4ed580c3d86 (patch)
tree2fec69efabece120b082beb9334714aa4a5e8987
parent0f4e480eecdf1958393e270f847476fbd97d4250 (diff)
downloadarchweb-c126492aba5b11415c9310f11c57f4ed580c3d86.tar.gz
archweb-c126492aba5b11415c9310f11c57f4ed580c3d86.zip
Fix highlighting on main site tabs
We should always highlight 'Home' when on the Django site. The sole exception is the download page which has its own special place. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--public/views.py3
-rw-r--r--templates/base.html12
2 files changed, 7 insertions, 8 deletions
diff --git a/public/views.py b/public/views.py
index e301aaef..39e5b5fb 100644
--- a/public/views.py
+++ b/public/views.py
@@ -68,8 +68,7 @@ def moreforums(request):
return list_detail.object_list(request,
AltForum.objects.order_by('language', 'name'),
template_name="public/moreforums.html",
- template_object_name="forum",
- extra_context={"path": request.path})
+ template_object_name="forum")
# vim: set ts=4 sw=4 et:
diff --git a/templates/base.html b/templates/base.html
index 1dee72bf..b9cdb6dd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -12,17 +12,17 @@
<body>
<div id="head_container">
<div id="title">
- <div id="logo"><h1 id="archtitle"><a href="http://www.archlinux.org/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
+ <div id="logo"><h1 id="archtitle"><a href="/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
</div>
<div id="main_nav">
{% block topmenu %}
<ul>
<li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="/download/">Download</a></li>
- <li><a href="http://aur.archlinux.org">AUR</a></li>
- <li><a href="http://bugs.archlinux.org">Bugs</a></li>
- <li><a href="http://wiki.archlinux.org">Wiki</a></li>
- <li><a href="http://bbs.archlinux.org">Forums</a></li>
- <li{% ifequal path '/' %} class="selected"{% endifequal %}><a href="/">Home</a></li>
+ <li><a href="http://aur.archlinux.org/">AUR</a></li>
+ <li><a href="http://bugs.archlinux.org/">Bugs</a></li>
+ <li><a href="http://wiki.archlinux.org/">Wiki</a></li>
+ <li><a href="http://bbs.archlinux.org/">Forums</a></li>
+ <li{% ifnotequal path '/download/' %} class="selected"{% endifnotequal %}><a href="/">Home</a></li>
</ul>
{% endblock %}
</div>