Skip to content

Commit 306b77c

Browse files
committed
general: improve account menu entry visibility
Updates the account menu entry by using the full patron name instead of initials (limited to 30 characters). Closes #1332 Co-Authored-by: Renaud Michotte <[email protected]>
1 parent 8cadba9 commit 306b77c

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Diff for: rero_ils/templates/rero_ils/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
{%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible %}
5959
{%- if item.children %}
6060
<li class="nav-item{{ ' active' if item.active else ''}}">
61-
<a class="nav-link collapsed" data-toggle="collapse" role="button"
61+
<a class="nav-link collapsed {{ item.cssClass }}" data-toggle="collapse" role="button"
6262
aria-controls="collapseExample" aria-expanded="false"
6363
href="#{{ item.name }}"
6464
{{ "id={}".format(item.id) if item.id }}

Diff for: rero_ils/views.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -196,25 +196,29 @@ def init_menu_profile():
196196
"""Create the profile header menu."""
197197
item = current_menu.submenu('main.profile')
198198
if current_patron:
199-
session['user_initials'] = current_patron.initial
199+
session['user_name'] = current_patron.formatted_name
200200
else:
201201
try:
202-
session['user_initials'] = current_user.email
202+
session['user_name'] = current_user.email
203203
# AnonymousUser
204204
except AttributeError:
205-
session.pop('user_initials', None)
206-
account = session.get('user_initials', _('My Account'))
205+
session.pop('user_name', None)
206+
account = session.get('user_name', _('My Account'))
207+
if len(account) > 30:
208+
account = account[:30] + '…'
207209

208210
rero_register(
209211
item,
210212
endpoint=None,
211-
text='{icon} <span class="{visible}">{account}</span>'.format(
212-
icon='<i class="fa fa-user"></i>',
213-
visible='visible-md-inline visible-lg-inline',
214-
account=account
215-
),
213+
text='<span class="btn btn-sm btn-success">{icon} '
214+
'<span class="{visible}">{account}</span><span>'.format(
215+
icon='<i class="fa fa-user"></i>',
216+
visible='visible-md-inline visible-lg-inline',
217+
account=account
218+
),
216219
order=1,
217220
id='my-account-menu',
221+
cssClass='py-1'
218222
)
219223

220224
item = current_menu.submenu('main.profile.login')

0 commit comments

Comments
 (0)