Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/686269
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#686269 Allow defining a meeting chair
https://bugs.launchpad.net/bugs/686269
--
https://code.launchpad.net/~chrisjohnston/loco-directory/686269/+merge/43229
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/686269 into lp:loco-directory.
=== modified file 'loco_directory/templates/meetings/team_meeting_detail.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail.inc.html 2010-12-07 21:33:54 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.inc.html 2010-12-09 15:21:16 +0000
@@ -1,9 +1,7 @@
{% load i18n %}
<article class="main-content">
<h2>{{team_meeting_object.name}}</h2>
-</article>
-<article class="main-content">
<h3>{% trans "Details" %}</h3>
{% include "meetings/team_meeting_detail_basic.inc.html" %}
</article>
=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-06 01:37:43 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-09 15:21:16 +0000
@@ -21,5 +21,11 @@
</tr>
{% endif %}
+{% if team_meeting_object.teams.all %}
+ <tr>
+ <th class="form-item-label" scope="row"><label>{% trans "Meeting Chair:" %}</label></th>
+ <td class="form-item-value">{{ team_meeting_object.chair }}</td>
+ </tr>
+{% endif %}
</table>
{% endif %}
_______________________________________________
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
