checkpointing some css/html noodling before tearing into models

 - Legacy-Id: 9587

Author: rjsparks

ietf/meeting/helpers.py

@@ -66,7 +66,9 @@ def build_all_agenda_slices(meeting):
     time_slices = []
     date_slices = {}
 
-    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']).order_by('time','name'):
+    #for ts in meeting.timeslot_set.exclude(type__in=['reg','break','lead','offagenda','other']).order_by('time','name'):
+    for ts in meeting.timeslot_set.filter(type__in=['session',]).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'):

ietf/meeting/views.py

@@ -259,8 +259,9 @@ def edit_agenda(request, num=None, owner=None, name=None):
     meeting_base_url = request.build_absolute_uri(meeting.base_url())
     site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash
 
-    rooms = meeting.room_set.order_by("capacity")
-    rooms = rooms.all()
+    #rooms = meeting.room_set.order_by("capacity")
+    #rooms = rooms.all()
+    rooms = meeting.room_set.filter(timeslot__type__slug='session').distinct().order_by("capacity")
     saveas = SaveAsForm()
     saveasurl=reverse(edit_agenda,
                       args=[meeting.number, schedule.owner_email(), schedule.name])

ietf/templates/meeting/landscape_edit.html

@@ -110,6 +110,8 @@
   <p>Please save this agenda to your account first.</p>
 </div>
 
+<div class="content"> {% comment %} For preserving styling across the facelift {% endcomment %}
+
 <div class="wrapper custom_text_stuff">
 
 
@@ -206,10 +208,11 @@
 </div>
 
 
-<table id="meetings" class="ietf-navbar" style="width:100%">
+{%comment%}<table id="meetings" class="ietf-navbar" style="width:100%">{%endcomment%}
+<table id="meetings" class="ietf-navbar" >
 <tr>
   <th class="schedule_title"><div id="pageloaded" style="display:none">loaded</div><div id="spinner"><!-- spinney goes here --></div></th>
-  <th></th>
+  {% comment %}<th></th>{% endcomment %}
 {% for day in time_slices %}
   <th colspan="{{date_slices|colWidth:day}}" id="{{day|date:'Y-m-d'}}-btn" class=" day_{{day}} agenda_slot_title agenda_slot_unavailable">
     <div id="close_{{day|date:'Y-m-d'}}" class="close top_left very_small close_day">x</div>
@@ -226,7 +229,7 @@
 
 <tr>
       <th class="th_column"><button id="show_all_button" class="styled_button">show all</button></th>
-      <th><!-- resources --></th>
+      {% comment %}<th><!-- resources --></th>{% endcomment %}
     {% for day in time_slices %}
 	  {% for slot in date_slices|lookup:day %}
 	      <th class="day_{{day}}-{{slot.0|date:'Hi'}} day_{{day}} room_title ">{{slot.0|date:'Hi'}}-{{slot.1|date:'Hi'}} </th>
@@ -246,6 +249,7 @@
       <div class="close very_small close_room top_left small_button" id="close_{{r.name|to_acceptable_id}}">X</div>
       <div class="right room_name">{{r.name}} <span class="capacity">({{r.capacity}})</span></div>
     </th>
+{% comment 'The secretariat is not using these features' %}
     <th class="room_features">
       <div class="resource_list">
       {% for resource in r.resources.all %}
@@ -255,6 +259,7 @@
       {% endfor %}
       </div>
     </th>
+{% endcomment %}
     {% for day in time_slices %}
       {% for slot in date_slices|lookup:day %}
         <td id="{{r.dom_id}}_{{day}}_{{slot.0|date:'Hi'}}" class="day_{{day}} agenda-column-{{day}}-{{slot.0|date:'Hi'}} agenda_slot agenda_slot_unavailable" capacity="{{r.capacity}}" ></td>
@@ -372,4 +377,6 @@
 
 </div>
 
+</div> {% comment %} End of .content div {% endcomment %}
+
 {% endblock %}

static/css/agenda/agenda.css

@@ -18,6 +18,8 @@
 
 .content table { border-collapse: separate; border-spacing: 2px; }
 
+.container-fluid {padding-right: 0; padding-left:0;}
+
 .ietf-navbar { background-color: #edf5ff; padding:0; border: 1px solid #89d; margin-top:4px; width: 130px; }
 .ietf-navbar ul { padding: 0; margin: 0; }
 .ietf-navbar ul li { list-style: none; padding: 0; margin: 0; font-size: 93%; padding: 2px 0px 2px 0px; }