Added fragment selection of WGs, areas. Now, we need to add an interface to manipulate it. :)

 - Legacy-Id: 2408

Author: adamroach

adam/ietf/meeting/views.py

@@ -4,6 +4,7 @@
 #import models
 from django.shortcuts import render_to_response, get_object_or_404
 from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches, WgProceedingsActivities
+from ietf.idtracker.models import IETFWG, IRTF
 from django.views.generic.list_detail import object_list
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.core.urlresolvers import reverse
@@ -91,6 +92,9 @@ def agenda_info(num=None):
 @decorator_from_middleware(GZipMiddleware)
 def html_agenda(request, num=None):
     timeslots, update, meeting, venue, ads, plenaryw_agenda, plenaryt_agenda = agenda_info(num)
+    wgs = IETFWG.objects.filter(status=IETFWG.ACTIVE)
+    rgs = IRTF.objects.all()
+
     if  settings.SERVER_MODE != 'production' and '_testiphone' in request.REQUEST:
         user_agent = "iPhone"
     elif 'user_agent' in request.REQUEST:
@@ -106,7 +110,8 @@ def html_agenda(request, num=None):
         template = "meeting/agenda.html"
     return render_to_response(template,
             {"timeslots":timeslots, "update":update, "meeting":meeting, "venue":venue, "ads":ads,
-                "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, },
+                "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, 
+                "wg_list" : wgs, "rg_list" : rgs},
             context_instance=RequestContext(request))
 
 def text_agenda(request, num=None):

adam/ietf/templates/meeting/agenda.html

@@ -29,12 +29,56 @@
 .bgwhite, .bgwhite a { background-color: white; color: black; }
 .bgyellow, .bgyellow a { background-color: yellow; color: black; }
 .bgblack, .bgblack a { background-color: black; color: white; }
+.groupagenda { display:none; }
+
 {% endblock morecss %}
 
 {% block pagehead %}
 <script type="text/javascript" src='/js/agenda2.js'></script>
+<script type="text/javascript">
+  function hideUnwantedGroups()
+  {
+    var fragment = window.location.hash.replace("#",'').split(',');
+    var rows = document.getElementsByTagName('tr');
+
+    var hidenone = false;
+    if (window.location.hash.replace("#",'').length == 0) { hidenone=true; }
+
+    var re = RegExp("-(" + fragment.join('|') + ")($|-)");
+
+    for (var i = 0; i < rows.length; i++)
+    {
+      if (rows[i].className == 'groupagenda' || rows[i].className == 'grouprow')
+      {
+        if (re.test(rows[i].id) || (hidenone && rows[i].className == 'grouprow'))
+        {
+          rows[i].style.display="table-row";
+        }
+        else
+        {
+          rows[i].style.display="none";
+        }
+      }
+    }
+
+    window.setTimeout("hideUnwantedGroups()",1000);
+
+  }
+
+  function r(obj)
+  {
+    /* This can't work until we move the agendas into the datatracker.ietf.org
+       domain -- we can't query the height of a document from another domain. */
+
+    /*
+    docHeight = obj.contentWindow.document.height;
+    obj.style.height = (docHeight + 20) * 1.05 + "px"
+    */
+  }
+</script>
+
 {% endblock pagehead %}
-{% block bodyAttrs %}onload='updateAgendaColors()'{% endblock %}
+{% block bodyAttrs %}onload='hideUnwantedGroups();updateAgendaColors()'{% endblock %}
 {% block content %}
 <h1>IETF {{ meeting.num }} Meeting Agenda</h1>
 <p>{{ meeting.city }}, {{ meeting.start_date|date:"F j" }}-{% ifnotequal meeting.start_date.month meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endifnotequal %}{{ meeting.end_date|date:"j, Y" }}<br />
@@ -44,10 +88,11 @@ <h1>IETF {{ meeting.num }} Meeting Agenda</h1>
 <p><strong>IETF agendas are subject to change, up to and during the meeting.</strong></p>
 
 {# cache this part for 15 minutes -- it takes 3-6 seconds to generate #}
+
 {% load cache %}
 {% cache 900 ietf_meeting_agenda meeting.num %}
 
-<table id="agenda">
+<table id="agenda" width="100%">
 {% for slot in timeslots %}
    {% ifchanged  %}
       <tr class="meeting-date">
@@ -89,18 +134,24 @@ <h2 class="ietf-divider">{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting
       </tr>
       {% if not slot.is_plenary %}
       {% for session in slot.sessions_by_area|dictsort:"area" %}
-      <tr id="{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.acronym|lower}}">
+      <tr id="{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.area|upper}}-{{session.info.acronym|lower}}" class="grouprow">
 	 <td><a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{session.info.room_id.room_name|slugify}}" title="room map">{{ session.info.room_id.room_name}}</a></td>
 	 {% if session.info.area %}
 	 <td>{{ session.info.area|upper}}</td>
 	 <td>{% if session.info.isWG %}<a href="/wg/{{ session.info.acronym|lower }}/">{{ session.info.acronym|lower }}</a>{% else %}{{ session.info.acronym|lower }}{% endif %}</td>
 	 <td>
-            <img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.acronym|lower}}',this);" title="color tag this line"/>
+            <img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.area|upper}}-{{session.info.acronym|lower}}',this);" title="color tag this line"/>
 	    {% if session.info.agenda_file %}<a href="http://www.ietf.org/proceedings/{{ session.info.agenda_file }}" title="session agenda">{{ session.info.acronym_name|escape }} {{ session.info.group_type_str }}</a>{% else %}{{ session.info.acronym_name|escape }} {{ session.info.group_type_str }}{% endif %}
 	    {% if session.info.special_agenda_note %}<br/> - {{ session.info.special_agenda_note }}{% endif %}
 	 </td>
 	 {% endif %}
       </tr>
+      <tr id="agenda-{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.area|upper}}-{{session.info.acronym|lower}}" class="groupagenda">
+        <td>&nbsp;</td>
+        <td colspan="3">
+          <iframe width="100%" height="400px" src="http://www.ietf.org/proceedings/{{ session.info.agenda_file }}" onload="r(this)"></iframe>
+        </td>
+      </tr>
       {% endfor %}
       {% endif %}
    {% else %}