Chris Johnston has proposed merging
lp:~chrisjohnston/loco-directory/meeting-details into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
--
https://code.launchpad.net/~chrisjohnston/loco-directory/meeting-details/+merge/43239
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/meeting-details into lp:loco-directory.
=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py 2010-12-07 21:33:54 +0000
+++ loco_directory/meetings/models.py 2010-12-09 16:43:10 +0000
@@ -16,7 +16,7 @@
channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Include #'), null=True)
logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log'), max_length=200, verify_exists=False, blank=True, null=True)
date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
- chair = models.ForeignKey(UserProfile, blank=True, null=True)
+ chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
def __unicode__(self):
return self.name
=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2010-12-07 21:33:54 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2010-12-09 16:43:10 +0000
@@ -1,8 +1,10 @@
{% load i18n %}
-{% if team_meeting_object %}
+{% if team_meeting_object.AgendaItem %}
<ol class="agenda-list">
{% for item in team_meeting_object.agenda.as_tree %}
{{item.as_ol|safe}}
{% endfor %}
</ol>
+{% else %}
+<p>{% trans "There are currently no items on the agenda." %}</p>
{% endif %}
=== 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 16:43:10 +0000
@@ -5,7 +5,7 @@
<tr>
<th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th>
<td class="form-item-value">
- {% ifequal team_meeting_object.local_date_begin|date team_meeting_object.local_date_end|date %}
+ {% ifequal team_meeting_object.date_begin|date team_meeting_object.date_end|date %}
{{ team_meeting_object.date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.date_end|date:"H:i T (O)" }}
{% else %}
{{ team_meeting_object.date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.date_end|date:"D, d N Y H:i T (O)" }}
_______________________________________________
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
