' % (first_cut_off, settings.CUTOFF_HOUR) + - 'The pre-meeting cut-off date for revisions to existing documents is %s at %02sh UTC.
' % (second_cut_off, settings.CUTOFF_HOUR) ) + self.cutoff_warning = ( 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) is %s at %02sh UTC.' % (first_cut_off, settings.CUTOFF_HOUR) + + 'The pre-meeting cut-off date for revisions to existing documents is %s at %02sh UTC.' % (second_cut_off, settings.CUTOFF_HOUR) ) elif now.date() >= first_cut_off and now.date() < second_cut_off: # We are in the first_cut_off if now.date() == first_cut_off and now.hour < settings.CUTOFF_HOUR: self.cutoff_warning = 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) is %s, at %02sh UTC. After that, you will not be able to submit a new document until %s, at %sh UTC' % (first_cut_off, settings.CUTOFF_HOUR, ietf_monday, settings.CUTOFF_HOUR, ) else: # No 00 version allowed - self.cutoff_warning = 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) was %s at %sh UTC. You will not be able to submit a new document until %s, at %sh UTC.
You can still submit a version -01 or higher Internet-Draft until %sh UTC, %s' % (first_cut_off, settings.CUTOFF_HOUR, ietf_monday, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, second_cut_off, ) + self.cutoff_warning = 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) was %s at %sh UTC. You will not be able to submit a new document until %s, at %sh UTC. You can still submit a version -01 or higher Internet-Draft until %sh UTC, %s' % (first_cut_off, settings.CUTOFF_HOUR, ietf_monday, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, second_cut_off, ) self.in_first_cut_off = True elif now.date() >= second_cut_off and now.date() < ietf_monday: if now.date() == second_cut_off and now.hour < settings.CUTOFF_HOUR: # We are in the first_cut_off yet - self.cutoff_warning = 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) was %s at %02sh UTC. You will not be able to submit a new document until %s, at %02sh UTC.
The I-D submission tool will be shut down at %02sh UTC today, and reopened at %02sh UTC on %s' % (first_cut_off, settings.CUTOFF_HOUR, ietf_monday, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, ietf_monday) + self.cutoff_warning = 'The pre-meeting cut-off date for new documents (i.e., version -00 Internet-Drafts) was %s at %02sh UTC. You will not be able to submit a new document until %s, at %02sh UTC. The I-D submission tool will be shut down at %02sh UTC today, and reopened at %02sh UTC on %s' % (first_cut_off, settings.CUTOFF_HOUR, ietf_monday, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, settings.CUTOFF_HOUR, ietf_monday) self.in_first_cut_off = True else: # Completely shut down of the tool - self.cutoff_warning = 'The cut-off time for the I-D submission was %02dh UTC, %s.
The I-D submission tool will be reopened at %02dh local time at the IETF meeting location, %s.' % (settings.CUTOFF_HOUR, second_cut_off, settings.CUTOFF_HOUR, ietf_monday) + self.cutoff_warning = 'The cut-off time for the I-D submission was %02dh UTC, %s. The I-D submission tool will be reopened at %02dh local time at the IETF meeting location, %s.' % (settings.CUTOFF_HOUR, second_cut_off, settings.CUTOFF_HOUR, ietf_monday) self.shutdown = True def clean_file(self, field_name, parser_class): @@ -116,7 +116,7 @@ class UploadForm(forms.Form): # check existing existing = Submission.objects.filter(name=self.parsed_draft.filename, rev=self.parsed_draft.revision).exclude(state__in=("posted", "cancel")) if existing: - raise forms.ValidationError(mark_safe('Submission with same name and revision is currently being processed. Check the status here' % urlreverse("submit_submission_status", kwargs={ 'submission_id': existing[0].pk }))) + raise forms.ValidationError(mark_safe('Submission with same name and revision is currently being processed. Check the status here.' % urlreverse("submit_submission_status", kwargs={ 'submission_id': existing[0].pk }))) # cut-off if self.parsed_draft.revision == '00' and self.in_first_cut_off: @@ -227,7 +227,7 @@ class EditSubmissionForm(forms.ModelForm): pages = forms.IntegerField(required=True) abstract = forms.CharField(widget=forms.Textarea, required=True) - note = forms.CharField(label=mark_safe(u'Comment to
the Secretariat'), widget=forms.Textarea, required=False) + note = forms.CharField(label=mark_safe(u'Comment to the Secretariat'), widget=forms.Textarea, required=False) class Meta: model = Submission diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py index 5692db021..9fcb913d8 100644 --- a/ietf/submit/templatetags/submit_tags.py +++ b/ietf/submit/templatetags/submit_tags.py @@ -17,7 +17,7 @@ def show_submission_files(context, submission): exists = True elif submission.state_id == "posted": continue - result.append({'name': '[%s version]' % ext[1:].upper(), + result.append({'name': '%s' % ext[1:], 'exists': exists, 'url': '%s%s-%s%s' % (settings.IDSUBMIT_STAGING_URL, submission.name, submission.rev, ext)}) return {'files': result} @@ -27,15 +27,16 @@ def show_submission_files(context, submission): def two_pages_decorated_with_errors(submission, errors): pages = submission.first_two_pages or '' if 'rev' not in errors.keys(): - return mark_safe('
%s' % escape(pages)) - result = '
\n'
+ return mark_safe('%s
' % escape(pages))
+ result = '\n'
for line in pages.split('\n'):
if line.find('%s-%s' % (submission.name, submission.rev)) > -1:
- result += ''
+ result += ''
result += escape(line)
result += '\n'
- result += '\n'
+ result += '
\n'
else:
result += escape(line)
result += '\n'
+ result += '
pre>\n'
return mark_safe(result)
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index 79020b7f8..d01847241 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -39,7 +39,7 @@ def validate_submission(submission):
for ext in submission.file_types.split(','):
source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s%s' % (submission.name, submission.rev, ext))
if not os.path.exists(source):
- errors['files'] = '"%s" was not found in the staging area.
We recommend you that you cancel this submission and upload your files again.' % os.path.basename(source)
+ errors['files'] = '"%s" was not found in the staging area. We recommend you that you cancel this submission and upload your files again.' % os.path.basename(source)
break
if not submission.title:
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
new file mode 100644
index 000000000..762c842c5
--- /dev/null
+++ b/ietf/templates/base/menu.html
@@ -0,0 +1,153 @@
+{% load wg_menu %}
+{% load streams_menu %}
+{% load ietf_filters community_tags %}
+
+
+
+
+
+
+{% endwith %}
+{% endwith %}
diff --git a/ietf/templates/community/customize_display.html b/ietf/templates/community/customize_display.html
index 8976eeca8..fb77c4475 100644
--- a/ietf/templates/community/customize_display.html
+++ b/ietf/templates/community/customize_display.html
@@ -1,18 +1,24 @@
-| + {{area.acronym|upper}} + | + {% endfor %} ++ IRTF + | +
|---|---|
|
+
+ {% for group in area.active_groups %}
+
+ {% endfor %}
+
+ |
+ {% endfor %}
+
+
+ {% for group in rgs %}
+
+ {% endfor %}
+
+ |
+
Display customization
+{% load bootstrap3 %} -{% csrf_token %} -Sort method
- {{ display_form.sort_method }}
+{% bootstrap_messages %}
- Show fields
-
- {% for field in dc.get_display_fields_config %}
-
-
-
-
- {% endfor %}
-
-
-
+
diff --git a/ietf/templates/community/manage_clist.html b/ietf/templates/community/manage_clist.html
index cbaf0a5a4..47bee283f 100644
--- a/ietf/templates/community/manage_clist.html
+++ b/ietf/templates/community/manage_clist.html
@@ -1,124 +1,130 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}{{ cl.long_name }}{% endblock %}
{% block content %}
- {% for field in dc.get_display_fields_config %}
-
-
-
-
-
- {% endfor %}
- {{ cl.long_name }}
-
-
-
-
- Documents -
- Explicitly added -
- Rules -
- Display customization -
- Exports + +{% bootstrap_messages %} + + -
- 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. +
- Read only view for {{ cl.long_name }} +
- Feed for every change in status of {{ cl.long_name }} +
- Feed for significant change in status of {{ cl.long_name }} +
- Subscribe to the mailing list for every change in status of {{ cl.long_name }} +
- Subscribe to the mailing list for significant change in status of {{ cl.long_name }} +
- Search for the document or documents you want to add using the datatracker search form. -
- In the search result you'll find a link to add individual documents to your list. -
- Read only view for {{ cl.long_name }} -
- Feed for every change in status of {{ cl.long_name }} -
- Feed for significant change in status of {{ cl.long_name }} -
- Subscribe to the mailing list for every change in status of {{ cl.long_name }} -
- Subscribe to the mailing list for significant change in status of {{ cl.long_name }} -
+
-
{% endblock %}
-{% block js %}
-
-{% endblock js %}
+{% comment %}
+XXX scrolling jumps around when using this, unfortunately
+
+{% endcomment %}
diff --git a/ietf/templates/community/public/subscribe.html b/ietf/templates/community/public/subscribe.html
index 18942b586..8f9252250 100644
--- a/ietf/templates/community/public/subscribe.html
+++ b/ietf/templates/community/public/subscribe.html
@@ -1,22 +1,29 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Subscribe to {{ cl.long_name }}{% endblock %}
{% block content %}
-
-{% include "community/view_list.html" %}
+
-
+
-
+ {% include "community/view_list.html" %}
+
+
+
+
+
+
+
+
+ + In order to add some individual documents to your list, you have to: +
+-
+
| Name | State | Title | + |
|---|---|---|---|
| {{ doc.display_name }} | +{{ doc.get_state }} | +{{ doc.title }} | +Remove | +
+
+
+
+
+
+
+ | Rule | Value | Documents | |
|---|---|---|---|
| {{ callable.description }} | +{{ callable.show_value }} | +{% with rule.cached_ids.count as count %}{{ count }} document{{ count|pluralize }}{% endwith %} | +Remove | +
Add a new rule
+ + +
+ {% include "community/customize_display.html" %}
+
+
+
+
Feel free to share the following links if you need to:
+ +-
+
Export your list to CSV format:
+ +
-
-
-
-
-Documents explicitly included, from a document search.
--In order to add some individual documents to your list you have to: -
--
-
- Go to the Search Form to search for and add specific documents -
- -| Name | State | Title | Remove from list |
|---|---|---|---|
| {{ doc.display_name }} | -{{ doc.get_state }} | -{{ doc.title }} | -Remove | -
-
-
-
-
-
-Rules added to this list
-| Rule | Value | Documents | Remove from list |
|---|---|---|---|
| {{ callable.description }} | -{{ callable.show_value }} | -{% with rule.cached_ids.count as count %}{{ count }} document{{ count|pluralize }}{% endwith %} | -Remove | -
Add a new rule
- - -
-{% include "community/customize_display.html" %}
-
-
-
-
-
-Feel free to share the following links if you need it.
--
-
Export your list to CSV format
- -Subscribe to {{ cl.long_name }}
+ {% if success %} --We have sent an email to your email address with instructions to complete your subscription. -
+Subscription successful
+ +We have sent an email to your email address with instructions to complete your subscription.
{% else %} --Subscribe to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}. -
-Subscribe to {{ cl.long_name }}
+ + {% bootstrap_messages %} + +Subscribe to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}.
+ + {% endif %} {% endblock %} diff --git a/ietf/templates/community/public/subscription_confirm.html b/ietf/templates/community/public/subscription_confirm.html index ae9bed32f..032cfb044 100644 --- a/ietf/templates/community/public/subscription_confirm.html +++ b/ietf/templates/community/public/subscription_confirm.html @@ -1,13 +1,13 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% block title %}Subscription to {{ cl.long_name }}{% endblock %} {% block content %}Subscription to {{ cl.long_name }}
+ +Your email address {{ email }} has been successfully subscribed to {{ cl.long_name }}.
+-You email address {{ email }} has been successfully subscribed to {{ cl.long_name }} -
--Return to the list view + Back
{% endblock %} diff --git a/ietf/templates/community/public/unsubscribe.html b/ietf/templates/community/public/unsubscribe.html index 7317307cd..3005fb5c9 100644 --- a/ietf/templates/community/public/unsubscribe.html +++ b/ietf/templates/community/public/unsubscribe.html @@ -1,22 +1,33 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% block title %}Cancel subscription to {{ cl.long_name }}{% endblock %} {% block content %} -Cancel subscription to {{ cl.long_name }}
+ {% if success %} --You will receive a confirmation email shortly containing further instructions on how to cancel your subscription. -
+Cancellation successful
+ ++ You will receive a confirmation email shortly containing further instructions on how to cancel your subscription. +
{% else %} --Cancel your subscription to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}. -
- +Cancel subscription to {{ cl.long_name }}
+ + {% bootstrap_messages %} + ++ Cancel your subscription to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}. +
+ + {% endif %} {% endblock %} diff --git a/ietf/templates/community/public/unsubscription_confirm.html b/ietf/templates/community/public/unsubscription_confirm.html index 69ac91129..0687e3ffe 100644 --- a/ietf/templates/community/public/unsubscription_confirm.html +++ b/ietf/templates/community/public/unsubscription_confirm.html @@ -1,13 +1,15 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block title %}Canceled subscription to {{ cl.long_name }}{% endblock %} +{% block title %}Cancelled subscription to {{ cl.long_name }}{% endblock %} {% block content %} -Canceled subscription to {{ cl.long_name }}
+Cancelled subscription to {{ cl.long_name }}
+-You email address {{ email }} has been successfully removed form {{ cl.long_name }} {% if significant %}significant {% endif %}changes mailing list. +Your email address {{ email }} has been successfully removed from the {{ cl.long_name }} {% if significant %}significant {% endif %}changes mailing list.
+-Return to the list view + Back
{% endblock %} diff --git a/ietf/templates/community/public/view_list.html b/ietf/templates/community/public/view_list.html index f0f0e3592..5ec24f23e 100644 --- a/ietf/templates/community/public/view_list.html +++ b/ietf/templates/community/public/view_list.html @@ -1,8 +1,8 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% block pagehead %} - - + + {% endblock %} {% block title %}{{ cl.long_name }}{% endblock %} @@ -10,7 +10,7 @@ {% block content %}{{ cl.long_name }}
-Subscribe to notification email list: +Subscribe to notification email lists:
- All changes email list diff --git a/ietf/templates/community/raw_view.html b/ietf/templates/community/raw_view.html index 4f31ad5b9..b5c0d1a06 100644 --- a/ietf/templates/community/raw_view.html +++ b/ietf/templates/community/raw_view.html @@ -3,42 +3,45 @@ {% with cl.get_rfcs_and_drafts as documents %} {% with dc.get_active_fields as fields %}
- Ballots + {% for b in all_ballots %} +
- + + {{ b.ballot_type.name }} ({{ b.rev }}) + + + {% endfor %} +
- Active Internet-Drafts (text) -
- Active Internet-Drafts with abstracts (text) -
- All Internet-Drafts (tab-separated), older version (with fewer fields) -
- All RFCs (text) -
- All RFCs (XML) +
- Active Internet-Drafts (text) +
- Active Internet-Drafts with abstracts (text) +
- All Internet-Drafts (tab-separated), older version (with fewer fields) +
- All RFCs (text) +
- All RFCs (XML)
- {{ heading }} ({{ count }}) +
- {{ heading }} ({{ count }}) {% endfor %}
Drafts
-| {{ field.description }} | - {% endfor %} -||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - {% show_field field doc %} - | - {% endfor %} -||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ field.description }} | + {% endfor %} +
|---|
| {% show_field field doc %} | + {% endfor %} +
RFCs
{% with dc.get_active_fields as fields %} -| {{ field.rfcDescription }} | - {% endfor %} -||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - {% show_field field doc %} - | - {% endfor %} -||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ field.rfcDescription }} | + {% endfor %} +
|---|
| {% show_field field doc %} | + {% endfor %} +
Cookie settings for the IETF datatracker
+User settings
-Following settings are implemented using cookies, so if you have -cookies disabled then you are not able to change the settings -(everything still continues to work by using default settings).
++ The following settings are implemented using cookies, so if you have + cookies disabled then you will not be able to change the settings + (everything still continues to work by using default settings). +
-
- How many days is considered new- |
- |||||
|
- This setting affects how many days is considered new enough to get the special marking in the drafts page. Default setting is 14 days. - |
- |||||
| {% if new_enough == 7 %}7 days{%else%}7 days{% endif %} | -{% if new_enough == 14 %}14 days{%else%}14 days{% endif %} | -{% if new_enough == 21 %}21 days{%else%}21 days{% endif %} | -{% if new_enough == 30 %}30 days{%else%}30 days{% endif %} | -{% if new_enough == 60 %}60 days{%else%}60 days{% endif %} | -{% if new_enough == 90 %}90 days{%else%}90 days{% endif %} | -
- How many days is considered soon- |
- |||||
|
- This setting tells what is considered soon when showing document which is going to be expire soon. Default setting is 14 days. - |
- |||||
| {% if expires_soon == 7 %}7 days{%else%}7 days{% endif %} | -{% if expires_soon == 14 %}14 days{%else%}14 days{% endif %} | -{% if expires_soon == 21 %}21 days{%else%}21 days{% endif %} | -{% if expires_soon == 30 %}30 days{%else%}30 days{% endif %} | -{% if expires_soon == 60 %}60 days{%else%}60 days{% endif %} | -{% if expires_soon == 90 %}90 days{%else%}90 days{% endif %} | -
- Show full document text in document page- |
- |||||
|
- Show the full draft immediately on the document page instead of only showing beginning of it. This defaults to off. - |
- |||||
| {% if full_draft == "off" %}off{%else%}off{% endif %} | -{% if full_draft == "on" %}on{%else%}on{% endif %} | -||||
Add comment on {{ doc }}
+Add comment
{{ doc }}
-The comment will be added to the history trail.
+{% bootstrap_messages %} - + {% endblock %} diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html index 804c3d467..20cc33e7d 100644 --- a/ietf/templates/doc/ballot/approvaltext.html +++ b/ietf/templates/doc/ballot/approvaltext.html @@ -1,36 +1,27 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} +{% load ietf_filters %} {% block title %}Approval announcement writeup for {{ doc }}{% endblock %} -{% block morecss %} -form #id_approval_text { - width: 700px; - height: 600px; -} -{% endblock %} - {% block content %} -Approval announcement writeup for {{ doc }}
+Approval announcement writeup
{{ doc }}
-
-{% load ietf_filters %}
-{% if user|has_role:"Secretariat" %}
--{% if can_announce %} -Approve ballot -{% endif %} -
-{% endif %} {% endblock%} diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html index 0bf04f750..6cf392196 100644 --- a/ietf/templates/doc/ballot/approve_ballot.html +++ b/ietf/templates/doc/ballot/approve_ballot.html @@ -1,45 +1,23 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% block title %}Approve ballot for {{ doc }}{% endblock %} -{% block morecss %} -form.approve-ballot pre { - margin: 0; - padding: 4px; - border-top: 4px solid #eee; - border-bottom: 4px solid #eee; -} -form.approve-ballot .announcement { - overflow-x: auto; - overflow-y: scroll; - width: 800px; - height: 400px; - border: 1px solid #bbb; -} -{% endblock %} - {% block content %} -Approve Ballot for {{ doc }}
+Approve ballot
{{ doc }}
-IETF announcement:
+
{% endblock %}
diff --git a/ietf/templates/doc/ballot/ballot_issued.html b/ietf/templates/doc/ballot/ballot_issued.html
index 4569076d7..ffeb145eb 100644
--- a/ietf/templates/doc/ballot/ballot_issued.html
+++ b/ietf/templates/doc/ballot/ballot_issued.html
@@ -1,19 +1,17 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Ballot for {{ doc }} issued{% endblock %}
+{% block title %}Ballot issued for {{ doc }}{% endblock %}
{% block content %}
-Ballot for {{ doc }} issued
+Ballot issued
{{ doc }}
Ballot has been sent out.
{% if doc.telechat_date %} -The document is currently on the {{ doc.telechat_date }} telechat agenda.
+The document is currently on the {{ doc.telechat_date }} telechat agenda.
{% else %} -The document is not on any telechat agenda.
+The document is not on any telechat agenda.
{% endif %} -
- Back to document
-
+Back
{% endblock %}
diff --git a/ietf/templates/doc/ballot/clear_ballot.html b/ietf/templates/doc/ballot/clear_ballot.html
index 186e258bf..5afcb9f0a 100644
--- a/ietf/templates/doc/ballot/clear_ballot.html
+++ b/ietf/templates/doc/ballot/clear_ballot.html
@@ -1,18 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Clear ballot for {{ doc }}{% endblock %}
{% block content %}
-Clear ballot for {{ doc }}
+Clear ballot
{{ doc }}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/ballot/defer_ballot.html b/ietf/templates/doc/ballot/defer_ballot.html
index 30484a854..bdd4fc7e3 100644
--- a/ietf/templates/doc/ballot/defer_ballot.html
+++ b/ietf/templates/doc/ballot/defer_ballot.html
@@ -1,18 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Defer ballot for {{ doc }}{% endblock %}
{% block content %}
-Defer ballot for {{ doc }}
+Defer ballot
{{ doc }}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 5dc8836ec..0dc1c3aa7 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -1,92 +1,64 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Change position for {{ ad.plain_name }} on {{ doc }}{% endblock %}
-{% block morecss %}
-div.ballot-deferred {
- margin-top: 8px;
- margin-bottom: 8px;
-}
-form.position-form .position ul {
- padding: 0;
- margin: 0;
-}
-form.position-form .position li {
- list-style-type: none;
- float: left;
- padding-right: 10px;
-}
-form.position-form .last-edited {
- font-style: italic;
-}
-form.position-form .discuss-text {
- padding-top: 20px
-}
-form.position-form #id_discuss,
-form.position-form #id_comment {
- width: 700px;
- height: 250px;
-}
-form.position-form .comment-text {
- margin-top: 20px;
-}
-div.question {
- font-size: 173%;
- padding-left: 5px;
- padding-bottom: 10px;
-}
-{% endblock %}
-
{% block content %}
-Change position for {{ ad.plain_name }} on {{ doc }}
+Change position for {{ ad.plain_name }}
{{ doc }}
+
+{% bootstrap_messages %}
{{ ballot.ballot_type.question }}
{% if ballot_deferred %}
-Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}.
+ + Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}. +
{% endif %} - {% endblock %} -{% block content_end %} - - +{% block scripts %} +var block_pos = {{ blocking_positions|safe }}; + +function discuss_toggle(val) { + if (val in block_pos) { + $("#div_id_discuss").show(); + } else { + $("#div_id_discuss").hide(); + } +} + +$("input[name=position]").click(function () { + discuss_toggle($(this).val()); +}); + +discuss_toggle($("input[name=position]:checked").val()); {% endblock %} diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html index 97861d085..4d11c1cbd 100644 --- a/ietf/templates/doc/ballot/lastcalltext.html +++ b/ietf/templates/doc/ballot/lastcalltext.html @@ -1,46 +1,36 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block title %}Last Call text for {{ doc }}{% endblock %} +{% load bootstrap3 %} +{% load ietf_filters %} -{% block morecss %} -form #id_last_call_text { - width: 700px; - height: 600px; -} -{% endblock %} +{% block title %}Last call text for {{ doc }}{% endblock %} {% block content %} -Last Call text for {{ doc }}
+Last call text
{{ doc }}
-
-{% load ietf_filters %}
-{% if user|has_role:"Secretariat" %}
--{% if can_make_last_call %} -Make Last Call -{% endif %} - -
-{% endif %} {% endblock%} diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html index 3345295bb..ea7bfc627 100644 --- a/ietf/templates/doc/ballot/send_ballot_comment.html +++ b/ietf/templates/doc/ballot/send_ballot_comment.html @@ -1,47 +1,55 @@ -{% extends "base.html" %} -{% load ietf_filters %} -{% block title %}Send ballot position email for {{ ad }}{% endblock %} +{% extends "ietf.html" %} -{% block morecss %} -form.send-ballot pre { - margin: 0; - padding: 4px; - border-top: 4px solid #eee; - border-bottom: 4px solid #eee; -} -{% endblock %} +{% load ietf_filters %} + +{% block title %}Send ballot position for {{ ad }}{% endblock %} {% block content %} -Send ballot position email for {{ ad }}
+Send ballot position for {{ ad }}
+ + + {% endblock %} diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html index 933302791..437862794 100644 --- a/ietf/templates/doc/ballot/writeupnotes.html +++ b/ietf/templates/doc/ballot/writeupnotes.html @@ -1,34 +1,28 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% block title %}Ballot writeup and notes for {{ doc }}{% endblock %} -{% block morecss %} -form #id_ballot_writeup { - width: 700px; - height: 600px; -} -{% endblock %} - {% block content %} -Ballot writeup and notes for {{ doc }}
- - - {% endblock%} diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html index 6b201aa73..bf8a57a33 100644 --- a/ietf/templates/doc/ballot_popup.html +++ b/ietf/templates/doc/ballot_popup.html @@ -1,14 +1,37 @@ {% load ietf_filters %} -
- Change shepherding AD
-
{% endblock %}
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index 4499801b9..8b04773e4 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -1,46 +1,33 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block morecss %}
-.warning {
- font-weight: bold;
- color: #a00;
-}
-{% endblock %}
+{% load bootstrap3 %}
{% block title %}
-Change the document shepherd for {{ doc.name }}-{{ doc.rev }}
+Change document shepherd for {{ doc.name }}-{{ doc.rev }}
{% endblock %}
{% block pagehead %}
-
+
+
{% endblock %}
{% block content %}
-Change document shepherd
-
{% endblock %}
-{% block content_end %}
-
-
+
+{% block js %}
+
+
{% endblock %}
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index 9d048b157..caa452e37 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -1,46 +1,24 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change State: {{doc.title}}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.change-state select {
- width: 22em;
-}
-
-#id_message, #id_comment {
- width: 40em;
-}
-
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
+{% block title %}Change state for {{doc.title}}{% endblock %}
{% block content %}
-Change state
-Change title
-
{% endblock %}
diff --git a/ietf/templates/doc/charter/announcement_text.html b/ietf/templates/doc/charter/announcement_text.html
index 49c9c8c96..a15ae7c2f 100644
--- a/ietf/templates/doc/charter/announcement_text.html
+++ b/ietf/templates/doc/charter/announcement_text.html
@@ -1,40 +1,33 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
+{% load ietf_filters %}
{% block title %}WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
-{% block morecss %}
-form #id_announcement_text {
- width: 700px;
- height: 600px;
-}
-{% endblock %}
-
{% block content %}
-WG {{ announcement }} announcement writeup
-
{% endblock%}
diff --git a/ietf/templates/doc/charter/approve.html b/ietf/templates/doc/charter/approve.html
index b01fc8436..e0c306e29 100644
--- a/ietf/templates/doc/charter/approve.html
+++ b/ietf/templates/doc/charter/approve.html
@@ -1,38 +1,17 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Approve {{ charter.canonical_name }}{% endblock %}
-{% block morecss %}
-form.approve pre {
- margin: 0;
- padding: 4px;
- border-top: 4px solid #eee;
- border-bottom: 4px solid #eee;
-}
-form.approve .announcement {
- overflow-x: auto;
- overflow-y: scroll;
- width: 800px;
- height: 400px;
- border: 1px solid #bbb;
-}
-{% endblock %}
-
{% block content %}
- {{ ballot_content }}
-
-
- {% if request.user|has_role:"Area Director" %}
- Edit Position
- {% endif %}
-
- Close
-
+
+
+
+
+Ballot for {{ doc.name }}
+ {% if deferred %} +Ballot deferred by {{ deferred.by }} on {{ deferred.time|date:"Y-m-d" }}.
+ {% endif %} +
+ {{ ballot_content }}
+
+
+
diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html
index b8179d7c0..32296eae6 100644
--- a/ietf/templates/doc/change_ad.html
+++ b/ietf/templates/doc/change_ad.html
@@ -1,39 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block morecss %}
-.warning {
- font-weight: bold;
- color: #a00;
-}
-{% endblock %}
+{% load bootstrap3 %}
-{% block title %}
-Change the shepherding AD for {{titletext}}
-{% endblock %}
+{% block title %}Change shepherding AD for {{titletext}}{% endblock %}
{% block content %}
-Change the shepherding AD for {{titletext}}
+Change shepherding AD
{{titletext}}
-
{% endblock %}
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index 4499801b9..8b04773e4 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -1,46 +1,33 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block morecss %}
-.warning {
- font-weight: bold;
- color: #a00;
-}
-{% endblock %}
+{% load bootstrap3 %}
{% block title %}
-Change the document shepherd for {{ doc.name }}-{{ doc.rev }}
+Change document shepherd for {{ doc.name }}-{{ doc.rev }}
{% endblock %}
{% block pagehead %}
-
+
+
{% endblock %}
{% block content %}
-Change the document shepherd for {{ doc.name }}-{{ doc.rev }}
+Change document shepherd
{{ doc.name }}-{{ doc.rev }}
-
{% endblock %}
-{% block content_end %}
-
-
+
+{% block js %}
+
+
{% endblock %}
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index 9d048b157..caa452e37 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -1,46 +1,24 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change State: {{doc.title}}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.change-state select {
- width: 22em;
-}
-
-#id_message, #id_comment {
- width: 40em;
-}
-
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
+{% block title %}Change state for {{doc.title}}{% endblock %}
{% block content %}
-Change State: {{doc.title}}
+Change state
{{doc.title}}
-For help on the states, see the state table.
+{% bootstrap_messages %} - {% endblock %} diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html index 26c8c6d09..1f1d5203a 100644 --- a/ietf/templates/doc/change_title.html +++ b/ietf/templates/doc/change_title.html @@ -1,42 +1,22 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -.warning { - font-weight: bold; - color: #a00; -} -form.edit-info #id_title { - width: 600px; -} -{% endblock %} +{% load bootstrap3 %} -{% block title %} -Change the title for {{titletext}} -{% endblock %} +{% block title %}Change title for {{doc.title}}{% endblock %} {% block content %} -Change the title for {{titletext}}
+Change title
{{titletext}}
-
{% endblock %}
diff --git a/ietf/templates/doc/charter/announcement_text.html b/ietf/templates/doc/charter/announcement_text.html
index 49c9c8c96..a15ae7c2f 100644
--- a/ietf/templates/doc/charter/announcement_text.html
+++ b/ietf/templates/doc/charter/announcement_text.html
@@ -1,40 +1,33 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
+{% load ietf_filters %}
{% block title %}WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
-{% block morecss %}
-form #id_announcement_text {
- width: 700px;
- height: 600px;
-}
-{% endblock %}
-
{% block content %}
-WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}
+WG {{ announcement }} announcement writeup
{{ charter.chartered_group.acronym }}
-
{% endblock%}
diff --git a/ietf/templates/doc/charter/approve.html b/ietf/templates/doc/charter/approve.html
index b01fc8436..e0c306e29 100644
--- a/ietf/templates/doc/charter/approve.html
+++ b/ietf/templates/doc/charter/approve.html
@@ -1,38 +1,17 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Approve {{ charter.canonical_name }}{% endblock %}
-{% block morecss %}
-form.approve pre {
- margin: 0;
- padding: 4px;
- border-top: 4px solid #eee;
- border-bottom: 4px solid #eee;
-}
-form.approve .announcement {
- overflow-x: auto;
- overflow-y: scroll;
- width: 800px;
- height: 400px;
- border: 1px solid #bbb;
-}
-{% endblock %}
-
{% block content %}
Approve {{ charter.canonical_name }}-{{ charter.rev }}
-IETF announcement:
-
-
{% endblock %}
diff --git a/ietf/templates/doc/charter/ballot_issued.html b/ietf/templates/doc/charter/ballot_issued.html
index b02a29311..fb6ae5995 100644
--- a/ietf/templates/doc/charter/ballot_issued.html
+++ b/ietf/templates/doc/charter/ballot_issued.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Ballot for {{ doc.name }} issued{% endblock %}
@@ -7,7 +7,7 @@
Ballot has been sent out.
-
- Back to writeups
+
{% endblock %}
diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html
index 1773fcddc..2028d7f46 100644
--- a/ietf/templates/doc/charter/ballot_writeupnotes.html
+++ b/ietf/templates/doc/charter/ballot_writeupnotes.html
@@ -1,30 +1,28 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Ballot writeup and notes for {{ charter.chartered_group }}{% endblock %}
-{% block morecss %}
-form #id_ballot_writeup {
- width: 700px;
- height: 600px;
-}
-{% endblock %}
-
{% block content %}
-Change responsible AD
-
{% endblock %}
diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html
index ab5b6019e..320931fdd 100644
--- a/ietf/templates/doc/charter/change_state.html
+++ b/ietf/templates/doc/charter/change_state.html
@@ -1,77 +1,46 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}{{ title }}{% endblock %}
-{% block morecss %}
-form.change-state select {
- width: 22em;
-}
-
-#id_message, #id_comment {
- width: 40em;
-}
-
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
-
{% block content %}
Charter submission
-Begin IETF conflict review
+
+{% bootstrap_messages %}
{% if user|has_role:"Secretariat" %}
-Edit conflict review
+
+{% bootstrap_messages %}
+
+
Ballot writeup and notes for {{ charter.chartered_group }}
- - - {% endblock%} diff --git a/ietf/templates/doc/charter/change_ad.html b/ietf/templates/doc/charter/change_ad.html index 00ea63012..ad84c739f 100644 --- a/ietf/templates/doc/charter/change_ad.html +++ b/ietf/templates/doc/charter/change_ad.html @@ -1,39 +1,24 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -.warning { - font-weight: bold; - color: #a00; -} -{% endblock %} +{% load bootstrap3 %} {% block title %} -Change the responsible AD for {{ charter.canonical_name }}-{{ charter.rev }} +Change responsible AD for {{ charter.canonical_name }}-{{ charter.rev }} {% endblock %} {% block content %} -Change the responsible AD for {{ charter.canonical_name }}-{{ charter.rev }}
+Change responsible AD
{{ charter.canonical_name }}-{{ charter.rev }}
-
{% endblock %}
diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html
index ab5b6019e..320931fdd 100644
--- a/ietf/templates/doc/charter/change_state.html
+++ b/ietf/templates/doc/charter/change_state.html
@@ -1,77 +1,46 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}{{ title }}{% endblock %}
-{% block morecss %}
-form.change-state select {
- width: 22em;
-}
-
-#id_message, #id_comment {
- width: 40em;
-}
-
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
-
{% block content %}
{{ title }}
+{% bootstrap_messages %} + {% if not option %} -For help on the states, see the state table.
+ {% endif %} - {% if prev_state %} @@ -87,10 +56,21 @@ form.change-state .actions { {% endif %} {% endblock %} -{% block content_end %} - - +{% block scripts %} +var info_msg = {{ info_msg|safe }}, statesForBallotWoExtern = {{ states_for_ballot_wo_extern }}; + +$(document).ready(function () { + function stateChanged() { + var v = $(this).val(); + $("#id_message").val(info_msg[v] || ""); + + if ($.inArray(+v, statesForBallotWoExtern) != -1) + $(".ballot-wo-extern").show(); + else + $(".ballot-wo-extern").hide(); + } + $("#id_charter_state").click(stateChanged).change(stateChanged).keydown(stateChanged); + $("#id_charter_state").click(); +}); + {% endblock %} diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index 52dedc927..61380d1bb 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -1,40 +1,26 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -form #id_content { - width: 40em; - height: 600px; -} -{% endblock %} +{% load bootstrap3 %} {% block title %} Charter submission for {{ group.acronym }} {{ group.type.name }} {% endblock %} {% block content %} -Charter submission for {{ group.acronym }} {{ group.type.name }}
+Charter submission
{{ group.acronym }} {{ group.type.name }}
-The text will be submitted as {{ name }}-{{ next_rev }}
- {% endblock %} diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html index aeed5a686..2648d146c 100644 --- a/ietf/templates/doc/conflict_review/approve.html +++ b/ietf/templates/doc/conflict_review/approve.html @@ -1,39 +1,22 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% block title %}Approve {{ review.canonical_name }}{% endblock %} -{% block morecss %} -form #id_announcement_text { - overflow-x: auto; - overflow-y: scroll; - width: 800px; - height: 400px; - border: 1px solid #bbb; -} -{% endblock %} - {% block content %}Approve {{ review.canonical_name }}
- + {% endblock %} diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html index 8ce73400d..da6a58f38 100644 --- a/ietf/templates/doc/conflict_review/start.html +++ b/ietf/templates/doc/conflict_review/start.html @@ -1,48 +1,28 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% load ietf_filters %} -{% block title %}Begin IETF conflict review : {{doc_to_review.canonical_name}}-{{doc_to_review.rev}}{% endblock %} - -{% block morecss %} -form.start-conflict-review #id_notify { - width: 600px; -} -form.start-conflict-review .actions { - padding-top: 20px; -} -.warning { - font-weight: bold; - color: #a00; -} -{% endblock %} +{% block title %}Begin IETF conflict review for {{doc_to_review.canonical_name}}-{{doc_to_review.rev}}{% endblock %} {% block content %} -Begin IETF conflict review for {{doc_to_review.canonical_name}}-{{doc_to_review.rev}}
+Begin IETF conflict review
{{doc_to_review.canonical_name}}-{{doc_to_review.rev}}
+
+{% bootstrap_messages %}
{% if user|has_role:"Secretariat" %}
-For help on the initial state choice, see the state table.
+ {% endif %} - {% endblock %} diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html index d6df2e2bc..b7519f8ae 100644 --- a/ietf/templates/doc/conflict_review/submit.html +++ b/ietf/templates/doc/conflict_review/submit.html @@ -1,41 +1,28 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -form #id_content { - width: 40em; - height: 450px; -} -{% endblock %} +{% load bootstrap3 %} {% block title %} Edit conflict review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }} {% endblock %} {% block content %} -Edit conflict review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
+Edit conflict review
{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
+
+{% bootstrap_messages %}
+
+The text will be submitted as {{ review.canonical_name }}-{{ next_rev }}
+ + {% endblock %} diff --git a/ietf/templates/doc/document_ballot.html b/ietf/templates/doc/document_ballot.html index 44d1e7ad3..44d7929b7 100644 --- a/ietf/templates/doc/document_ballot.html +++ b/ietf/templates/doc/document_ballot.html @@ -1,19 +1,10 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% load ietf_filters %} {% block title %}Ballot for {{ doc.name }}-{{ doc.rev }}{% endblock %} -{% block pagehead %} - -{% endblock %} - {% block content %} -{{ top|safe }} - -{{ ballot_content|safe }} - + {{ top|safe }} + {{ ballot_content|safe }} {% endblock content %} - -{% block content_end %} -{% endblock content_end %} diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 0e83883fe..9e1cde68a 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -1,77 +1,114 @@ {% load ietf_filters %} -
-{% if editable and user|has_role:"Area Director,Secretariat" %}
-
-
-
-{% if user|has_role:"Area Director" %}
-
-{% endif %}
-
-{% if doc.type_id == "draft" or doc.type_id == "conflrev" or doc.type_id == "statchg" %}
-
-{% endif %}
-
-{% for n, positions in position_groups %}
-
-{% if deferred %}
-
-
-{% endif %}
-
-Ballot deferred by {{ deferred.by }} on {{ deferred.time|date:"Y-m-d" }}.
-{% else %}
- {% if doc.telechat_date %}
-
- {% endif %}
-{% endif %}
-{% if user|has_role:"Secretariat" %}
-
-{% endif %}
-
-
-{% endfor %}
-
- {{ n.name }}
- {% for p in positions %}
- {% if p.old_ad %}[{% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %} 
{% endif %}
- {% if p.old_positions %}{% endif %}(was {{ p.old_positions|join:", " }})
{% endif %}
- {% empty %}
- none
- {% endfor %}
-
-
-{% if all_ballots and all_ballots|length > 1 %}
-Charter {{ doc.canonical_name }}-{{ doc.rev }}
+
{% endif %}
-
{% if doc.rev != "" %}
-
- Available ballots:
-{% for b in all_ballots %}
-{{ b.ballot_type.name }} ({{ b.rev }})
-{% endfor %}
-
-{% endif %}
-
-{{ ballot.ballot_type.question }}
- -{% if not ballot_open %} -Note: This ballot was opened for revision {{ ballot.rev }} and is now closed.
-{% endif %} - -Summary: {{ summary }}
- -{% for p in text_positions %} -{% if p.old_ad %}[{% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}]{% endif %}
- -{% if p.pos.blocking and p.discuss %} -{{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %})
{{ p.discuss|wrap_text:80 }}
-{% endif %}
-
-{% if p.comment %}
-Comment ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %})
{{ p.comment|wrap_text:80 }}
-{% endif %}
-{% endfor %}
+
+
+
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 52034cdb5..e22d4bc8b 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -1,139 +1,171 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% load ietf_filters %}
-{% block title %}{{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
-
{% block pagehead %}
-
+
{% endblock %}
+{% block morecss %}
+.edit { width: 1px }
+{% endblock %}
+
+{% block title %}{{ doc.title }}{% endblock %}
+
{% block content %}
{{ top|safe }}
{% include "doc/revisions_list.html" %}
-
-
-
+ {% if all_ballots and all_ballots|length > 1 %}
+
-
+
Ballot deferred by {{ deferred.by }} on {{ deferred.time|date:"Y-m-d" }}.
+ {% endif %} + {% endif %} + +Summary: {{ summary }}
+ {% if not ballot_open %} +Note: This ballot was opened for revision {{ ballot.rev }} and is now closed.
+ {% endif %} + + {% if ballot.ballot_type.question %} +Ballot question: "{{ ballot.ballot_type.question }}"
+ {% endif %} + + {% if editable and user|has_role:"Area Director,Secretariat" %} + {% if user|has_role:"Area Director" %} + Edit position + {% endif %} + + {% if doc.type_id == "draft" or doc.type_id == "conflrev" or doc.type_id == "statchg" %} + {% if deferred %} + Undefer ballot + {% else %} + {% if doc.telechat_date %} + Defer ballot + {% endif %} + {% endif %} + + {% if user|has_role:"Secretariat" %} + Clear ballot + {% endif %} + {% endif %} + {% endif %} + + {% for n, positions in position_groups %} + {% for p in positions|dictsort:"ad.last_name" %} ++ {% if p.old_ad %}{% endif %} + {{ p.ad.plain_name }} + {% if p.old_ad %}{% endif %} + + {% if p.old_positions %} + (was {{ p.old_positions|join:", " }}) + {% endif %} + {{p.pos}} + {% if user|has_role:"Secretariat" %} + + Edit + {% endif %} + +
+ + {% if p.pos.blocking and p.discuss %} +
+
+
+ {% endif %}
+
+ {% if p.comment %}
+
+
+ {{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }} for -{{ p.get_dochistory.rev}})
+{{ p.discuss|wrap_text:80|escape|urlize }}
+
+
+ {% endif %}
+ {% endfor %}
+ {% endfor %}
+
+
+ Comment ({{ p.comment_time|date:"Y-m-d" }} for -{{ p.get_dochistory.rev}})
+{{ p.comment|wrap_text:80|escape|urlize }}Other versions: plain text
- -Charter {{ doc.canonical_name }}-{{ doc.rev }}
+Charter
{{ doc.canonical_name }}-{{ doc.rev }}
{% if not snapshot and can_manage and chartering and group.state_id != "conclude" %}
-Change charter text
+
{% endif %}
-
{% if doc.rev != "" %}
-{{ doc.canonical_name }}-{{ doc.rev }}
- {{ content|safe|keep_spacing|sanitize_html|wordwrap:80|safe }}
-
+ {{ content|safe|keep_spacing|sanitize_html|wordwrap:80|safe }}
{% endif %}
{% if not snapshot and chartering %}
-Proposed Milestones -{% if can_manage %} -Edit charter milestones -{% endif %} -
+Proposed milestones
+ {% if can_manage %} + + {% endif %} -{% if milestones %} -{% include "group/milestones.html" %} -{% else %} -No milestones for charter found.
-{% endif %} + {% if milestones %} + {% include "group/milestones.html" %} + {% else %} +No milestones for charter found.
+ {% endif %} {% endif %} {% endblock %} diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 8588517ab..a957c499d 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -1,109 +1,121 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% load ietf_filters %} -{% block title %}{{ doc.name }}-{{ doc.rev }}{% endblock %} - -{% block pagehead %} - +{% block morecss %} +.edit { width: 1px } {% endblock %} +{% block title %}{{ doc.title }}{% endblock %} + {% block content %} {{ top|safe }} {% include "doc/revisions_list.html" %} -
-
+
+Conflict review
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
-Change conflict review text
+ Change conflict review text
+{% endif %}
+
+{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
+ {% if request.user|has_role:"Secretariat" %}
+ {% if doc.get_state_slug = 'appr-reqnopub-pend' or doc.get_state_slug = 'appr-noprob-pend' %}
+ Approve conflict review
+ {% endif %}
+ {% endif %}
{% endif %}
-
{% if doc.rev %}
-
- {% if snapshot %}Snapshot of{% endif %}
- {% if doc.get_state_slug not in approved_states %}Proposed{% endif %}
- IESG Conflict Review for the {{conflictdoc.stream}} document: {{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}
-
+| + {% if doc.get_state_slug not in approved_states %} + Proposed conflict review + {% else %} + Conflict review + {% endif %} + | ++ |
+
+ {{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}
+
+ {{conflictdoc.stream}} stream
-
Conflict Review for {{ conflictdoc.name }}-{{ conflictdoc.rev }}
+ Last updated |
+
+ | {{ doc.time|date:"Y-m-d" }} |
+ | ||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Conflict review
{{ conflictdoc.name }}-{{ conflictdoc.rev }}
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
-Change conflict review text
+ Change conflict review text
+{% endif %}
+
+{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
+ {% if request.user|has_role:"Secretariat" %}
+ {% if doc.get_state_slug = 'appr-reqnopub-pend' or doc.get_state_slug = 'appr-noprob-pend' %}
+ Approve conflict review
+ {% endif %}
+ {% endif %}
{% endif %}
-
{% if doc.rev %}
-
-{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
-
+{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
{% endif %} {% endblock %} diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 0985e3302..c1ccedc76 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -1,303 +1,400 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} {% load ietf_filters %} -{% block title %}{% if doc.get_state_slug == "rfc" %}RFC {{ rfc_number }}{% else %}{{ name }}-{{ doc.rev }}{% endif %}{% endblock %} - {% block pagehead %} - - + + +{% endblock %} + +{% block morecss %} +.edit { width: 1px } +{% endblock %} + +{% block title %} + {% if doc.get_state_slug == "rfc" %} + RFC {{ rfc_number }} + {% else %} + {{ name }}-{{ doc.rev }} + {% endif %} {% endblock %} {% block content %} {{ top|safe }} -
-
-
+
+
-
| Document type: | -
- {% if doc.get_state_slug == "rfc" %}
- RFC - {{ doc.std_level }}
- ({% if published %}{{ published.time|date:"F Y" }}{% else %}publication date unknown{% endif %}{% if has_errata %}; Errata{% else %}; No errata{% endif %})
+
- Email Authors
- | IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %}
- | References
- | Referenced By
- | Check nits
- | History feed
- | Search Mailing Lists
- {% if user|has_role:"Area Director" %}
- | Search Mailing Lists (ARO)
- {% endif %}
- {% if user.is_authenticated %}
- {% if tracking_document %}
- |
-
- {% if can_edit and iesg_state %}
-
- {% endif %}
-
- {% if actions %}
-  Untrack this document
- {% else %}
- |  Track this document
- {% endif %}
- {% endif %}
-
- {% for label, url in actions %}{{ label }} {% endfor %}
-
- {% endif %}
-
-
-{% if doc.get_state_slug == "active" or doc.get_state_slug == "rfc" %}
-
-
-{{ content|safe }}
-
-
-{% if split_content %}
-
+{% if doc.get_state_slug != "rfc" %}
+ | |||||||||||||||||||||||||||||||||||||||||||||||||||
| Intended RFC status | ++ {% if can_edit or can_edit_stream_info %} + Edit + {% endif %} + | ++ {{ doc.intended_std_level|default:"(None)" }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Other versions | ++ |
+ {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %} Expired & archived {% endif %}
+ {% if file_urls %}
+ {% for label, url in file_urls %}
+
+
+ {{ label }}
+ {% endfor %}
+ {% else %}
+ (not online)
+ {% endif %}
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||
| IETF conflict review | ++ | {{ conflict_reviews|join:", "|urlize_ietf_docs }} | +||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ doc.stream }} state | ++ {% if doc.stream and can_edit_stream_info %} + Edit + {% endif %} + | +
+ {{ stream_state|default:"(None)" }}
- {{ doc.abstract }} + {% for m in milestones %} + {{ m.due|date:"M Y" }} + {% endfor %} -Authors+ {% if stream_tags %} + + {% endif %} + |
+ {% else %}
+ Stream state | ++ | (No stream defined) | + {% endif %} +|||||||||||||||||||||||||||||||||||||||||||||||
| Consensus | ++ {% if can_edit or can_edit_stream_info %} + Edit + {% endif %} + | ++ {{ consensus }} + + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| Document shepherd | ++ {% if can_edit_stream_info %} + Edit + {% endif %} + | ++ {{ doc.shepherd|default:"(None)" }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| Shepherd write-up | ++ {% if can_edit_shepherd_writeup %} + {% url "doc_edit_shepherd_writeup" name=doc.name as doc_edit_url %} + {% if doc_edit_url %} + Edit + {% endif %} + {% endif %} + | ++ {% if shepherd_writeup %} + Show + (last changed {{ shepherd_writeup.time|date:"Y-m-d"}}) + {% else %} + (None) + {% endif %} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| This information refers to IESG processing after the RFC was initially published: | +||||||||||||||||||||||||||||||||||||||||||||||||||||
| IESG state | ++ {% if iesg_state and can_edit %} + Edit + {% endif %} + | ++ {{ iesg_state_summary|default:"I-D Exists" }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| IANA review state | ++ {% if can_edit_iana_state %} + Edit + {% endif %} + | ++ {{ iana_review_state }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| IANA action state | ++ {% if can_edit_iana_state %} + Edit + {% endif %} + | ++ {{ iana_action_state }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| RFC Editor state | ++ | {{ rfc_editor_state }} | +||||||||||||||||||||||||||||||||||||||||||||||||||
| Telechat date | ++ {% if can_edit %} + Edit + {% endif %} + | +
+ {% if telechat %}
+ On agenda of {{ telechat.telechat_date }} IESG telechat
+ {% if telechat.returning_item %}
+ (returning item)
+ {% endif %}
+ {% else %}
+ {% if can_edit %}
+ (None)
+ {% endif %}
+ {% endif %}
+
+ {% if ballot_summary %}
+ {{ ballot_summary }} + {% endif %} + |
+||||||||||||||||||||||||||||||||||||||||||||||||||
| Responsible AD | ++ {% if can_edit %} + Edit + {% endif %} + | ++ {{ doc.ad|default:"(None)" }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| IESG note | ++ {% if can_edit %} + Edit + {% endif %} + | ++ {{ doc.note|default:"(None)"|linebreaksbr }} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
| Send notices to | ++ {% if can_edit %} + Edit + {% endif %} + | ++ {{ doc.notify|default:"(None)"}} + | +||||||||||||||||||||||||||||||||||||||||||||||||||
(Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid)
+{% if doc.get_state_slug == "active" or doc.get_state_slug == "rfc" %} + {{ content|safe }} + {% if split_content %} + Show full document + {% endif %} + +{% else %} + +
+
{% endif %}
{% endblock %}
-
-{% block js %}
-
-
-{% endblock %}
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 45d1637d4..76ec638fd 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -1,81 +1,110 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% load ietf_filters %}
{% block title %}History for {{ doc.name }}-{{ doc.rev }}{% endblock %}
{% block pagehead %}
-
-
+
{% endblock %}
{% block content %}
{{ top|safe }}
{% if diff_revisions and diff_revisions|length > 1 %}
-
+ This Internet-Draft is no longer active. A copy of the expired Internet-Draft can be found at
+ https://www.ietf.org/archive/id/{{ doc.name }}-{{ doc.rev }}.txt
+
+
+
+ This Internet-Draft is no longer active. A copy of
+ the expired Internet-Draft can be found here:
+ {{doc.href}}
+
+
Abstract
+{{ doc.abstract }}
+ +Authors
+
+ {% for author in doc.documentauthor_set.all %}
+ {% if not author.author.invalid_address %}
+
+
+ {% endif %}
+ {{ author.author.person }}
+ {% if not author.author.invalid_address %}
+ ({{ author.author.address }})
+ {% endif %}
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+
(Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid.)
+
-
+
{% endif %}
Diffs
+Revision differences
- -Document history
{% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %} -
- Add comment
+
{% endif %}
+
+
+
-
{% endblock content %}
-
-{% block content_end %}
-
-{% endblock content_end %}
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 9095e3136..29ee7594e 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,59 +1,64 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
{% block title %}
References to {{alias_name}}
{% endblock %}
-{% block morecss %}
-.referencetable {margin-top:1em;}
-.referenctable .references {width:100%;}
-.referencetable .references .reference .source {width:30%;}
-.referencetable .references .reference .title {width:35%;}
-.referencetable .references .reference .level {width:15%;}
-.referencetable .references .reference .reftype {width:15%;}
-.referencetable .references .reference .downref {width:5%;}
-.reflinks {font-size:80%;float:right;}
-.showmore {margin-top:1em;}
-{% endblock %}
+
{% block content %}
| Date | +Version | +By | +Action | +|
|---|---|---|---|---|
| Date | Version | By | Text |
|---|---|---|---|
| {{ e.time|date:"Y-m-d" }} | -{{ e.rev }} | -{{ e.by }} | -{{ e.desc|format_history_text }} - | -
| {{ e.time|date:"Y-m-d" }} | +{{ e.rev }} | +{{ e.by|escape }} | +{{ e.desc|format_history_text }} | +
References to {{alias_name}}
- -
+
+
+
+
{% if numdocs %}
-+ This is an experimental product. These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly. +
+ +Showing RFCs and active Internet-Drafts, sorted by reference type, then document name. -
-Results restricted to the first 250 of {{ numdocs }} documents. Show All
-
+
+
{% endif %}
-Showing only the first 250 of {{ numdocs }} documents.
+ +
-
-
+
+
-
{% endblock %}
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index 070d9601c..40a139447 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,54 +1,51 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
{% block title %}
References from {{doc.canonical_name}}
{% endblock %}
-{% block morecss %}
-.referencetable {margin-top:1em;}
-.referenctable .references {width:100%;}
-.referencetable .references .reference .source {width:30%;}
-.referencetable .references .reference .title {width:35%;}
-.referencetable .references .reference .level {width:15%;}
-.referencetable .references .reference .reftype {width:15%;}
-.referencetable .references .reference .downref {width:5%;}
-.reflinks {font-size:80%;float:right;}
-{% endblock %}
+
{% block content %}
| Document | Title | Status | Reference Type | Downref |
|---|---|---|---|---|
| -{% with ref.source.canonical_name as name %} -{{name}} {% if ref.target.name != alias_name %}(as {{ref.target.name}}){% endif %} (refs, refby) -{% endwith %} - | --{{ref.source.title}} - | --{% ifequal ref.source.get_state.slug 'rfc' %} - {% with ref.source.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} -{% else %} - {% with ref.source.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} -{% endifequal %} - | --{{ref.relationship.name}} - | --{{ref.is_downref|default:''}} - | -
| Document | +Title | +Status | +Type | +Downref | +
|---|---|---|---|---|
|
+ {{name}}
+ {% if ref.target.name != alias_name %}
+ As {{ref.target.name}} + {% endif %} + |
+
+ {{ref.source.title}} + Refs + Ref'd by + |
+ + {% ifequal ref.source.get_state.slug 'rfc' %} + {% with ref.source.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% else %} + {% with ref.source.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% endifequal %} + | +{{ref.relationship.name}} | +{{ref.is_downref|default:''}} | +
References from {{doc.canonical_name}}
- -
-Sorted by document name.
-Reference type help
-
-
-
-
+
+
-
+
{% endblock %}
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 8553a09e1..21a2209e3 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -1,137 +1,132 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% load ietf_filters %}
-{% block title %}{{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
-
-{% block pagehead %}
-
+{% block morecss %}
+.edit { width: 1px }
{% endblock %}
+{% block title %}{{ doc.title }}{% endblock %}
+
{% block content %}
{{ top|safe }}
{% include "doc/revisions_list.html" %}
-
-
-{{ doc.title }}
+{% load ietf_filters %}
-
+ {{ title|capfirst_allcaps }}
+ {% if subtitle %}
+
-{% if subtitle %}Change shepherding AD
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 5e22bde5b..1c8d2c68b 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -1,21 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change whether {{ doc.name }}-{{ doc.rev }} is the result of a consensus process{% endblock %}
+{% load bootstrap3 %}
+
+{% block title %}Change consensus for {{ doc.name }}-{{ doc.rev }}{% endblock %}
{% block content %}
-Change consensus
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index c7bb3fb98..d291b6818 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -1,24 +1,21 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change IANA state of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form table .actions { text-align: right; padding-top: 1em; }
-{% endblock %}
+{% block title %}Change IANA state for {{ doc }}{% endblock %}
{% block content %}
-Change IANA state
-
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index 836dc66bc..dc9163869 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -1,29 +1,21 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Change intended status for {{ doc }}{% endblock %}
-{% block morecss %}
-form.change-intended-status select {
- width: 22em;
-}
-form.change-intended-status .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
-
{% block content %}
-Change intended status
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index f1daf7ca2..2ba82a256 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -1,86 +1,39 @@
-{% extends "base.html" %}
-{% block title %}Change which documents {{ doc }} replaces{% endblock %}
-{% block pagehead %}{{ block.super }}
-
-
-
-
-
+{% extends "ietf.html" %}
-
+{% bootstrap_messages %}
+
+{% block pagehead %}
+
+
{% endblock %}
{% block content %}
-Change documents replaced by
+
+
{% endblock %}
+
+{% block js %}
+
+
+{% endblock %}
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index 0c2f835d8..5e9965608 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -1,40 +1,25 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block morecss %}
-form #id_content {
- width: 40em;
- height: 450px;
-}
-{% endblock %}
+{% load bootstrap3 %}
{% block title %}
Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
{% endblock %}
{% block content %}
-Edit shepherd writeup
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index bf580af64..895dd69da 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -1,86 +1,69 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change state of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.change-state select { width: 22em; }
-form.change-state #id_comment { width: 30em; }
-form.change-state .cancel-pub-note { width: 30em; color: #a00; }
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-.next-states,
-.prev-state {
- margin-bottom: 30px;
-}
-.next-states form,
-.prev-state form {
- display: inline;
- margin-right: 10px;
-}
-{% endblock %}
+{% block title %}Change state for {{ doc }}{% endblock %}
{% block content %}
-Change state
-Change stream
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index 7fa6fb433..6b220dac1 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -1,72 +1,43 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change {{ state_type.label }} of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
+
+{% block title %}Change {{ state_type.label }} for {{ doc }}{% endblock %}
-{% block morecss %}
-.next-states { margin-bottom: 1em; }
-.next-states a {
- display: inline-block;
- margin: 0 0.2em;
- padding: 0.2em 0.3em;
- border-radius: 0.2em;
- cursor: pointer;
- color: #333;
- font-weight: bold;
-}
-.next-states a:hover { background-color: #eee; transition-duration: 0.2s; }
-form.change-state th { max-width: 8em; }
-form.change-state th, form.change-state td { padding-bottom: 0.3em; }
-form.change-state #id_comment { width: 30em; }
-form.change-state #id_weeks { width: 2em;}
-form.change-state .actions { text-align: right; padding-top: 1em; }
-form.change-state ul { padding: 0; margin: 0; }
-form.change-state ul li { padding: 0; padding-bottom: 0.1em; margin: 0; list-style-type: none; }
-form.change-state ul li input { vertical-align: middle; }
-form.change-state ul li label { cursor: pointer; }
-{% endblock %}
{% block content %}
-Change {{ state_type.label }}
{% if next_states %}
-
+ Edit IESG note
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 7ca00b797..0d3d52513 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -1,64 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Edit info on {{ doc }}{% endblock %}
+{% load bootstrap3 %}
+{% load ietf_filters %}
-{% block scripts %}
-function make_bold()
-{
- var e = document.getElementById("ballotwarn");
- e.setAttribute("class","warning");
-}
-{% endblock %}
-
-{% block morecss %}
-form.edit-info #id_notify {
- width: 600px;
-}
-form.edit-info #id_note {
- width: 600px;
- height: 150px;
-}
-form.edit-info .actions {
- padding-top: 20px;
-}
-.warning {
- font-weight: bold;
- color: #a00;
-}
-{% endblock %}
+{% block title %}Edit info for {{ doc }}{% endblock %}
{% block content %}
-{% load ietf_filters %}
-Edit info
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/last_call_requested.html b/ietf/templates/doc/draft/last_call_requested.html
index f7b3c571b..347c98273 100644
--- a/ietf/templates/doc/draft/last_call_requested.html
+++ b/ietf/templates/doc/draft/last_call_requested.html
@@ -1,17 +1,15 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Last Call Requested{% endblock %}
+{% block title %}Last call requested{% endblock %}
{% block content %}
-Make last call
-Request publication
-Request resurrection
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html
index 5942abdcd..174d80e42 100644
--- a/ietf/templates/doc/draft/resurrect.html
+++ b/ietf/templates/doc/draft/resurrect.html
@@ -1,18 +1,24 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Resurrect {{ doc }}{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
index d27cd3ed7..fd15e1b40 100644
--- a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
+++ b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
@@ -1,10 +1,9 @@
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Posting Approved Draft to RFC Editor Failed{% endblock %}
+{% block title %}Posting approved I-D to RFC Editor failed{% endblock %}
{% block content %}
-
+
+
-
-{% endfor %}
{% endblock %}
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index 9416973d5..1ced23dfe 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -1,15 +1,10 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Internet-Drafts in IETF Last Call{% endblock %}
+{% block title %}Internet-Drafts in IETF last call{% endblock %}
{% block content %}
-Edit notification addresses
-
{% endblock %}
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index 92634699b..fce2d912b 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -1,36 +1,30 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}
-Set Telechat Date for {{ doc.name }}
-{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.telechat-date td.actions {
- padding-top: 1em;
-}
-{% endblock %}
+{% block title %}Set telechat date for {{ doc.name }}{% endblock %}
{% block content %}
-{% load ietf_filters %}
-Set telechat date
-
+
{% if prompts %}
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of the Nokia Corporation and/or its
- subsidiary(-ies) nor the names of its contributors may be used
- to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-{% endcomment %}
+{% extends "ietf.html" %}
{% block title %}IETF Datatracker{% endblock %}
-{% block morecss %}
-.ietf-main-title h1 { font-size:40px; font-weight:bold; margin-bottom:10px; margin-top:5px;}
-td.ietf-main-logo { padding: 8px; }
-.ietf-main-logo div { text-align:center; }
-td.ietf-main-search { width:650px; padding:8px; }
-td.ietf-main-intro { width:200px; background:#fff5df; padding:8px; border:1px solid #cccccc; }
-.ietf-main-intro li { padding-left:0; margin-left:0; }
-.ietf-main-intro ul { margin-left:5px; padding-left:10px; }
-{% endblock %}
-
{% block content %}
-
-
+
-
+
+
{% endblock %}
diff --git a/ietf/templates/doc/revisions_list.html b/ietf/templates/doc/revisions_list.html
index 0c23b878a..8aca86ff5 100644
--- a/ietf/templates/doc/revisions_list.html
+++ b/ietf/templates/doc/revisions_list.html
@@ -1,8 +1,8 @@
-
- {% if doc.type_id == "draft" and doc.ipr %}
- IPR: {{ doc.ipr|length }}
- {% endif %}
-
diff --git a/ietf/templates/doc/search/search.html b/ietf/templates/doc/search/search.html
index 3a69707fa..7daec5833 100644
--- a/ietf/templates/doc/search/search.html
+++ b/ietf/templates/doc/search/search.html
@@ -1,19 +1,13 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Search Internet-Drafts and RFCs{% endblock %}
+{% block title %}Search documents{% endblock %}
{% block content %}
-
+{% load widget_tweaks %}
+{% load ietf_filters %}
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+
| Document | Title | Status | Reference Type | Downref |
|---|---|---|---|---|
| -{% with ref.target.name as name %} -{{name}} (refs, refby) -{% endwith %} - | --{{ref.target.document.title}} - | --{% ifequal ref.target.document.get_state.slug 'rfc' %} - {% with ref.target.document.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} -{% else %} - {% with ref.target.document.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} -{% endifequal %} - | --{{ref.relationship.name}} - | --{{ref.is_downref|default:''}} - | -
| Document | +Title | +Status | +Type | +Downref | +
|---|---|---|---|---|
| {{name}} | +
+ {{ref.target.document.title}} + Refs + Ref'd by + |
+ + {% ifequal ref.target.document.get_state.slug 'rfc' %} + {% with ref.target.document.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% else %} + {% with ref.target.document.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%} + {% endifequal %} + | +{{ref.relationship.name}} | +{{ref.is_downref|default:''}} | +
RFC Status Change : {{ doc.title }} - -{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %} -Change status change text -{% endif %} -
+ {% if request.user|has_role:"Secretariat" and doc.get_state_slug = 'appr-pend' %} + Approve RFC status change + {% endif %} + {% if doc.rev %} -
-{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
-
+ {{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
{% endif %}
{% endblock %}
diff --git a/ietf/templates/doc/document_top.html b/ietf/templates/doc/document_top.html
index 259315eda..25ee2e08a 100644
--- a/ietf/templates/doc/document_top.html
+++ b/ietf/templates/doc/document_top.html
@@ -1,9 +1,12 @@
-{{ doc.title }}
{{ name }}
+{% load ietf_filters %}
-
-
+
diff --git a/ietf/templates/doc/document_writeup.html b/ietf/templates/doc/document_writeup.html
index aae69b4c9..d818b0d3a 100644
--- a/ietf/templates/doc/document_writeup.html
+++ b/ietf/templates/doc/document_writeup.html
@@ -1,28 +1,37 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load ietf_filters %}
{% block title %}Writeups for {{ doc.name }}-{{ doc.rev }}{% endblock %}
-{% block pagehead %}
-
-{% endblock %}
-
{% block content %}
{{ top|safe }}
{% for title, subtitle, writeups in sections %}
--
- {% for name, t, url, active, tooltip in tabs %}
-
{{ doc.title }}
{{ name }}
+
+
-{{ title }}
+
+ {{ title|capfirst_allcaps }}
+ {% if subtitle %}
+
{{ subtitle|safe }}
+ {% endif %}
+
-{% if subtitle %}{{ subtitle|safe }}
{% endif %} + {% for name, text, url in writeups %} + {% if text %} +{{ text|urlize }}
+ {% endif %}
-{% for name, text, url in writeups %}
-
-{% if can_edit %}{% if text %}Edit{% else %}Generate{% endif %} {{ name }}{% endif %}
-
-
+
-{{ text }}
-
-+ {% if can_edit %} + + {% if text %} + Edit + {% else %} + Generate + {% endif %} + {{ name|lower_allcaps }} + + {% endif %} +
+ {% endfor %} {% endfor %} -{% endfor %} - {% endblock content %} diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html index 5c3f46f75..01540c44d 100644 --- a/ietf/templates/doc/draft/adopt_draft.html +++ b/ietf/templates/doc/draft/adopt_draft.html @@ -1,43 +1,28 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block title %}Adopt {{ doc }} in Group{% endblock %} +{% load bootstrap3 %} -{% block morecss %} -form.adopt-draft th { width: 8em; } -form.adopt-draft #id_comment { width: 30em; } -form.adopt-draft #id_weeks { width: 3em; } -form.adopt-draft .actions { text-align: right; padding-top: 1em; } -p.intro { max-width: 50em; } -{% endblock %} +{% block title %}Adopt {{ doc }} in group{% endblock %} {% block content %} -Adopt {{ doc }} in Group
+Adopt {{ doc }} in group
-You can adopt this draft into a group.
+{% bootstrap_messages %} -For a WG, the draft enters the IETF stream and the +
You can adopt this draft into a group. +For a WG, the draft enters the IETF stream and the stream state becomes "Call for Adoption by WG Issued". For an RG, the draft enters the IRTF stream and the stream state becomes "Active RG Document".
- + {% endblock %} diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html index 4815e9db8..52dac710a 100644 --- a/ietf/templates/doc/draft/change_ad.html +++ b/ietf/templates/doc/draft/change_ad.html @@ -1,39 +1,22 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -.warning { - font-weight: bold; - color: #a00; -} -{% endblock %} +{% load bootstrap3 %} -{% block title %} -Change the shepherding AD for {{ doc.name }}-{{ doc.rev }} -{% endblock %} +{% block title %}Change shepherding AD for {{ doc.name }}-{{ doc.rev }}{% endblock %} {% block content %} -Change the shepherding AD for {{ doc.name }}-{{ doc.rev }}
+Change shepherding AD
{{ doc.name }}-{{ doc.rev }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 5e22bde5b..1c8d2c68b 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -1,21 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change whether {{ doc.name }}-{{ doc.rev }} is the result of a consensus process{% endblock %}
+{% load bootstrap3 %}
+
+{% block title %}Change consensus for {{ doc.name }}-{{ doc.rev }}{% endblock %}
{% block content %}
-Change whether {{ doc.name }}-{{ doc.rev }} is the result of a consensus process
+Change consensus
{{ doc.name }}-{{ doc.rev }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index c7bb3fb98..d291b6818 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -1,24 +1,21 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change IANA state of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form table .actions { text-align: right; padding-top: 1em; }
-{% endblock %}
+{% block title %}Change IANA state for {{ doc }}{% endblock %}
{% block content %}
-Change IANA state of {{ doc }}
+Change IANA state
{{ doc }}
-
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index 836dc66bc..dc9163869 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -1,29 +1,21 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Change intended status for {{ doc }}{% endblock %}
-{% block morecss %}
-form.change-intended-status select {
- width: 22em;
-}
-form.change-intended-status .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
-
{% block content %}
-Change intended status for {{ doc }}
+Change intended status
{{ doc }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index f1daf7ca2..2ba82a256 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -1,86 +1,39 @@
-{% extends "base.html" %}
-{% block title %}Change which documents {{ doc }} replaces{% endblock %}
-{% block pagehead %}{{ block.super }}
-
-
-
-
-
+{% extends "ietf.html" %}
-
+{% bootstrap_messages %}
+
+{% block pagehead %}
+
+
{% endblock %}
{% block content %}
-Change which documents {{ doc }} replaces
+Change documents replaced by
{{ doc }}
+
+
{% endblock %}
+
+{% block js %}
+
+
+{% endblock %}
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index 0c2f835d8..5e9965608 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -1,40 +1,25 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block morecss %}
-form #id_content {
- width: 40em;
- height: 450px;
-}
-{% endblock %}
+{% load bootstrap3 %}
{% block title %}
Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
{% endblock %}
{% block content %}
-Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
+Edit shepherd writeup
{{ doc.canonical_name }}-{{ doc.rev }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index bf580af64..895dd69da 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -1,86 +1,69 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change state of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.change-state select { width: 22em; }
-form.change-state #id_comment { width: 30em; }
-form.change-state .cancel-pub-note { width: 30em; color: #a00; }
-form.change-state .actions {
- text-align: right;
- padding-top: 10px;
-}
-.next-states,
-.prev-state {
- margin-bottom: 30px;
-}
-.next-states form,
-.prev-state form {
- display: inline;
- margin-right: 10px;
-}
-{% endblock %}
+{% block title %}Change state for {{ doc }}{% endblock %}
{% block content %}
-Change state of {{ doc }}
+Change state
{{ doc }}
-For help on the states, see the state table.
+{% bootstrap_messages %} + ++ Help on states +
+ + {% if next_states %} -Or jump directly to
+Or jump directly to
- + {% endif %} {% if to_iesg_eval %} -You could also jump directly to
-
-
-
+ - But the ballot for this document has not yet been issued. - Edit Ballot Text -
-You could also jump directly to
+ + {% endif %} {% if prev_state %} -Or revert to previous state
+Or revert to previous state
-
-
-
+
{% endif %}
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_stream.html b/ietf/templates/doc/draft/change_stream.html
index 994d6c651..bd170cfd9 100644
--- a/ietf/templates/doc/draft/change_stream.html
+++ b/ietf/templates/doc/draft/change_stream.html
@@ -1,29 +1,20 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
+
+{% load bootstrap3 %}
{% block title %}Change stream for {{ doc }}{% endblock %}
-{% block morecss %}
-form.change-stream select {
- width: 22em;
-}
-form.change-stream .actions {
- text-align: right;
- padding-top: 10px;
-}
-{% endblock %}
-
{% block content %}
-Change stream for {{ doc }}
+Change stream
{{ doc }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index 7fa6fb433..6b220dac1 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -1,72 +1,43 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Change {{ state_type.label }} of {{ doc }}{% endblock %}
+{% load bootstrap3 %}
+
+{% block title %}Change {{ state_type.label }} for {{ doc }}{% endblock %}
-{% block morecss %}
-.next-states { margin-bottom: 1em; }
-.next-states a {
- display: inline-block;
- margin: 0 0.2em;
- padding: 0.2em 0.3em;
- border-radius: 0.2em;
- cursor: pointer;
- color: #333;
- font-weight: bold;
-}
-.next-states a:hover { background-color: #eee; transition-duration: 0.2s; }
-form.change-state th { max-width: 8em; }
-form.change-state th, form.change-state td { padding-bottom: 0.3em; }
-form.change-state #id_comment { width: 30em; }
-form.change-state #id_weeks { width: 2em;}
-form.change-state .actions { text-align: right; padding-top: 1em; }
-form.change-state ul { padding: 0; margin: 0; }
-form.change-state ul li { padding: 0; padding-bottom: 0.1em; margin: 0; list-style-type: none; }
-form.change-state ul li input { vertical-align: middle; }
-form.change-state ul li label { cursor: pointer; }
-{% endblock %}
{% block content %}
-Change {{ state_type.label }} of {{ doc }}
- -For help on the states, see the state table.
+Change {{ state_type.label }}
{{ doc }}
{% if next_states %}
-
+ + Move document to {{ next_states|pluralize:"to one of" }} the recommended next state{{ next_states|pluralize }}: +
+ {% endif %} - {% endblock %} -{% block js %} - {% endblock %} diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html index e604cb1d8..c627be641 100644 --- a/ietf/templates/doc/draft/edit_iesg_note.html +++ b/ietf/templates/doc/draft/edit_iesg_note.html @@ -1,34 +1,22 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% block title %}Edit IESG note for {{ doc.name }}{% endblock %} -{% block morecss %} -form.edit-iesg-note #id_note { - width: 600px; - height: 150px; -} -{% endblock %} - {% block content %} -Edit IESG note for {{ doc.name }}
+Edit IESG note
{{ doc.name }}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 7ca00b797..0d3d52513 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -1,64 +1,22 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Edit info on {{ doc }}{% endblock %}
+{% load bootstrap3 %}
+{% load ietf_filters %}
-{% block scripts %}
-function make_bold()
-{
- var e = document.getElementById("ballotwarn");
- e.setAttribute("class","warning");
-}
-{% endblock %}
-
-{% block morecss %}
-form.edit-info #id_notify {
- width: 600px;
-}
-form.edit-info #id_note {
- width: 600px;
- height: 150px;
-}
-form.edit-info .actions {
- padding-top: 20px;
-}
-.warning {
- font-weight: bold;
- color: #a00;
-}
-{% endblock %}
+{% block title %}Edit info for {{ doc }}{% endblock %}
{% block content %}
-{% load ietf_filters %}
-Edit info on {{ doc }}
+Edit info
{{ doc }}
-
{% endblock %}
diff --git a/ietf/templates/doc/draft/last_call_requested.html b/ietf/templates/doc/draft/last_call_requested.html
index f7b3c571b..347c98273 100644
--- a/ietf/templates/doc/draft/last_call_requested.html
+++ b/ietf/templates/doc/draft/last_call_requested.html
@@ -1,17 +1,15 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Last Call Requested{% endblock %}
+{% block title %}Last call requested{% endblock %}
{% block content %}
-Last Call Requested
+Last call requested
-Your request to issue the Last Call has been submitted to the Secretariat.
+Your request to issue the last call has been submitted to the secretariat.
-Note that the Last Call will not actually go out until the +
Note that the last call will not actually go out until the secretariat takes appropriate steps. This may take up to one business day, as it involves a person taking action.
-
- Back
-
+Back
{% endblock %}
diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html
index 604c0dc90..f1f95fba5 100644
--- a/ietf/templates/doc/draft/make_last_call.html
+++ b/ietf/templates/doc/draft/make_last_call.html
@@ -1,39 +1,28 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Make Last Call for {{ doc.name }}{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.approve-ballot pre {
- margin: 0;
- padding: 4px;
- border-top: 4px solid #eee;
- border-bottom: 4px solid #eee;
-}
-form.approve-ballot .announcement {
- overflow-x: auto;
- overflow-y: scroll;
- width: 800px;
- height: 400px;
- border: 1px solid #bbb;
-}
-{% endblock %}
+{% block title %}Make last call for {{ doc.name }}{% endblock %}
{% block content %}
-Make Last Call for {{ doc.name }}
+Make last call
{{ doc.name }}
-Make last call for following draft:
+{% bootstrap_messages %} -{{ doc.file_tag }} ({{ doc.group.acronym }}) - {{ doc.intended_std_level.name }}
++ Last call for: + {{ doc.name }} ({{ doc.group.acronym }}) to {{ doc.intended_std_level.name }} +
- + {% endblock %} diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html index 32aadcc40..370107bca 100644 --- a/ietf/templates/doc/draft/request_publication.html +++ b/ietf/templates/doc/draft/request_publication.html @@ -1,46 +1,53 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} + +{% load bootstrap3 %} {% block title %}Request publication for {{ doc }}{% endblock %} -{% block morecss %} -p.warning { color: #a00; font-weight: bold; } -form.request-publication #id_subject, -form.request-publication #id_body { width: 50em; } -form.request-publication #id_body { height: 30em; } -{% endblock %} - {% block content %} -Request publication for {{ doc }}
+Request publication
{{ doc }}
-Send a publication request to the RFC Editor for {{ doc }} and move -it to the {{ next_state.name }} stream state.
+{% bootstrap_messages %} + ++ Send a publication request to the RFC Editor for {{ doc }} and move it to the {{ next_state.name }} stream state. + Please edit the message and remove any parts in brackets you do not +fill in. For independent submissions, see the guidelines. +
{% if not doc.intended_std_level %} -Note: Intended RFC status is not set for the document.
++ Note: Intended RFC status is not set for the document. +
{% endif %} {% if doc.stream_id != "ise" and not consensus_filled_in %} -Note: Consensus status is not set for the document.
++ Note: Consensus status is not set for the document. +
{% endif %} + + {% endblock %} diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html index 8871015b8..76dd57353 100644 --- a/ietf/templates/doc/draft/request_resurrect.html +++ b/ietf/templates/doc/draft/request_resurrect.html @@ -1,19 +1,21 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block title %}Request resurrection of {{ doc }}{% endblock %} +{% block title %}Request resurrection for {{ doc }}{% endblock %} {% block content %} -Request resurrection of {{ doc }}
+Request resurrection
{{ doc }}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html
index 5942abdcd..174d80e42 100644
--- a/ietf/templates/doc/draft/resurrect.html
+++ b/ietf/templates/doc/draft/resurrect.html
@@ -1,18 +1,24 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
{% block title %}Resurrect {{ doc }}{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
index d27cd3ed7..fd15e1b40 100644
--- a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
+++ b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
@@ -1,10 +1,9 @@
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}Posting Approved Draft to RFC Editor Failed{% endblock %}
+{% block title %}Posting approved I-D to RFC Editor failed{% endblock %}
{% block content %}
-Posting Approved Draft to RFC Editor Failed
+Posting approved I-D to RFC Editor failed
Sorry, when trying to notify the RFC Editor through HTTP, we hit an error.
@@ -14,13 +13,11 @@ yet so if this is an intermittent error, you can go back and try again.The error was:
-{{ error }}
The response from the RFC Editor was:
- -{{ response|linebreaksbr }}
The response from the RFC Editor was:
+{{ response|linebreaksbr }}
Documents for {{ ad_name }}
- {% include "doc/search/search_results.html" %} - -{% endblock %} - -{% block js %} - - {% endblock %} diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html index dc4a1b9de..be6e0a5ec 100644 --- a/ietf/templates/doc/drafts_in_iesg_process.html +++ b/ietf/templates/doc/drafts_in_iesg_process.html @@ -1,15 +1,11 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} +{% extends "ietf.html" %} {% load ietf_filters %} {% block pagehead %} -{% if last_call_only %}{% endif %} -{% endblock %} - -{% block morecss %} -th.area, td.area { text-align: left; padding-right: 0.5em; } -th.date, td.date { text-align: left; padding-right: 0.5em; white-space: nowrap; } +{% if last_call_only %} + +{% endif %} {% endblock %} {% block title %}{{ title }}{% endblock %} @@ -17,51 +13,41 @@ th.date, td.date { text-align: left; padding-right: 0.5em; white-space: nowrap; {% block content %}{{ title }}
-{% for state, docs in grouped_docs %} -{{ state.name }}
+| Area | +{% if state.slug == "lc" %}Expires at{% else %}Date{% endif %} | +Document | +
|---|---|---|
| {{ state.name }} | ||
| Area | -{% if state.slug == "lc" %}Expires at{% else %}Date{% endif %} | -|
|---|---|---|
| {% if doc.area_acronym %}{{ doc.area_acronym }}{% endif %} | ++ {% if state.slug == "lc" %} + {% if doc.lc_expires %}{{ doc.lc_expires|date:"Y-m-d" }}{% endif %} + {% else %} + {{ doc.time|date:"Y-m-d" }} + {% endif %} + | - {% for doc in docs %} -|
| {% if doc.area_acronym %}{{ doc.area_acronym.upper }}{% endif %} | -- {% if state.slug == "lc" %} - {% if doc.lc_expires %}{{ doc.lc_expires|date:"M j, Y" }}{% endif %} - {% else %} - {{ doc.time|date:"M j, Y" }} - {% endif %} - | - -{{ doc.title }} ({{ doc.intended_std_level.name }}) | -
| - | - | {{ doc.name }} | -
| - | AD: | -{{ doc.ad.plain_name }} | -
| - | Note: | -{{ doc.note|linebreaksbr|urlize }} | -
+ {{ doc.title }} ({{ doc.intended_std_level.name }})
+ {{ doc.name }} + AD: {{ doc.ad.plain_name }} + {% if doc.note %} + Note: {{ doc.note|linebreaksbr|urlize }} + {% endif %} + |
+
+ {% endfor %}
+ {% endfor %}
+
Internet-Drafts in IETF Last Call
+Internet-Drafts in IETF last call
{% include "doc/search/search_results.html" %} {% endblock %} - -{% block js %} - - -{% endblock %} diff --git a/ietf/templates/doc/edit_notify.html b/ietf/templates/doc/edit_notify.html index 8b49178ae..571f82f02 100644 --- a/ietf/templates/doc/edit_notify.html +++ b/ietf/templates/doc/edit_notify.html @@ -1,43 +1,25 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block morecss %} -form.edit-info #id_notify { - width: 600px; -} -.warning { - font-weight: bold; - color: #a00; -} -{% endblock %} +{% load bootstrap3 %} {% block title %} -Edit notification addresses for {{titletext}} +Edit notification addresses for {{titletext}} {% endblock %} {% block content %} -Edit notification addresses for {{titletext}}
+Edit notification addresses
{{titletext}}
-
{% endblock %}
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index 92634699b..fce2d912b 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -1,36 +1,30 @@
-{% extends "base.html" %}
+{% extends "ietf.html" %}
-{% block title %}
-Set Telechat Date for {{ doc.name }}
-{% endblock %}
+{% load bootstrap3 %}
-{% block morecss %}
-form.telechat-date td.actions {
- padding-top: 1em;
-}
-{% endblock %}
+{% block title %}Set telechat date for {{ doc.name }}{% endblock %}
{% block content %}
-{% load ietf_filters %}
-Set Telechat Date for {{ doc.name }}
+Set telechat date
{{ doc.name }}
-
+
{% if prompts %}
-
-{% for prompt in prompts %}
-
+ {% for prompt in prompts %}
+ {# XXX FACELIFT: check what this is #}
+ {{prompt}}
-{% endfor %}
-{{prompt}}
+ }
+ {% endfor %}
{% endif %}
+
{% endblock %}
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 545b935ef..3f114896f 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -1,78 +1,34 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved. Contact: Pasi Eronen IETF Datatracker |
- |
-|
-Search Internet-Drafts and RFCs-{% include "doc/search/search_form.html" %} - |
-- | -The IETF Datatracker is the IETF's web system for managing information -about: - - | -
+
+
{% endblock content %}
-
-{% block js %}
-
-
-{% endblock %}
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
index f8d55a83b..e4a7899ca 100644
--- a/ietf/templates/doc/index_active_drafts.html
+++ b/ietf/templates/doc/index_active_drafts.html
@@ -1,9 +1,4 @@
-{% extends "base.html" %}
-
-{% block morecss %}
-.contents { max-width: 50em; }
-.contents a { float: left; width: 7em; margin-right: 2em; }
-{% endblock %}
+{% extends "ietf.html" %}
{% block title %}Active Internet-Drafts{% endblock %}
@@ -18,19 +13,24 @@ group. For normal use, it is recommended to use the
Internet-Drafts (that page also lists some machine-readable files
for download).
-
+
+ About
+The IETF Datatracker is the IETF's web system for managing organizational information, such as:
+ +
+
+Search Documents
+ {% include "doc/search/search_form.html" %} + +-{% for group in groups %}{{ group.acronym }} {% endfor %} +
- - {% for group in groups %} -{{ group.name }} ({{ group.acronym }})
-{% for d in group.active_drafts %} -{{ d.title }}
-{% for a in d.authors %}{{ a }}{% if not forloop.last %}, {% endif %}{% endfor %}
-{{ d.name }}-{{ d.rev }} ({{ d.rev_time|date:"Y-m-d" }})
{{ group.name }} ({{ group.acronym }})
+ {% for d in group.active_drafts %} +
+ {{ d.title }}.
+ {% for a in d.authors %}
+ {{ a }}{% if not forloop.last %}, {% else %}.{% endif %}
+ {% endfor %}
+
{{ d.name }}-{{ d.rev }}
+
{{ d.rev_time|date:"Y-m-d" }}
+
There's also an index of
+ There is also an index of
active Internet-Drafts with more information. In addition, the following files are available for download:
-
Contents
@@ -28,14 +28,13 @@ active Internet-Drafts with more information.
-
{% for state, heading, count, _ in categories %}
-
{{ heading }} ({{ count }})
- -{{ links|safe }}
+{{ heading }} ({{ count }})
+{{ links|safe }}
{% endfor %} {% endblock %} diff --git a/ietf/templates/doc/relationship_help.html b/ietf/templates/doc/relationship_help.html index e6f970e1f..56370699b 100644 --- a/ietf/templates/doc/relationship_help.html +++ b/ietf/templates/doc/relationship_help.html @@ -1,29 +1,27 @@ -{% extends "base.html" %} +{% extends "ietf.html" %} -{% block title %}Document Relationships{% endblock %} - -{% block morecss %} -.ietf-table .name { white-space: nowrap; padding-right: 1em; } -.ietf-table .desc { max-width: 35em; } -{% endblock %} +{% block title %}Document relationships{% endblock %} {% block content %} -Document Relationships
+Document relationships
-| Relationship | -Description | -Inverse Relationship | -
|---|---|---|
| {{ rel.name }} | -{{ rel.desc|linebreaksbr }} | -{{ rel.revname }} | -
| Relationship | +Description | +Inverse relationship | +
|---|---|---|
| {{ rel.name }} | +{{ rel.desc|linebreaksbr }} | +{{ rel.revname }} | +
- Versions:
-
- {% for rev in revisions %}
- {{ rev }}
- {% endfor %}
-
-
+
diff --git a/ietf/templates/doc/search/ipr_column_with_label.html b/ietf/templates/doc/search/ipr_column_with_label.html
deleted file mode 100644
index e1e4eed27..000000000
--- a/ietf/templates/doc/search/ipr_column_with_label.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Search Internet-Drafts and RFCs
+Search documents
-
{% include "doc/search/search_form.html" %}
-
-
-{% if meta.searching %}{% include "doc/search/search_results.html" %}{% endif %}
+{% if meta.searching %}
+ {% include "doc/search/search_results.html" %}
+{% endif %}
{% endblock content %}
-
-{% block js %}
-
-
-{% endblock %}
diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html
index 277f4476e..3f1cfe01b 100644
--- a/ietf/templates/doc/search/search_form.html
+++ b/ietf/templates/doc/search/search_form.html
@@ -1,92 +1,134 @@
-{% comment %}
-Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved. Contact: Pasi Eronen