Merge lp:~daker/loco-team-portal/fix.menu into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the menu

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2012-11-09 23:41:35 +0000
+++ loco_directory/templates/base.html	2012-11-16 21:26:22 +0000
@@ -25,7 +25,7 @@
 
 {% block top_nav_login_links %}
     {% if user.is_authenticated %}
-        {% trans "Logged in as:" %}
+        {% trans "Welcome" %}&nbps;
         <a class="top-login-item" href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>
         <span class="top-login-separator">|</span>
         <a class="top-login-item" href="{% url my-teams %}">{% trans "My Teams" %}</a>
@@ -42,12 +42,12 @@
 
 {% block main_nav_links %}
 <ul class="clearfix">
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'teams' %}active{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'events' %}active{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'meetings' %}active{% endifequal %}" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a></li>
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'loco-council' %}active{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a></li>
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'about-loco' %}active{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
-    <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item {% ifequal url_base 'irc' %}active{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
+    <li{% ifequal url_base 'teams' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
+    <li{% ifequal url_base 'events' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
+    <li{% ifequal url_base 'meetings' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a></li>
+    <li{% ifequal url_base 'loco-council' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "Governance" %}" href="{% url loco_council %}">{% trans "Governance" %}</a></li>
+    <li{% ifequal url_base 'about-loco' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
+    <li{% ifequal url_base 'irc' %}class="active"{% endifequal %} id="main-nav"><a class="main-nav-item" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
 </ul>
 {% endblock %}