From 8c8ec56df265feb17553a0c1b6f88333a2f9a79e Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Mon, 2 Feb 2015 17:14:10 +0000 Subject: [PATCH] Summary: Remove now unused old base templates - Legacy-Id: 8953 --- ietf/doc/templatetags/wg_menu.py | 8 +- ietf/templates/base.html | 153 ----------------------------- ietf/templates/base/left_menu.html | 130 ------------------------ ietf/templates/base/menu.html | 2 +- ietf/templates/base/wg_menu.html | 38 ------- 5 files changed, 3 insertions(+), 328 deletions(-) delete mode 100644 ietf/templates/base.html delete mode 100644 ietf/templates/base/left_menu.html delete mode 100644 ietf/templates/base/wg_menu.html diff --git a/ietf/doc/templatetags/wg_menu.py b/ietf/doc/templatetags/wg_menu.py index 477df82b0..3757d3d97 100644 --- a/ietf/doc/templatetags/wg_menu.py +++ b/ietf/doc/templatetags/wg_menu.py @@ -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 diff --git a/ietf/templates/base.html b/ietf/templates/base.html deleted file mode 100644 index 6c6513fea..000000000 --- a/ietf/templates/base.html +++ /dev/null @@ -1,153 +0,0 @@ - -{% comment %}{% endcomment %} -{% load ietf_filters %} - - - - -{% block title %}No title{% endblock %}{% if server_mode %}{% if server_mode != "production" %} - {{ server_mode|upper }} MODE{% endif %}{% endif %} - - - -{% block pagehead %}{% endblock %} -{% if server_mode != "production" %} - -{% else %} - -{% endif %} - - - -
-datatracker.ietf.org {% if server_mode %}{% if server_mode != "production" %} - {{ server_mode|upper}} MODE{% endif %}{% endif %} -
- -{% if user %} -
- {% if request.get_full_path == "/accounts/logout/" %} - - {% else %} - {% if user.is_authenticated %} - {{ user }} | - {% else %} - - {% endif %} - {% endif %} -
-{% endif %} - -{% block start_content_table %} - - - -
-
-{% include "base/left_menu.html" %} -
-
-{% if version_num %} -Version {{ version_num }}, {{revision_date}} -
-{% endif %} -Report a bug -
-		 -{% endblock start_content_table %} -{% if messages %} -
    - {% for message in messages %} - {{ message }} - {% endfor %} -
-{% endif %} -{% block content %} -{% endblock %} - - - - -{% block js %}{% endblock %} - -{% block content_end %} -{% endblock %} -
-{% block end_content_table %} -
-{% endblock end_content_table %} -{% include "debug.html" %} - diff --git a/ietf/templates/base/left_menu.html b/ietf/templates/base/left_menu.html deleted file mode 100644 index da92a0acd..000000000 --- a/ietf/templates/base/left_menu.html +++ /dev/null @@ -1,130 +0,0 @@ -{% comment %} -{% endcomment %} -{% load wg_menu %} -{% load streams_menu %} -{% load ietf_filters community_tags %} - diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 762c842c5..edc2e3c74 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -69,7 +69,7 @@ {% if flavor == "top" %}
  • {% endif %}
  • By area/parent
    • - {% wg_menu "facelift" %} + {% wg_menu %} {% if flavor == "top" %}{% endif %} diff --git a/ietf/templates/base/wg_menu.html b/ietf/templates/base/wg_menu.html deleted file mode 100644 index b32b9d2ca..000000000 --- a/ietf/templates/base/wg_menu.html +++ /dev/null @@ -1,38 +0,0 @@ -{% comment %} -Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. Contact: Pasi Eronen - -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 %} -
  • {{ area.short_area_name }}
    • -{% endfor %}