diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-16 23:23:17 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-11 11:28:15 +0100 |
| commit | 608851b2d3af2bb9f4fddb3b07c8017d01cb1b2f (patch) | |
| tree | 368baa360f17988f767158b3ff79714c4037758e /templates | |
| parent | 571e85416a955b7a450ec63475554010f68721b5 (diff) | |
| download | openembedded-core-contrib-608851b2d3af2bb9f4fddb3b07c8017d01cb1b2f.tar.gz | |
Login drop-down style improvements
Thanks to Belen for the design.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/templates/base.html b/templates/base.html index a1cdf4433b..2d54e2df79 100644 --- a/templates/base.html +++ b/templates/base.html @@ -27,7 +27,7 @@ {% autoescape on %} <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> - <div class="container"> + <div class="container-fluid"> <a class="brand" href="{% url frontpage %}">OpenEmbedded metadata index</a> <ul class="nav"> @@ -52,17 +52,34 @@ </li> {% endblock %} </ul> + {% if user.is_authenticated %} + <div class="btn-group pull-right"> + {% if perms.layerindex.publish_layer %} + {% if unpublished_count > 0 %} + <a class="btn" href="{% url layer_list_review %}?branch=master"> + <span class="badge badge-warning review-notification">{{ unpublished_count }}</span> + </a> + {% endif %} + {% endif %} + <button class="btn dropdown-toggle" data-toggle="dropdown""> + <i class="icon-user"></i> + {{ user.username }} + <b class="caret"></b> + </button> + <ul class="dropdown-menu"> + <li><a href="{% url auth_logout %}">{% trans "Log out" %}</a></li> + <li><a href="{% url auth_password_change %}">{% trans "Change password" %}</a></li> + <li><a href="{% url profile %}">{% trans "Edit profile" %}</a></li> + </ul> + </div> + {% else %} + <div class="pull-right"> + <a class="btn" href="{% url auth_login %}">{% trans "Log in" %}</a> + </div> + {% endif %} <ul class="nav pull-right"> {% block submitlink %}<li><a href="{% url submit_layer %}">Submit layer</a></li>{% endblock %} {% if user.is_authenticated %} - {% if perms.layerindex.publish_layer %} - <li><a href="{% url layer_list_review %}?branch=master"> - Review - {% if unpublished_count > 0 %} - <span class="badge badge-warning">{{ unpublished_count }}</span> - {% endif %} - </a></li> - {% endif %} <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> Tools @@ -74,21 +91,6 @@ </ul> </li> <li class="divider-vertical"></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - {{ user.username }} - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="{% url auth_logout %}">{% trans "Log out" %}</a></li> - <li><a href="{% url auth_password_change %}">{% trans "Change password" %}</a></li> - <li><a href="{% url profile %}">{% trans "Edit profile" %}</a></li> - </ul> - </li> - {% else %} - <li> - <a href="{% url auth_login %}">{% trans "log in" %}</a> - </li> {% endif %} </ul> </div> <!-- end of "container" --> |