Skip to content

Commit 1c2bcbf

Browse files
committed
Merged r736 from branch/2.00 to trunk
- Legacy-Id: 737
1 parent 2b5e469 commit 1c2bcbf

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

ietf/ipr/urls.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
(r'^ipr-(?P<ipr_id>\d+)/$', views.show),
1010
(r'^update/$', views.updatelist),
1111
(r'^update/(?P<ipr_id>\d+)/$', new.update),
12-
(r'^new-(?P<type>(specific|generic|third-party))/$', new.new),
12+
(r'^new-(?P<type>specific)/$', new.new),
13+
(r'^new-(?P<type>generic)/$', new.new),
14+
(r'^new-(?P<type>third-party)/$', new.new),
1315
(r'^search/$', search.search),
1416
)
1517

ietf/redirects/fixtures/initial_data.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@
187187
<field type="CharField" name="remove"></field>
188188
</object>
189189
<object pk="32" model="redirects.redirect">
190-
<field type="CharField" name="cgi">dummy/2</field>
191-
<field type="CharField" name="url"></field>
190+
<field type="CharField" name="cgi"></field>
191+
<field type="CharField" name="url">idtracker</field>
192192
<field type="CharField" name="rest"></field>
193193
<field type="CharField" name="remove"></field>
194194
</object>

ietf/templates/idtracker/base.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{# Copyright The IETF Trust 2007, All Rights Reserved #}
22
<html>
3-
<HEAD><TITLE>IETF I-D Tracker v1.1 {% block title %}{% endblock %}-- WCF</title>
4-
<link rel="icon" href="http://tools.ietf.org/images/django-ietf.png" />
3+
<HEAD>
4+
<!-- Project Revision {{ revision_num }}, {{ revision_time }} -->
5+
<title>{% block title %}IETF Data{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %}</title>
6+
{% ifnotequal server_mode "production" %}
7+
<link rel="icon" href="/images/ietf-dev-icon.bmp" />
8+
{% else %}
9+
<link rel="icon" href="/images/ietf-icon.bmp" />
10+
{% endifnotequal %}
511

612
<STYLE TYPE="text/css">
713
<!--

ietf/templates/ipr/disclosure.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
<p />
2626
<hr>
2727
<p>
28-
<a href="./ipr.cgi"><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>
28+
<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>
2929
</p>
30-
<p><a href="./ipr_generic.cgi"><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>
30+
<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>
3131
</p>
32-
<p><a href="./ipr_notify.cgi"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">Notify the IETF of IPR other than your own</a>
32+
<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>
3333
</p>
3434
<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>
3535
</p>
36-
<p><a href="./ipr_search.cgi"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">Search the IPR disclosures</a>
36+
<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>
3737
</p>
3838
<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>
3939
</p>

0 commit comments

Comments
 (0)