From 7d554f2bd90c0ed7448913adbb137cc7435dea68 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Tue, 19 Jun 2007 18:27:40 +0000 Subject: [PATCH] Reduce the hardcoded references to https://datatracker.ietf.org/ . (To abstract this, we need to put is_secure and the site info into the context.) - Legacy-Id: 536 --- ietf/templates/base.html | 5 ++++- ietf/templates/idindex/doclist.html | 2 +- ietf/templates/idindex/internetdraft_detail.html | 2 +- ietf/templates/idtracker/ballotinfo_detail.html | 2 +- ietf/templates/idtracker/idtracker_search.html | 4 ++-- ietf/templates/liaisons/guide_from_ietf.html | 10 +++++----- ietf/templates/mailinglists/nwg_wizard_done_email.txt | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ietf/templates/base.html b/ietf/templates/base.html index d5f18931e..4ad9db46a 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -23,12 +23,15 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - + + {% ifnotequal server_mode "production" %} + Server mode: {{ server_mode }} + {% endifnotequal %} {% if user.is_authenticated %} Logged in as {{ user }} | diff --git a/ietf/templates/idindex/doclist.html b/ietf/templates/idindex/doclist.html index fd19d1e94..048b592d2 100644 --- a/ietf/templates/idindex/doclist.html +++ b/ietf/templates/idindex/doclist.html @@ -10,7 +10,7 @@ {% else %} RFC # {% endif %} -I-D Tracker State +I-D Tracker State {% for draft in object_list %} diff --git a/ietf/templates/idindex/internetdraft_detail.html b/ietf/templates/idindex/internetdraft_detail.html index 982fc073b..79f9282da 100644 --- a/ietf/templates/idindex/internetdraft_detail.html +++ b/ietf/templates/idindex/internetdraft_detail.html @@ -24,7 +24,7 @@
  • I-D Intended Status at Publication: {{ object.intended_status }}
  • RFC Number: {% if object.rfc_number %}{{ object.rfc_number }}{% endif %}
    • -
  • I-D Tracker State: +
  • I-D Tracker State: {% if object.idtracker %} {{ object.idstate }} {% else %} diff --git a/ietf/templates/idtracker/ballotinfo_detail.html b/ietf/templates/idtracker/ballotinfo_detail.html index a1210f28b..df5fdac5c 100644 --- a/ietf/templates/idtracker/ballotinfo_detail.html +++ b/ietf/templates/idtracker/ballotinfo_detail.html @@ -13,7 +13,7 @@ Subject: Evaluation: {% for id in object.drafts.all %}{{ id.draft.filename }}-{{ -------- Evaluation for{% for id in object.drafts.all %} {{ id.draft.filename }}-{{ id.draft.revision }}.txt {% endfor %}can be found at -http://datatracker.ietf.org/idtracker/ballot/{{ object.ballot }}/ +https://datatracker.ietf.org/{% url ietf.idtracker.views.view_ballot object.ballot %}/ {% if object.drafts.all.0.draft.lc_expiration_date %} Last Call to expire on: {{ object.drafts.all.0.draft.lc_expiration_date|escape }} {% endif %} diff --git a/ietf/templates/idtracker/idtracker_search.html b/ietf/templates/idtracker/idtracker_search.html index 69fe38aab..655483fa2 100644 --- a/ietf/templates/idtracker/idtracker_search.html +++ b/ietf/templates/idtracker/idtracker_search.html @@ -68,8 +68,8 @@ state: {{ form.sub_state_id }}
    -Document States: State Diagram and -State Explanations +Document States: State Diagram and +State Explanations diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html index 9a7dcf764..e1d38673e 100755 --- a/ietf/templates/liaisons/guide_from_ietf.html +++ b/ietf/templates/liaisons/guide_from_ietf.html @@ -19,28 +19,28 @@ For definitive information on generating liaison statements, please see:

    "Cc:" Field (1, 2, 3)