Summit

Merge lp://qastaging/~mhall119/summit/fixes-793019 into lp://qastaging/summit

fixes-793019
Merge into trunk

Proposed by Michael Hall on 2011-09-03

Status:

Merged

Approved by:

Michael Hall on 2011-09-11

Approved revision:

158

Merged at revision:

158

Proposed branch:

lp://qastaging/~mhall119/summit/fixes-793019

Merge into:

lp://qastaging/summit

Diff against target:

235 lines (+182/-18)

4 files modified

summit/media/css/schedule.css (+0/-18)
summit/schedule/migrations/0002_add_track_color.py (+179/-0)
summit/schedule/models/trackmodel.py (+1/-0)
summit/schedule/render.py (+2/-0)

To merge this branch:

bzr merge lp://qastaging/~mhall119/summit/fixes-793019

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Chris Johnston		2011-09-03	Approve on 2011-09-11
Review via email: mp+73929@code.qastaging.launchpad.net

Commit message

Adds a new 'color' field to the Track record, this contains a 6-char hex color code that will be used as the background for meeting blocks on the schedule.

Description of the change

Adds a new 'color' field to the Track record, this contains a 6-char hex color code that will be used as the background for meeting blocks on the schedule.

Revision history for this message

Chris Johnston (cjohnston) wrote on 2011-09-11:

Mike, would it be possible that when we assign a color, say green to community for uds-p, that if community exists at uds-q, it would default to green?

Revision history for this message

Chris Johnston (cjohnston) wrote on 2011-09-11:

Works well.. Approving as is, but not changing the status until my question is answered. Feel free to change status to approved for merging.

review: Approve

Revision history for this message

Nigel Babu (nigelbabu) wrote on 2011-09-11:

Hrm, can we script this so that the most common tracks can just be created from the commandline? That way we can give it a default color to take.

Revision history for this message

Michael Hall (mhall119) wrote on 2011-09-11:

It's certainly possible, but not something that I think we should block on this cycle. I'm marking this as approved to tarmac will land it.