Skip to content

Commit 7d554f2

Browse files
fennerfenner
committed
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
1 parent 46afc19 commit 7d554f2

7 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎ietf/templates/base.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@
2323
<td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
2424
<td><a href="http://www.ietf.org/proceedings_directory.html"><img src="https://www1.ietf.org/images/header/proceed11.gif" border="0" /></a></td>
2525
<td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
26-
<td><a href="https://datatracker.ietf.org/public/idindex.cgi"><img src="https://www1.ietf.org/images/header/id-index11.gif" border="0" /></a></td>
26+
<td><a href="{% url ietf.idindex.views.search %}"><img src="https://www1.ietf.org/images/header/id-index11.gif" border="0" /></a></td>
2727
<td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
2828
<td><a href="http://www.ietf.org/rfc.html"><img src="https://www1.ietf.org/images/header/rfc11.gif" border="0" /></a></td>
2929
</tr>
3030
</table>
3131
</center>
32+
{% ifnotequal server_mode "production" %}
33+
<span style="float: left; font-size: 80%;">Server mode: {{ server_mode }}</span>
34+
{% endifnotequal %}
3235
{% if user.is_authenticated %}
3336
<span style="float: right; font-size: 80%;">Logged in as {{ user }}
3437
|

‎ietf/templates/idindex/doclist.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% else %}
1111
<td width="70"><b>RFC #</td>
1212
{% endif %}
13-
<td width="150"><a href="https://datatracker.ietf.org/"><b>I-D Tracker</a> State</td>
13+
<td width="150"><a href="{% url ietf.idtracker.views.search %}"><b>I-D Tracker</a> State</td>
1414
</tr>
1515

1616
{% for draft in object_list %}

‎ietf/templates/idindex/internetdraft_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2>{{ object.filename }}-{{ object.revision_display }}</h2>
2424
</li>
2525
<li> <b>I-D Intended Status at Publication:</b> {{ object.intended_status }}</li>
2626
<li> <b>RFC Number:</b> {% if object.rfc_number %}<a href="http://www.ietf.org/rfc/rfc{{ object.rfc_number }}.txt">{{ object.rfc_number }}</a>{% endif %}</li>
27-
<li> <b><a href="https://datatracker.ietf.org/">I-D Tracker</a> State:</b>
27+
<li> <b><a href="{% url ietf.idtracker.views.search %}">I-D Tracker</a> State:</b>
2828
{% if object.idtracker %}
2929
<a href="/idtracker/{{ object.filename }}/">{{ object.idstate }}</a>
3030
{% else %}

‎ietf/templates/idtracker/ballotinfo_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--------
1414

1515
Evaluation for{% for id in object.drafts.all %} {{ id.draft.filename }}-{{ id.draft.revision }}.txt {% endfor %}can be found at
16-
http://datatracker.ietf.org/idtracker/ballot/{{ object.ballot }}/ <!-- FIXME: hardcoded URL -->
16+
https://datatracker.ietf.org/{% url ietf.idtracker.views.view_ballot object.ballot %}/ <!-- FIXME: hardcoded URL -->
1717
{% if object.drafts.all.0.draft.lc_expiration_date %}
1818
Last Call to expire on: {{ object.drafts.all.0.draft.lc_expiration_date|escape }}
1919
{% endif %}

‎ietf/templates/idtracker/idtracker_search.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ <h1>IETF I-D TRACKER</h1>
6868
</form>
6969

7070
<HR>
71-
Document States: <a href="https://datatracker.ietf.org/state_diagram.gif">State Diagram</a> and
72-
<a href="https://datatracker.ietf.org/public/states_table.cgi">State Explanations</a>
71+
Document States: <a href="/images/state_diagram.gif">State Diagram</a> and
72+
<a href="/idtracker/states/">State Explanations</a>
7373

7474
</center>
7575

‎ietf/templates/liaisons/guide_from_ietf.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,28 @@
1919
<td><b>"Cc:" Field</b> <sup><small>(1, 2, 3)</small></sup></td></tr>
2020
<tr>
2121
<td><ul><li>The IAB </li></td>
22-
<td><ul><li><a href="https://datatracker.ietf.org/public/liaison_managers_list.cgi">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
22+
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
2323
<li>The IAB Chair (if not the submitter)&lt;iab-chair@iab.org&gt;<br><br>
2424
<li>The IAB &lt;iab@iab.org&gt;</li></td></tr>
2525
<tr>
2626
<td><ul><li>The IESG </li></td>
27-
<td><ul><li><a href="https://datatracker.ietf.org/public/liaison_managers_list.cgi">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
27+
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
2828
<li>The IETF Chair (if not the submitter)&lt;chair@ietf.org&gt;<br><br>
2929
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
3030
<tr>
3131
<td><ul><li>The IETF </li></td>
32-
<td><ul><li><a href="https://datatracker.ietf.org/public/liaison_managers_list.cgi">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
32+
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
3333
<li>The IETF Chair (if not the submitter)&lt;chair@ietf.org&gt;<br><br>
3434
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
3535
<tr>
3636
<td><ul><li>An IETF Area </li></td>
37-
<td><ul><li><a href="https://datatracker.ietf.org/public/liaison_managers_list.cgi">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
37+
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
3838
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a> (if not the submitter)<br><br>
3939
<li>The IETF Chair &lt;chair@ietf.org&gt;<br><br>
4040
<li>The IETF Area Directorate Mailing List (where applicable) <sup><small>(5)</small></sup></li></td></tr>
4141
<tr>
4242
<td><ul><li>An IETF Working Group </li></td>
43-
<td><ul><li><a href="https://datatracker.ietf.org/public/liaison_managers_list.cgi">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
43+
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
4444
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Working Group Chair(s)</a> (if not the submitter)<br><br>
4545
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a><br><br>
4646
<li><a href="

‎ietf/templates/mailinglists/nwg_wizard_done_email.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The Secretariat has received a request to {% ifequal add_edit "edit" %}edit an existing entry on{% else %}{% ifequal add_edit "add" %}add a new entry to{% else %}delete an existing entry from{% endifequal %}{% endifequal %}
2-
the "IETF Non-WG Mailing Lists" Web Page, https://datatracker.ietf.org/public/nwg_list.cgi
2+
the "IETF Non-WG Mailing Lists" Web Page, https://datatracker.ietf.org/mailinglists/nonwg_lists/
33
The details of the request are provided below.
44

55
Please approve or deny this request via the "IETF Non-WG Mailing List Approval Page,"

0 commit comments

Comments
 (0)