From cabddc90ca61d43a175e5dec671b93df6dd1e6f1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 28 Mar 2011 17:42:56 +0000 Subject: [PATCH] Merged [2990] from adam@nostrum.com: In response to early feedback, changed 'close' metaphor from 'click anywhere' to 'click on the red "x" icon.' - Legacy-Id: 2993 Note: SVN reference [2990] has been migrated to Git commit 04289ed0e3dd56899a7c3cfa6ee43cdcd9eb68f5 --- ietf/meeting/views.py | 6 +- ietf/proceedings/models.py | 6 +- ietf/templates/meeting/week-view.html | 95 +++++++++++++++----------- static/images/close.png | Bin 0 -> 6557 bytes static/images/warning.png | Bin 0 -> 6465 bytes 5 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 static/images/close.png create mode 100644 static/images/warning.png diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 19825ce57..3d2342a3d 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -25,7 +25,7 @@ from ietf.idtracker.models import InternetDraft from ietf.idrfc.idrfc_wrapper import IdWrapper from ietf.utils.pipe import pipe -from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches, WgProceedingsActivities +from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches, WgProceedingsActivities, SessionConflict @decorator_from_middleware(GZipMiddleware) @@ -104,7 +104,6 @@ def agenda_info(num=None): def html_agenda(request, num=None): timeslots, update, meeting, venue, ads, plenaryw_agenda, plenaryt_agenda = agenda_info(num) - groups_meeting = []; for slot in timeslots: for session in slot.sessions(): @@ -321,12 +320,13 @@ def week_view(request, num=None): wgs = IETFWG.objects.filter(status=IETFWG.ACTIVE).order_by('group_acronym__acronym') rgs = IRTF.objects.all().order_by('acronym') areas = Area.objects.filter(status=Area.ACTIVE).order_by('area_acronym__acronym') + conflicts = SessionConflict.objects.filter(meeting_num=meeting.meeting_num) template = "meeting/week-view.html" return render_to_response(template, {"timeslots":timeslots, "update":update, "meeting":meeting, "venue":venue, "ads":ads, "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, "wg_list" : wgs, - "rg_list" : rgs, "area_list" : areas}, + "rg_list" : rgs, "area_list" : areas, "conflicts":conflicts}, context_instance=RequestContext(request)) def ical_agenda(request, num=None): diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py index 384246b2e..246ec4e2d 100644 --- a/ietf/proceedings/models.py +++ b/ietf/proceedings/models.py @@ -209,7 +209,11 @@ class SessionConflict(models.Model): conflict_gid = models.ForeignKey(Acronym, related_name='conflicts_with_set', db_column='conflict_gid') meeting_num = models.ForeignKey(Meeting, db_column='meeting_num') def __str__(self): - return "At IETF %s, %s conflicts with %s" % ( self.meeting_num_id, self.group_acronym.acronym, self.conflict_gid.acronym) + try: + return "At IETF %s, %s conflicts with %s" % ( self.meeting_num_id, self.group_acronym.acronym, self.conflict_gid.acronym) + except BaseException: + return "At IETF %s, something conflicts with something" % ( self.meeting_num_id ) + class Meta: db_table = 'session_conflicts' diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html index cdf032a87..a8c2d18bf 100644 --- a/ietf/templates/meeting/week-view.html +++ b/ietf/templates/meeting/week-view.html @@ -1,6 +1,7 @@ {# Copyright The IETF Trust 2007, All Rights Reserved #} {% load humanize %} +