Merge lp:~wxl/loco-team-portal/more-details into lp:loco-team-portal

[ԜаӀtеr Ⅼарсһуnѕkі]

In Team Details, if a user is not a member (in an else of a blank is_member), "Join This Team!" is displayed in the nav, but at no point anywhere on the page is the Launchpad Team mentioned. So if is_member succeeds, it now now offers "Team Details."

[Pablo Rubianes (pablorubianes-uy)]

As LoCo Council member I don't think that encourage people to join every team on the list is a good idea, as you need to join just your LoCo.
I think that provide more stuff to the members is a good idea but not encouraging people to join every LoCo.

Pablo

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

This change doesn't do anything different with regards to joining teams. That was already there for non-team members. All it does is add a "Team Details" link if they are a member of the team.

[ԜаӀtеr Ⅼарсһуnѕkі (wxl)]

Added daker per dholbach's suggestion.

[Lucy Llewellyn (lucyllewy)]

Looks good to me.

review: Approve

Unmerged revisions

683. By ԜаӀtеr Ⅼарсһуnѕkі on 2015-02-18

added lp team details to nav for members

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2013-11-17 05:32:01 +0000
+++ loco_directory/templates/teams/team_detail.html	2015-02-18 20:59:20 +0000
@@ -5,7 +5,7 @@
 
 {% block sub_nav_links %}
     <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
-    {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
+    {% if is_member %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}">{% trans "Team Details" %}</a></li>{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
     {% if is_admin %}<li><a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
     {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
     {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}