Mobile alignments and toolbar #151 (#157)

* improved toolbar position #151
* fixed alignments on mobile #151
* fixed moment js #151

templates/admin/activity.html.twig

@@ -1,11 +1,16 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'plus-square': path('admin_activity_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin') }}
+{% endblock %}
+
 {% block main %}
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
@@ -18,7 +23,7 @@
         'label.comment': 'hidden-xs',
         'label.visible': 'hidden-xs',
         'label.actions': '',
-    }, toolbarForm, 'collapseActivityAdmin') }}
+    }) }}
 
     {% for entry in entries %}
         <tr>

templates/admin/customer.html.twig

@@ -1,11 +1,16 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_customer.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'plus-square': path('admin_customer_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin') }}
+{% endblock %}
+
 {% block main %}
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
@@ -20,7 +25,7 @@
         'label.currency': 'hidden-xs',
         'label.visible': 'hidden-xs',
         'label.actions': '',
-    }, toolbarForm, 'collapseCustomerAdmin') }}
+    }) }}
 
     {% for entry in entries %}
         <tr>

templates/admin/project.html.twig

@@ -1,11 +1,16 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'plus-square': path('admin_project_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin') }}
+{% endblock %}
+
 {% block main %}
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
@@ -18,7 +23,7 @@
         'label.budget': 'hidden-xs',
         'label.visible': 'hidden-xs',
         'label.actions': '',
-    }, toolbarForm, 'collapseProjectAdmin') }}
+    }) }}
 
     {% for entry in entries %}
         <tr>

templates/admin/timesheet.html.twig

@@ -1,11 +1,16 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'plus-square': path('admin_timesheet_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin') }}
+{% endblock %}
+
 {% block main %}
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
@@ -17,16 +22,14 @@
         {% set columns = columns|merge({'label.starttime': 'hidden-xs', 'label.endtime': 'hidden-xs'}) %}
     {% endif %}
 
-    {% set columns = columns|merge({
+    {{ tables.data_table_header(columns|merge({
         'label.duration': '',
         'label.rate': '',
         'label.activity': 'hidden-xs hidden-sm',
         'label.username': 'hidden-xs',
         'label.description': 'hidden-xs hidden-sm',
         'label.actions': '',
-    }) %}
-
-    {{ tables.data_table_header(columns, toolbarForm, 'collapseTimesheetAdmin') }}
+    })) }}
 
     {% for entry in entries %}
         <tr>

templates/admin/user.html.twig

@@ -1,11 +1,16 @@
 {% extends 'base.html.twig' %}
 {% import "macros/datatables.html.twig" as tables %}
 {% import "macros/widgets.html.twig" as widgets %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_user.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'plus-square': path('admin_user_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin') }}
+{% endblock %}
+
 {% block main %}
     {% if entries.count == 0 %}
         {{ widgets.callout('warning', 'error.no_entries_found') }}
@@ -20,7 +25,7 @@
         'label.active': '',
         'label.roles': '',
         'label.actions': '',
-    }, toolbarForm, 'collapseUserAdmin') }}
+    }) }}
 
     {% for entry in entries %}
         <tr>