altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

fix: Move the navbar last, for text-based browsers (#3636)

Browse source 
Fixes #3632.
This commit is contained in:
Lars Eggert 2022-03-14 18:38:33 +02:00 committed by GitHub
parent fd8d9762f2
commit 646b7e52ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
ietf/templates/base.html
View file

@ -35,45 +35,6 @@
</head> </head>
<body {% block bodyAttrs %}{% endblock %} class="position-relative" <body {% block bodyAttrs %}{% endblock %} class="position-relative"
data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}"> 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' %}">
Datatracker
{% if server_mode and server_mode != "production" %}Dev Mode{% endif %}
</a>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav">
{% include "base/menu.html" with flavor="top" %}
</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|removesuffix:"accounts/logout/"|urlencode }}">
Sign
in
</a>
{% endif %}
<div class="d-flex d-none d-lg-block">
<input class="form-control select2-field"
id="navbar-doc-search"
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
type="text"
data-placeholder="Document search">
</div>
<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">
<i class="navbar-toggler-icon"></i>
</button>
</div>
</nav>
<div class="pt-3 container-fluid"> <div class="pt-3 container-fluid">
<div class="row"> <div class="row">
{% if request.COOKIES.left_menu == "on" and not hide_menu %} {% if request.COOKIES.left_menu == "on" and not hide_menu %}
@ -142,6 +103,46 @@
</footer> </footer>
{% endblock %} {% endblock %}
</div> </div>
{# placing the navbar here moves it to the bottom of the page for text-based browsers #}
<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' %}">
Datatracker
{% if server_mode and server_mode != "production" %}Dev Mode{% endif %}
</a>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav">
{% include "base/menu.html" with flavor="top" %}
</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|removesuffix:"accounts/logout/"|urlencode }}">
Sign
in
</a>
{% endif %}
<div class="d-flex d-none d-lg-block">
<input class="form-control select2-field"
id="navbar-doc-search"
data-ajax--url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
type="text"
data-placeholder="Document search">
</div>
<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">
<i class="navbar-toggler-icon"></i>
</button>
</div>
</nav>
{% block js %} {% block js %}
{% endblock %} {% endblock %}
<script src="{% static 'ietf/js/select2.js' %}"></script> <script src="{% static 'ietf/js/select2.js' %}"></script>