diff --git a/ietf/community/display.py b/ietf/community/display.py
index a6f293a41..f96ae1ab2 100644
--- a/ietf/community/display.py
+++ b/ietf/community/display.py
@@ -30,7 +30,7 @@ class FilenameField(DisplayField):
class TitleField(DisplayField):
codename = 'title'
description = 'I-D title'
- rfcDescription = 'RFC Title'
+ rfcDescription = 'RFC title'
def get_value(self, document, raw=False):
return document.title
@@ -38,8 +38,8 @@ class TitleField(DisplayField):
class DateField(DisplayField):
codename = 'date'
- description = 'Date of current I-D'
- rfcDescription = 'Date of RFC'
+ description = 'Last revision'
+ rfcDescription = 'Published'
def get_value(self, document, raw=False):
date = document.latest_event(type='new_revision')
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index d7f217c6e..2063f4efa 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -47,7 +47,7 @@ class GroupPagesTests(TestCase):
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="rg"))
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
- self.assertTrue('Active Research Groups' in unicontent(r))
+ self.assertTrue('Active research groups' in unicontent(r))
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="area"))
r = self.client.get(url)
@@ -57,17 +57,17 @@ class GroupPagesTests(TestCase):
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="ag"))
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
- self.assertTrue("Active Area Groups" in unicontent(r))
+ self.assertTrue("Active area groups" in unicontent(r))
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="dir"))
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
- self.assertTrue("Active Directorates" in unicontent(r))
+ self.assertTrue("Active directorates" in unicontent(r))
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="team"))
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
- self.assertTrue("Active Teams" in unicontent(r))
+ self.assertTrue("Active teams" in unicontent(r))
url = urlreverse('ietf.group.info.active_groups', kwargs=dict())
r = self.client.get(url)
@@ -960,7 +960,7 @@ expand-ames-chairs@virtual.ietf.org mars_chair@ietf
url = urlreverse('ietf.group.info.email', kwargs=dict(acronym="mars"))
r = self.client.get(url)
self.assertEqual(r.status_code,200)
- self.assertTrue('Email Aliases' in unicontent(r))
+ self.assertTrue('Email aliases' in unicontent(r))
self.assertTrue('mars-ads@ietf.org' in unicontent(r))
self.assertTrue('group_personnel_change' in unicontent(r))
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index e270b992f..ef7866594 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -188,7 +188,7 @@
"order": 0,
"revname": "Conflict reviewed by",
"used": true,
- "name": "conflict reviews",
+ "name": "Conflict reviews",
"desc": ""
},
"model": "name.docrelationshipname",
diff --git a/ietf/static/ietf/js/ietf.js b/ietf/static/ietf/js/ietf.js
index 9bd4da61a..f9e59a4fa 100644
--- a/ietf/static/ietf/js/ietf.js
+++ b/ietf/static/ietf/js/ietf.js
@@ -256,6 +256,8 @@ $(document).ready(function () {
};
// disable the URL-based sorting stuff that uses the django backend
$(".tablesorter thead a").contents().unwrap();
+ // strip the caret used by the django backend sorting
+ $(".tablesorter thead th span.fa-caret-down").remove();
// make the table sortable
$(".tablesorter").tablesorter({
emptyTo: "zero",
diff --git a/ietf/templates/community/manage_clist.html b/ietf/templates/community/manage_clist.html
index bd6630359..12bc1a045 100644
--- a/ietf/templates/community/manage_clist.html
+++ b/ietf/templates/community/manage_clist.html
@@ -1,10 +1,14 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
{% load future %}
{% load staticfiles %}
{% load bootstrap3 %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block title %}{{ cl.long_name }}{% endblock %}
{% block content %}
@@ -34,12 +38,12 @@
Search for the document or documents you want to add using the datatracker search form.
In the search results, you'll find a link to add individual documents to your list.
- Document search
+ Document search
-
+
- Name State Title
+ Name State Title
@@ -56,9 +60,9 @@
-
+
- Rule Value Documents
+ Rule Value Documents
{% for rule in cl.rule_set.all %}
@@ -111,22 +115,26 @@
{% endblock %}
+{% block js %}
+
+
{% comment %}
-XXX scrolling jumps around when using this, unfortunately
-
+Stay on the current tab after form submission.
+If other pages need this functionality, it should move to ietf.js.
{% endcomment %}
+
+
+{% endblock %}
diff --git a/ietf/templates/community/raw_view.html b/ietf/templates/community/raw_view.html
index 02e91cf3a..9ec31ca12 100644
--- a/ietf/templates/community/raw_view.html
+++ b/ietf/templates/community/raw_view.html
@@ -5,8 +5,8 @@
{% with cl.get_rfcs_and_drafts as documents %}
{% with dc.get_active_fields as fields %}
- Drafts
-
+ Internet-Drafts
+
{% for field in fields %}
@@ -28,7 +28,7 @@
{% with dc.get_active_fields as fields %}
RFCs
-
+
{% for field in fields %}
diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html
index 59f60d28d..1aa73af93 100644
--- a/ietf/templates/doc/document_email.html
+++ b/ietf/templates/doc/document_email.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load future %}
+{% load future staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Email expansions for {{ doc.name }}-{{ doc.rev }}{% endblock %}
@@ -11,13 +15,21 @@
{{ top|safe }}
{% if aliases %}
- Email Aliases
-
-
+ Email aliases
+
+
{% endif %}
- Recipient Expansions
+ Recipient expansions
-
+
- Mail Trigger
+ Mail trigger
To
Cc
@@ -47,3 +59,7 @@
{% endblock content %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index cf2bea8d9..651d1bc5f 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -2,7 +2,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load future %}
+{% load future staticfiles %}
{% block title %}History for {{ doc.name }}-{{ doc.rev }}{% endblock %}
@@ -12,6 +12,7 @@
{% block pagehead %}
+
{% endblock %}
{% block content %}
@@ -88,7 +89,7 @@
{% endif %}
-
+
{% endblock content %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index ebb05eeea..ca2171749 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}
References to {{alias_name}}
@@ -25,7 +29,7 @@
{% endif %}
-
+
Document
@@ -65,3 +69,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index e7cf85e37..0d1feec97 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}
References from {{doc.canonical_name}}
@@ -17,7 +21,7 @@
Reference type help
-
+
Document
@@ -52,3 +56,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/relationship_help.html b/ietf/templates/doc/relationship_help.html
index 1de8da0fd..30e5aec10 100644
--- a/ietf/templates/doc/relationship_help.html
+++ b/ietf/templates/doc/relationship_help.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Document relationships{% endblock %}
@@ -8,7 +12,7 @@
{% origin %}
Document relationships
-
+
Relationship
@@ -19,7 +23,7 @@
{% for rel in relations %}
- {{ rel.name }}
+ {{ rel.name }}
{{ rel.desc|linebreaksbr }}
{{ rel.revname }}
@@ -28,3 +32,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index ffe376ea2..0b7d55fae 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -4,6 +4,10 @@
{% load staticfiles %}
{% block title %}{{ title }}{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block content %}
{% origin %}
{{ title }}
@@ -12,7 +16,7 @@
View diagram
{% endif %}
-
+
State
@@ -40,7 +44,7 @@
{% if tags %}
Tags
-
+
Tag
@@ -51,7 +55,7 @@
{% for tag in tags %}
- {{ tag.name }}
+ {{ tag.name }}
{{ tag.desc|linebreaksbr }}
{% endfor %}
@@ -60,3 +64,7 @@
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index f7dced285..ece2ab751 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -1,7 +1,11 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}RFC status changes{% endblock %}
@@ -14,7 +18,7 @@
{% endif %}
{% regroup docs by get_state as state_groups %}
-
+
Document
@@ -22,18 +26,23 @@
-
{% for state in state_groups %}
+
{{state.grouper}}
+
+
{% for doc in state.list %}
{{ doc.displayname_with_link|safe }}
{{ doc.title }}
{% endfor %}
- {% endfor %}
+ {% endfor %}
{% endblock content %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html
index b77a69369..3efdfc535 100644
--- a/ietf/templates/doc/submit_to_iesg.html
+++ b/ietf/templates/doc/submit_to_iesg.html
@@ -16,7 +16,7 @@
Please verify the following information:
-
+
Intended status level
{% if warn.intended_std_level %} {% endif %}
diff --git a/ietf/templates/group/active_ags.html b/ietf/templates/group/active_ags.html
index 06ebc979c..7aa43a1ef 100644
--- a/ietf/templates/group/active_ags.html
+++ b/ietf/templates/group/active_ags.html
@@ -1,13 +1,17 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
-{% block title %}Active Area Groups{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
+{% block title %}Active area groups{% endblock %}
{% block content %}
{% origin %}
- Active Area Groups
-
+ Active area groups
+
{% endblock %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index 08f1ed645..c3a312189 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -1,14 +1,18 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
-{% block title %}Active Directorates{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
+{% block title %}Active directorates{% endblock %}
{% block content %}
{% origin %}
Active Directorates
-
+
{% endblock %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_groups.html b/ietf/templates/group/active_groups.html
index b63731a61..26d3fe05f 100644
--- a/ietf/templates/group/active_groups.html
+++ b/ietf/templates/group/active_groups.html
@@ -1,13 +1,17 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
-{% block title %}Active Groups{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
+{% block title %}Active groups{% endblock %}
{% block content %}
{% origin %}
- Active Groups
-
+ Active groups
+
{% endblock %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_rgs.html b/ietf/templates/group/active_rgs.html
index b26e13977..5b6eac5b1 100644
--- a/ietf/templates/group/active_rgs.html
+++ b/ietf/templates/group/active_rgs.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Active IRTF research groups{% endblock %}
@@ -11,9 +15,9 @@
IRTF chair
{{ irtf.chair.person.plain_name }}
- Active Research Groups
+ Active research groups
-
+
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html
index 3867a01b3..3501ab6e6 100644
--- a/ietf/templates/group/active_teams.html
+++ b/ietf/templates/group/active_teams.html
@@ -1,14 +1,18 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
-{% block title %}Active Teams{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
+{% block title %}Active teams{% endblock %}
{% block content %}
{% origin %}
- Active Teams
-
+ Active teams
+
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index 3a3d7b8de..6b84f9b94 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Active IETF working groups{% endblock %}
@@ -42,7 +46,7 @@
{% if area.groups %}
{{ area.acronym }} active WG{{ area.groups|pluralize}}
-
+
Group
@@ -86,3 +90,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/bofs.html b/ietf/templates/group/bofs.html
index 14340f510..22bd0c0f5 100644
--- a/ietf/templates/group/bofs.html
+++ b/ietf/templates/group/bofs.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}BOFs{% endblock %}
@@ -19,7 +23,7 @@
{% if not groups %}
No BOFs found.
{% else %}
-
+
BOF
@@ -40,3 +44,7 @@
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/chartering_groups.html b/ietf/templates/group/chartering_groups.html
index 0de27c031..e39336220 100644
--- a/ietf/templates/group/chartering_groups.html
+++ b/ietf/templates/group/chartering_groups.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Chartering or re-chartering groups{% endblock %}
@@ -30,10 +34,10 @@
{% if not t.chartering_groups %}
No groups found.
{% else %}
-
+
- Group
+ {{ t.name }}
Name
Date
Status
@@ -69,3 +73,7 @@
{% endif %}
{% endfor %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html
index 4915960c8..1489b431f 100644
--- a/ietf/templates/group/concluded_groups.html
+++ b/ietf/templates/group/concluded_groups.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Concluded groups{% endblock %}
@@ -29,7 +33,7 @@
{% if not t.concluded_groups %}
No groups found.
{% else %}
-
+
Group
@@ -45,20 +49,8 @@
{{ g.acronym }}
{{ g.name }}
-
- {% if g.start_date %}
- {{ g.start_date|date:"M. Y" }}
- {% else %}
- ?
- {% endif %}
-
-
- {% if g.conclude_date %}
- {{ g.conclude_date|date:"M. Y" }}
- {% else %}
- ?
- {% endif %}
-
+ {{ g.start_date|date:"Y-m" }}
+ {{ g.conclude_date|date:"Y-m" }}
{% endfor %}
@@ -67,3 +59,7 @@
{% endfor %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/email.html b/ietf/templates/group/email.html
index e1f47f566..7c0591798 100644
--- a/ietf/templates/group/email.html
+++ b/ietf/templates/group/email.html
@@ -2,19 +2,31 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load future %}
+{% load future staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block group_content %}
{% origin %}
{% if aliases %}
- Email Aliases
+ Email aliases
-
+
{% endif %}
- Recipient Expansions
+ Recipient expansions
-
+
- Mail Trigger
+ Mail trigger
To
Cc
@@ -45,3 +57,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html
index f62bfb84f..11064a59f 100644
--- a/ietf/templates/group/history.html
+++ b/ietf/templates/group/history.html
@@ -2,11 +2,15 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load ietf_filters %}
-{% load future %}
+{% load future staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block group_content %}
{% origin %}
-
+
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html
index 5d548a2bf..acb1a70b5 100644
--- a/ietf/templates/group/index.html
+++ b/ietf/templates/group/index.html
@@ -1,16 +1,20 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
{% load ietf_filters %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block title %}Other RFC streams{% endblock %}
{% block content %}
{% origin %}
Other RFC streams
-
+
Stream
Owner
@@ -34,3 +38,6 @@
{% endblock %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 5fb240cdb..f9e70aadf 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block group_subtitle %}Materials{% endblock %}
@@ -14,16 +18,18 @@
{% for doc_type, docs in doc_types %}
{{ doc_type.name }}
-
+
+
Title
Abstract
- Curr. Rev.
+ Curr. rev.
Date
- Last Presented
- On Agenda
+ Last presented
+ On agenda
-
+
+
{% for d in docs %}
{{ d.title }}
@@ -44,6 +50,7 @@
{% endif %}
{% if not forloop.last %}, {% endif %}
{% endfor %}
+
{% regroup d.future_presentations by session.meeting as meeting_pres_list %}
{% for p in meeting_pres_list %}
{{ p.grouper }}
@@ -61,6 +68,7 @@
{% endfor %}
+
{% endfor %}
{% else %}
@@ -70,3 +78,7 @@
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/milestones.html b/ietf/templates/group/milestones.html
index 601dc57a6..eea6a3a88 100644
--- a/ietf/templates/group/milestones.html
+++ b/ietf/templates/group/milestones.html
@@ -1,6 +1,6 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
{# assumes milestones is in context #}
-
+
Date
diff --git a/ietf/templates/help/state_index.html b/ietf/templates/help/state_index.html
index 5648a5bde..c5e065351 100644
--- a/ietf/templates/help/state_index.html
+++ b/ietf/templates/help/state_index.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %} Document state index{% endblock %}
@@ -11,7 +15,7 @@
Document state information is available for the following document and document state groups:
-
+
Document
@@ -38,3 +42,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/help/states.html b/ietf/templates/help/states.html
index 6cebd406c..6faad8d6a 100644
--- a/ietf/templates/help/states.html
+++ b/ietf/templates/help/states.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %} {{type.label|cut:"state"|cut:"state"}} states{% endblock %}
@@ -10,7 +14,7 @@
{{type.label|cut:"state"|cut:"State"}} states
-
+
State
@@ -33,3 +37,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 75ae473a4..444f5fc48 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -1,12 +1,13 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
{% load ballot_icon %}
{% load ietf_filters %}
{% block pagehead %}
+
{% endblock %}
{% block title %}Documents on future IESG telechat agendas{% endblock %}
@@ -42,10 +43,10 @@
{% endif %}
{% if "docs" in section and section.docs %}
-
+
-
+
Document
Date
Status
@@ -70,3 +71,7 @@
{% endif %}
{% endblock content %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index fb153a131..538a7b17f 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -1,10 +1,14 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
{% load ballot_icon %}
{% load ietf_filters %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block title %}IESG discuss positions{% endblock %}
{% block content %}
@@ -25,7 +29,7 @@
{% endif %}
-
+
Document
@@ -64,6 +68,7 @@
{% endblock %}
{% block js %}
+
{% endblock %}
+
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index 032434e96..6a4cf742b 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -2,9 +2,13 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters ipr_filters %}
+{% load ietf_filters ipr_filters staticfiles %}
{% load future %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block title %}History for IPR - {{ ipr.title }}{% endblock %}
{% block content %}
@@ -20,7 +24,7 @@
{% endif %}
-
+
{% endblock content %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
index 52702e591..a363c02bb 100644
--- a/ietf/templates/ipr/ipr_table.html
+++ b/ietf/templates/ipr/ipr_table.html
@@ -1,7 +1,7 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
{% load ietf_filters %}
-
+
Date
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
index 8ca12bd37..fbeaeeafc 100644
--- a/ietf/templates/ipr/list.html
+++ b/ietf/templates/ipr/list.html
@@ -2,12 +2,16 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
{% block title %}Intellectual property rights disclosures{% endblock %}
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+{% block pagehead %}
+
+{% endblock %}
+
{% block content %}
{% origin %}
@@ -59,3 +63,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 635893180..09d35b91a 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block search_header %}Draft search results{% endblock %}
@@ -10,7 +14,7 @@
Total number of IPR disclosures found: {{ iprs|length }} .
{% if iprs %}
-
+
Date
@@ -35,7 +39,7 @@
Total number of documents searched: {{ docs|length}} .
-
+
Date
@@ -44,14 +48,15 @@
-
{% for doc in docs %}
+
Results for {{ doc.name|rfcspace|lstrip:"0"|rfcnospace }} ("{{ doc.document.title }}"){% if not forloop.first %}{% if doc.related %}, that was {{ doc.relation|lower }} {{ doc.related.source|rfcspace|lstrip:"0"|rfcnospace }} ("{{ doc.related.source.title }}"){% endif %}{% endif %}:
-
+
+
{% with doc.iprdocrel_set.all as doc_iprs %}
{% if doc_iprs %}
{% for ipr in doc_iprs %}
@@ -76,8 +81,12 @@
{% endif %}
{% endwith %}
- {% endfor %}
+ {% endfor %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 781cbeb85..46d377b00 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -2,7 +2,12 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
+
{% block search_header %}Search result on {{ q }}{% endblock %}
{% block search_result %}
@@ -11,17 +16,19 @@
{% else %}
Total number of IPR disclosures found: {{ iprs|length }} .
-
+
Date ID Statement
-
{% for alias in docs %}
+
IPR that is related to {{ alias.name|rfcspace|lstrip:"0"|rfcnospace }} ("{{ alias.document.title }}"){% if alias.related %} that was {{ alias.relation|lower }} {{ alias.related.source.name|rfcspace|lstrip:"0"|rfcnospace }} ("{{ alias.related.source.title }}"){% endif %}
+
+
{% if alias.document.ipr %}
{% for ipr in alias.document.ipr %}
@@ -46,8 +53,12 @@
No IPR disclosures related to {{ alias.name|rfcspace|lstrip:"0" }} have been submitted.
{% endif %}
- {% endfor %}
+ {% endfor %}
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 34740d1f6..5d7a073e3 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -3,7 +3,11 @@
{% load origin %}
{% load staticfiles %}
{% load ietf_filters %}
-{% load future %}
+{% load future staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}IPR disclosures{% endblock %}
@@ -23,7 +27,7 @@
Total number of IPR disclosures found: {{ iprs|length }} .
-
+
Date ID Statement
{% block iprlist %}
@@ -50,7 +54,8 @@
{% block intro_suffix %}{% endblock %}
-
+
+
{{ ipr.time|date:"Y-m-d" }}
{{ ipr.id }}
@@ -82,5 +87,6 @@
{% endblock %}
{% block js %}
+
{% endblock %}
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index ac7ea398a..216c12e43 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -2,14 +2,19 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}{% origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
+
{% block search_header %}Working Group search results{% endblock %}
{% block search_result %}
Total number of {{ q }} WG IPR disclosures found: {{ iprs|length }} .
{% if docs %}
-
+
Date
@@ -18,14 +23,15 @@
-
{% for alias in docs %}
+
IPR related to {{ alias.name|rfcspace|lstrip:"0"|rfcnospace }} ("{{ alias.document.title }}"){% if alias.related %} that was {{ alias.relation|lower }} {{ alias.related.source|rfcspace|lstrip:"0"|rfcnospace }} ("{{ alias.related.source.title|escape }}"){% endif %}{% if alias.product_of_this_wg %}, a product of the {{ q }} WG{% endif %}:
-
+
+
{% if alias.document.ipr %}
{% for ipr in alias.document.ipr %}
@@ -50,9 +56,13 @@
No IPR disclosures related to {{ alias.name|rfcspace|lstrip:"0" }} have been submitted.
{% endif %}
- {% endfor %}
+ {% endfor %}
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index 9749dc9b7..c65a8cf82 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -1,7 +1,11 @@
{% extends "base.html" %}
{% load future %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}History for Liaison Statement - {{ liaison.title }}{% endblock %}
@@ -16,7 +20,7 @@
{% endif %}
-
+
{% endblock content %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html
index 4de075f1d..c2e73cbee 100644
--- a/ietf/templates/liaisons/field_help.html
+++ b/ietf/templates/liaisons/field_help.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Liaison statement field help{% endblock %}
@@ -44,7 +48,7 @@
-
+
Fieldset
@@ -60,7 +64,7 @@
Use arrows to select or type name to search
-
+ From
From Contact
The e-mail address of the person submitting the liaison statement.
@@ -68,7 +72,7 @@
The field is filled in automatically.
-
+ From
Response Contacts
The e-mail address(es) to which any response should be sent, separated by commas.
@@ -86,7 +90,7 @@
-
+ To
Contacts
The e-mail address(es) of the recipient(s) of the liaison statement, separated by commas.
@@ -102,7 +106,7 @@
Optional. Suggested format: Name <e-mail address>
-
+ Other email addresses
Action Holder Contacts
The e-mail address(es) of the persons responsible for acting on the statement.
@@ -110,7 +114,7 @@
Optional. Suggested format: Name <e-mail address>
-
+ Other email addresses
Cc
The e-mail address(es) of the copy recipient(s) of the liaison statement, one on each line.
@@ -128,7 +132,7 @@
-
+ Purpose
Deadline
The date by which a comment or action is required.
@@ -143,13 +147,13 @@
Mandatory.
-
+ Liaison statements
Submission date
The date the liaison was originally submitted.
Mandatory.
-
+ Liaison statements
Body
The text of the liaison statement.
@@ -166,7 +170,7 @@
-
+ Add attachment
File
Browse to find the attachment.
@@ -175,3 +179,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index f55066835..fc5ea7e3c 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Liaison statements from the IETF - guidelines for completing the "Cc:" field{% endblock %}
@@ -22,7 +26,7 @@
RFC 4053 (BCP 103), "Procedures for Handling Liaison Statements to and from the IETF"
-
+
Submitting entity (1)
@@ -77,3 +81,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html
index 2827fee36..cd025d7e8 100644
--- a/ietf/templates/liaisons/guide_to_ietf.html
+++ b/ietf/templates/liaisons/guide_to_ietf.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Liaison statements to the IETF - guidelines for completing the "To:" and "Cc:" fields{% endblock %}
@@ -16,7 +20,7 @@
For definitive information on generating liaison statements, please
see RFC 4053 (BCP 103) "Procedures for Handling Liaison Statements to and from the IETF."
-
+
To: organization
@@ -65,3 +69,7 @@
(3) A list of area directorate mailing lists is not currently available.
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/liaison_base.html b/ietf/templates/liaisons/liaison_base.html
index fc72a1235..7dee3ff26 100644
--- a/ietf/templates/liaisons/liaison_base.html
+++ b/ietf/templates/liaisons/liaison_base.html
@@ -6,6 +6,7 @@
{% block pagehead %}
+
{% endblock %}
{% block title %}Liaison Statements - {{ selected_menu_entry|capfirst }}{% endblock %}
@@ -52,6 +53,7 @@
{% endblock content %}
{% block js %}
+
{% endblock %}
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index fecb0020d..86dc3407b 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -2,7 +2,7 @@
{% load ietf_filters %}
{% load future %}
-
+
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 36912db99..50956940e 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
@@ -35,7 +39,7 @@
{% if plenaries %}
Plenaries
-
+
Group
@@ -57,7 +61,7 @@
{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
{% for sessions in areas %}
{{sessions.list.0.group.parent.acronym|upper}} {{ sessions.grouper }}
-
+
Group
@@ -81,7 +85,7 @@
{% if training %}
{% with "False" as show_agenda %}
Training
-
+
Group
@@ -105,7 +109,7 @@
{% if iab %}
IAB Internet Architecture Board
-
+
Group
@@ -128,7 +132,7 @@
{% if irtf %}
IRTF Internet Research Task Force
-
+
Group
@@ -175,3 +179,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 935eac64b..7fe6bd88e 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -2,7 +2,11 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
@@ -31,7 +35,7 @@
{% endfor %}
-
+
Group
@@ -46,7 +50,11 @@
{% for session in area.list %}
{% ifchanged %}
+
+
{{session.status|capfirst}}
+
+
{% endifchanged %}
@@ -119,3 +127,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 0dc16aff7..22a0ce314 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -1,7 +1,11 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
@@ -29,7 +33,7 @@
{{ regime.chair.person.plain_name }}
-
+
Date
@@ -53,7 +57,7 @@
{# somebody ought to import these announcements in the DB instead of this mess #}
Messages from 2003/2004
Committee chair: Rich Draves
-
+
Date
@@ -82,7 +86,7 @@
Messages from 2002/2003
Committee chair: Phil Roberts
-
+
Date
@@ -131,3 +135,7 @@
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html
index 68ffeb052..78d0bca7f 100644
--- a/ietf/templates/nomcom/index.html
+++ b/ietf/templates/nomcom/index.html
@@ -1,14 +1,19 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
-{% load ietf_filters %}
+{% load ietf_filters staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
+
{% block title %}IAB/IESG NomComs{% endblock %}
{% block content %}
{% origin %}
IAB/IESG NomComs
-
+
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/approvals.html b/ietf/templates/submit/approvals.html
index fd7200ae8..3934f78e4 100644
--- a/ietf/templates/submit/approvals.html
+++ b/ietf/templates/submit/approvals.html
@@ -1,6 +1,10 @@
{% extends "submit/submit_base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Draft submission approvals{% endblock %}
@@ -14,7 +18,7 @@
{% if not approvals %}
You don't have any submissions to approve.
{% else %}
-
+
Draft
@@ -41,13 +45,13 @@
{% if not preapprovals %}
No pre-approvals within your jurisdiction found.
{% else %}
-
+
Draft name
Pre-approved
By
-
+
@@ -68,7 +72,7 @@
{% if not recently_approved %}
No drafts approved.
{% else %}
-
+
Draft
@@ -97,3 +101,7 @@
{% endif %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/sync/discrepancies.html b/ietf/templates/sync/discrepancies.html
index 2141720b9..128b35191 100644
--- a/ietf/templates/sync/discrepancies.html
+++ b/ietf/templates/sync/discrepancies.html
@@ -1,6 +1,10 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin staticfiles %}
+
+{% block pagehead %}
+
+{% endblock %}
{% block title %}Sync discrepancies{% endblock %}
@@ -12,7 +16,7 @@
{{ title }}
{% if docs %}
-
+
Draft name
@@ -38,3 +42,7 @@
{% endfor %}
{% endblock %}
+
+{% block js %}
+
+{% endblock %}
\ No newline at end of file