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

removed setting for table icons and improved responsivness by hiding several columns on small screens

Browse Source
This commit is contained in:
Kevin Papst
2018-01-01 16:27:33 +01:00
parent 2f09ea7c74
commit 588c0b85ed
7 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/TimesheetBundle/Resources/views/admin/activity.html.twig
View File

@@ -10,20 +10,20 @@
{% if entries.count > 0 %}
{{ tables.data_table_header({
'label.id': '',
'label.name': 'bookmark-o',
'label.project': 'book',
'label.comment': 'comment-o',
'label.visible': 'eye',
'label.actions': 'pencil-square-o',
'label.id': 'hidden-xs',
'label.name': '',
'label.project': '',
'label.comment': 'hidden-xs',
'label.visible': '',
'label.actions': '',
}) }}
{% for entry in entries %}
<tr>
<td>{{ entry.id }}</td>
<td class="hidden-xs">{{ entry.id }}</td>
<td>{{ entry.name }}</td>
<td>{{ entry.project }}</td>
<td>{{ entry.comment }}</td>
<td class="hidden-xs">{{ entry.comment }}</td>
<td>{{ widgets.label_visible(entry.visible) }}</td>
<td>
{{ widgets.button_group({

24
src/TimesheetBundle/Resources/views/admin/project.html.twig
View File

@@ -10,24 +10,24 @@
{% if entries.count > 0 %}
{{ tables.data_table_header({
'label.id': '',
'label.name': 'bookmark-o',
'label.customer': 'address-card-o',
'label.comment': 'comment-o',
'label.activity': 'tasks',
'label.budget': 'credit-card',
'label.visible': 'eye',
'label.actions': 'pencil-square-o',
'label.id': 'hidden-xs',
'label.name': '',
'label.customer': '',
'label.comment': 'hidden-xs hidden-sm',
'label.activity': 'hidden-xs hidden-sm',
'label.budget': 'hidden-xs',
'label.visible': '',
'label.actions': '',
}) }}
{% for entry in entries %}
<tr>
<td>{{ entry.id }}</td>
<td class="hidden-xs">{{ entry.id }}</td>
<td>{{ entry.name }}</td>
<td>{{ entry.customer.name }}</td>
<td>{{ entry.comment }}</td>
<td>{{ widgets.badge_counter(entry.activities.count) }}</td>
<td>{{ entry.budget|money(entry.currency) }}</td>
<td class="hidden-xs hidden-sm">{{ entry.comment }}</td>
<td class="hidden-xs hidden-sm">{{ widgets.badge_counter(entry.activities.count) }}</td>
<td class="hidden-xs">{{ entry.budget|money(entry.currency) }}</td>
<td>{{ widgets.label_visible(entry.visible) }}</td>
<td>
{{ widgets.button_group({

26
src/TimesheetBundle/Resources/views/admin/timesheet.html.twig
View File

@@ -8,31 +8,31 @@
{% block main %}
{% if entries.count > 0 %}
{{ datatables.data_table_header({
'label.date': 'calendar',
'label.starttime': 'hourglass-start',
'label.endtime': 'hourglass-end',
'label.duration': 'clock-o',
'label.rate': 'money',
'label.username': 'user',
'label.description': 'comment-o',
'label.actions': 'pencil-square-o',
'label.date': '',
'label.starttime': 'hidden-xs',
'label.endtime': 'hidden-xs',
'label.duration': '',
'label.rate': '',
'label.username': 'hidden-xs',
'label.description': 'hidden-xs hidden-sm',
'label.actions': '',
}) }}
{% for entry in entries %}
<tr>
<td>{{ entry.begin|date(kimai_context.date_1) }}</td>
<td>{{ entry.begin|date("H:i") }}</td>
<td class="hidden-xs">{{ entry.begin|date("H:i") }}</td>
{% if entry.end %}
<td>{{ entry.end|date("H:i") }}</td>
<td class="hidden-xs">{{ entry.end|date("H:i") }}</td>
<td>{{ entry.duration|duration }}</td>
<td>{{ entry.rate|money }}</td>
{% else %}
<td>&dash;</td>
<td class="hidden-xs">&dash;</td>
<td>&dash;</td>
<td>&dash;</td>
{% endif %}
<td><a href="{{ path('profile'|route_alias, {'username' : entry.user.username}) }}">{{ entry.user.username }}</a></td>
<td>{{ entry.description }}</td>
<td class="hidden-xs"><a href="{{ path('profile'|route_alias, {'username' : entry.user.username}) }}">{{ entry.user.username }}</a></td>
<td class="hidden-xs hidden-sm">{{ entry.description }}</td>
<td>
{{ widgets.button_group({'edit': '#', 'trash': '#'}) }}
</td>

24
src/TimesheetBundle/Resources/views/timesheet/index.html.twig
View File

@@ -8,13 +8,13 @@
{% block main %}
{% if entries.count > 0 %}
{{ datatables.data_table_header({
'label.date': 'calendar',
'label.starttime': 'hourglass-start',
'label.endtime': 'hourglass-end',
'label.duration': 'clock-o',
'label.rate': 'money',
'label.description': 'comment-o',
'label.actions': 'pencil-square-o',
'label.date': '',
'label.starttime': '',
'label.endtime': '',
'label.duration': 'hidden-xs',
'label.rate': 'hidden-xs',
'label.description': 'hidden-xs hidden-sm',
'label.actions': '',
}) }}
{% for entry in entries %}
@@ -23,14 +23,14 @@
<td>{{ entry.begin|date("H:i") }}</td>
{% if entry.end %}
<td>{{ entry.end|date("H:i") }}</td>
<td>{{ entry.duration|duration }}</td>
<td>{{ entry.rate|money }}</td>
<td class="hidden-xs">{{ entry.duration|duration }}</td>
<td class="hidden-xs">{{ entry.rate|money }}</td>
{% else %}
<td>&dash;</td>
<td>&dash;</td>
<td>&dash;</td>
<td class="hidden-xs">&dash;</td>
<td class="hidden-xs">&dash;</td>
{% endif %}
<td>{{ entry.description }}</td>
<td class="hidden-xs hidden-sm">{{ entry.description }}</td>
<td>
{{ widgets.button_group({'repeat': '#', 'edit': '#', 'trash': '#'}) }}
</td>