From 588c0b85ed888a490c2517024489de65962ab1be Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Mon, 1 Jan 2018 16:27:33 +0100
Subject: [PATCH] removed setting for table icons and improved responsivness by
 hiding several columns on small screens

---
 app/Resources/views/admin/user.html.twig      | 24 ++++++++---------
 .../views/macros/datatables.html.twig         |  5 ++--
 app/config/config.yml                         |  1 -
 .../Resources/views/admin/activity.html.twig  | 16 ++++++------
 .../Resources/views/admin/project.html.twig   | 24 ++++++++---------
 .../Resources/views/admin/timesheet.html.twig | 26 +++++++++----------
 .../Resources/views/timesheet/index.html.twig | 24 ++++++++---------
 7 files changed, 59 insertions(+), 61 deletions(-)

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 %}
             <tr>
-                <td>{{ entry.id }}</td>
+                <td class="hidden-xs">{{ entry.id }}</td>
                 <td>{{ entry.alias }}</td>
-                <td>{{ entry.username }}</td>
-                <td>{{ entry.email }}</td>
-                <td>{{ entry.title }}</td>
+                <td class="hidden-xs">{{ entry.username }}</td>
+                <td class="hidden-xs hidden-sm">{{ entry.email }}</td>
+                <td class="hidden-xs">{{ entry.title }}</td>
                 <td>{{ widgets.label_visible(entry.active) }}</td>
                 <td>{{ entry.roles|join(',')|trans }}</td>
                 <td>
diff --git a/app/Resources/views/macros/datatables.html.twig b/app/Resources/views/macros/datatables.html.twig
index 32b47b56..f21d6866 100644
--- a/app/Resources/views/macros/datatables.html.twig
+++ b/app/Resources/views/macros/datatables.html.twig
@@ -26,9 +26,8 @@
                     <table class="table table-striped table-hover dataTable" role="grid">
                         <thead>
                         <tr>
-                            {% for title, icon in entries %}
-                            <th>
-                                {% if kimai_context.table_icons and icon %}<i class="fa fa-{{ icon }}"></i>{% endif %}
+                            {% for title, class in entries %}
+                            <th{% if class %} class="{{ class }}"{% endif %}>
                                 {{ title|trans }}
                             </th>
                             {% 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 %}
             <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({
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 %}
             <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({
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 %}
             <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>
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 @@
                 <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>