Fix ticket adamlaska#156. Adding a number of missing image files, and changing all <image src='...'/> tags to use local images.

 - Legacy-Id: 761

Author: levkowetz

ietf/ipr/search.py

@@ -84,7 +84,7 @@ def search(request, type="", q="", id=""):
                     if q:
                         # normalize the draft name.
                         q = q.strip()
-                        q = re.sub("\.txt$","",q)
+                        q = re.sub("\.txt$","")
                         q = re.sub("-\d\d$","",q)
                         start = InternetDraft.objects.filter(filename__contains=q)
                     if id:

ietf/ipr/testurl.list

@@ -1,30 +1,30 @@
 # -*- conf-mode -*-
-200	/ipr/				https://datatracker.ietf.org/public/ipr_list.cgi
-200	/ipr/ipr-657/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=657 # Generic disclosure
-200	/ipr/ipr-834/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=834 # Specific disclosure
-200	/ipr/ipr-795/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=795 # Third-party disclosure
-200	/ipr/new-generic/		https://datatracker.ietf.org/public/ipr_generic.cgi
-200	/ipr/new-specific/		https://datatracker.ietf.org/public/ipr.cgi
-200	/ipr/new-third-party/		https://datatracker.ietf.org/public/ipr_notify.cgi
-200	/ipr/update/			https://datatracker.ietf.org/public/ipr_update_list.cgi
+200			/ipr/				https://datatracker.ietf.org/public/ipr_list.cgi
+200			/ipr/ipr-657/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=657 # Generic disclosure
+200			/ipr/ipr-834/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=834 # Specific disclosure
+200			/ipr/ipr-795/			https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=795 # Third-party disclosure
+200			/ipr/new-generic/		https://datatracker.ietf.org/public/ipr_generic.cgi
+200			/ipr/new-specific/		https://datatracker.ietf.org/public/ipr.cgi
+200			/ipr/new-third-party/		https://datatracker.ietf.org/public/ipr_notify.cgi
+200			/ipr/update/			https://datatracker.ietf.org/public/ipr_update_list.cgi
 
-200	/ipr/update/657/		https://datatracker.ietf.org/public/ipr_generic.cgi?command=update_ipr&ipr_id=657
+200			/ipr/update/657/		https://datatracker.ietf.org/public/ipr_generic.cgi?command=update_ipr&ipr_id=657
 
-200	/ipr/search/			https://datatracker.ietf.org/public/ipr_search.cgi
-302	/ipr/search/?option=document_search # incomplete argument set gives redirect
+200			/ipr/search/			https://datatracker.ietf.org/public/ipr_search.cgi
+302			/ipr/search/?option=document_search # incomplete argument set gives redirect
 
-200	/ipr/search/?document_search=mod&option=document_search https://datatracker.ietf.org/public/ipr_search.cgi?option=document_search&document_search=mod
+200			/ipr/search/?document_search=mod&option=document_search https://datatracker.ietf.org/public/ipr_search.cgi?option=document_search&document_search=mod
 200,sort /ipr/search/?id_document_tag=2220&option=document_search https://datatracker.ietf.org/public/ipr_search.cgi?option=document_search&id_document_tag=2220
-200	/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns-05	https://datatracker.ietf.org/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns
-200	/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns-05.txt	https://datatracker.ietf.org/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns
+200,skipredirect	/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns-05	https://datatracker.ietf.org/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns
+200,skipredirect	/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns-05.txt	https://datatracker.ietf.org/ipr/search/?option=document_search&document_search=draft-housley-tls-authz-extns
 
 # This takes ~ 300s:
-#200,sort /ipr/search/?rfc_search=1034&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1034			# Loong result, RFC search
-200,sort /ipr/search/?rfc_search=1032&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1032			# Loong result, RFC search
-200	/ipr/search/?rfc_search=4444&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=4444			# Empty result, RFC search
+#200,sort		/ipr/search/?rfc_search=1034&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1034			# Loong result, RFC search
+200,sort		/ipr/search/?rfc_search=1032&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1032			# Loong result, RFC search
+200			/ipr/search/?rfc_search=4444&option=rfc_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=4444			# Empty result, RFC search
 
-200	/ipr/search/?patent_search=nortel&option=patent_search	https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_search&patent_search=nortel
-200	/ipr/search/?patent_search=nortelxz&option=patent_search	https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_search&patent_search=nortelxz	# Empty result
+200			/ipr/search/?patent_search=nortel&option=patent_search	https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_search&patent_search=nortel
+200			/ipr/search/?patent_search=nortelxz&option=patent_search	https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_search&patent_search=nortelxz	# Empty result
 
 200,sort,ignore:quote /ipr/search/?wg_search=dnsext&option=wg_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=wg_search&wg_search=dnsext
 #200,sort,ignore:quote /ipr/search/?wg_search=aaa&option=wg_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=wg_search&wg_search=aaa	# FIXME This fails, needs revisiting
@@ -33,17 +33,17 @@
 200,sort,ignore:quote /ipr/search/?option=title_search&title_search=AAA		https://datatracker.ietf.org/public/ipr_search.cgi?option=title_search&title_search=AAA
 200,sort,ignore:quote /ipr/search/?option=title_search&title_search=AAAxz	https://datatracker.ietf.org/public/ipr_search.cgi?option=title_search&title_search=AAAxz # Empty result
 
-200,sort /ipr/search/?patent_info_search=123&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=123
-200,sort /ipr/search/?patent_info_search=31415&option=patent_info_search	https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=31415 # Empty result
+200,sort		/ipr/search/?patent_info_search=123&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=123
+200,sort		/ipr/search/?patent_info_search=31415&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=31415 # Empty result
 
-200	/ipr/search/?patent_info_search=12&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=12 # Error: at least 3 characters
-200	/ipr/search/?patent_info_search=abc&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=abc # Error: at least 1 digit
+200			/ipr/search/?patent_info_search=12&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=12 # Error: at least 3 characters
+200			/ipr/search/?patent_info_search=abc&option=patent_info_search		https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=abc # Error: at least 1 digit
 
-200	/ipr/search/?option=ipr_title_search&ipr_title_search=nortel	https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortel
-200	/ipr/search/?option=ipr_title_search&ipr_title_search=nortelxz	https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortelxz	# Empty result
+200			/ipr/search/?option=ipr_title_search&ipr_title_search=nortel	https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortel
+200			/ipr/search/?option=ipr_title_search&ipr_title_search=nortelxz	https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortelxz	# Empty result
 
 
-200	/ipr/about/			https://datatracker.ietf.org/public/ipr_disclosure.cgi
-200	/ipr/2006/
-200	/ipr/2006/feb/
-200	/ipr/by-date/
+200			/ipr/about/			https://datatracker.ietf.org/public/ipr_disclosure.cgi
+200			/ipr/2006/
+200			/ipr/2006/feb/
+200			/ipr/by-date/

ietf/templates/404.html

@@ -4,15 +4,15 @@
 
 {% block content %}
 <center>
-<img src="http://www.ietf.org/images/ietflogo2e.gif" height="160" width="280">
+<img src="/images/ietflogo2e.gif" height="160" width="280">
 <br clear=all>
 
 <center><h1>The Internet Engineering Task Force</h1></center>
 <table border=0 cellspacing=5 cellpadding=5>
 
 <br>
 <font size = 3>
-<center><img alt="" src="http://www.ietf.org/images/blue-line.jpg"></center>
+<center><img alt="" src="/images/blue-line.jpg"></center>
 <br clear=all>
 <h3>The page you are looking for cannot be found.</h3><br>
 If it is an Internet-Draft, the version may have expired.<br>
@@ -23,14 +23,14 @@ <h3>The page you are looking for cannot be found.</h3><br>
 For other Web page issues, please contact <a href="mailto:webmaster@ietf.org">webmaster@ietf.org</a>. <br>
 <br>
 <font size = 3>
-<center><img alt="Blue Line" src="http://www.ietf.org/images/blue-line.jpg"></center>
+<center><img alt="Blue Line" src="/images/blue-line.jpg"></center>
 <br clear=all>
-The IETF is an organized activity of the <a href="http://www.isoc.org"><img alt="ISOC" src="http://www.ietf.org/images/isoc-small.gif" hspace="3" border="0"></A>
+The IETF is an organized activity of the <a href="http://www.isoc.org"><img alt="ISOC" src="/images/isoc-small.gif" hspace="3" border="0"></A>
 
 <br>
 
 <hr>
-<i>The <A HREF="/secretariat.html">IETF Secretariat</A> is hosted by the NeuStar Secretariat Services, a wholly owned subsidiary of <a href="http://www.neustar.biz/"><img src="http://www.ietf.org/images/NS_logo_100px.gif" alt="NeuStar Logo" border="0">
+<i>The <A HREF="/secretariat.html">IETF Secretariat</A> is hosted by the NeuStar Secretariat Services, a wholly owned subsidiary of <a href="http://www.neustar.biz/"><img src="/images/NS_logo_100px.gif" alt="NeuStar Logo" border="0">
 
 </i>
 {% endblock %}

ietf/templates/500.html

@@ -4,14 +4,14 @@
 
 {% block content %}
 <center>
-<img src="http://www.ietf.org/images/ietflogo2e.gif" height="80" width="140">
+<img src="/images/ietflogo2e.gif" height="80" width="140">
 <br clear=all>
 
 <h2>The Internet Engineering Task Force</h2>
 <table border=0 cellspacing=5 cellpadding=5>
 
 <br>
-<center><img alt="" src="http://www.ietf.org/images/blue-line.jpg"></center>
+<center><img alt="" src="/images/blue-line.jpg"></center>
 <br clear=all>
 <h1>Error 500</h1>
 <h2>Internal Server Error</h2>
@@ -20,14 +20,14 @@ <h2>Internal Server Error</h2>
 Please contact <a href="mailto:webtools@ietf.org">webtools@ietf.org</a>. <br>
 <br>
 <!--
-<center><img alt="Blue Line" src="http://www.ietf.org/images/blue-line.jpg"></center>
+<center><img alt="Blue Line" src="/images/blue-line.jpg"></center>
 <br clear=all>
-The IETF is an organized activity of the <a href="http://www.isoc.org"><img alt="ISOC" src="http://www.ietf.org/images/isoc-small.gif" hspace="3" border="0"></A>
+The IETF is an organized activity of the <a href="http://www.isoc.org"><img alt="ISOC" src="/images/isoc-small.gif" hspace="3" border="0"></A>
 
 <br>
 
 <hr>
-<i>The <A HREF="/secretariat.html">IETF Secretariat</A> is hosted by the NeuStar Secretariat Services, a wholly owned subsidiary of <a href="http://www.neustar.biz/"><img src="http://www.ietf.org/images/NS_logo_100px.gif" alt="NeuStar Logo" border="0"/></a></i>
+<i>The <A HREF="/secretariat.html">IETF Secretariat</A> is hosted by the NeuStar Secretariat Services, a wholly owned subsidiary of <a href="http://www.neustar.biz/"><img src="/images/NS_logo_100px.gif" alt="NeuStar Logo" border="0"/></a></i>
 -->
 {% endblock %}
 

ietf/templates/base-new.html

@@ -14,7 +14,7 @@
 
 <div id="leftmenu">
 <div class="menulogo">
-<img class="menulogo" src="http://www1.tools.ietf.org/images/ietflogo2i.png" alt="IETF logo" />
+<img class="menulogo" src="/images/ietflogo2i.png" alt="IETF logo" />
 </div>
 <ul>
   <li><a title="About the Internet Engineering Task Force">About the IETF</a>

ietf/templates/base.html

@@ -24,18 +24,18 @@
    <center>
       <table border=0 cellpadding=0 cellspacing=0>
 	 <tr>
-	    <td><a href="http://www.ietf.org/home.html"><img src="https://www1.ietf.org/images/header/ietflogo_sm.gif" border="0" /></a></td>
-	    <td><a href="http://www.ietf.org/home.html"><img src="https://www1.ietf.org/images/header/home11.gif" border="0" /></a></td>
-	    <td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
-	    <td><a href="http://www.ietf.org/html.charters/wg-dir.html"><img src="https://www1.ietf.org/images/header/wg11.gif" border="0" /></a></td>
-	    <td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
-	    <td><a href="http://www.ietf.org/meetings/meetings.html"><img src="https://www1.ietf.org/images/header/meetings11.gif" border="0" /></a></td>
-	    <td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
-	    <td><a href="http://www.ietf.org/proceedings_directory.html"><img src="https://www1.ietf.org/images/header/proceed11.gif"  border="0" /></a></td>
-	    <td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
-	    <td><a href="{% url ietf.idindex.views.search %}"><img src="https://www1.ietf.org/images/header/id-index11.gif" border="0" /></a></td>
-	    <td><img src="https://www1.ietf.org/images/header/separator.gif" border="0" /></td>
-	    <td><a href="http://www.ietf.org/rfc.html"><img src="https://www1.ietf.org/images/header/rfc11.gif" border="0" /></a></td>
+	    <td><a href="http://www.ietf.org/home.html"><img src="/images/header/ietflogo_sm.gif" border="0" /></a></td>
+	    <td><a href="http://www.ietf.org/home.html"><img src="/images/header/home11.gif" border="0" /></a></td>
+	    <td><img src="/images/header/separator.gif" border="0" /></td>
+	    <td><a href="http://www.ietf.org/html.charters/wg-dir.html"><img src="/images/header/wg11.gif" border="0" /></a></td>
+	    <td><img src="/images/header/separator.gif" border="0" /></td>
+	    <td><a href="http://www.ietf.org/meetings/meetings.html"><img src="/images/header/meetings11.gif" border="0" /></a></td>
+	    <td><img src="/images/header/separator.gif" border="0" /></td>
+	    <td><a href="http://www.ietf.org/proceedings_directory.html"><img src="/images/header/proceed11.gif"  border="0" /></a></td>
+	    <td><img src="/images/header/separator.gif" border="0" /></td>
+	    <td><a href="{% url ietf.idindex.views.search %}"><img src="/images/header/id-index11.gif" border="0" /></a></td>
+	    <td><img src="/images/header/separator.gif" border="0" /></td>
+	    <td><a href="http://www.ietf.org/rfc.html"><img src="/images/header/rfc11.gif" border="0" /></a></td>
 	 </tr>
       </table>
    </center>

ietf/templates/idtracker/idtracker_search.html

@@ -25,7 +25,7 @@
 <center>
 {% if searching %}
 {% else %}
-   <img src="https://www.ietf.org/images/ietflogo2e.gif" border=0><br>
+   <img src="/images/ietflogo2e.gif" border=0><br>
    <h1>IETF I-D TRACKER</h1>
 {% endif %}
 

ietf/templates/ipr/details.html

@@ -108,15 +108,15 @@ <h3>{{ ipr.title }}</h3>
 	    There are 3 different IPR disclosures that can be made:
 	 </p>
 	 <p>
-	    <img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0" />
+	    <img src="/images/blue.gif" hspace="3" border="0" />
 	    "Specific": <a href="{% url ietf.ipr.views.new_specific %}">A disclosure about your IPR related to a specific IETF contribution</a>
 	 </p>
 	 <p>
-	    <img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0" />
+	    <img src="/images/blue.gif" hspace="3" border="0" />
 	    "Generic": <a href="{% url ietf.ipr.views.new_generic %}">An IPR disclosure about your IPR that is not related to a specific IETF contribution</a>
 	 </p>
 	 <p>
-	    <img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0" />
+	    <img src="/images/blue.gif" hspace="3" border="0" />
 	    "Third-Party": <a href="{% url ietf.ipr.views.new_thirdpty %}">Notify the IETF of IPR other than your own which you believe may be related to a specific IETF contribution</a>
 	 </p>
       {% endif %}
@@ -564,8 +564,8 @@ <h4 class="ipr">The Patent Disclosure and Licensing Declaration Template for {{
       </form>
       <blockquote>
 	 <hr>
-	 <img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"><a href="./ipr_disclosure.cgi">IPR Disclosure Page</a><br>
-	 <img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"><a href="./ipr_list.cgi">View IPR Disclosures</a><br><br>
+	 <img src="/images/blue.gif" hspace="3" border="0"><a href="./ipr_disclosure.cgi">IPR Disclosure Page</a><br>
+	 <img src="/images/blue.gif" hspace="3" border="0"><a href="./ipr_list.cgi">View IPR Disclosures</a><br><br>
       </blockquote>
       {% endif %}
 

ietf/templates/ipr/disclosure.html

@@ -3,11 +3,11 @@
 {% block title %}IPR Disclosure Page{% endblock %}
 {% block content %}
 <center>
-   <img src="http://www.ietf.org/images/ietflogo2e.gif" height="160" width="280">
+   <img src="/images/ietflogo2e.gif" height="160" width="280">
 </center>
 <div>
    <center>
-      <img src="http://www.ietf.org/images/ipr_header.gif" >
+      <img src="/images/ipr_header.gif" >
    </center>
    <p>
    This page provides a mechanism for filing Disclosures about intellectual property rights
@@ -25,17 +25,17 @@
    <p />
    <hr>
    <p>
-   <a href="{% url ietf.ipr.new.new "specific" %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">File a disclosure about your IPR related to a specific IETF contribution</a>
+   <a href="{% url ietf.ipr.new.new "specific" %}"><img src="/images/blue.gif" hspace="3" border="0">File a disclosure about your IPR related to a specific IETF contribution</a>
    </p>
-   <p><a href="{% url ietf.ipr.new.new "generic" %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">File an IPR disclosure that is not related to a specific IETF contribution</a>
+   <p><a href="{% url ietf.ipr.new.new "generic" %}"><img src="/images/blue.gif" hspace="3" border="0">File an IPR disclosure that is not related to a specific IETF contribution</a>
    </p>
-   <p><a href="{% url ietf.ipr.new.new "third-party" %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">Notify the IETF of IPR other than your own</a>
+   <p><a href="{% url ietf.ipr.new.new "third-party" %}"><img src="/images/blue.gif" hspace="3" border="0">Notify the IETF of IPR other than your own</a>
    </p>
-   <p><a href="{% url ietf.ipr.views.updatelist %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">Update an existing IPR disclosure</a>
+   <p><a href="{% url ietf.ipr.views.updatelist %}"><img src="/images/blue.gif" hspace="3" border="0">Update an existing IPR disclosure</a>
    </p>
-   <p><a href="{% url ietf.ipr.search.search %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">Search the IPR disclosures</a>
+   <p><a href="{% url ietf.ipr.search.search %}"><img src="/images/blue.gif" hspace="3" border="0">Search the IPR disclosures</a>
    </p>
-   <p><a href="{% url ietf.ipr.views.showlist %}"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">List of IPR disclosures</a><p>
+   <p><a href="{% url ietf.ipr.views.showlist %}"><img src="/images/blue.gif" hspace="3" border="0">List of IPR disclosures</a><p>
    </p>
    <hr>
    <p>To remove an IPR disclosure from the list, please contact the IETF Secretariat at <a href="mailto:ietf-ipr@ietf.org">ietf-ipr@ietf.org</a>.