From 13f970e46dd6e5b1a22514c32712d014fd16edd9 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 17 Feb 2015 11:05:55 +0000 Subject: [PATCH] Summary: Move user submenu to right-hand side in top menu to prevent things jumping around when logging in - Legacy-Id: 9091 --- ietf/templates/base/menu.html | 63 ++++-------------------------- ietf/templates/base/menu_user.html | 54 +++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 55 deletions(-) create mode 100644 ietf/templates/base/menu_user.html diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 00e4e34ad..44cb48483 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -1,59 +1,8 @@ -{% load wg_menu %} -{% load streams_menu %} -{% load ietf_filters community_tags %} +{% load ietf_filters community_tags wg_menu streams_menu %} -
  • - {% if flavor == "top" %}{% endif %} - {##} - {% if user.is_authenticated %} {{ user }} {% else %} User {% endif %} - {% if flavor == "top" %} - - {% endif %} +{% if flavor != "top" %} + {% include "base/menu_user.html" %} +{% endif %}
  • {% if flavor == "top" %}{% endif %} @@ -151,3 +100,7 @@
  • Liaison statements
  • IESG agenda
    • {% if flavor == "top" %}{% endif %} + +{% if flavor == "top" %} + {% include "base/menu_user.html" %} +{% endif %} diff --git a/ietf/templates/base/menu_user.html b/ietf/templates/base/menu_user.html new file mode 100644 index 000000000..c405a8118 --- /dev/null +++ b/ietf/templates/base/menu_user.html @@ -0,0 +1,54 @@ +{% load ietf_filters %} + +
  • + {% if flavor == "top" %}{% endif %} + {##} + {% if user.is_authenticated %} {{ user }} {% else %} User {% endif %} + {% if flavor == "top" %} + + {% endif %}