altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merged r736 from branch/2.00 to trunk

Browse source 
- Legacy-Id: 737
This commit is contained in:
Henrik Levkowetz 2007-06-28 08:13:09 +00:00
parent 2b5e469373
commit 1c2bcbf356
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/ipr/urls.py
View file

@ -9,7 +9,9 @@ urlpatterns = patterns('',
(r'^ipr-(?P<ipr_id>\d+)/$', views.show),
(r'^update/$', views.updatelist),
(r'^update/(?P<ipr_id>\d+)/$', new.update),
(r'^new-(?P<type>(specific|generic|third-party))/$', new.new),
(r'^new-(?P<type>specific)/$', new.new),
(r'^new-(?P<type>generic)/$', new.new),
(r'^new-(?P<type>third-party)/$', new.new),
(r'^search/$', search.search),
)

4
ietf/redirects/fixtures/initial_data.xml
View file

@ -187,8 +187,8 @@
<field type="CharField" name="remove"></field>
</object>
<object pk="32" model="redirects.redirect">
<field type="CharField" name="cgi">dummy/2</field>
<field type="CharField" name="url"></field>
<field type="CharField" name="cgi"></field>
<field type="CharField" name="url">idtracker</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>

10
ietf/templates/idtracker/base.html
View file

@ -1,7 +1,13 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
<html>
<HEAD><TITLE>IETF I-D Tracker v1.1 {% block title %}{% endblock %}-- WCF</title>
<link rel="icon" href="http://tools.ietf.org/images/django-ietf.png" />
<HEAD>
<!-- Project Revision {{ revision_num }}, {{ revision_time }} -->
<title>{% block title %}IETF Data{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %}</title>
{% ifnotequal server_mode "production" %}
<link rel="icon" href="/images/ietf-dev-icon.bmp" />
{% else %}
<link rel="icon" href="/images/ietf-icon.bmp" />
{% endifnotequal %}
<STYLE TYPE="text/css">
<!--

8
ietf/templates/ipr/disclosure.html
View file

@ -25,15 +25,15 @@
<p />
<hr>
<p>
<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>
<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>
</p>
<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>
<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>
<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>
<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>
<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>
<p><a href="./ipr_search.cgi"><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="http://www.ietf.org/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>