Based on [17694] from mark@painless-security.com, this merges in a set of changes that provides agenda-like details on session meeting view, and fixes issue ietf-tools#2751. It also aligns the styling of materials and resources link lists on the upcoming meetings and ietf agenda pages, and adds calendar symbols with links and recordings symbols with links to interim meeting pages.

 - Legacy-Id: 17782
Note: SVN reference [17694] has been migrated to Git commit 4df7e55

Author: levkowetz

ietf/meeting/models.py

@@ -793,7 +793,7 @@ def slug(self):
         if not self.timeslot:
             components.append("unknown")
 
-        if not self.session or not (getattr(self.session, "historic_group") or self.session.group):
+        if not self.session or not (getattr(self.session, "historic_group", None) or self.session.group):
             components.append("unknown")
         else:
             components.append(self.timeslot.time.strftime("%Y-%m-%d-%a-%H%M"))

ietf/meeting/tests_views.py

@@ -1243,6 +1243,12 @@ def test_session_details(self):
         self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
         self.assertNotContains(r, 'deleted')
 
+        q = PyQuery(r.content)
+        self.assertTrue(q('h2#session_%s div#session-buttons-%s' % (session.id, session.id)), 
+                               'Session detail page does not contain session tool buttons') 
+        self.assertFalse(q('h2#session_%s div#session-buttons-%s span.fa-arrows-alt' % (session.id, session.id)), 
+                         'The session detail page is incorrectly showing the "Show meeting materials" button')
+
     def test_session_details_past_interim(self):
         group = GroupFactory.create(type_id='wg',state_id='active')
         chair = RoleFactory(name_id='chair',group=group)
@@ -1492,8 +1498,7 @@ def test_upcoming(self):
         self.assertContains(r, 'IETF 72')
         # cancelled session
         q = PyQuery(r.content)
-#        self.assertIn('CANCELLED', q('[id*="-ames"]').text())
-        self.assertIn('CANCELLED', q('tr>td>a>span').text())
+        self.assertIn('CANCELLED', q('tr>td.text-right>span').text())
         self.check_interim_tabs(url)
 
     def test_upcoming_ical(self):

ietf/meeting/views.py

@@ -82,6 +82,7 @@
 from ietf.secr.proceedings.proc_utils import (get_progress_stats, post_process, import_audio_files,
     create_recording)
 from ietf.utils.decorators import require_api_key
+from ietf.utils.history import find_history_replacements_active_at
 from ietf.utils.log import assertion
 from ietf.utils.mail import send_mail_message, send_mail_text
 from ietf.utils.pipe import pipe
@@ -1532,9 +1533,22 @@ def session_details(request, num, acronym):
     if not sessions:
         raise Http404
 
+    # Find the time of the meeting, so that we can look back historically 
+    # for what the group was called at the time. 
+    meeting_time = datetime.datetime.combine(meeting.date, datetime.time()) 
+
+    groups = list(set([ s.group for s in sessions ]))
+    group_replacements = find_history_replacements_active_at(groups, meeting_time) 
+
     status_names = {n.slug: n.name for n in SessionStatusName.objects.all()}
     for session in sessions:
 
+        session.historic_group = None 
+        if session.group: 
+            session.historic_group = group_replacements.get(session.group_id) 
+            if session.historic_group: 
+                session.historic_group.historic_parent = None 
+
         session.type_counter = Counter()
         ss = session.timeslotassignments.filter(schedule=meeting.schedule).order_by('timeslot__time')
         if ss:
@@ -1587,6 +1601,7 @@ def session_details(request, num, acronym):
                     'can_manage_materials' : can_manage,
                     'can_view_request': can_view_request,
                     'thisweek': datetime.date.today()-datetime.timedelta(days=7),
+                    'now': datetime.datetime.now(),
                   })
 
 class SessionDraftsForm(forms.Form):
@@ -2656,7 +2671,7 @@ def past(request):
 
 def upcoming(request):
     '''List of upcoming meetings'''
-    today = datetime.date.today()
+    today = datetime.date.today()-datetime.timedelta(days=7)
 
     # Get ietf meetings starting 7 days ago, and interim meetings starting today
     ietf_meetings = Meeting.objects.filter(type_id='ietf', date__gte=today-datetime.timedelta(days=7))
@@ -2695,6 +2710,7 @@ def upcoming(request):
                   'menu_actions': actions,
                   'menu_entries': menu_entries,
                   'selected_menu_entry': selected_menu_entry,
+                  'now': datetime.datetime.now()
                   })
 
 

ietf/static/ietf/css/ietf.css

@@ -771,6 +771,25 @@ ul.progress-section {
 
 .btn .fa-stack { width: 1em; height: 1em; }
 .btn .fa-stack .fa-stack-1x { line-height: 80%; }
+.fa-stack-1 {
+  position: relative;
+  display: inline-block;
+  width: 1.28571429em;
+  height: 1em;
+  vertical-align: inherit;
+}
+.fa-stack-sm {
+  width: 100%;
+  text-align: center;
+  font-size: 0.7172em;
+  line-height: inherit;
+}
+.fa-stack-xs {
+  width: 100%;
+  text-align: center;
+  font-size: 0.5em;
+  line-height: inherit;
+}
 
 /* ========================================================================== */
 

ietf/static/ietf/font-datatracker/README.txt

@@ -0,0 +1,75 @@
+This webfont is generated by http://fontello.com open source project.
+
+
+================================================================================
+Please, note, that you should obey original font licenses, used to make this
+webfont pack. Details available in LICENSE.txt file.
+
+- Usually, it's enough to publish content of LICENSE.txt file somewhere on your
+  site in "About" section.
+
+- If your project is open-source, usually, it will be ok to make LICENSE.txt
+  file publicly available in your repository.
+
+- Fonts, used in Fontello, don't require a clickable link on your site.
+  But any kind of additional authors crediting is welcome.
+================================================================================
+
+
+Comments on archive content
+---------------------------
+
+- /font/* - fonts in different formats
+
+- /css/*  - different kinds of css, for all situations. Should be ok with 
+  twitter bootstrap. Also, you can skip <i> style and assign icon classes
+  directly to text elements, if you don't mind about IE7.
+
+- demo.html - demo file, to show your webfont content
+
+- LICENSE.txt - license info about source fonts, used to build your one.
+
+- config.json - keeps your settings. You can import it back into fontello
+  anytime, to continue your work
+
+
+Why so many CSS files ?
+-----------------------
+
+Because we like to fit all your needs :)
+
+- basic file, <your_font_name>.css - is usually enough, it contains @font-face
+  and character code definitions
+
+- *-ie7.css - if you need IE7 support, but still don't wish to put char codes
+  directly into html
+
+- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
+  rules, but still wish to benefit from css generation. That can be very
+  convenient for automated asset build systems. When you need to update font -
+  no need to manually edit files, just override old version with archive
+  content. See fontello source code for examples.
+
+- *-embedded.css - basic css file, but with embedded WOFF font, to avoid
+  CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
+  We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
+  server headers. But if you ok with dirty hack - this file is for you. Note,
+  that data url moved to separate @font-face to avoid problems with <IE9, when
+  string is too long.
+
+- animate.css - use it to get ideas about spinner rotation animation.
+
+
+Attention for server setup
+--------------------------
+
+You MUST setup server to reply with proper `mime-types` for font files -
+otherwise some browsers will fail to show fonts.
+
+Usually, `apache` already has necessary settings, but `nginx` and other
+webservers should be tuned. Here is list of mime types for our file extensions:
+
+- `application/vnd.ms-fontobject` - eot
+- `application/x-font-woff` - woff
+- `application/x-font-ttf` - ttf
+- `image/svg+xml` - svg

ietf/static/ietf/font-datatracker/config.json

@@ -0,0 +1,58 @@
+@font-face {
+  font-family: 'datatracker';
+  src: url('../font/datatracker.eot?60587374');
+  src: url('../font/datatracker.eot?60587374#iefix') format('embedded-opentype'),
+       url('../font/datatracker.woff2?60587374') format('woff2'),
+       url('../font/datatracker.woff?60587374') format('woff'),
+       url('../font/datatracker.ttf?60587374') format('truetype'),
+       url('../font/datatracker.svg?60587374#datatracker') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
+/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
+/*
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: 'datatracker';
+    src: url('../font/datatracker.svg?60587374#datatracker') format('svg');
+  }
+}
+*/
+ 
+.dt {
+  font-family: "datatracker";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+ 
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+ 
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+ 
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+ 
+  /* Animation center compensation - margins should be symmetric */
+  /* remove if not needed */
+  margin-left: .2em;
+ 
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+ 
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+ 
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+ 
+.fd-meetecho:before { content: '\e800'; } /* '' */

ietf/static/ietf/font-datatracker/css/datatracker.css

@@ -0,0 +1,48 @@
+@font-face {
+  font-family: 'font-datatracker';
+  src: url('../font/font-datatracker.eot?60587374');
+  src: url('../font/font-datatracker.eot?60587374#iefix') format('embedded-opentype'),
+       url('../font/font-datatracker.woff2?60587374') format('woff2'),
+       url('../font/font-datatracker.woff?60587374') format('woff'),
+       url('../font/font-datatracker.ttf?60587374') format('truetype'),
+       url('../font/font-datatracker.svg?60587374#font-datatracker') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+ 
+.fd {
+  font-family: "font-datatracker";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+ 
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+ 
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+ 
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+ 
+  /* Animation center compensation - margins should be symmetric */
+  /* remove if not needed */
+  margin-left: .2em;
+ 
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+ 
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+ 
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+ 
+.fd-meetecho:before { content: '\e800'; } /* '' */