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 %}