From c41a079d4f9b3924036218d4d5c004949f909bf8 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 18 Jul 2015 09:18:54 +0000 Subject: [PATCH] Merged in [9735] from lars@netapp.com: More HTML fixes identified by test-crawl --vnu. - Legacy-Id: 9767 Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361 --- hold-for-merge | 1 + ietf/meeting/views.py | 2 +- ietf/templates/doc/document_charter.html | 6 ++--- .../doc/document_conflict_review.html | 11 +++++---- ietf/templates/doc/document_draft.html | 18 +++++++++------ .../templates/doc/document_status_change.html | 14 ++++------- ietf/templates/group/group_about.html | 2 ++ ietf/templates/meeting/agenda.html | 23 ++++++------------- 8 files changed, 36 insertions(+), 41 deletions(-) diff --git a/hold-for-merge b/hold-for-merge index fa8d7a0e5..ca425df2d 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,6 @@ # -*- conf-mode -*- +personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach' personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 1190cde85..6142bba3e 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -437,7 +437,7 @@ def session_agenda(request, num, session): if d: agenda = d[0] - content = read_agenda_file(num, agenda) or "Could not read agenda file" + content = read_agenda_file(num, agenda) or "Error

Could not read agenda file

" _, ext = os.path.splitext(agenda.external_url) ext = ext.lstrip(".").lower() diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index 25ae1daca..7462d4789 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -27,7 +27,7 @@ - + Document @@ -87,7 +87,7 @@ - + WG @@ -100,7 +100,7 @@ - + IESG diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 2a33b77e6..c017ea08a 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -16,14 +16,14 @@ {% if doc.rev != latest_rev %} -  The information below is for an old version of the document + The information below is for an old version of the document {% else %} -   - {% endif %} + + {% endif %} - + Document @@ -137,7 +137,8 @@ {% 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 7cf63883f..40f521231 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -9,6 +9,10 @@ {% endblock %} +{% block morecss %} + .inline { display: inline; } +{% endblock %} + {% block title %} {% if doc.get_state_slug == "rfc" %} RFC {{ rfc_number }} @@ -34,7 +38,7 @@ - + Document Type @@ -146,7 +150,7 @@ {% endif %} - + Stream {% if doc.stream %} @@ -239,7 +243,7 @@ {% endif %} - + IESG IESG state @@ -321,7 +325,7 @@ {% if iana_review_state %} - + IANA IANA review state @@ -349,7 +353,7 @@ {% endif %} - + {% if rfc_editor_state %} @@ -369,7 +373,7 @@ References Referenced by Nits - +
@@ -380,7 +384,7 @@
  • ARO
    • {% endif %} - +
    {% if user.is_authenticated %} {% if tracking_document %} Untrack diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html index d75c3aaf9..403439c39 100644 --- a/ietf/templates/doc/document_status_change.html +++ b/ietf/templates/doc/document_status_change.html @@ -12,18 +12,14 @@ {% include "doc/revisions_list.html" %} - {% if doc.rev != latest_rev %} -

    The information below is for an old version of the document

    - {% endif %} - {% if doc.rev != latest_rev %} - + {% else %} - - {% endif %} + + {% endif %} @@ -82,9 +78,9 @@ - + - + diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 6cd9f3210..972d5b04e 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -27,6 +27,8 @@ {% if group.parent and group.parent.type_id == "area" %} + {% else %} + {% endif %} diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 6db995a93..1307b209f 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -193,16 +193,11 @@ {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} {% endif %} - - @@ -223,20 +218,14 @@ {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} {% endif %} - - {% else %} - + - + - {% endwith %}
     The information below is for an old version of the documentThe information below is for an old version of the document 
    IESGIESG
    {{ group.parent.type.name }} {{ group.parent.name }} ({{ group.parent.acronym }})
    {% if item.timeslot.show_location and item.timeslot.get_location %} {{item.timeslot.get_location|split:"/"|join:"/"}} {% endif %} - {% if item.timeslot.show_location and item.timeslot.get_location %} - {{item.timeslot.get_location|split:"/"|join:"/"}} - {% endif %} - {{item.timeslot.name}} + {% if item.timeslot.show_location and item.timeslot.get_location %} {{item.timeslot.get_location|split:"/"|join:"/"}} {% endif %} {% if item.timeslot.show_location and item.timeslot.get_location %} @@ -244,7 +233,7 @@ {% endif %} {% if item.session.group.charter %} @@ -318,12 +307,14 @@ +