spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Fix active tag not to hardcode urls

merge-requests/138/head
Nikos Roussos 2015-07-12 00:37:51 +03:00
parent 0ffb0056a0
commit 5cf0b73efe
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
network/base/templatetags/tags.py
View File

@ -1,13 +1,14 @@
import re
from django import template
from django.core.urlresolvers import reverse
register = template.Library()
@register.simple_tag
def active(request, pattern):
if re.search(pattern, request.path):
def active(request, urls):
if request.path in ( reverse(url) for url in urls.split() ):
return 'active'
return None

9
network/templates/base.html
View File

@ -41,10 +41,11 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="{% active request '^/$' %}"><a href="{% url 'base:home' %}">Home</a></li>
<li class="{% active request '^/observations/$' %}"><a href="{% url 'base:observations_list' %}">Observations</a></li>
<li class="{% active request '^/stations/$' %}"><a href="{% url 'base:stations_list' %}">Ground Stations</a></li>
<li class="{% active request '^/about/$' %}"><a href="{% url 'base:about' %}">About</a></li>
<li class="{% active request 'base:home' %}"><a href="{% url 'base:home' %}">Home</a></li>
<li class="{% active request 'base:observations_list' %}"><a href="{% url 'base:observations_list' %}">Observations</a></li>
<li class="{% active request 'base:stations_list' %}"><a href="{% url 'base:stations_list' %}">Ground Stations</a></li>
<li class="{% active request 'base:about' %}"><a href="{% url 'base:about' %}">About</a></li>
<li><a href="https://community.satnogs.org/" target="_blank">Community</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if request.user.is_authenticated %}