Moves the prefix for the URI to use for rfcdiff into settings.py.

Fixes bug #808
 - Legacy-Id: 4701

ietf/context_processors.py

@@ -5,6 +5,9 @@ from ietf import __date__, __rev__, __version__, __id__
 
 def server_mode(request):
     return {'server_mode': settings.SERVER_MODE}
+
+def rfcdiff_prefix(request):
+    return {'rfcdiff_prefix': settings.RFCDIFF_PREFIX}
     
 def revision_info(request):
     return {'revision_time': __date__[7:32], 'revision_date': __date__[7:17], 'revision_num': __rev__[6:-2], "revision_id": __id__[5:-2], "version_num": __version__ }

ietf/idrfc/views_doc.py

@@ -468,7 +468,7 @@ def _get_history(doc, versions):
                 filename = u"%s-%s" % (e.doc.name, e.newrevisiondocevent.rev)
                 e.desc = 'New version available: <a href="http://tools.ietf.org/id/%s.txt">%s</a>' % (filename, filename)
                 if int(e.newrevisiondocevent.rev) != 0:
-                    e.desc += ' (<a href="http://tools.ietf.org/rfcdiff?url2=%s">diff from -%02d</a>)' % (filename, int(e.newrevisiondocevent.rev) - 1)
+                    e.desc += ' (<a href="http:{{rfcdiff_prefix}}?url2=%s">diff from -%02d</a>)' % (filename, int(e.newrevisiondocevent.rev) - 1)
                 info["dontmolest"] = True
 
             multiset_ballot_text = "This was part of a ballot set with: "

ietf/settings.py

@@ -121,7 +121,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.i18n',
     'django.core.context_processors.request',
     'ietf.context_processors.server_mode',
-    'ietf.context_processors.revision_info'
+    'ietf.context_processors.revision_info',
+    'ietf.context_processors.rfcdiff_prefix', 
 )
 
 INSTALLED_APPS = (
@@ -173,6 +174,7 @@ INTERNAL_IPS = (
 
 # no slash at end
 IDTRACKER_BASE_URL = "http://datatracker.ietf.org"
+RFCDIFF_PREFIX = "//www.ietf.org/rfcdiff"
 
 # Valid values:
 # 'production', 'test', 'development'

ietf/submit/utils.py

@@ -215,7 +215,8 @@ def announce_to_lists(request, submission):
         if submission.group_acronym:
             m.cc = submission.group_acronym.email_address
         m.body = render_to_string('submit/announce_to_lists.txt', dict(submission=submission,
-                                                                       authors=authors))
+                                                                       authors=authors,
+                                                                       settings=settings,))
         m.save()
         m.related_docs.add(Document.objects.get(name=submission.filename))
 

ietf/templates/idrfc/date_column.html

@@ -32,6 +32,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% endcomment %}
 {% load ietf_filters %}<td class="date">{% if not doc.rfc %}{{ doc.publication_date }}{% else %}{{ doc.publication_date|date:"Y-m" }}{% endif %}
-{% if doc.publication_date|timesince_days|new_enough:request %}<br/><span class="ietf-small ietf-highlight-y">{% if not doc.rfc%}<a href="http://tools.ietf.org/rfcdiff?url2={{doc.id.draft_name_and_revision}}">new</a>{%else%}new{%endif%}</span>{%endif%}
+{% if doc.publication_date|timesince_days|new_enough:request %}<br/><span class="ietf-small ietf-highlight-y">{% if not doc.rfc%}<a href="http:{{rfcdiff_prefix}}?url2={{doc.id.draft_name_and_revision}}">new</a>{%else%}new{%endif%}</span>{%endif%}
 {% if doc.id and doc.id.expected_expiration_date and doc.id.expected_expiration_date|timesince_days|expires_soon:request %}<br/><span class="ietf-small ietf-highlight-y">expires soon</span>{%endif%}
 </td>

ietf/templates/idrfc/doc_diffs.html

@@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <div class="ietf-box diffTool">
 <h2 style="margin-top:0;margin-bottom:4px;">Diffs</h2>
-<form action="http{% if request.is_secure %}s{% endif %}://tools.ietf.org/rfcdiff" method="get" target="_blank" style="margin:0;">
+<form action="http{% if request.is_secure %}s{% endif %}:{{rfcdiff_prefix}}" method="get" target="_blank" style="margin:0;">
 <table>
 <tr><td>
 <label>From:</label> <select name="url1">

ietf/templates/idrfc/doc_history.html

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% if c.is_rev %}
 <td>{{ c.revision }}</td>
 <td>(System)</td>
-<td>New version available: <a href="http://tools.ietf.org/id/{{c.draft_name}}-{{c.revision}}.txt">{{c.draft_name}}-{{c.revision}}</a> {% ifnotequal c.revision "00" %}(<a href="http://tools.ietf.org/rfcdiff?url2={{c.draft_name}}-{{c.revision}}">diff from -{{c.revision|add:"-1"|stringformat:"02d"}}</a>){% endifnotequal %}</td>
+<td>New version available: <a href="http://tools.ietf.org/id/{{c.draft_name}}-{{c.revision}}.txt">{{c.draft_name}}-{{c.revision}}</a> {% ifnotequal c.revision "00" %}(<a href="http:{{rfcdiff_prefix}}?url2={{c.draft_name}}-{{c.revision}}">diff from -{{c.revision|add:"-1"|stringformat:"02d"}}</a>){% endifnotequal %}</td>
 {% endif %}
 
 {% if c.is_text %}

ietf/templates/idrfc/document_history.html

@@ -15,7 +15,7 @@
 <div class="ietf-box diffTool">
   <h2>Diffs</h2>
 
-  <form action="http{% if request.is_secure %}s{% endif %}://tools.ietf.org/rfcdiff" method="get" target="_blank">
+  <form action="http{% if request.is_secure %}s{% endif %}:{{rfcdiff_prefix}}" method="get" target="_blank">
     <table>
       <tr>
         <td>

ietf/templates/submit/announce_new_version.txt

@@ -9,7 +9,7 @@ The IETF datatracker page for this Internet-Draft is:
 https://datatracker.ietf.org/doc/{{ submission.filename }}/
 
 Diff from previous version:
-http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}
+http:{{rfcdiff_prefix}}?url2={{ submission.filename }}-{{ submission.revision }}
 
 IETF Secretariat.
 {% endautoescape %}

ietf/templates/submit/announce_to_authors.txt

@@ -12,7 +12,7 @@ Number of pages: {{ submission.txt_page_count }}
 URL:             http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
 Status:          http://datatracker.ietf.org/doc/{{ submission.filename }}
 Htmlized:        http://tools.ietf.org/html/{{ submission.filename }}-{{ submission.revision }}
-{% ifnotequal submission.revision "00" %}Diff:            http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}{% endifnotequal %}
+{% ifnotequal submission.revision "00" %}Diff:            http:{{rfcdiff_prefix}}?url2={{ submission.filename }}-{{ submission.revision }}{% endifnotequal %}
 
 Abstract:
 {{ submission.abstract }}
@@ -20,4 +20,4 @@ Abstract:
 {{ submission.comment_to_sec|default:"" }}
 
 The IETF Secretariat
-{% endautoescape %}
+{% endautoescape %}

ietf/templates/submit/announce_to_lists.txt

@@ -18,8 +18,8 @@ https://datatracker.ietf.org/doc/{{ submission.filename }}
 There's also a htmlized version available at:
 http://tools.ietf.org/html/{{ submission.filename }}-{{ submission.revision }}
 {% if submission.revision != "00" %}
-A diff from previous version is available at:
+A diff from the previous version is available at:
-http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}
+http:{{settings.RFCDIFF_PREFIX}}?url2={{ submission.filename }}-{{ submission.revision }}
 {% endif %}
 
 Internet-Drafts are also available by anonymous FTP at: