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

Plugins support (#592)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-24 15:54:38 +01:00
committed by GitHub
parent 36a158a805
commit 03aa4c9ddc
11 changed files with 220 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/admin/activity.html.twig
View File

@@ -42,14 +42,14 @@
{% if entry.project and entry.project.customer %}
<a href="{{ path('admin_customer_edit', {'id' : entry.project.customer.id}) }}">{{ widgets.label_customer(entry.project.customer) }}</a>
{% else %}
{#{ widgets.label('x', 'success') }#}
{# GLOBAL ACTIVTITY DOES NOT HAVE A CUSTOMER #}
{% endif %}
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'project') }}">
{% if entry.project %}
<a href="{{ path('admin_project_edit', {'id' : entry.project.id}) }}">{{ widgets.label_project(entry.project) }}</a>
{% else %}
{#{ widgets.label('x', 'success') }#}
{# GLOBAL ACTIVTITY DOES NOT HAVE A PROJECT #}
{% endif %}
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'comment') }}">{{ entry.comment }}</td>

3
templates/base.html.twig
View File

@@ -89,12 +89,14 @@
{% block stylesheets %}
{# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
<link rel="stylesheet" href="{{ asset('build/app.css') }}">
{{ render(controller('App\\Controller\\EventController::trigger', {'request':app.request, 'event':constant('App\\Event\\ThemeEvent::STYLESHEET')})) }}
{% endblock %}
{% block head %}
{{ parent() }}
<script src="{{ asset('build/app.js') }}"></script>
{% include 'partials/head.html.twig' %}
{{ render(controller('App\\Controller\\EventController::trigger', {'request':app.request, 'event':constant('App\\Event\\ThemeEvent::HTML_HEAD')})) }}
{% endblock %}
{% block javascripts %}
@@ -119,4 +121,5 @@
{# $.kimai.pauseRecord('li.messages-menu ul.menu li'); #}
});
</script>
{{ render(controller('App\\Controller\\EventController::trigger', {'request':app.request, 'event':constant('App\\Event\\ThemeEvent::JAVASCRIPT')})) }}
{% endblock %}