Skip to content

Commit 13f970e

Browse files
OleLaursenOleLaursen
committed
Summary: Move user submenu to right-hand side in top menu to prevent
things jumping around when logging in - Legacy-Id: 9091
1 parent 1e8647d commit 13f970e

2 files changed

Lines changed: 62 additions & 55 deletions

File tree

‎ietf/templates/base/menu.html‎

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,8 @@
1-
{% load wg_menu %}
2-
{% load streams_menu %}
3-
{% load ietf_filters community_tags %}
1+
{% load ietf_filters community_tags wg_menu streams_menu %}
42

5-
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
6-
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
7-
{#<span class="fa fa-user"></span>#}
8-
{% if user.is_authenticated %} {{ user }} {% else %} User {% endif %}
9-
{% if flavor == "top" %}
10-
</a>
11-
<ul class="dropdown-menu" role="menu">
12-
{% endif %}
13-
{% if request.get_full_path == "/accounts/logout/" %}
14-
<li><a rel="nofollow" href="/accounts/login{% if "/accounts/logout/" not in request.get_full_path %}/?next={{request.get_full_path|urlencode}}{% endif %}">Sign in</a></li>
15-
{% else %}
16-
{% if user.is_authenticated %}
17-
<li><a rel="nofollow" href="/accounts/logout/" >Sign out</a></li>
18-
<li><a rel="nofollow" href="/accounts/profile/">Edit profile</a></li>
19-
{% else %}
20-
<li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in</a></li>
21-
{% endif %}
22-
{% endif %}
23-
24-
<li><a href="{% url "account_index" %}">{% if request.user.is_authenticated %}Manage account{% else %}New account{% endif %}</a></li>
25-
<li><a href="{%url "ietf.cookies.views.settings" %}" rel="nofollow">Settings</a></li>
26-
27-
{% if user|has_role:"Area Director" %}
28-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
29-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>AD dashboard</li>
30-
<li><a href="{% url "docs_for_ad" name=user.person.full_name_as_key %}">My docs</a></li>
31-
<li><a href="{% url "ietf.iesg.views.agenda_documents" %}">Next telechat</a></li>
32-
<li><a href="{% url "ietf.iesg.views.discusses" %}">Discusses</a></li>
33-
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestone review</a></li>
34-
{% endif %}
35-
36-
{% if user|has_role:"Secretariat" %}
37-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
38-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>IETF secretariat</li>
39-
<li><a href="/admin/iesg/telechatdate/">Telechat dates</a></li>
40-
<li><a href="/admin/iesg/telechatagendaitem/">Management items</a></li>
41-
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
42-
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a>
43-
{% endif %}
44-
45-
{% if user|has_role:"IANA" %}
46-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
47-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>IANA</li>
48-
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
49-
{% endif %}
50-
51-
{% if user|has_role:"RFC Editor" %}
52-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
53-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>RFC Editor</li>
54-
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
55-
{% endif %}
56-
{% if flavor == "top" %}</ul>{% endif %}
3+
{% if flavor != "top" %}
4+
{% include "base/menu_user.html" %}
5+
{% endif %}
576

587
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
598
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
@@ -151,3 +100,7 @@
151100
<li><a href="/liaison/">Liaison statements</a></li>
152101
<li><a href="/iesg/agenda/">IESG agenda</a></li>
153102
{% if flavor == "top" %}</ul>{% endif %}
103+
104+
{% if flavor == "top" %}
105+
{% include "base/menu_user.html" %}
106+
{% endif %}

‎ietf/templates/base/menu_user.html‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{% load ietf_filters %}
2+
3+
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
4+
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
5+
{#<span class="fa fa-user"></span>#}
6+
{% if user.is_authenticated %} {{ user }} {% else %} User {% endif %}
7+
{% if flavor == "top" %}
8+
</a>
9+
<ul class="dropdown-menu" role="menu">
10+
{% endif %}
11+
{% if request.get_full_path == "/accounts/logout/" %}
12+
<li><a rel="nofollow" href="/accounts/login{% if "/accounts/logout/" not in request.get_full_path %}/?next={{request.get_full_path|urlencode}}{% endif %}">Sign in</a></li>
13+
{% else %}
14+
{% if user.is_authenticated %}
15+
<li><a rel="nofollow" href="/accounts/logout/" >Sign out</a></li>
16+
<li><a rel="nofollow" href="/accounts/profile/">Edit profile</a></li>
17+
{% else %}
18+
<li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in</a></li>
19+
{% endif %}
20+
{% endif %}
21+
22+
<li><a href="{% url "account_index" %}">{% if request.user.is_authenticated %}Manage account{% else %}New account{% endif %}</a></li>
23+
<li><a href="{%url "ietf.cookies.views.settings" %}" rel="nofollow">Settings</a></li>
24+
25+
{% if user|has_role:"Area Director" %}
26+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
27+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>AD dashboard</li>
28+
<li><a href="{% url "docs_for_ad" name=user.person.full_name_as_key %}">My docs</a></li>
29+
<li><a href="{% url "ietf.iesg.views.agenda_documents" %}">Next telechat</a></li>
30+
<li><a href="{% url "ietf.iesg.views.discusses" %}">Discusses</a></li>
31+
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestone review</a></li>
32+
{% endif %}
33+
34+
{% if user|has_role:"Secretariat" %}
35+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
36+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>IETF secretariat</li>
37+
<li><a href="/admin/iesg/telechatdate/">Telechat dates</a></li>
38+
<li><a href="/admin/iesg/telechatagendaitem/">Management items</a></li>
39+
<li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
40+
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a>
41+
{% endif %}
42+
43+
{% if user|has_role:"IANA" %}
44+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
45+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>IANA</li>
46+
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
47+
{% endif %}
48+
49+
{% if user|has_role:"RFC Editor" %}
50+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
51+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>RFC Editor</li>
52+
<li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
53+
{% endif %}
54+
{% if flavor == "top" %}</ul>{% endif %}

0 commit comments

Comments
 (0)