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

[Adnane Belmadiaf]

Fixed the meeting page

[Chris Johnston (cjohnston)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

[Michael Hall (mhall119)]

Tests pass

review: Approve

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2013-04-14 23:00:20 +0000
+++ loco_directory/meetings/views.py	2013-11-24 14:12:40 +0000
@@ -117,13 +117,13 @@
 #################################################################
 
 def team_meeting_detail(request, team_slug, team_meeting_id):
-    team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
+    team_meeting = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     is_member = False
-    for team_object in team_meeting_object.teams.all():
+    for team_object in team_meeting.teams.all():
         is_member = is_member or launchpad.is_team_member(request.user, team_object)
 
     context = {
-        'team_meeting_object': team_meeting_object,
+        'team_meeting': team_meeting,
         'user_is_team_member': is_member,
     }
     return render_to_response('meetings/team_meeting_detail.html',

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html	2013-11-24 14:12:40 +0000
@@ -1,26 +1,26 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block page_name %}{% trans team_meeting_object.name %}{% endblock %}
+{% block page_name %}{% trans team_meeting.name %}{% endblock %}
 {% block extrahead %}{{ block.super }}
 <meta property="fb:app_id" content="127188230723188"/>
-<meta property="og:title" content="{{ team_meeting_object.name }}" />
-<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}"/>
+<meta property="og:title" content="{{ team_meeting.name }}" />
+<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting.first_team.lp_name team_meeting.id %}"/>
 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
 <meta property="og:site_name" content="Loco Team Portal"/>
 <meta property="og:type" content="loco-team-portal:meeting"/>
 {% endblock %}
 
 {% block sub_nav_links %}
-{% for team in team_meeting_object.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
+{% for team in team_meeting.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <li><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></li>
-    <li><a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Delete Meeting" %}</a></li>
-    <li><a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Copy Meeting" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-meeting-update team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-meeting-delete team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Delete Meeting" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-meeting-copy team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Copy Meeting" %}</a></li>
   {% endif %}
 {% endif %}
-<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "iCal Feed" %}</a></li>
+<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail.inc.html	2013-04-14 23:00:20 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.inc.html	2013-11-24 14:12:40 +0000
@@ -3,9 +3,9 @@
     <section class="span-9">
         <div class="box_content">
             <div class="pagelet">
-                <h3>{{ team_meeting_object.name }}</h3>
                 {% include "meetings/team_meeting_detail_basic.inc.html" %}
             </div>
+            <h3 style="margin-left: 15px;">{% trans "Agenda Items" %}</h3>
             {% include "meetings/team_meeting_detail_agenda.inc.html" %}
         </div>
     </section>

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2013-04-14 23:00:20 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2013-11-24 14:12:40 +0000
@@ -1,23 +1,22 @@
 {% load i18n markup %}
 {% load recurse %}
 {% if user_is_team_member %}
-    <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting_object.id %}">{% trans 'Add Agenda Item' %}</a>
+    <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
 {% endif %}
 
-{% if team_meeting_object.agenda %}
-    {% recurse item.children.all with team_meeting_object.agenda.top as item %}
+{% if team_meeting.agenda %}
+    {% recurse item.children.all with team_meeting.agenda.top as item %}
         <ul class="agenda-list">
         {% loop %}
             <li class="agenda-item">
                 <div style="overflow: auto">
                     <div style="float: left; width: 615px">
                         {% if user_is_team_member %}
-                        <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url agenda-item-update team_meeting_object.id item.id %}">{{ item.title }}</a>
+                        <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url agenda-item-update team_meeting.id item.id %}">{{ item.title }}</a>
                         {% else %}
                         <span class="agenda-title" >{{ item.title }}</span>
                         {% endif %}
                         ‒ <a class="agenda-sig" href="{% url profile-detail item.owner.user.username %}">{{ item.owner.realname }}</a>
-                        @ {{ item.created_date|date:"D, d N Y H:i T" }}
                         {% if item.description %}
                         <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>
                         {% endif %}

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2011-06-17 17:10:41 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2013-11-24 14:12:40 +0000
@@ -1,50 +1,60 @@
 {% load i18n %}
-{% if team_meeting_object %}
-<table id="team-meeting-basic">
-    {% if team_meeting_object.date_begin %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "When:" %}</th>
-        <td class="form-item-value">
-            {% ifequal team_meeting_object.local_date_begin|date team_meeting_object.local_date_end|date %}
-                {{ team_meeting_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.local_date_end|date:"H:i T (O)" }}
-            {% else %}
-                {{ team_meeting_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.local_date_end|date:"D, d N Y H:i T (O)" }}
-            {% endifequal %}
-        </td>
-    </tr>
-{% endif %}
-
-{% if team_meeting_object.teams.all %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Organizing Team:" %}</th>
-        <td class="form-item-value">{% for team in team_meeting_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td>
-    </tr>
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Meeting Channel:" %}</th>
-        <td class="form-item-value"><a title="{% trans "Join Channel" %} {{ team_meeting_object.channel }}" href="#" onclick="$('#webchat').show('fast', function() {$(window).scrollTop($('#webchat').position().top);} );">{{ team_meeting_object.channel }}</a></td>
-    </tr>
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Meeting Chair:" %}</th>
-        <td class="form-item-value">
-            {% if team_meeting_object.chair %}
-                <a target="launchpaduser" href="https://launchpad.net/~{{team_meeting_object.chair.user.username}}" >{{ team_meeting_object.chair }}</a>
-            {% else %}
-                {% trans "No Meeting Chair Assigned" %}
-            {% endif %}
-        </td>
-    </tr>
-    {% if team_meeting_object.minutes %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Meeting Minutes:" %}</th>
-            <td class="form-item-value"><a href="{{ team_meeting_object.minutes }}">{{ team_meeting_object.minutes }}</a></td>
-        </tr>
-    {% endif %}
-    {% if team_meeting_object.logs %}{% if team_meeting_object.is_past %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Meeting Logs:" %}</th>
-            <td class="form-item-value"><a href="{{ team_meeting_object.logs }}">{{ team_meeting_object.logs }}</a></td>
-        </tr>
-    {% endif %}{% endif %}
-{% endif %}
-</table>
+{% if team_meeting %}
+    <div>
+        <h2>
+            {% if team_meeting.teams.all %}
+            {% for team in team_meeting.teams.all %}
+            <a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
+            {% if not forloop.last %},{% endif %}{% endfor %}
+            {% endif %}
+        </h2>
+        <div style="display:block;">
+            <div id="loco-location">
+                <span title="{% trans "Meeting Channel" %}" class="pictogram place"></span>
+                <span class="value ellipsis medium-ellipsis" style="width: 350px;">
+                    <a target="_blank" href="http://webchat.freenode.net/?channels={{ team_meeting.channel }}">{{ team_meeting.channel }}</a>
+                </span>
+            </div>
+
+            <div id="loco-language">
+                <span title="{% trans "Meeting Chair" %}" class="pictogram language"></span>
+                <span class="value ellipsis" style="width: 350px;">
+                    {% if team_meeting.chair %}
+                        <a href="{% url profile-detail team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
+                    {% else %}
+                        {% trans "No Meeting Chair Assigned" %}
+                    {% endif %}
+                </span>
+            </div>
+
+            <div id="loco-location">
+                <span class="pictogram calendar" title="{% trans "Meeting Channel" %}"></span>
+                <span class="value ellipsis" style="width: auto;">
+                    {% ifequal team_meeting.local_date_begin|date team_meeting.local_date_end|date %}
+                        {{ team_meeting.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting.local_date_end|date:"H:i T (O)" }}
+                    {% else %}
+                        {{ team_meeting.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting.local_date_end|date:"D, d N Y H:i T (O)" }}
+                    {% endifequal %}
+                </span>
+            </div>
+
+            {% if team_meeting.minutes %}
+            <div id="loco-location">
+                <span class="pictogram announcement" title="{% trans "Meeting Channel" %}"></span>
+                <span class="value ellipsis" style="width: auto;">
+                    <a href="{{ team_meeting.minutes }}">{{ team_meeting.minutes }}</a>
+                </span>
+            </div>
+            {% endif %}
+
+            {% if team_meeting.logs %}{% if team_meeting.is_past %}
+            <div id="loco-location">
+                <span class="pictogram forums" title="{% trans "Meeting Channel" %}"></span>
+                <span class="value ellipsis" style="width: auto;">
+                    <a href="{{ team_meeting.logs }}">{{ team_meeting.logs }}</a>
+                </span>
+            </div>
+            {% endif %}{% endif %}
+        </div>
+    </div>
 {% endif %}