Alan Bell has proposed merging lp:~alanbell/loco-directory/backbutton into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~alanbell/loco-directory/backbutton/+merge/73526
the "back to events list" and "back to meetings list" subnav options are
duplicates of the main nav options and add no value. They also cause confusion
to people expecting to remain in their team microsite. This patch adds the team
name link in the subnav.
--
https://code.launchpad.net/~alanbell/loco-directory/backbutton/+merge/73526
Your team loco-directory-dev is requested to review the proposed merge of
lp:~alanbell/loco-directory/backbutton into lp:loco-directory.
=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html 2011-03-16 17:20:55 +0000
+++ loco_directory/templates/events/team_event_detail.html 2011-08-31 13:21:24 +0000
@@ -4,7 +4,8 @@
{% block title %}{% trans team_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
{% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
+{% for team in team_event_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
+
<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
{% if user.is_authenticated %}
{% if user_is_team_member %}
=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html 2011-03-16 18:35:53 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html 2011-08-31 13:21:24 +0000
@@ -4,7 +4,7 @@
{% block title %}{% trans team_meeting_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
{% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a>
+{% for team in team_meeting_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
{% if user.is_authenticated %}
{% if user_is_team_member %}
<a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Edit Details" %}</a>
=== modified file 'requirements.txt'
--- requirements.txt 2011-07-29 21:19:54 +0000
+++ requirements.txt 2011-08-31 13:21:24 +0000
@@ -18,7 +18,7 @@
python-dateutil==1.5
vobject==0.8.1c
simplejson==2.0.9
-python-feedparser
+feedparser
# Non-standard dependencies
-f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
_______________________________________________
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
