Skip to content

Commit 61a0059

Browse files
committed
checkpoint before trying to fix the static agenda page
- Legacy-Id: 8972
1 parent 3f65037 commit 61a0059

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

ietf/meeting/helpers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def build_all_agenda_slices(meeting):
6969
for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'):
7070
#for ts in meeting.timeslot_set.exclude(type__in=['reg','break','other']).order_by('time','name'):
7171
#for ts in meeting.timeslot_set.order_by('time','name'):
72+
#for ts in meeting.timeslot_set.filter(type='offagenda').order_by('time','name'):
7273
ymd = ts.time.date()
7374

7475
if ymd not in date_slices and ts.location != None:

static/js/agenda/agenda_objects.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,6 +1172,10 @@ Session.prototype.event_template = function() {
11721172
}
11731173
//console.log("acronym", groupacronym, this.group.acronym, this.visible_title());
11741174

1175+
var durationstring="";
1176+
if (this.requested_duration!="0.0") {
1177+
durationstring = " ("+this.requested_duration+")"
1178+
}
11751179
// see comment in ietf.ccs, and
11761180
// http://stackoverflow.com/questions/5148041/does-firefox-support-position-relative-on-table-elements
11771181
return "<div class='meeting_box_container' session_id=\""+this.session_id+"\"><div class=\"meeting_box "+bucket_list_style+"\" ><table class='meeting_event "+
@@ -1183,7 +1187,7 @@ Session.prototype.event_template = function() {
11831187
this.wg_scheme()+" "+
11841188
this.area_scheme() +" meeting_obj'>"+
11851189
this.visible_title()+
1186-
"<span> ("+this.requested_duration+")</span>" +
1190+
"<span>" + durationstring + "</span>" +
11871191
"</th><td class=\"ourconflicts\"></td>"+pinned+"</tr></table>"+ area_mark +"</div></div>";
11881192
};
11891193

0 commit comments

Comments
 (0)