From 8fbc104cad5cdf4bf9f6e5bd687742f8ff25fd3b Mon Sep 17 00:00:00 2001
From: Olivier Girardot <ssaboum@gmail.com>
Date: Sun, 21 Oct 2012 11:10:00 +0200
Subject: [PATCH] refactored tab handling to not depend on any url hardcoded
 path

---
 templates/about.html |  1 +
 templates/base.html  | 10 +++++-----
 templates/index.html |  1 +
 templates/list.html  |  1 +
 templates/nn.html    |  1 +
 templates/start.html |  1 +
 templates/view.html  |  1 +
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/templates/about.html b/templates/about.html
index 90a3753..6b0cd76 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load bt %}
 {% load i18n %}
+{% block active_tab_contact %}id="current"{% endblock %}
 {% block content %}
 <div id='global'>
    <p>{% trans "RespectMyNet.eu is an online platform enabling citizens to become the watchmen of the Internet by reporting Net Neutrality violations. Everyone is invited to report undue blocking or throttling of their Internet access, and help  name and shame operators' harmful practices." %}</p>
diff --git a/templates/base.html b/templates/base.html
index a400fee..5bbc4e4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -37,11 +37,11 @@
   </p></div>
 
   <ul id="nav">
-     <li><a {% if request.path == '/' %}id="current" {% endif %}href="{% url homepage %}">{% trans "Home" %}</a></li>
-     <li><a {% if request.path == '/list/' or '/view' in request.path %}id="current" {% endif %}href="{% url list_violations %}">{% trans "Cases" %}</a></li>
-     <li><a {% if request.path == '/about/' %}id="current" {% endif %}href="{%root_url%}/about">{% trans "What is Net Neutrality?" %}</a></li>
-     <li><a {% if request.path == '/start/' %}id="current" {% endif %}href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
-     <li><a {% if request.path == '/contact/' %}id="current" {% endif %}href="{%root_url%}/contact">{% trans "Contact" %}</a></li>
+     <li><a {% block active_tab_home %}{% endblock %} href="{% url homepage %}">{% trans "Home" %}</a></li>
+     <li><a {% block active_tab_cases %}{% endblock %} href="{% url list_violations %}">{% trans "Cases" %}</a></li>
+     <li><a {% block active_tab_about %}{% endblock %} href="{%root_url%}/about">{% trans "What is Net Neutrality?" %}</a></li>
+     <li><a {% block active_tab_start %}{% endblock %} href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
+     <li><a {% block active_tab_contact %}{% endblock %} href="{%root_url%}/contact">{% trans "Contact" %}</a></li>
   </ul></div>
 </div>
 </div>
diff --git a/templates/index.html b/templates/index.html
index 9e2eb7e..d2cdf77 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load bt %}
 {% load i18n %}
+{% block active_tab_home %}id="current"{% endblock %}
 {% block styles %}
   <link rel="stylesheet" type="text/css" media="all" href="{% media_url %}/css/jquery.autocomplete.css" />
 {% endblock %}
diff --git a/templates/list.html b/templates/list.html
index 7fade1e..ee24549 100644
--- a/templates/list.html
+++ b/templates/list.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load bt %}
 {% load i18n %}
+{% block active_tab_cases %}id="current"{% endblock %}
 {% block styles %}
    <link rel="stylesheet" href="{{ MEDIA_URL }}/css/map.css" type="text/css" />
 {% endblock %}
diff --git a/templates/nn.html b/templates/nn.html
index 5850f86..636c9d5 100644
--- a/templates/nn.html
+++ b/templates/nn.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load bt %}
 {% load i18n %}
+{% block active_tab_about %}id="current"{% endblock %}
 {% block content %}
 <div id='global'>
 <h3>{% trans "On the Internet, <strong>you</strong> decide what you do, right? <em>Not anymore!</em>" %}</h3>
diff --git a/templates/start.html b/templates/start.html
index 6810bbe..9f48b41 100644
--- a/templates/start.html
+++ b/templates/start.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load bt %}
 {% load i18n %}
+{% block active_tab_start %}id="current"{% endblock %}
 {% block content %}
 <div id='global'>
    <p>{% trans "Do you want to check whether your access provider is manipulating your internet traffic? Great!" %}</p>
diff --git a/templates/view.html b/templates/view.html
index 809b450..79352bf 100644
--- a/templates/view.html
+++ b/templates/view.html
@@ -2,6 +2,7 @@
 {% load bt %}
 {% load i18n %}
 {% load comments %}
+{% block active_tab_cases %}id="current"{% endblock %}
 {% block styles %}
 {% endblock %}
 {% block adminext %}
-- 
GitLab