Timesheet toolbar (#12)

* add toolbar to timesheet #11
* add customer filter #11
* add project filter #11
* add activity filter #11
* add page size selector #11
* added state filter #11
* fixed csrf token names
* fixed typo
This commit is contained in:
Kevin Papst
2018-01-05 09:30:22 +01:00
committed by GitHub
parent c9c82e767f
commit 80d0dc2369
20 changed files with 742 additions and 46 deletions

View File

@@ -22,6 +22,10 @@
<source>subtitle.amount</source>
<target> (insgesamt %count%)</target>
</trans-unit>
<trans-unit id="This is a mandatory field">
<source>This is a mandatory field</source>
<target>Pflichtfeld</target>
</trans-unit>
<!--
Login / Security
@@ -478,6 +482,10 @@
<!--
ROLES
-->
<trans-unit id="ROLE_SUPER_ADMIN">
<source>ROLE_SUPER_ADMIN</source>
<target>System-Admin</target>
</trans-unit>
<trans-unit id="ROLE_ADMIN">
<source>ROLE_ADMIN</source>
<target>Administrator</target>

View File

@@ -32,17 +32,6 @@
{% block avanzu_head %}
<link rel="stylesheet" href="{{ asset('css/kimai.css') }}">
<script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
<script src="{{ asset('theme/bootstrap/js/bootstrap.min.js') }}"></script>
<script src="{{ asset('js/kimai.js') }}"></script>
<script src="{{ asset('js/Chart.min.js') }}"></script>
<script type="text/javascript">
$(document).ready(function() {
$('.dropdown-toggle').dropdown();
$(document).kimai({imagePath: '{{ asset('images') }}'});
//$(document).kimai('pauseRecord', 'li.messages-menu ul.menu li');
});
</script>
{% endblock %}
{% block avanzu_footer %}
@@ -91,5 +80,21 @@
{% block avanzu_breadcrumb %}{{ parent() }}{% endblock %}
{% block avanzu_control_sidebar %}{{ parent() }}{% endblock %}
{% block avanzu_javascripts %}{{ parent() }}{% endblock %}
{% block avanzu_javascripts_inline %}{{ parent() }}{% endblock %}
{% block avanzu_javascripts %}
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
<script src="{{ asset('theme/bootstrap/js/bootstrap.min.js') }}"></script>
<script src="{{ asset('js/kimai.js') }}"></script>
<script src="{{ asset('js/Chart.min.js') }}"></script>
{% block javascript_imports %}{% endblock %}
{% endblock %}
{% block avanzu_javascripts_inline %}
<script type="text/javascript">
$(document).ready(function () {
$('.dropdown-toggle').dropdown();
$(document).kimai({imagePath: '{{ asset('images') }}'});
//$(document).kimai('pauseRecord', 'li.messages-menu ul.menu li');
});
</script>
{% endblock %}

View File

@@ -0,0 +1,9 @@
{% import "macros/toolbar.html.twig" as toolbar %}
{{ toolbar.start() }}
{{ form_start(form) }}
<div class="box-body">
{{ form_widget(form) }}
</div>
{{ form_end(form) }}
{{ toolbar.end() }}

View File

@@ -0,0 +1,11 @@
{% macro start(columns) %}
<div class="box toolbar">
<div class="box-header">
<div class="row">
{% endmacro %}
{% macro end() %}
</div>
</div>
</div>
{% endmacro %}