matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display the work "Profile" instead of the user's full name or username.

Browse Source 
This avoid style breakage on long full names or usernames.
The user's full name or username is no longer displayed in the main menu.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-03-20 01:18:17 -04:00
parent 69c1eacb75
commit 2ad4b9c06f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/releases/2.2.rst
View File

@@ -61,6 +61,10 @@ resolved to '/api/documents/<pk>/pages/<page_pk>/pages'.
Other changes
-------------
- The user's full name or username is no longer displayed in the main menu.
Instead the work "Profile" is displayed. The users's full name or username
will be displayed when the "Profile" icon is clicked. This avoid menu
style breakable on long full names or usernames.
- Simplify test runner by adding a new option '--mayan-apps' that automatically
tests all Mayan apps that report to have tests.
- Change the app flag that indicates when an app has test from 'test' to the

15
mayan/apps/appearance/templates/appearance/base.html
View File

@@ -72,14 +72,19 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true">
{% if not request.user.is_authenticated %}
{% trans 'Anonymous' %}
{% else %}
{{ request.user.get_full_name|default:request.user }} <i class="fa fa-user-circle-o"></i>
{% endif %}
{% trans 'Profile' %} <i class="fa fa-user-circle-o"></i>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li class="text-center" style="padding-left: 10px; padding-right: 20px;">
{% if not request.user.is_authenticated %}
{% trans 'Anonymous' %}
{% else %}
{{ request.user.get_full_name|default:request.user }}
{% endif %}
</li>
<li role="separator" class="divider"></li>
{% get_menu_links 'user menu' as menu_links %}
{% for link_set in menu_links %}
{% for link in link_set %}