LoCo Team Portal

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

  1. fix.1234036
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 663
Merged at revision: 664
Proposed branch: lp:~daker/loco-team-portal/fix.1234036
Merge into: lp:loco-team-portal
Diff against target: 219 lines (+74/-65)
5 files modified
loco_directory/meetings/views.py (+3/-3)
loco_directory/templates/meetings/team_meeting_detail.html (+8/-8)
loco_directory/templates/meetings/team_meeting_detail.inc.html (+1/-1)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+4/-5)
loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+58/-48)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1234036
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+196448@code.launchpad.net

Commit message

Fixed the meeting page

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

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

Revision history for this message
Michael Hall (mhall119) wrote :

Tests pass

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
117#################################################################117#################################################################
118118
119def team_meeting_detail(request, team_slug, team_meeting_id):119def team_meeting_detail(request, team_slug, team_meeting_id):
120 team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)120 team_meeting = get_object_or_404(TeamMeeting, pk=team_meeting_id)
121 is_member = False121 is_member = False
122 for team_object in team_meeting_object.teams.all():122 for team_object in team_meeting.teams.all():
123 is_member = is_member or launchpad.is_team_member(request.user, team_object)123 is_member = is_member or launchpad.is_team_member(request.user, team_object)
124124
125 context = {125 context = {
126 'team_meeting_object': team_meeting_object,126 'team_meeting': team_meeting,
127 'user_is_team_member': is_member,127 'user_is_team_member': is_member,
128 }128 }
129 return render_to_response('meetings/team_meeting_detail.html',129 return render_to_response('meetings/team_meeting_detail.html',
130130
=== 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 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block page_name %}{% trans team_meeting_object.name %}{% endblock %}4{% block page_name %}{% trans team_meeting.name %}{% endblock %}
5{% block extrahead %}{{ block.super }}5{% block extrahead %}{{ block.super }}
6<meta property="fb:app_id" content="127188230723188"/>6<meta property="fb:app_id" content="127188230723188"/>
7<meta property="og:title" content="{{ team_meeting_object.name }}" />7<meta property="og:title" content="{{ team_meeting.name }}" />
8<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}"/>8<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting.first_team.lp_name team_meeting.id %}"/>
9<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>9<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
10<meta property="og:site_name" content="Loco Team Portal"/>10<meta property="og:site_name" content="Loco Team Portal"/>
11<meta property="og:type" content="loco-team-portal:meeting"/>11<meta property="og:type" content="loco-team-portal:meeting"/>
12{% endblock %}12{% endblock %}
1313
14{% block sub_nav_links %}14{% block sub_nav_links %}
15{% for team in team_meeting_object.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>15{% for team in team_meeting.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
16{% if user.is_authenticated %}16{% if user.is_authenticated %}
17 {% if user_is_team_member %}17 {% if user_is_team_member %}
18 <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>18 <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>
19 <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>19 <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>
20 <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>20 <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>
21 {% endif %}21 {% endif %}
22{% endif %}22{% endif %}
23<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>23<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
24{% endblock %}24{% endblock %}
2525
26{% block content %}26{% block content %}
2727
=== 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 @@
3 <section class="span-9">3 <section class="span-9">
4 <div class="box_content">4 <div class="box_content">
5 <div class="pagelet">5 <div class="pagelet">
6 <h3>{{ team_meeting_object.name }}</h3>
7 {% include "meetings/team_meeting_detail_basic.inc.html" %}6 {% include "meetings/team_meeting_detail_basic.inc.html" %}
8 </div>7 </div>
8 <h3 style="margin-left: 15px;">{% trans "Agenda Items" %}</h3>
9 {% include "meetings/team_meeting_detail_agenda.inc.html" %}9 {% include "meetings/team_meeting_detail_agenda.inc.html" %}
10 </div>10 </div>
11 </section>11 </section>
1212
=== 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 @@
1{% load i18n markup %}1{% load i18n markup %}
2{% load recurse %}2{% load recurse %}
3{% if user_is_team_member %}3{% if user_is_team_member %}
4 <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting_object.id %}">{% trans 'Add Agenda Item' %}</a>4 <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
5{% endif %}5{% endif %}
66
7{% if team_meeting_object.agenda %}7{% if team_meeting.agenda %}
8 {% recurse item.children.all with team_meeting_object.agenda.top as item %}8 {% recurse item.children.all with team_meeting.agenda.top as item %}
9 <ul class="agenda-list">9 <ul class="agenda-list">
10 {% loop %}10 {% loop %}
11 <li class="agenda-item">11 <li class="agenda-item">
12 <div style="overflow: auto">12 <div style="overflow: auto">
13 <div style="float: left; width: 615px">13 <div style="float: left; width: 615px">
14 {% if user_is_team_member %}14 {% if user_is_team_member %}
15 <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>15 <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url agenda-item-update team_meeting.id item.id %}">{{ item.title }}</a>
16 {% else %}16 {% else %}
17 <span class="agenda-title" >{{ item.title }}</span>17 <span class="agenda-title" >{{ item.title }}</span>
18 {% endif %}18 {% endif %}
19 ‒ <a class="agenda-sig" href="{% url profile-detail item.owner.user.username %}">{{ item.owner.realname }}</a>19 ‒ <a class="agenda-sig" href="{% url profile-detail item.owner.user.username %}">{{ item.owner.realname }}</a>
20 @ {{ item.created_date|date:"D, d N Y H:i T" }}
21 {% if item.description %}20 {% if item.description %}
22 <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>21 <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>
23 {% endif %}22 {% endif %}
2423
=== 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 @@
1{% load i18n %}1{% load i18n %}
2{% if team_meeting_object %}2{% if team_meeting %}
3<table id="team-meeting-basic">3 <div>
4 {% if team_meeting_object.date_begin %}4 <h2>
5 <tr>5 {% if team_meeting.teams.all %}
6 <th class="form-item-label" scope="row">{% trans "When:" %}</th>6 {% for team in team_meeting.teams.all %}
7 <td class="form-item-value">7 <a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>
8 {% ifequal team_meeting_object.local_date_begin|date team_meeting_object.local_date_end|date %}8 {% if not forloop.last %},{% endif %}{% endfor %}
9 {{ team_meeting_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.local_date_end|date:"H:i T (O)" }}9 {% endif %}
10 {% else %}10 </h2>
11 {{ 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)" }}11 <div style="display:block;">
12 {% endifequal %}12 <div id="loco-location">
13 </td>13 <span title="{% trans "Meeting Channel" %}" class="pictogram place"></span>
14 </tr>14 <span class="value ellipsis medium-ellipsis" style="width: 350px;">
15{% endif %}15 <a target="_blank" href="http://webchat.freenode.net/?channels={{ team_meeting.channel }}">{{ team_meeting.channel }}</a>
1616 </span>
17{% if team_meeting_object.teams.all %}17 </div>
18 <tr>18
19 <th class="form-item-label" scope="row">{% trans "Organizing Team:" %}</th>19 <div id="loco-language">
20 <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>20 <span title="{% trans "Meeting Chair" %}" class="pictogram language"></span>
21 </tr>21 <span class="value ellipsis" style="width: 350px;">
22 <tr>22 {% if team_meeting.chair %}
23 <th class="form-item-label" scope="row">{% trans "Meeting Channel:" %}</th>23 <a href="{% url profile-detail team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
24 <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>24 {% else %}
25 </tr>25 {% trans "No Meeting Chair Assigned" %}
26 <tr>26 {% endif %}
27 <th class="form-item-label" scope="row">{% trans "Meeting Chair:" %}</th>27 </span>
28 <td class="form-item-value">28 </div>
29 {% if team_meeting_object.chair %}29
30 <a target="launchpaduser" href="https://launchpad.net/~{{team_meeting_object.chair.user.username}}" >{{ team_meeting_object.chair }}</a>30 <div id="loco-location">
31 {% else %}31 <span class="pictogram calendar" title="{% trans "Meeting Channel" %}"></span>
32 {% trans "No Meeting Chair Assigned" %}32 <span class="value ellipsis" style="width: auto;">
33 {% endif %}33 {% ifequal team_meeting.local_date_begin|date team_meeting.local_date_end|date %}
34 </td>34 {{ team_meeting.local_date_begin|date:"D, d N Y H:i" }} - {{ team_meeting.local_date_end|date:"H:i T (O)" }}
35 </tr>35 {% else %}
36 {% if team_meeting_object.minutes %}36 {{ 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)" }}
37 <tr>37 {% endifequal %}
38 <th class="form-item-label" scope="row">{% trans "Meeting Minutes:" %}</th>38 </span>
39 <td class="form-item-value"><a href="{{ team_meeting_object.minutes }}">{{ team_meeting_object.minutes }}</a></td>39 </div>
40 </tr>40
41 {% endif %}41 {% if team_meeting.minutes %}
42 {% if team_meeting_object.logs %}{% if team_meeting_object.is_past %}42 <div id="loco-location">
43 <tr>43 <span class="pictogram announcement" title="{% trans "Meeting Channel" %}"></span>
44 <th class="form-item-label" scope="row">{% trans "Meeting Logs:" %}</th>44 <span class="value ellipsis" style="width: auto;">
45 <td class="form-item-value"><a href="{{ team_meeting_object.logs }}">{{ team_meeting_object.logs }}</a></td>45 <a href="{{ team_meeting.minutes }}">{{ team_meeting.minutes }}</a>
46 </tr>46 </span>
47 {% endif %}{% endif %}47 </div>
48{% endif %}48 {% endif %}
49</table>49
50 {% if team_meeting.logs %}{% if team_meeting.is_past %}
51 <div id="loco-location">
52 <span class="pictogram forums" title="{% trans "Meeting Channel" %}"></span>
53 <span class="value ellipsis" style="width: auto;">
54 <a href="{{ team_meeting.logs }}">{{ team_meeting.logs }}</a>
55 </span>
56 </div>
57 {% endif %}{% endif %}
58 </div>
59 </div>
50{% endif %}60{% endif %}

Subscribers

People subscribed via source and target branches