more changes

- Legacy-Id: 5432
This commit is contained in:
Ryan Cross 2013-02-15 19:02:07 +00:00
parent 00dbf38cd9
commit a0fffcc776
5 changed files with 9 additions and 93 deletions

View file

@ -38,7 +38,7 @@
<table width="100%">
<tr>
<td align="left">
{% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
{% block breadcrumbs %}<a href="/secret/">Home</a>{% endblock %}
</td>
<td align="right">
{% block instructions %}{% endblock %}

View file

@ -1,15 +0,0 @@
<!-- InstanceEndEditable --> </div></td>
</tr>
<tr>
<td id="footer1" colspan="2"><div id="footer2">
<p><a href="http://www.isoc.org/"><img src="/images/isoc_logo.gif" alt="Internet Society" align="left" border="0" hspace="5" /></a><a href="http://www.amsl.com/"><img src="/images/ams_logo.png" alt="AMS" align="right" border="0" hspace="5" /></a><a href="/">Home</a> - <a href="http://tools.ietf.org/">Tools</a> - <a href="https://datatracker.ietf.org/">Datatracker</a> - <a href="/usagedata/">Web&nbsp;Site&nbsp;Usage&nbsp;Statistics</a> - <a href="http://iaoc.ietf.org/">IASA</a> - <a href="http://www.iab.org/">IAB</a> - <a href="http://www.rfc-editor.org/">RFC&nbsp;Editor</a> - <a href="http://www.iana.org/">IANA</a> - <a href="http://www.irtf.org/">IRTF</a> - <a href="http://trustee.ietf.org/">IETF&nbsp;Trust</a> - <a href="http://www.isoc.org/">ISOC</a> - <a href="/secretariat.html">Contact&nbsp;Us</a><br />
Secretariat services provided by <a href="http://www.amsl.com/">Association Management Solutions, LLC (AMS)</a>.<br />
Please send problem reports to: <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.<br />
&nbsp;</p>
</div></td>
</tr>
</tbody>
</table>
</div>
</body>
<!-- InstanceEnd --></html>

View file

@ -1,75 +0,0 @@
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td id="sidebar1"><div id="sidebar2"><a href="/"><img src="/images/ietflogotrans.gif" alt="Logo" height="75" width="140" border="0"/></a>
<div style="margin:0;padding:0;white-space: nowrap;">
<form method="get" action="http://www.google.com/u/ietf" style="margin:0;padding:0;white-space: nowrap;">
<p style="margin:0;padding:0;white-space: nowrap;">
<input name="q" size="16" maxlength="255" value="" type="text" style="margin:1px;padding:0;width:100px;border:1px solid #89d;" />
<input name="Search" value="Search" type="submit" style="margin:0;padding:0;font-size:85%;" />
</p>
</form>
</div>
<ul>
<li class="subhdr00"><a class="subhdr00" href="xmpp:hallway@jabber.ietf.org?join"><img src="/images/chat-trans.png" border="0" alt="transparent chat button" /></a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org"><strong>Home</strong></a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/about/"><strong>About the IETF</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/about/mission.html">Mission</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/about/standards-process.html">Standards&nbsp;Process</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/about/note-well.html">Note&nbsp;Well</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/nomcom/">NomCom</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/newcomers.html">Info&nbsp;for&nbsp;Newcomers</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/id-info/"><strong>Internet-Drafts</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/">Datatracker</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/drafts/">Search</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/idst/upload.cgi">Submit</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/rfc.html"><strong>RFC Pages</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://rfc-editor.org/rfcsearch.html">Search&nbsp;RFC&nbsp;Ed&nbsp;Index</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.rfc-editor.org/queue2.html">RFC&nbsp;Editor&nbsp;Queue</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/iana.html"><strong>IANA Pages</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/assignments/">Protocol&nbsp;Parameters</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/wg/"><strong>Working Groups</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/dyn/wg/charter.html">WG&nbsp;Charters</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/list/wg/">Email&nbsp;Lists</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/wg/chairs-page.html">WG&nbsp;Chairs'&nbsp;Page</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/tools/"><strong>Resources</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/tools/tools.html">Community&nbsp;Tools</a></li>
<li class="subhdr02"><a class="subhdr02" href="http://tools.ietf.org/">Tools&nbsp;Team&nbsp;Pages</a></li>
<li class="subhdr02"><a class="subhdr02" href="/edu/">Edu&nbsp;Team&nbsp;Pages</a></li>
<li class="subhdr02"><a class="subhdr02" href="/edu/tutorials.html">Tutorials</a></li>
<li class="subhdr02"><a class="subhdr02" href="http://wiki.tools.ietf.org/group/">Wikis</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/meeting/"><strong>Meetings</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/meeting/upcoming.html">Upcoming&nbsp;Meetings</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/meeting/interim-meetings.html">Interim&nbsp;Meetings</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/meeting/cutoff-dates.html">Important&nbsp;Dates</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/meeting/proceedings.html">Proceedings</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/list/"><strong>Mailing Lists</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/list/announcement.html">Announcement&nbsp;Lists</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/list/discussion.html">Discussion&nbsp;Lists</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/list/nonwg.html">Non-WG&nbsp;Lists</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/iesg/"><strong>IESG </strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/iesg/ann/new/">Announcements</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/iesg/statement.html">Statements</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/iesg/members.html">Members</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/iesg/minutes.html">Minutes</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/ipr/"><strong>IPR</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/ipr/policy.html">IPR&nbsp;Policy</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/ipr/file-disclosure">File&nbsp;a&nbsp;Disclosure</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/ipr/search/">Disclosure&nbsp;Search</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/liaison/"><strong>Liaisons</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://datatracker.ietf.org/liaison/">Liaison&nbsp;Statements</a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/liaison/managers.html">Liaison&nbsp;Managers</a></li>
<li class="subhdr00"><a class="subhdr00" href="https://www.ietf.org/contact-the-ietf.html"><strong>Contact</strong></a></li>
<li class="subhdr02"><a class="subhdr02" href="https://www.ietf.org/secretariat.html">IETF&nbsp;Secretariat</a><sup>&reg;</sup></li>
<li class="subhdr02"><a class="subhdr02" href="https://iaoc.ietf.org/subpoena.html">Legal&nbsp;Matters</a></li>
<li class="subhdr02"><a class="subhdr02" href="mailto:webmaster@ietf.org">Report&nbsp;Web&nbsp;Site&nbsp;Errors</a></li>
<li class="subhdr00"><strong>Customize View</strong><br />
</li>
<li class="subhdr01"><a class="subhdr01" href="javascript:setStyle('2');" title="Brief">Brief</a></li>
<li class="subhdr01"><a class="subhdr01" href="javascript:setStyle('1');" title="Normal">Normal</a></li>
<li class="subhdr01"><a class="subhdr01" href="javascript:setStyle('3');" title="Extended">Extended</a></li>
<li class="subhdr01"><a class="subhdr01" href="javascript:setStyle('4');" title="Advanced">Advanced</a></li>
<li class="subhdr01"><small>(Requires Javascript)</small></li>
</ul>
</div></td>
<td id="content1"><div id="content2"> <!-- InstanceBeginEditable name="body" -->

View file

@ -111,6 +111,7 @@ MIDDLEWARE_CLASSES = (
'ietf.middleware.RedirectTrailingPeriod',
'django.middleware.transaction.TransactionMiddleware',
'ietf.middleware.UnicodeNfkcNormalization',
'ietf.secr.middleware.secauth.SecAuthMiddleware'
)
ROOT_URLCONF = 'ietf.urls'
@ -203,7 +204,7 @@ DATETIME_FORMAT = "Y-m-d H:i"
INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/'
INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
RFC_PATH = '/a/www/ietf-ftp/rfc/'
CHARTER_PATH = '/a/www/ietf-ftp/charters/'
CHARTER_PATH = '/a/www/ietf-ftp/charter/'
CHARTER_TXT_URL = 'http://www.ietf.org/charter/'
CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict-reviews'
CONFLICT_REVIEW_TXT_URL = 'http://www.ietf.org/cr/'
@ -311,6 +312,11 @@ TZDATA_ICS_PATH = '/www/ietf-datatracker/tz/ics/'
CHANGELOG_PATH = '/www/ietf-datatracker/web/changelog'
# Secretariat Tool
BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf'
BLUE_SHEET_URL = 'https://datatracker.ietf.org/documents/blue_sheet.rtf'
INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim'
MAX_UPLOAD_SIZE = 40960000
PROCEEDINGS_DIR = '/a/www/www6s/proceedings/'
# this is a tuple of regular expressions. if the incoming URL matches one of
# these, than non secretariat access is allowed.
SEC_AUTH_UNRESTRICTED_URLS = (

View file

@ -62,7 +62,7 @@ urlpatterns = patterns('',
(r'^person/', include('ietf.person.urls')),
(r'^release/$', 'ietf.release.views.release'),
(r'^release/(?P<version>.+)/$', 'ietf.release.views.release'),
(r'^secr/', include('ietf.secr.urls')),
(r'^secret/', include('ietf.secr.urls')),
(r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
(r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', { 'sitemaps': sitemaps}),
(r'^streams/', include('ietf.ietfworkflows.urls')),