diff --git a/app/Resources/views/admin/user.html.twig b/app/Resources/views/admin/user.html.twig index 3ee31149..3c89b4d9 100644 --- a/app/Resources/views/admin/user.html.twig +++ b/app/Resources/views/admin/user.html.twig @@ -9,23 +9,23 @@ {% block main %} {% if entries.count > 0 %} {{ tables.data_table_header({ - 'label.id': '', - 'label.alias': 'bookmark-o', - 'label.username': 'user', - 'label.email': 'envelope-o', - 'label.title': 'graduation-cap', - 'label.active': 'lock', - 'label.roles': 'users', - 'label.actions': 'pencil-square-o', + 'label.id': 'hidden-xs', + 'label.alias': '', + 'label.username': 'hidden-xs', + 'label.email': 'hidden-xs hidden-sm', + 'label.title': 'hidden-xs', + 'label.active': '', + 'label.roles': '', + 'label.actions': '', }) }} {% for entry in entries %}
| - {% if kimai_context.table_icons and icon %}{% endif %} + {% for title, class in entries %} + | {{ title|trans }} | {% endfor %} diff --git a/app/config/config.yml b/app/config/config.yml index 22a23d2a..3b42a6a9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -61,7 +61,6 @@ twig: kimai_context: date_1: "d.m.Y" # used for display in timesheets box_color: "green" - table_icons: false # Assetic Configuration (used for managing web assets: CSS, JavaScript, Sass, etc.) #assetic: diff --git a/src/TimesheetBundle/Resources/views/admin/activity.html.twig b/src/TimesheetBundle/Resources/views/admin/activity.html.twig index e66b31e2..d7e28e8b 100644 --- a/src/TimesheetBundle/Resources/views/admin/activity.html.twig +++ b/src/TimesheetBundle/Resources/views/admin/activity.html.twig @@ -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 %}||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ entry.id }} | +{{ entry.id }} | {{ entry.name }} | {{ entry.project }} | -{{ entry.comment }} | +{{ entry.comment }} | {{ widgets.label_visible(entry.visible) }} | {{ widgets.button_group({ diff --git a/src/TimesheetBundle/Resources/views/admin/project.html.twig b/src/TimesheetBundle/Resources/views/admin/project.html.twig index 3eb883e2..64149696 100644 --- a/src/TimesheetBundle/Resources/views/admin/project.html.twig +++ b/src/TimesheetBundle/Resources/views/admin/project.html.twig @@ -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 %} | ||||||||||||||||||||
| {{ entry.id }} | +{{ entry.id }} | {{ entry.name }} | {{ entry.customer.name }} | -{{ entry.comment }} | -{{ widgets.badge_counter(entry.activities.count) }} | -{{ entry.budget|money(entry.currency) }} | + + +{{ entry.budget|money(entry.currency) }} | {{ widgets.label_visible(entry.visible) }} | {{ widgets.button_group({ diff --git a/src/TimesheetBundle/Resources/views/admin/timesheet.html.twig b/src/TimesheetBundle/Resources/views/admin/timesheet.html.twig index ed3495f4..aa7487ea 100644 --- a/src/TimesheetBundle/Resources/views/admin/timesheet.html.twig +++ b/src/TimesheetBundle/Resources/views/admin/timesheet.html.twig @@ -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 %} | ||||||||||||||||||
| {{ entry.begin|date(kimai_context.date_1) }} | -{{ entry.begin|date("H:i") }} | +{{ entry.begin|date("H:i") }} | {% if entry.end %} -{{ entry.end|date("H:i") }} | +{{ entry.end|date("H:i") }} | {{ entry.duration|duration }} | {{ entry.rate|money }} | {% else %} -‐ | +‐ | ‐ | ‐ | {% endif %} -{{ entry.user.username }} | -{{ entry.description }} | +{{ entry.user.username }} | +{{ widgets.button_group({'edit': '#', 'trash': '#'}) }} | diff --git a/src/TimesheetBundle/Resources/views/timesheet/index.html.twig b/src/TimesheetBundle/Resources/views/timesheet/index.html.twig index 1862fe99..903b8828 100644 --- a/src/TimesheetBundle/Resources/views/timesheet/index.html.twig +++ b/src/TimesheetBundle/Resources/views/timesheet/index.html.twig @@ -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 @@{{ entry.begin|date("H:i") }} | {% if entry.end %}{{ entry.end|date("H:i") }} | -{{ entry.duration|duration }} | -{{ entry.rate|money }} | +{{ entry.duration|duration }} | +{{ entry.rate|money }} | {% else %}‐ | -‐ | -‐ | +‐ | +‐ | {% endif %} -{{ entry.description }} | +{{ widgets.button_group({'repeat': '#', 'edit': '#', 'trash': '#'}) }} |