From 1c2bcbf356f394c2ea1dd87ceb259ade26fb6246 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 28 Jun 2007 08:13:09 +0000 Subject: [PATCH] Merged r736 from branch/2.00 to trunk - Legacy-Id: 737 --- ietf/ipr/urls.py | 4 +++- ietf/redirects/fixtures/initial_data.xml | 4 ++-- ietf/templates/idtracker/base.html | 10 ++++++++-- ietf/templates/ipr/disclosure.html | 8 ++++---- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py index cf503ff0f..355f76670 100644 --- a/ietf/ipr/urls.py +++ b/ietf/ipr/urls.py @@ -9,7 +9,9 @@ urlpatterns = patterns('', (r'^ipr-(?P\d+)/$', views.show), (r'^update/$', views.updatelist), (r'^update/(?P\d+)/$', new.update), - (r'^new-(?P(specific|generic|third-party))/$', new.new), + (r'^new-(?Pspecific)/$', new.new), + (r'^new-(?Pgeneric)/$', new.new), + (r'^new-(?Pthird-party)/$', new.new), (r'^search/$', search.search), ) diff --git a/ietf/redirects/fixtures/initial_data.xml b/ietf/redirects/fixtures/initial_data.xml index cf05960a5..bbd4f238f 100644 --- a/ietf/redirects/fixtures/initial_data.xml +++ b/ietf/redirects/fixtures/initial_data.xml @@ -187,8 +187,8 @@ - dummy/2 - + + idtracker diff --git a/ietf/templates/idtracker/base.html b/ietf/templates/idtracker/base.html index 7376de53a..9db9954fb 100644 --- a/ietf/templates/idtracker/base.html +++ b/ietf/templates/idtracker/base.html @@ -1,7 +1,13 @@ {# Copyright The IETF Trust 2007, All Rights Reserved #} -IETF I-D Tracker v1.1 {% block title %}{% endblock %}-- WCF - + + + {% block title %}IETF Data{% endblock %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper }} MODE{% endifnotequal %} + {% ifnotequal server_mode "production" %} + + {% else %} + + {% endifnotequal %}