Chris Johnston has proposed merging 
lp:~chrisjohnston/loco-team-portal/event-recap into lp:loco-team-portal.

Requested reviews:
  LoCo Team Portal Developers (loco-directory-dev)

For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-team-portal/event-recap/+merge/81925
-- 
https://code.launchpad.net/~chrisjohnston/loco-team-portal/event-recap/+merge/81925
Your team LoCo Team Portal Developers is requested to review the proposed merge 
of lp:~chrisjohnston/loco-team-portal/event-recap into lp:loco-team-portal.
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2011-08-27 23:19:01 +0000
+++ loco_directory/events/models.py	2011-11-11 01:32:23 +0000
@@ -128,6 +128,7 @@
     channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)  
     registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
     template = 'events/team_event_li.inc.html'
+    recap = models.TextField(verbose_name=_('Event Recap'), help_text=_('After the event, add a recap of the event.'), blank=True, null=True)
 
     def __unicode__(self):
         return "%s %s %s" % (self.name, self.venue, self.date_begin or "")

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2010-11-27 15:04:43 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2011-11-11 01:32:23 +0000
@@ -33,3 +33,14 @@
     {% include "events/team_event_detail_comments.inc.html" %}
 </article>
 {% endif %}
+
+{% if team_event_object.recap %}
+<article class="main-content">
+    <h3>{% trans "Event Recap" %}</h3>
+    <table id="team-event-basic">
+        <tr>
+            <td class="form-item-value">{{ team_event_object.recap|linebreaksbr|urlize }}</td>
+        </tr>
+    </table>
+</article>
+{% 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

Reply via email to