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

2
templates/project/actions.html.twig
View File

@@ -46,7 +46,7 @@
{% set actions = actions|merge({'timesheet': path('admin_timesheet', {'customers[]': project.customer.id, 'projects[]': project.id})}) %}
{% endif %}
{% if project.visible and project.customer.visible and is_granted('create_activity') %}
{% set actions = actions|merge({'create-activity': path('admin_activity_create_with_project', {'project': project.id})}) %}
{% set actions = actions|merge({'create-activity': {'url': path('admin_activity_create_with_project', {'project': project.id}), 'class': 'modal-ajax-form'}}) %}
{% endif %}
{% if (view == 'index' or view == 'custom') and is_granted('delete', project) %}
{% set actions = actions|merge({'trash': {'url': path('admin_project_delete', {'id': project.id}), 'class': 'modal-ajax-form'}}) %}

23
templates/project/details.html.twig
View File

@@ -27,11 +27,11 @@
{{ project.comment|comment2html(true) }}
</div>
{% endif %}
<table class="table table-hover">
<table class="table table-hover dataTable">
{% if not project.visible %}
<tr>
<th>{{ 'label.visible'|trans }}</th>
<td>
<td colspan="3">
{{ widgets.label_boolean(project.visible) }}
</td>
</tr>
@@ -40,23 +40,24 @@
<th>{{ 'label.customer'|trans }}</th>
<td>
{{ widgets.label_customer(project.customer) }}
{% if project.customer.teams|length == 0 %}
{{ widgets.icon('unlocked') }}
{% endif %}
&nbsp;
</td>
<td class="w-min">
{{ widgets.badge_team_access(project.customer.teams) }}
</td>
<td class="actions">
{{ customerActions.customer(project.customer, 'custom') }}
</td>
</tr>
{% if is_granted('details', project) %}
<tr>
<th>{{ 'label.orderNumber'|trans }}</th>
<td>
<td colspan="3">
{{ project.orderNumber }}
</td>
</tr>
<tr>
<th>{{ 'label.orderDate'|trans }}</th>
<td>
<td colspan="3">
{% if project.orderDate is not empty %}
{{ project.orderDate|date_full }}
{% else %}
@@ -66,7 +67,7 @@
</tr>
<tr>
<th>{{ 'label.project_start'|trans }}</th>
<td>
<td colspan="3">
{% if project.start is not empty %}
{{ project.start|date_full }}
{% else %}
@@ -76,7 +77,7 @@
</tr>
<tr>
<th>{{ 'label.project_end'|trans }}</th>
<td>
<td colspan="3">
{% if project.end is not empty %}
{{ project.end|date_full }}
{% else %}
@@ -88,7 +89,7 @@
{% for metaField in project.visibleMetaFields %}
<tr>
<th>{{ metaField.label|trans }}</th>
<td>{{ widgets.form_type_value(metaField.type, metaField.value, project) }}</td>
<td colspan="3">{{ widgets.form_type_value(metaField.type, metaField.value, project) }}</td>
</tr>
{% endfor %}
</table>

2
templates/project/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': project.name|default('create'|trans),
'title': project.name|default('create-project'|trans({}, 'actions')),
'form': form,
'back': path('admin_project')
} %}