Skip to content
Snippets Groups Projects
Commit e0f3f0e9 authored by Jan Mach's avatar Jan Mach
Browse files

Fix: Caret was misleading about the purpose of the dropdown.

There are additional context item actions hidden behind the caret in item (group, user) detail page. It was not obvious, hopefully the different icon will be better to understand. Alternatively all buttons could be brought to toplevel, I am however reluctant to do that, because the labels are too long. (Redmine issue: #4874)
parent 04185551
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@
{%- if menu_item.type == 'submenu' %}
<a data-toggle="dropdown" role="button" aria-haspopup="true" href="#" class="btn btn-default btn-sm dropdown-toggle" aria-expanded="false">
<span{% if menu_item.get_legend(context_item) %} data-toggle="tooltip" title="{{ menu_item.get_legend(context_item) }}"{% endif %}>
{% if menu_item.get_icon(context_item) %}{{ get_icon(menu_item.get_icon(context_item)) }}{% endif %}{% if menu_item.get_title(context_item) %}{% if menu_item.resptitle %}<span class="hidden-sm"> {{ menu_item.get_title(context_item) }}</span>{% else %} {{ menu_item.get_title(context_item) }}{% endif %}{% endif %} <span class="caret"></span>
{% if menu_item.get_icon(context_item) %}{{ get_icon(menu_item.get_icon(context_item)) }}{% endif %}{% if menu_item.get_title(context_item) %}{% if menu_item.resptitle %}<span class="hidden-sm"> {{ menu_item.get_title(context_item) }}</span>{% else %} {{ menu_item.get_title(context_item) }}{% endif %}{% endif %} <i class="fas fa-fw fa-bars"></i>
</span>
</a>
<ul class="dropdown-menu{% if menu_item.align_right %} dropdown-menu-right{% endif %}">
......@@ -94,7 +94,7 @@
{%- if menu_item.type == 'submenu' %}
<a data-toggle="dropdown" role="button" aria-haspopup="true" href="#" class="btn btn-default btn-sm dropdown-toggle" aria-expanded="false">
<span{% if menu_item.get_legend(context_item) %} data-toggle="tooltip" title="{{ menu_item.get_legend(context_item) }}"{% endif %}>
{% if menu_item.get_icon(context_item) %}{{ get_icon(menu_item.get_icon(context_item)) }}{% endif %}{% if menu_item.get_title(context_item) %}{% if menu_item.resptitle %}<span class="hidden-sm"> {{ menu_item.get_title(context_item) }}</span>{% else %} {{ menu_item.get_title(context_item) }}{% endif %}{% endif %} <span class="caret"></span>
{% if menu_item.get_icon(context_item) %}{{ get_icon(menu_item.get_icon(context_item)) }}{% endif %}{% if menu_item.get_title(context_item) %}{% if menu_item.resptitle %}<span class="hidden-sm"> {{ menu_item.get_title(context_item) }}</span>{% else %} {{ menu_item.get_title(context_item) }}{% endif %}{% endif %} <i class="fas fa-fw fa-bars"></i>
</span>
</a>
<ul class="dropdown-menu{% if menu_item.align_right %} dropdown-menu-right{% endif %}">
......@@ -168,7 +168,7 @@
{%- endif %}
&nbsp;|&nbsp;
<a class="btn btn-default btn-xs" role="button" data-toggle="collapse" href="#{{ idprefix }}-difference-{{ loop.index }}" aria-expanded="false" aria-controls="collapseExample">
{{ _('Difference') }} <span class="caret"></span>
{{ _('Difference') }} <i class="fas fa-fw fa-bars"></i>
</a>
<div class="collapse" id="{{ idprefix }}-difference-{{ loop.index }}">
<hr>
......
......@@ -209,7 +209,7 @@ class ShowView(HTMLMixin, SQLAlchemyMixin, ItemShowView):
'submenu',
'more',
align_right = True,
legend = lazy_gettext('More actions')
legend = gettext('More actions')
)
action_menu.add_entry(
'endpoint',
......@@ -389,7 +389,7 @@ class UpdateView(HTMLMixin, SQLAlchemyMixin, ItemUpdateView): # pylint: disable
@classmethod
def get_menu_title(cls, item = None):
"""*Implementation* of :py:func:`hawat.base.BaseView.get_menu_title`."""
return lazy_gettext('Update group')
return lazy_gettext('Update')
@classmethod
def get_menu_legend(cls, item = None):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment