Simplify the structure some.
- Legacy-Id: 19635
This commit is contained in:
Lars Eggert
parent
4125e71627
commit
868f583afc
|
|
@ -1,42 +1,43 @@
|
|||
<!doctype html>
|
||||
{# Copyright The IETF Trust 2015-2021, All Rights Reserved #}
|
||||
|
||||
<!doctype html>
|
||||
|
||||
{% load ietf_filters static %}
|
||||
{% load origin %}{% origin %}
|
||||
{% load django_bootstrap5 %}
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>{% block title %}No title{% endblock %}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta charset="utf-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
|
||||
<title>{% block title %}No title{% endblock title %}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
|
||||
{% comment Halloween %}
|
||||
<link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
|
||||
{% endcomment %}
|
||||
<link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'/>
|
||||
{% endcomment %}
|
||||
|
||||
<link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}"/>
|
||||
<style>
|
||||
{% block morecss %}{% endblock %}
|
||||
{% block morecss %}{% endblock morecss %}
|
||||
</style>
|
||||
|
||||
{% block pagehead %}{% endblock %}
|
||||
{% block pagehead %}{% endblock pagehead %}
|
||||
|
||||
{% if server_mode and server_mode == "production" %}
|
||||
<link rel="shortcut icon" href="{% static 'ietf/images/ietf-icon-blue3.png' %}">
|
||||
<link rel="shortcut icon" href="{% static 'ietf/images/ietf-icon-blue3.png' %}"/>
|
||||
{% else %}
|
||||
<link rel="shortcut icon" href="{% static 'ietf/images/ietf-icon-red3.png' %}">
|
||||
<link rel="shortcut icon" href="{% static 'ietf/images/ietf-icon-red3.png' %}"/>
|
||||
{% endif %}
|
||||
<link rel="apple-touch-icon" href="{% static 'ietf/images/apple-touch-icon.png' %}">
|
||||
<link rel="apple-touch-icon" href="{% static 'ietf/images/apple-touch-icon.png' %}"/>
|
||||
<script src="{% static 'ietf/js/ietf.js' %}"></script>
|
||||
</head>
|
||||
|
||||
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
|
||||
<body {% block bodyAttrs %}{% endblock bodyAttrs %} data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
|
||||
<nav class="navbar navbar-expand-lg {% if server_mode and server_mode != " production" %}navbar-light bg-warning{% else %}navbar-dark bg-secondary{% endif %} {% if navbar_mode %}{{ navbar_mode }}{% else %}fixed-top{% endif %}">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" href="/">
|
||||
<img alt="IETF Logo" src="{% static 'ietf/images/ietflogo-small-transparent.png' %}">
|
||||
<img alt="IETF Logo" src="{% static 'ietf/images/ietflogo-small-transparent.png' %}"/>
|
||||
Datatracker
|
||||
{% if server_mode and server_mode != "production" %}
|
||||
Dev Mode
|
||||
|
|
@ -48,13 +49,13 @@
|
|||
</ul>
|
||||
</div>
|
||||
{% if not user.is_authenticated %}
|
||||
<a class="d-none d-sm-block mx-5 btn {% if server_mode and server_mode == " production" %}btn-warning{% else %}btn-info{% endif %}" rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign
|
||||
<a class="d-none d-sm-block mx-5 btn {% if server_mode and server_mode == " production" %}btn-warning{% else %}btn-info{% endif %}" rel="nofollow" href="/accounts/login/?next={{ request.get_full_path|urlencode }}">Sign
|
||||
in</a>
|
||||
{% endif %}
|
||||
<form class="d-flex d-none d-lg-block" action="/doc/search/">
|
||||
<input class="form-control" type="text" name="name" placeholder="Document search" required>
|
||||
<input type="hidden" name="activedrafts" value="on">
|
||||
<input type="hidden" name="rfcs" value="on">
|
||||
<input class="form-control" type="text" name="name" placeholder="Document search" required/>
|
||||
<input type="hidden" name="activedrafts" value="on"/>
|
||||
<input type="hidden" name="rfcs" value="on"/>
|
||||
</form>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-collapse" aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
|
|
@ -65,7 +66,7 @@
|
|||
<div class="pt-3 container-fluid">
|
||||
{% comment %} {% bootstrap_messages %} {% endcomment %}
|
||||
{% for message in messages %}
|
||||
<div class="alert{% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}{% endif %}{% if message.extra_tags %} {{message.extra_tags}}{% endif %} alert-dismissable"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>{{ message }}</div>
|
||||
<div class="alert{% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}{% endif %}{% if message.extra_tags %} {{ message.extra_tags }}{% endif %} alert-dismissable"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>{{ message }}</div>
|
||||
{% endfor %}
|
||||
{% if request.COOKIES.left_menu == "on" and not hide_menu %}
|
||||
{# ugly hack for the more or less unported meeting agenda edit pages #}
|
||||
|
|
@ -75,64 +76,54 @@
|
|||
{% include "base/menu.html" with flavor="left" %}
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col" id="content">
|
||||
{% else %}
|
||||
<div class="col" id="content">
|
||||
{% endif %}
|
||||
{% block content %}{{ content|safe }}{% endblock %}
|
||||
{% block content_end %}{% endblock %}
|
||||
<div class="col" id="content">
|
||||
{% block content %}{{ content|safe }}{% endblock content %}
|
||||
{% block content_end %}{% endblock content_end %}
|
||||
</div>
|
||||
{% if request.COOKIES.left_menu == "on" and not hide_menu %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% block footer %}
|
||||
<footer class="col-md-12 col-sm-12 text-center">
|
||||
<hr/>
|
||||
<a href="https://www.ietf.org/" class="p-3">IETF</a>
|
||||
<a href="https://www.ietf.org/iesg/" class="p-3">IESG</a>
|
||||
<a href="https://www.iab.org/" class="p-3">IAB</a>
|
||||
<a href="https://www.irtf.org/" class="p-3">IRTF</a>
|
||||
<a href="https://www.ietf.org/llc/" class="p-3">IETF LLC</a>
|
||||
<a href="https://trustee.ietf.org/" class="p-3">IETF Trust</a>
|
||||
<a href="https://www.rfc-editor.org/" class="p-3">RFC Editor</a>
|
||||
<a href="https://www.iana.org/" class="p-3">IANA</a>
|
||||
<a href="https://www.ietf.org/privacy-statement/" class="p-3">Privacy Statement</a>
|
||||
|
||||
<p class="small text-muted p-3">
|
||||
{% if version_num %}
|
||||
<a href="/release/about">About</a>
|
||||
IETF Datatracker
|
||||
<a href="/release/{{ version_num }}/">Version {{ version_num }}</a>
|
||||
{{ revision_date }}
|
||||
{% endif %}
|
||||
|
||||
Report a bug:
|
||||
<a href="https://trac.ietf.org/trac/ietfdb/newticket">Tracker <span class="bi bi-bug"></span></a>
|
||||
{% if bugreport_email %}
|
||||
<a href="mailto:{{ bugreport_email }}">Email <span class="bi bi-envelope"></span></a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
{% if python_version %}Python {{ python_version }}{% endif %}
|
||||
{% if django_version %}Django {{ django_version }}{% endif %}
|
||||
</p>
|
||||
</footer>
|
||||
{% endblock footer %}
|
||||
</div>
|
||||
{% block footer %}
|
||||
<hr>
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<div class="text-center padded">
|
||||
<a href="https://www.rfc-editor.org/" class="padded">RFC Editor</a>
|
||||
<a href="https://www.ietf.org/llc/" class="padded">IASA & IETF LLC</a>
|
||||
<a href="https://trustee.ietf.org/" class="padded">IETF Trust</a>
|
||||
<a href="https://www.irtf.org/" class="padded">IRTF</a>
|
||||
<a href="https://www.ietf.org/" class="padded">IETF</a>
|
||||
<a href="https://www.ietf.org/iesg/" class="padded">IESG</a>
|
||||
<a href="https://www.iab.org/" class="padded">IAB</a>
|
||||
<a href="https://www.iana.org/" class="padded">IANA</a>
|
||||
<a href="https://www.ietf.org/privacy-statement/" class="padded">Privacy Statement</a>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="col-md-12 col-sm-12">
|
||||
<div class="col-md-12">
|
||||
<div class="text-center">
|
||||
<p class="small text-muted">
|
||||
{% if version_num %}
|
||||
<a href="/release/about">About</a> |
|
||||
IETF Datatracker |
|
||||
<a href="/release/{{version_num}}/">Version {{ version_num }}</a>
|
||||
|
|
||||
{{revision_date}} |
|
||||
{% endif %}
|
||||
Report a bug:
|
||||
<a href="https://trac.ietf.org/trac/ietfdb/newticket">Tracker:<span class="bi bi-bug"></span></a>
|
||||
{% if bugreport_email %}
|
||||
<a href="mailto:{{ bugreport_email }}">Email:<span class="bi bi-envelope"></span></a>
|
||||
{% endif %}
|
||||
<br>
|
||||
{% if python_version %}Python {{ python_version }}{% endif %} |
|
||||
{% if django_version %}Django {{ django_version }}{% endif %}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
{% include "debug.html" %}
|
||||
{% include "debug.html" %}
|
||||
|
||||
<script src="{% static 'ietf/js/ietf.js' %}"></script>
|
||||
{% block js %}{% endblock %}
|
||||
{% if debug %}
|
||||
<script src="{% static 'ietf/js/datatables.js' %}"></script>
|
||||
{% endif %}
|
||||
</body>
|
||||
{% block js %}{% endblock js %}
|
||||
{% if debug %}
|
||||
<script src="{% static 'ietf/js/datatables.js' %}"></script>
|
||||
{% endif %}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
Loading…
Reference in a new issue