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