Merge lp:~cjohnston/loco-team-portal/720567 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 390
Merged at revision: 392
Proposed branch: lp:~cjohnston/loco-team-portal/720567
Merge into: lp:loco-team-portal
Diff against target: 14 lines (+1/-3)
1 file modified
loco_directory/templates/events/global_event_detail.html (+1/-3)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/720567
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+50103@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/global_event_detail.html'
2--- loco_directory/templates/events/global_event_detail.html 2010-12-19 21:25:01 +0000
3+++ loco_directory/templates/events/global_event_detail.html 2011-02-17 07:52:20 +0000
4@@ -9,9 +9,7 @@
5
6 {% block sub_nav_links %}
7 <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
8-{% if add_team_event %}
9-<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Your Team's Event" %}</a>
10-{% endif %}
11+<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a>
12 {% if user_is_on_lc %}
13 <a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a>
14 <a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a>

Subscribers

People subscribed via source and target branches