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

[Adnane Belmadiaf]

Fixed the Team Meetings history

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-02-09 16:26:04 +0000
+++ loco_directory/teams/views.py	2013-02-10 15:12:21 +0000
@@ -148,11 +148,11 @@
     """
     list with all team meetings in past for the given team
     """
-    team_object = get_object_or_404(Team, lp_name=team_slug)
-    team_meeting_list = team_object.teammeeting_set.history_meetings()
+    team = get_object_or_404(Team, lp_name=team_slug)
+    team_meetings = team.teammeeting_set.history_meetings()
     context = {
-        'team_object': team_object,
-        'team_meeting_list': team_meeting_list,
+        'team': team,
+        'team_meetings': team_meetings,
     }
     return render_to_response('teams/team_meeting_history.html', context,
                   RequestContext(request))
 
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-12-18 22:25:30 +0000
+++ loco_directory/templates/teams/team_detail.html	2013-02-10 15:12:21 +0000
@@ -154,10 +154,10 @@
                         </div>
 
                         <div id="loco-support">
-                            <span title="{% trans "Reapproval Date:" %}" class="pictogram calendar"></span>
+                            <span title="{% trans "Reapproval Date" %}" class="pictogram calendar"></span>
                             <span class="value ellipsis medium-ellipsis">
                                 {% if team.approved %}
-                                    {% trans "Reapproval Date:" %} {{ team.expires_date }}
+                                    {{ team.expires_date }}
                                 {% endif %}
                             </span>
                         </div>
@@ -179,6 +179,9 @@
                             <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
                         </span>
                         <span>
+                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                        </span>
+                        <span>
                             <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
@@ -196,7 +199,7 @@
                     {% endfor %}
                 {% else %}
                     <div class="no-results">
-                    {% trans "There are currently no upcoming events :(" %}
+                    {% trans "There are currently no upcoming events or meetings :(" %}
                     </div>
                 {% endif %}
             </div>
 
=== modified file 'loco_directory/templates/teams/team_event_history.html'
--- loco_directory/templates/teams/team_event_history.html	2013-02-09 17:15:00 +0000
+++ loco_directory/templates/teams/team_event_history.html	2013-02-10 15:12:21 +0000
@@ -109,10 +109,10 @@
                         </div>
 
                         <div id="loco-support">
-                            <span title="{% trans "Reapproval Date:" %}" class="pictogram calendar"></span>
+                            <span title="{% trans "Reapproval Date" %}" class="pictogram calendar"></span>
                             <span class="value ellipsis medium-ellipsis">
                                 {% if team.approved %}
-                                    {% trans "Reapproval Date:" %} {{ team.expires_date }}
+                                    {{ team.expires_date }}
                                 {% endif %}
                             </span>
                         </div>
@@ -134,6 +134,9 @@
                             <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
                         </span>
                         <span>
+                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                        </span>
+                        <span>
                             <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
@@ -172,7 +175,7 @@
                     {% endfor %}
                 {% else %}
                     <div class="no-results">
-                    {% trans "There team has no events yet :(" %}
+                    {% trans "This team has no events yet :(" %}
                     </div>
                 {% endif %}
             </div>
 
=== modified file 'loco_directory/templates/teams/team_meeting_history.html'
--- loco_directory/templates/teams/team_meeting_history.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/team_meeting_history.html	2013-02-10 15:12:21 +0000
@@ -1,27 +1,217 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n teams_tags %}
 
-{% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting History{% endblocktrans %}{% endblock %}
+{% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meetings History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-meeting-list team_object.lp_name %}">{% trans "Upcoming Meetings" %}</a></li>
+    <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_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 %}
+    {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
+{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+<link type="application/rss+xml" rel="alternate" title="{% trans "Team (RSS)" %}" href="/feeds/teams/{{ team.lp_name }}" />
 {% endblock %}
 
 {% block content %}
 <div class="row">
-<section class="span-12">
-<h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting History{% endblocktrans %}</h1>
-
-{% if team_meeting_list %}
-<p>{% trans "Select a team meeting below to see more information about it:" %}</p>
-
-{% include "meetings/team_meeting_list.inc.html" %}
-
-{% else %}
-<p>{% blocktrans with team_object.lp_name as teamname %}There are no past meetings for {{teamname}} :({% endblocktrans %}</p>
-{% endif %}
-
-</section>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <div id="locobranding">
+                    <img src="{{ team.mugshot_url }}" alt="{{ team.name }}" title="{{ team.name }}" />
+                </div>
+                <div id="loco-name">
+                    <h2>{{ team.name }} <a class="contact-button" href="https://launchpad.net/~{{ team.lp_name }}/+contactuser/" title="{% trans "Contact this team" %}" target="_blank">{% trans "Contact this team" %}</a></h2>
+                    <div style="display:block;">
+                        <div id="loco-location">
+                            <span title="{% trans "Location" %}" class="pictogram place"></span>
+                            <span class="value ellipsis small-ellipsis">
+                            {% if team.countries.all %}
+                                {% for country in team.countries.all %}
+                                    {% if not forloop.first %}, {% endif %}{{ country.name }}
+                                {% endfor %}
+                                {% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}
+                                {% endif %}
+                            {% else %}
+                                {% trans "None Specified" %}
+                            {% endif %}
+                            </span>
+                        </div>
+
+                        <div id="loco-language">
+                            <span title="{% trans "Languages" %}" class="pictogram language"></span>
+                            <span class="value ellipsis">
+                            {% if team.languages.all %}
+                                {% for language in team.languages.all %}
+                                    {% if not forloop.first %}, {% endif %}{{ language.name }}
+                                {% endfor %}
+                            {% else %}
+                                {% trans "None Specified" %}
+                            {% endif %}
+                            </span>
+                        </div>
+
+                        <div id="loco-support">
+                            <span title="{% trans "Local Support" %}" class="pictogram support"></span>
+                            <span class="value ellipsis medium-ellipsis">
+                            {% if team.provides_support %}
+                                {% trans "This LoCo provides support :)" %}
+                            {% else %}
+                                {% trans "This LoCo doesn't provide support :(" %}
+                            {% endif %}
+                            </span>
+                        </div>
+                    </div>
+
+                    <div style="display:block;">
+                        <div id="loco-location">
+                            <span title="{% trans "Resources" %}" class="pictogram ml"></span>
+                            <span class="value ellipsis small-ellipsis">
+                                {% if team.web_url %}
+                                <a href="{{ team.web_url }}" title="{% trans "Website" %}" target="_blank">
+                                    {% trans "Website" %}
+                                </a>
+                                {% endif %}
+                                {% if team.web_url and team.wiki_url %} / {% endif %}
+                                {% if team.wiki_url %}
+                                <a href="{{ team.wiki_url }}" title="{% trans "Wiki" %}" target="_blank">
+                                    {% trans "Wiki" %}
+                                </a>
+                                {% endif %}
+                            </span>
+                        </div>
+
+
+                        <div id="loco-support">
+                            <span class="pictogram forums" title="{% trans "Support" %}"></span>
+                            <span class="value ellipsis">
+                                {% if team.ml_url %}
+                                <a href="{{ team.ml_url }}" title="{% trans "Mailing List" %}" target="_blank">
+                                    {% trans "Mailing List" %}
+                                </a>
+                                {% endif %} /
+                                {% if team.forum_url  %}
+                                <a href="{{ team.forum_url }}" title="{% trans "Forums" %}" target="_blank">
+                                    {% trans "Forums" %}
+                                </a>
+                                {% endif %} /
+                                {% if team.irc_chan %}
+                                <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={% if user.is_authenticated %}{{ user.username|irc }}{% else %}locodir-user{% endif %}" title="{% trans "IRC" %}" target="_blank">
+                                    {% trans "IRC" %}
+                                </a>
+                                {% endif %}
+                            </span>
+                        </div>
+
+                        <div id="loco-support">
+                            <span title="{% trans "Reapproval Date" %}" class="pictogram calendar"></span>
+                            <span class="value ellipsis medium-ellipsis">
+                                {% if team.approved %}
+                                    {{ team.expires_date }}
+                                {% endif %}
+                            </span>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+            <div class="events-meetings-wrapper">
+                <div style="overflow: auto; margin-bottom: 10px;border-bottom: 1px solid #E6E6E6;">
+                    <h3 class="title">{% trans "Past Meetings" %}</h3>
+                    <div class="team-actions">
+                        <span>
+                            <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                        </span>
+                        <span>
+                            <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
+                        </span>
+                        <span>
+                            <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
+                        </span>
+                    </div>
+                </div>
+                {% if team_meetings %}
+                    {% regroup team_meetings by date_begin|date:"Y" as meetings %}
+                    {% for year in meetings %}
+                        <a name="y{{ year.grouper }}"></a>
+                        <div style="font-size: 12px;float: right; padding-top: 10px;padding-right: 15px;">
+                            <span style="margin-left: 10px; text-transform: uppercase;">{% trans "Browse by year" %} </span>
+                            {% for y in meetings %}
+                            <span style="margin-left: 10px;">
+                                {% if y == year %}
+                                    {{ y.grouper }}
+                                {% else %}
+                                    <a href="#y{{ y.grouper }}" title="{{ y.grouper }}">{{ y.grouper }}</a>
+                                {% endif %}
+                            </span>
+                            {% endfor %}
+                        </div>
+                        <h3 style="padding-left: 15px;">{{ year.grouper }}
+                            {% with meetings_count=year.list|length %}
+                            ({% blocktrans with meetings_count as meetings_count %}{{ meetings_count }} meetings{% endblocktrans %})
+                            {% endwith %}
+                        </h3>
+                        {% for event in year.list %}
+                        <a href="{{ event.get_absolute_url }}" title="{% if event.venue %}{% else %}{{event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
+                            <span class="title">{{ event.name }}</span>
+                            <small>{{ event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ event.local_date_begin|date:"H:i T" }}</small>
+                            <p>{{ event.description|truncatewords:50 }}</p>
+                        </a>
+                        {% endfor %}
+                    {% endfor %}
+                {% else %}
+                    <div class="no-results">
+                    {% trans "This team has no meetings yet :(" %}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </section>
+    <section class="span-3 box_content last">
+        <div class="sidebar-inner">
+            <h3 class="title">{% trans "Team Admin(s)" %}</h3>
+            <div class="team-admins">
+            {% for admin in team.admin_profiles.all %}
+                {% ifequal team.owner admin.user.username %}
+                    <a href="{% url profile-detail admin.user.username %}">
+                        <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
+                        <p>{{ admin.realname }}</p>
+                    </a>
+                {% else %}
+                    <a href="{% url profile-detail admin.user.username %}">
+                        <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
+                        <p>{{ admin.realname }}</p>
+                    </a>
+                {% endifequal %}
+            {% endfor %}
+            </div>
+            <h3 class="title">{% trans "Team Contact(s)" %}</h3>
+            <div class="team-admins">
+                {% if team.contact_profiles.all %}
+                    {% for contact in team.contact_profiles.all %}
+                        <a href="{% url profile-detail contact.user.username %}">
+                        <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
+                        <p>{{ contact.realname }}</p>
+                    </a>
+                    {% endfor %}
+                {% else %}
+                    <p>{% trans "No LoCo Team contacts are set." %}</p>
+                {% endif %}
+            </div>
+        </div>
+    </section>
 </div>
 {% endblock %}