Ronnie has proposed merging lp:~ronnie.vd.c/loco-directory/top-nav into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~ronnie.vd.c/loco-directory/top-nav/+merge/51459
Added top-nav
Need to check if the related-links in the top-nav are appropriate
--
https://code.launchpad.net/~ronnie.vd.c/loco-directory/top-nav/+merge/51459
Your team loco-directory-dev is requested to review the proposed merge of
lp:~ronnie.vd.c/loco-directory/top-nav into lp:loco-directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2011-02-19 14:00:14 +0000
+++ loco_directory/media/css/newstyle.css 2011-02-27 15:39:58 +0000
@@ -246,6 +246,10 @@
.thumbs li img { display: block; }
.thumbs li a img { border: none;}
+aside#top-nav {
+ width: 980px;
+}
+
header#page-header {
width: 960px;
margin: 0px auto;
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2011-02-08 15:10:10 +0000
+++ loco_directory/templates/base.html 2011-02-27 15:39:58 +0000
@@ -10,6 +10,22 @@
<script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
{% endblock %}
+{% block top_nav_login_links %}
+ {% if user.is_authenticated %}
+ {% trans "Logged in as:" %}
+ <a class="top-login-item" href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>
+ <span class="top-login-separator">|</span>
+ {% comment %}
+ <!-- Need to be activated when https://code.launchpad.net/~ronnie.vd.c/loco-directory/my-teams is merged -->
+ <a class="top-login-item" href="{% url my-teams %}">{% trans "My Teams" %}</a>
+ <span class="top-login-separator">|</span>
+ {% endcomment %}
+ <a class="top-login-item" href="{% url logout %}" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
+ {% else %}
+ <a class="top-login-item" href="/openid/login?next={{login_next}}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
+ {% endif %}
+{% endblock %}
+
{% block main_nav_links %}
<a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
<a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
@@ -17,11 +33,6 @@
<a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
<a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a>
<a class="main-nav-item {% ifequal url_base 'irc' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a>
- {% if user.is_authenticated %}
- <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
- {% else %}
- <a class="main-nav-item" href="/openid/login?next={{login_next}}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
- {% endif %}
{% endblock %}
{% block sub_nav_links %}
@@ -50,7 +61,6 @@
{% block footer %}
<div style="height: 40px;">
- <div class="loggedin">{% if user.is_authenticated %}{% trans "Logged in as" %}: <a href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>{% endif %}</div>
<div class="lang_switcher">
<form name="lang-switcher" style="text-align:right;" action="/language/" method="get">
<input name="next" type="hidden" value="{{ request.path }}" />
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py 2010-12-02 09:12:22 +0000
+++ loco_directory/urls.py 2011-02-27 15:39:58 +0000
@@ -21,7 +21,7 @@
url(r'^meetings/', include('meetings.urls')),
url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'),
url(r'^loco-council/approved$', 'teams.views.reapprovals', name='reapprovals'),
- url(r'^logout$', 'common.views.site_logout'),
+ url(r'^logout$', 'common.views.site_logout', name='logout'),
url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
url(r'^services/', include('services.urls')),
url(r'^search/', 'common.views.site_search', name='site_search'),
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
