Summary: Remove now unused old base templates

- Legacy-Id: 8953
This commit is contained in:
Ole Laursen 2015-02-02 17:14:10 +00:00
parent 6ee6a3968f
commit 8c8ec56df2
5 changed files with 3 additions and 328 deletions

View file

@ -43,8 +43,6 @@ area_short_names = {
'rai':'RAI'
}
# FACELIFT: Function is called with "facelift" flavor from the new UI code.
# The old code (and flavoring) can be remove eventually.
@register.simple_tag
def wg_menu(flavor=""):
res = cache.get('wgmenu' + flavor)
@ -64,11 +62,9 @@ def wg_menu(flavor=""):
areas = [a for a in areas if a.active_groups]
if flavor == "facelift":
res = render_to_string('base/menu_wg.html', {'areas':areas, 'rgs':rgs})
elif flavor == "modal":
if flavor == "modal":
res = render_to_string('base/menu_wg_modal.html', {'areas':areas, 'rgs':rgs})
else:
res = render_to_string('base/wg_menu.html', {'areas':areas, 'rgs':rgs})
res = render_to_string('base/menu_wg.html', {'areas':areas, 'rgs':rgs})
cache.set('wgmenu' + flavor, res, 30*60)
return res

View file

@ -1,153 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
{% comment %}<!--
Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of the Nokia Corporation and/or its
subsidiary(-ies) nor the names of its contributors may be used
to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->{% endcomment %}
{% load ietf_filters %}
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- v{{version_num}}, {{ revision_num }}, {{ revision_time }} -->
<title>{% block title %}No title{% endblock %}{% if server_mode %}{% if server_mode != "production" %} - {{ server_mode|upper }} MODE{% endif %}{% endif %}</title>
<link rel="stylesheet" type="text/css" href="/css/yui/yui-20100305.css"></link>
<link rel="stylesheet" type="text/css" href="/css/base2.css"></link>
<style type="text/css">
{% block morecss %}{% endblock %}
</style>
{% block pagehead %}{% endblock %}
{% if server_mode != "production" %}
<link rel="icon" href="/images/ietf-dev-icon.bmp" />
{% else %}
<link rel="icon" href="/images/ietf-icon-blue.bmp" />
{% endif %}
<link rel="search" href="/js/datatracker-search.xml" type="application/opensearchdescription+xml" title="IETF Datatracker Search" />
</head>
<body class="yui-skin-sam" {% block bodyAttrs %}{%endblock%}>
<div style="background-color:{% if server_mode %}{% if server_mode != "production" %}#c00000{% else %}#313163{% endif %}{%else %}#313163{%endif%};color:white;font-size:150%;height:35px;" class="noprint">
<span style="padding-left:15px;font-weight:bold;letter-spacing:0.1em;"><a href="/" style="text-decoration:none;color:white"><img src="/images/ietflogo-blue-small.png" width="60" height="34" style="vertical-align:middle;padding-left:8px;" alt=""/>datatracker.ietf.org</a> {% if server_mode %}{% if server_mode != "production" %} - {{ server_mode|upper}} MODE{% endif %}{% endif %}</span>
</div>
{% if user %}
<div id="ietf-login" class="noprint">
{% if request.get_full_path == "/accounts/logout/" %}
<a href="{% if server_mode == "development" %}http://{% else %}https://{% endif %}{{ request.get_host }}/accounts/login/" class="login" rel="nofollow">Sign in</a>
{% else %}
{% if user.is_authenticated %}
<a href="/accounts/">{{ user }}</a> | <a href="/accounts/logout/" class="login" rel="nofollow">Sign out</a>
{% else %}
<a href="{% if debug %}http://{% else %}https://{% endif %}{{ request.get_host }}/accounts/login/?next={{request.get_full_path|urlencode}}" class="login" rel="nofollow">Sign in</a>
{% endif %}
{% endif %}
</div>
{% endif %}
{% block start_content_table %}
<table style="margin-left:8px;margin-top:8px; width:98%;" id="ietf_menubar">
<tr valign="top">
<td style="width:130px;padding-right:8px;" class="noprint">
<div class="ietf-navbar">
{% include "base/left_menu.html" %}
</div>
<div style="width: 100%; text-align: center; padding-top:4px;font-size:69%;">
{% if version_num %}
<a href="/release/{{version_num}}/">Version {{ version_num }}, {{revision_date}}</a>
<br/>
{% endif %}
<a href="http://tools.ietf.org/tools/ietfdb/newticket">Report a bug</a>
</div>
</td>
<td>
{% endblock start_content_table %}
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% block content %}
{% endblock %}
<script type="text/javascript" src="/js/lib/jquery-1.8.2.min.js"></script>
<script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
<script type="text/javascript">
//<![CDATA[
YAHOO.util.Event.onContentReady("wgs", function () {
var oMenu = new YAHOO.widget.Menu("wgs", { position: "static", hidedelay: 750, lazyload: true });
oMenu.render();
});
// setup CSRF protection
// using jQuery
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]);
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) == (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}
var csrftoken = getCookie('csrftoken');
function csrfSafeMethod(method) {
// these HTTP methods do not require CSRF protection
return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
}
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", csrftoken);
}
}
});
{% block scripts %}
{% endblock %}
//]]>
</script>
{% block js %}{% endblock %}
{% block content_end %}
{% endblock %}
<div id="ietf-extras"></div>
{% block end_content_table %}
</td></tr></table>
{% endblock end_content_table %}
{% include "debug.html" %}
</body></html>

View file

@ -1,130 +0,0 @@
{% comment %}<!--
Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of the Nokia Corporation and/or its
subsidiary(-ies) nor the names of its contributors may be used
to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
{% endcomment %}
{% load wg_menu %}
{% load streams_menu %}
{% load ietf_filters community_tags %}
<ul>
<li class="sect first">Settings</li>
<li><a href="{% url "account_index" %}">{% if request.user.is_authenticated %}Manage Account{% else %}New Account{% endif %}</a></li>
<li><a href="{% url "ietf.cookies.views.settings" %}" rel="nofollow">Options</a></li>
{% if user|has_role:"Area Director" %}
<li class="sect">AD Dashboard</li>
<li><a href="{% url "docs_for_ad" name=user.person.full_name_as_key %}">My Documents</a></li>
<li><a href="{% url "ietf.iesg.views.agenda_documents" %}">Next Telechat</a></li>
<li><a href="{% url "ietf.iesg.views.discusses" %}">Discusses</a></li>
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
{% endif %}
{% if user|has_role:"Secretariat" %}
<li class="sect">Secretariat</li>
<li><a href="/admin/iesg/telechatdate/">Telechat Dates</a></li>
<li><a href="/admin/iesg/telechatagendaitem/">Management Items</a></li>
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a>
{% endif %}
{% streams_menu %}
{% if user|has_role:"IANA" %}
<li class="sect">IANA</li>
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
{% endif %}
{% if user|has_role:"RFC Editor" %}
<li class="sect">RFC Editor</li>
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
{% endif %}
<li class="sect">Working Groups</li>
<li style="padding-bottom:0;"><div id="wgs" class="yuimenu"><div class="bd" style="border:0;">
<ul class="first-of-type" style="padding:0;">
<!-- begin wg_menu -->
{% wg_menu %}
<!-- end wg_menu -->
</ul>
</div></div></li>
<li style="padding-top:0;"><a href="{% url "ietf.group.info.active_groups" group_type="wg" %}">Active WGs</a></li>
<li style="padding-top:0;"><a href="{% url "ietf.group.info.active_groups" group_type="rg" %}">Active RGs</a></li>
<li><a href="{% url "ietf.group.info.chartering_groups" %}">Chartering</a></li>
<li><a href="{% url "ietf.group.info.bofs" group_type="wg" %}">BoFs</a></li>
<li><a href="{% url "ietf.group.info.concluded_groups" %}">Concluded</a></li>
<li><a href="http://www.ietf.org/list/nonwg.html">Non-WG Lists</a></li>
<li class="sect">Drafts&nbsp;&amp;&nbsp;RFCs</li>
<li><a href="/doc/">Document search:</a></li>
<li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activedrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
<li>
<div style="padding: 0 0 0 10px;">Streams:</div>
<a style="padding: 0 0 0 20px;" href="{% url "ietf.group.views_stream.streams" %}iab/">IAB</a>
<a style="padding: 0;" href="{% url "ietf.group.views_stream.streams" %}irtf/">IRTF</a>
<a style="padding: 0;" href="{% url "ietf.group.views_stream.streams" %}ise/">ISE</a>
</li>
<li><a href="{% url "submit_upload_submission" %}">Submit a draft</a></li>
{% if user|has_role:"WG Chair" %}
<li><a href="{% url "submit_approvals" %}">Approve a draft</a></li>
{% endif %}
{% get_user_managed_lists user as community_lists %}
{% if community_lists %}
<li><a href="{{ community_lists.personal.get_manage_url }}">My tracked docs</a>&nbsp;</li>
{% for cl in community_lists.group %}
<li><a href="{{ cl.get_manage_url }}">WG {{ cl.short_name }} docs</a></li>
{% endfor %}
{% else %}
<li><a href="http://{{ request.get_host }}/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign in to track drafts</a></li>
{% endif %}
{% if user|has_role:"Area Director,Secretariat" %}
<li><a href="{% url "rfc_status_changes" %}">RFC status changes</a></li>
{% endif %}
<li class="sect">Meetings</li>
<li><a href="/meeting/agenda/">Agenda</a></li>
<li><a href="/meeting/">Materials</a></li>
<li><a href="http://www.ietf.org/meeting/proceedings.html">Past Proceedings</a></li>
<li><a href="http://www.ietf.org/meeting/upcoming.html">Upcoming</a></li>
<li><a href="/meeting/requests">Session Requests</a></li>
<li class="sect">Other Documents</li>
<li><a href="/ipr/">IPR Disclosures</a></li>
<li><a href="/liaison/">Liaison&nbsp;Statements</a></li>
<li><a href="/iesg/agenda/">IESG Agenda</a></li>
<li class="sect">Related Sites</li>
<li><a href="http://www.ietf.org/">Main IETF site</a></li>
<li><a href="http://tools.ietf.org/">IETF tools</a></li>
<li><a href="http://www.iab.org/">IAB</a></li>
<li><a href="http://www.rfc-editor.org/">RFC Editor</a></li>
<li><a href="http://iaoc.ietf.org">IASA/IAOC/Trust</a></li>
<li><a href="http://www.iana.org/">IANA</a></li>
<li><a href="http://www.irtf.org/">IRTF</a></li>
</ul>

View file

@ -69,7 +69,7 @@
{% if flavor == "top" %}<li class="divider visible-lg-block"></li>{% endif %}
<li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
{% wg_menu "facelift" %}
{% wg_menu %}
<li class="hidden-lg hidden-nojs"><a href="#" data-toggle="modal" data-target="#navmodal">Jump to group</a></li>
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}

View file

@ -1,38 +0,0 @@
{% comment %}
Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of the Nokia Corporation and/or its
subsidiary(-ies) nor the names of its contributors may be used
to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endcomment %}
{% for area in areas %}
<li class="yuimenuitem"><a class="yuimenuitemlabel">{{ area.short_area_name }}</a><div id="wgs-{{ area.acronym }}" class="yuimenu"><div class="bd"><ul>{% for g in area.active_groups %}
<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/wg/{{ g.acronym }}/">{{ g.acronym }} &mdash; {{ g.name}}</a></li>{% endfor %}
</ul></div></div></li>
{% endfor %}