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

polish detail pages (#1817)

Browse Source
This commit is contained in:
Kevin Papst
2020-07-12 20:11:13 +02:00
committed by GitHub
parent 164af7ae02
commit f2dd2331a5
31 changed files with 136 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,15 @@
{% endblock %}
{% block box_tools %}
{% if can_edit %}
<a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_activity_edit', {'id': activity.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
<a class="modal-ajax-form open-edit btn btn-default btn-sm" data-href="{{ path('admin_activity_edit', {'id': activity.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
{% endif %}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_body %}
{% if activity.comment is not empty %}
{{ activity.comment|comment2html(true) }}
<div class="comment">
{{ activity.comment|comment2html(true) }}
</div>
{% endif %}
<table class="table table-hover">
{% if not activity.visible %}

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

@@ -1,5 +1,4 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "activity/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
@@ -39,7 +38,12 @@
{% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }}
{% endif %}
{% if form.create_more is defined and app.request.xmlHttpRequest %}
<div class="hidden">
{{ form_row(form.create_more) }}
</div>
{% endif %}
{{ form_widget(form) }}
{% endblock %}
{% endembed %}
{% endembed %}
{% endblock %}

7
templates/customer/details.html.twig
View File

@@ -17,12 +17,15 @@
{% endblock %}
{% block box_tools %}
{% if can_edit %}
<a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_customer_edit', {'id': customer.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
<a class="modal-ajax-form open-edit btn btn-default btn-sm" data-href="{{ path('admin_customer_edit', {'id': customer.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
{% endif %}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_body %}
{% if customer.comment is not empty %}
{{ customer.comment|comment2html(true) }}
<div class="comment">
{{ customer.comment|comment2html(true) }}
</div>
{% endif %}
<table class="table table-hover">
{% if not customer.visible %}

1
templates/customer/edit.html.twig
View File

@@ -1,5 +1,4 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "customer/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}

27
templates/customer/embed_projects.html.twig
View File

@@ -1,4 +1,3 @@
{% if projects|length > 0 %}
{% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'customer': customer, 'projects': projects, 'page': page} %}
{% import "project/actions.html.twig" as actions %}
{% import "macros/widgets.html.twig" as widgets %}
@@ -7,18 +6,34 @@
id="project_list_box" data-href="{{ path('customer_projects', {'id': customer.id}) }}" data-reload="kimai.projectUpdate"
{% endblock %}
{% block box_tools %}
{{ pagination(projects, { css_container_class: 'pagination pagination-sm inline', routeName: 'customer_projects', routeParams: {'id': customer.id} }) }}
{% if customer.visible and is_granted('create_project') %}
<a class="modal-ajax-form open-edit btn btn-default btn-sm btn-pager" data-href="{{ path('admin_project_create_with_customer', {'customer': customer.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'create'|trans }}"><i class="{{ 'create'|icon }}"></i></a>
{% endif %}
{% if projects|length > 0 %}
{{ pagination(projects, { css_container_class: 'pagination pagination-sm inline', routeName: 'customer_projects', routeParams: {'id': customer.id} }) }}
{% endif %}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_tools_attributes %}data-page="{{ page }}"{% endblock %}
{% block box_body %}
{% if projects|length == 0 %}
<div class="comment">{{ 'error.no_entries_found'|trans }}</div>
{% else %}
<table class="table table-hover dataTable">
<thead>
<tr>
<th>{{ 'label.name'|trans }}</th>
<th class="hidden-xs">{{ 'label.comment'|trans }}</th>
<th class="w-min text-center">{{ 'label.team'|trans }}</th>
<th class="actions"></th>
</tr>
</thead>
<tbody>
{% for project in projects %}
<tr>
<td>{{ project.name }}</td>
<td>{{ project.comment|comment2html }}</td>
<td>
<td>{{ widgets.label_project(project) }}</td>
<td class="hidden-xs">{{ project.comment|comment2html }}</td>
<td class="w-min text-center">
{% if project.teams|length > 0 %}
{{ widgets.badge_counter(project.teams|length) }}
{% else %}
@@ -30,6 +45,7 @@
{% endfor %}
</tbody>
</table>
{% endif %}
{% endblock %}
{% endembed %}
<script type="text/javascript">
@@ -38,4 +54,3 @@
KimaiPaginatedBoxWidget.create('#project_list_box');
});
</script>
{% endif %}

6
templates/embeds/comments.html.twig
View File

@@ -26,7 +26,7 @@
{% if route_delete is not null %}
<a href="{{ path(route_delete, {'id': comment.id}) }}" class="confirmation-link btn btn-default btn-xs" data-question="confirm.delete"><i class="{{ 'delete'|icon }}"></i></a>
{% endif %}
{{ comment.createdAt|date_full }}
<span class="hidden-xs">{{ comment.createdAt|date_full }}</span>
</span>
</span>
{{ comment.message|replace(replacer)|md2html }}
@@ -40,11 +40,11 @@
<div class="input-group">
{{ widgets.user_avatar(app.user, false, 'img-responsive img-sm') }}
<div class="img-push">
{{ form_widget(form.message) }}
{{ form_widget(form.message, {'attr': {'rows': '1', 'placeholder': 'placeholder.type_message'|trans}}) }}
</div>
<span class="input-group-btn">
<button type="submit" class="btn btn-default">
{{ 'action.save'|trans }}
<i class="{{ 'comment'|icon }}"></i>
</button>
</span>
</div>

7
templates/embeds/rates-table.html.twig
View File

@@ -5,13 +5,14 @@
{{ 'rates.title'|trans }}
{% endblock %}
{% block box_tools %}
<a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ create_url }}" data-toggle="tooltip" data-placement="top" title="{{ 'create'|trans }}"><i class="{{ 'create'|icon }}"></i></a>
<a class="modal-ajax-form open-edit btn btn-default btn-sm" data-href="{{ create_url }}" data-toggle="tooltip" data-placement="top" title="{{ 'create'|trans }}"><i class="{{ 'create'|icon }}"></i></a>
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_body %}
{% if rates is empty %}
{{ 'rates.empty'|trans }}
<div class="comment">{{ 'rates.empty'|trans }}</div>
{% else %}
<table class="table dataTable" >
<table class="table dataTable">
<thead>
<tr>
<th>

9
templates/embeds/teams.html.twig
View File

@@ -11,22 +11,23 @@
{% import "macros/widgets.html.twig" as widgets %}
{% block box_tools %}
{% if route_create is not null and (teams|length == 0 or team is null) and is_granted('create_team') %}
<a class="btn-box-tool" href="{{ route_create }}" data-toggle="tooltip" data-placement="top" title="{{ 'team.create_default'|trans({}, 'teams') }}"><i class="{{ 'create'|icon }}"></i></a>
<a class="btn btn-default btn-sm" href="{{ route_create }}" data-toggle="tooltip" data-placement="top" title="{{ 'team.create_default'|trans({}, 'teams') }}"><i class="{{ 'create'|icon }}"></i></a>
{% endif %}
{% if route_edit is not null %}
<a class="modal-ajax-form open-edit btn btn-box-tool" href="{{ route_edit }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
<a class="modal-ajax-form open-edit btn btn-default btn-sm" href="{{ route_edit }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
{% endif %}
{% endblock %}
{% block box_attributes %}id="team_listing_box"{% endblock %}
{% block box_title %}
{{ 'permissions'|trans({}, 'actions') }}
{% if teams|length > 0 %}<small class="hidden-xs">{{ 'team.visibility_restricted'|trans({}, 'teams') }}</small>{% endif %}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_body %}
{% if teams|length > 0 %}
<p>{{ 'team.visibility_restricted'|trans({}, 'teams') }}</p>
{{ widgets.team_list(teams) }}
{% else %}
{{ empty_message|default('team.visibility_global')|trans({}, 'teams') }}
<div class="comment">{{ empty_message|default('team.visibility_global')|trans({}, 'teams') }}</div>
{% endif %}
{% endblock %}
{% endembed %}

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

@@ -45,7 +45,7 @@
{% if is_granted('view_other_timesheet') %}
{% set actions = actions|merge({'timesheet': path('admin_timesheet', {'customers[]': project.customer.id, 'projects[]': project.id})}) %}
{% endif %}
{% if is_granted('create_activity') and project.visible and project.customer.visible %}
{% 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})}) %}
{% endif %}
{% if (view == 'index' or view == 'custom') and is_granted('delete', project) %}

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

@@ -14,15 +14,18 @@
{% block box_attributes %}id="project_details_box"{% endblock %}
{% block box_tools %}
{% if can_edit %}
<a class="modal-ajax-form open-edit btn btn-box-tool" data-href="{{ path('admin_project_edit', {'id': project.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
<a class="modal-ajax-form open-edit btn btn-default btn-sm" data-href="{{ path('admin_project_edit', {'id': project.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'action.edit'|trans }}"><i class="{{ 'edit'|icon }}"></i></a>
{% endif %}
{% endblock %}
{% block box_title %}
{{ widgets.label_project(project) }}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_body %}
{% if project.comment is not empty %}
{{ project.comment|comment2html(true) }}
<div class="comment">
{{ project.comment|comment2html(true) }}
</div>
{% endif %}
<table class="table table-hover">
{% if not project.visible %}

6
templates/project/edit.html.twig
View File

@@ -1,5 +1,4 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "project/actions.html.twig" as actions %}
{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
@@ -54,6 +53,11 @@
{% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }}
{% endif %}
{% if form.create_more is defined and app.request.xmlHttpRequest %}
<div class="hidden">
{{ form_row(form.create_more) }}
</div>
{% endif %}
{{ form_widget(form) }}
{% endblock %}
{% endembed %}

43
templates/project/embed_activities.html.twig
View File

@@ -1,27 +1,43 @@
{% if activities|length > 0 %}
{% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'project': project, 'activities': activities, 'page': page} %}
{% import "activity/actions.html.twig" as actions %}
{% import "macros/widgets.html.twig" as widgets %}
{% block box_title %}{{ 'menu.admin_activity'|trans }}{% endblock %}
{% block box_attributes %}
id="activity_list_box" data-href="{{ path('project_activities', {'id': project.id}) }}" data-reload="kimai.activityUpdate"
{% endblock %}
{% block box_tools %}
{{ pagination(activities, { css_container_class: 'pagination pagination-sm inline', routeName: 'project_activities', routeParams: {'id': project.id} }) }}
{% if project.visible and project.customer.visible and is_granted('create_activity') %}
<a class="modal-ajax-form open-edit btn btn-default btn-sm btn-pager" data-href="{{ path('admin_activity_create_with_project', {'project': project.id}) }}" data-toggle="tooltip" data-placement="top" title="{{ 'create'|trans }}"><i class="{{ 'create'|icon }}"></i></a>
{% endif %}
{% if activities|length > 0 %}
{{ pagination(activities, { css_container_class: 'pagination pagination-sm inline', routeName: 'project_activities', routeParams: {'id': project.id} }) }}
{% endif %}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_tools_attributes %}data-page="{{ page }}"{% endblock %}
{% block box_body %}
<table class="table table-hover dataTable">
<tbody>
{% for activity in activities %}
<tr>
<td>{{ activity.name }}</td>
<td>{{ activity.comment|comment2html }}</td>
<td class="actions">{{ actions.activity(activity, 'custom') }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if activities|length == 0 %}
<div class="comment">{{ 'error.no_entries_found'|trans }}</div>
{% else %}
<table class="table table-hover dataTable">
<thead>
<tr>
<th>{{ 'label.name'|trans }}</th>
<th class="hidden-xs">{{ 'label.comment'|trans }}</th>
<th class="actions"></th>
</tr>
</thead>
<tbody>
{% for activity in activities %}
<tr>
<td>{{ widgets.label_activity(activity) }}</td>
<td class="hidden-xs">{{ activity.comment|comment2html }}</td>
<td class="actions">{{ actions.activity(activity, 'custom') }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}
{% endblock %}
{% endembed %}
<script type="text/javascript">
@@ -30,4 +46,3 @@
KimaiPaginatedBoxWidget.create('#activity_list_box');
});
</script>
{% endif %}