From 61a0059d066fccbeadc8a03995af59a07f7074e1 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 4 Feb 2015 20:47:40 +0000 Subject: [PATCH] checkpoint before trying to fix the static agenda page - Legacy-Id: 8972 --- ietf/meeting/helpers.py | 1 + static/js/agenda/agenda_objects.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index 5e25d12b0..1d3b2afc0 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -69,6 +69,7 @@ def build_all_agenda_slices(meeting): for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'): #for ts in meeting.timeslot_set.exclude(type__in=['reg','break','other']).order_by('time','name'): #for ts in meeting.timeslot_set.order_by('time','name'): + #for ts in meeting.timeslot_set.filter(type='offagenda').order_by('time','name'): ymd = ts.time.date() if ymd not in date_slices and ts.location != None: diff --git a/static/js/agenda/agenda_objects.js b/static/js/agenda/agenda_objects.js index 1cc85af09..7f2f728b7 100644 --- a/static/js/agenda/agenda_objects.js +++ b/static/js/agenda/agenda_objects.js @@ -1172,6 +1172,10 @@ Session.prototype.event_template = function() { } //console.log("acronym", groupacronym, this.group.acronym, this.visible_title()); + var durationstring=""; + if (this.requested_duration!="0.0") { + durationstring = " ("+this.requested_duration+")" + } // see comment in ietf.ccs, and // http://stackoverflow.com/questions/5148041/does-firefox-support-position-relative-on-table-elements return "
"+ this.visible_title()+ - " ("+this.requested_duration+")" + + "" + durationstring + "" + ""+pinned+"
"+ area_mark +"
"; };