Summit

Merge lp:~cjohnston/summit/462832 into lp:summit

  1. 462832
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 296
Merged at revision: 301
Proposed branch: lp:~cjohnston/summit/462832
Merge into: lp:summit
Diff against target: 251 lines (+210/-2)
4 files modified
summit/schedule/admin/roomadmin.py (+1/-1)
summit/schedule/migrations/0017_add_irc_chan_room.py (+204/-0)
summit/schedule/models/roommodel.py (+2/-1)
summit/schedule/templates/schedule/daily.html (+3/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/462832
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+91693@code.launchpad.net

Commit message

Adds IRC Channel field to roommodel, adds chat icon to agenda page when there is an IRC Channel defined.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Look good. Do we have links to the IRC channel anywhere in the current summit?

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

Not that I'm aware of.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/media/img/chat.png'
2Binary files summit/media/img/chat.png 1970-01-01 00:00:00 +0000 and summit/media/img/chat.png 2012-02-06 18:29:24 +0000 differ
3=== modified file 'summit/schedule/admin/roomadmin.py'
4--- summit/schedule/admin/roomadmin.py 2012-01-23 01:18:55 +0000
5+++ summit/schedule/admin/roomadmin.py 2012-02-06 18:29:24 +0000
6@@ -37,7 +37,7 @@
7 fieldsets = (
8 (None, {
9 'fields': ('summit', 'name', 'title', 'type', 'size', 'tracks',
10- 'icecast_url', 'has_dial_in'),
11+ 'icecast_url', 'irc_channel', 'has_dial_in'),
12 }),
13 ("Availability", {
14 'fields': ('start_utc', 'end_utc'),
15
16=== added file 'summit/schedule/migrations/0017_add_irc_chan_room.py'
17--- summit/schedule/migrations/0017_add_irc_chan_room.py 1970-01-01 00:00:00 +0000
18+++ summit/schedule/migrations/0017_add_irc_chan_room.py 2012-02-06 18:29:24 +0000
19@@ -0,0 +1,204 @@
20+# encoding: utf-8
21+import datetime
22+from south.db import db
23+from south.v2 import SchemaMigration
24+from django.db import models
25+
26+class Migration(SchemaMigration):
27+
28+ def forwards(self, orm):
29+
30+ # Adding field 'Room.irc_channel'
31+ db.add_column('schedule_room', 'irc_channel', self.gf('django.db.models.fields.CharField')(default='', max_length=50, blank=True), keep_default=False)
32+
33+
34+ def backwards(self, orm):
35+
36+ # Deleting field 'Room.irc_channel'
37+ db.delete_column('schedule_room', 'irc_channel')
38+
39+
40+ models = {
41+ 'auth.group': {
42+ 'Meta': {'object_name': 'Group'},
43+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
44+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
45+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
46+ },
47+ 'auth.permission': {
48+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
49+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
50+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
51+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
52+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
53+ },
54+ 'auth.user': {
55+ 'Meta': {'ordering': "['username']", 'object_name': 'User'},
56+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
57+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
58+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
59+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
60+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
61+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
62+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
63+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
64+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
65+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
66+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
67+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
68+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
69+ },
70+ 'contenttypes.contenttype': {
71+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
72+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
73+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
74+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
75+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
76+ },
77+ 'schedule.agenda': {
78+ 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
79+ 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
80+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
81+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
82+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
83+ 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
84+ },
85+ 'schedule.attendee': {
86+ 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
87+ 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
88+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
89+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
90+ 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
91+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
92+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
93+ 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
94+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
95+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
96+ },
97+ 'schedule.attendeebusy': {
98+ 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
99+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
100+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
101+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
102+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
103+ },
104+ 'schedule.crew': {
105+ 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
106+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
107+ 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
108+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
109+ },
110+ 'schedule.lead': {
111+ 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
112+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
113+ 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
114+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
115+ 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
116+ },
117+ 'schedule.meeting': {
118+ 'Meta': {'object_name': 'Meeting'},
119+ 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
120+ 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
121+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
122+ 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
123+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
124+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
125+ 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
126+ 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
127+ 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
128+ 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
129+ 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
130+ 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
131+ 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
132+ 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
133+ 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
134+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
135+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
136+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
137+ 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
138+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
139+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
140+ 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
141+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
142+ },
143+ 'schedule.participant': {
144+ 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
145+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
146+ 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
147+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
148+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
149+ 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
150+ },
151+ 'schedule.room': {
152+ 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
153+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
154+ 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
155+ 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
156+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
157+ 'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
158+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
159+ 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
160+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
161+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
162+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
163+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
164+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
165+ },
166+ 'schedule.roombusy': {
167+ 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
168+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
169+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
170+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
171+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
172+ },
173+ 'schedule.slot': {
174+ 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
175+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
176+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
177+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
178+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
179+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
180+ },
181+ 'schedule.summit': {
182+ 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
183+ 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
184+ 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
185+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
186+ 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
187+ 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
188+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
189+ 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
190+ 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
191+ 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
192+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
193+ 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
194+ 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
195+ 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
196+ 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
197+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
198+ },
199+ 'schedule.summitsprint': {
200+ 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
201+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
202+ 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
203+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
204+ },
205+ 'schedule.topic': {
206+ 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
207+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
208+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
209+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
210+ },
211+ 'schedule.track': {
212+ 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
213+ 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
214+ 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
215+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
216+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
217+ 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
218+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
219+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
220+ }
221+ }
222+
223+ complete_apps = ['schedule']
224
225=== modified file 'summit/schedule/models/roommodel.py'
226--- summit/schedule/models/roommodel.py 2012-01-23 01:18:55 +0000
227+++ summit/schedule/models/roommodel.py 2012-02-06 18:29:24 +0000
228@@ -51,7 +51,8 @@
229 verbose_name="End (UTC)")
230 icecast_url = models.URLField(blank=True, verify_exists=False,
231 verbose_name="Icecast URL")
232-
233+ irc_channel = models.CharField(max_length=50, verbose_name="IRC Channel", blank=True, help_text="Please enter the IRC channel without the #")
234+
235 # Whether the room has dial-in capability
236 has_dial_in = models.BooleanField(default=False)
237
238
239=== modified file 'summit/schedule/templates/schedule/daily.html'
240--- summit/schedule/templates/schedule/daily.html 2012-02-02 16:40:27 +0000
241+++ summit/schedule/templates/schedule/daily.html 2012-02-06 18:29:24 +0000
242@@ -231,6 +231,9 @@
243 {% if agenda.room.icecast_url %}
244 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed", alt="(Audio Feed)"></a>
245 {% endif %}
246+ {% if agenda.room.irc_channel %}
247+ <a href="irc://irc.freenode.net:6667/#{{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel" alt="(IRC Channel)" /></a>
248+ {% endif %}
249 </td>
250 </tr>
251 {% endfor %}

Subscribers

People subscribed via source and target branches