jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

UI improvement (#1829)

Browse Source 
* open "create new project/activity" form in modal
* re-use action translation for create action title
* do not pre-select first customer in list - fixes #1828
* sort user preferences in sections for better visual grouping
* show comment date only in hover of user avatar
This commit is contained in:
Kevin Papst
2020-07-17 20:32:11 +02:00
committed by GitHub
parent c843dba29a
commit 7907b43ef7
15 changed files with 149 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/activity/details.html.twig
View File

@@ -32,11 +32,11 @@
{{ activity.comment|comment2html(true) }}
</div>
{% endif %}
<table class="table table-hover">
<table class="table table-hover dataTable">
{% if not activity.visible %}
<tr>
<th>{{ 'label.visible'|trans }}</th>
<td>
<td colspan="3">
{{ widgets.label_boolean(activity.visible) }}
</td>
</tr>
@@ -46,10 +46,11 @@
<th>{{ 'label.customer'|trans }}</th>
<td>
{{ widgets.label_customer(activity.project.customer) }}
{% if activity.project.customer.teams|length == 0 %}
{{ widgets.icon('unlocked') }}
{% endif %}
&nbsp;
</td>
<td class="w-min">
{{ widgets.badge_team_access(activity.project.customer.teams) }}
</td>
<td class="actions">
{{ customerActions.customer(activity.project.customer, 'custom') }}
</td>
</tr>
@@ -57,10 +58,11 @@
<th>{{ 'label.project'|trans }}</th>
<td>
{{ widgets.label_project(activity.project) }}
{% if activity.project.teams|length == 0 %}
{{ widgets.icon('unlocked') }}
{% endif %}
&nbsp;
</td>
<td class="w-min">
{{ widgets.badge_team_access(activity.project.teams) }}
</td>
<td class="actions">
{{ projectActions.project(activity.project, 'custom') }}
</td>
</tr>
@@ -68,7 +70,7 @@
{% for metaField in activity.visibleMetaFields %}
<tr>
<th>{{ metaField.label|trans }}</th>
<td>{{ widgets.form_type_value(metaField.type, metaField.value, activity) }}</td>
<td colspan="3">{{ widgets.form_type_value(metaField.type, metaField.value, activity) }}</td>
</tr>
{% endfor %}
</table>

2
templates/activity/edit.html.twig
View File

@@ -7,7 +7,7 @@
{% block main %}
{% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': activity.name|default('create'|trans),
'title': activity.name|default('create-activity'|trans({}, 'actions')),
'form': form,
'back': path('admin_activity')
} %}