Mobile alignments and toolbar #151 (#157)

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

assets/css/kimai.scss

@@ -208,7 +208,6 @@ div.dataTables_paginate ul.pagination {
 }
 
 @media screen and (max-width: 767px) {
-    div.dataTables_wrapper > div.row > div,
     div.dataTables_length,
     div.dataTables_filter,
     div.dataTables_info,

assets/js/app.js

@@ -12,10 +12,6 @@ const Moment = require('moment');
 global.moment = Moment;
 require('daterangepicker');
 
-const Moment = require('moment');
-global.moment = Moment;
-require('daterangepicker');
-
 // ------ for charts ------
 const Chart = require('../../vendor/almasaeed2010/adminlte/plugins/chartjs/Chart.min.js');
 global.Chart = Chart;

public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "build/app.js": "/build/app.js?fab779303341628fc8bd",
-  "build/app.css": "/build/app.css?d149689fb08d5ae275df59d6cc85cca8",
+  "build/app.css": "/build/app.css?47621c0ceca4e4e6b1911e97b18b53ea",
   "build/fonts/fontawesome-webfont.eot": "/build/fonts/fontawesome-webfont.eot?674f50d2",
   "build/images/boxed-bg.jpg": "/build/images/boxed-bg.jpg?7799dece",
   "build/images/blue.png": "/build/images/blue.png?96f8a905",

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>

templates/base.html.twig

@@ -3,7 +3,7 @@
 {% block avanzu_page_content_class %}{{ parent() }} {% block main_content_class %}{% endblock %}{% endblock %}
 
 {% block avanzu_page_content_before %}
-    <div class="pad margin no-print">
+    <div class="pad no-print">
         {% block main_before %}{% endblock %}
     </div>
 {% endblock %}

templates/invoice/index.html.twig

@@ -1,6 +1,6 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "macros/toolbar.html.twig" as macro %}
+{% import "macros/toolbar.html.twig" as toolbar %}
 
 {% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'invoice.subtitle'|trans }}{% endblock %}
@@ -9,7 +9,7 @@
 {% block main_content_class %}invoice{% endblock %}
 
 {% block main_before %}
-    {{ macro.toolbar(form, 'collapseInvoice', true) }}
+    {{ toolbar.toolbar(form, 'collapseInvoice', true) }}
 {% endblock %}
 
 {% block main_after %}

templates/macros/toolbar.html.twig

@@ -3,7 +3,7 @@
         <div class="toolbar no-print">
             {% if collapsible %}<div class="collapse{% if displayInitial %} collapse.show in{% endif %}" id="{{ collapsible }}">{% endif %}
                 {% form_theme form 'form/toolbar-theme.html.twig' %}
-                {{ form_start(form, { 'attr': {'class': 'navbar-form navbar-left'}}) }}
+                {{ form_start(form, { 'attr': {'class': 'navbar-form'}}) }}
                 {{ form_widget(form) }}
                 {{ form_end(form) }}
             {% if collapsible %}</div>{% endif %}

templates/timesheet/index.html.twig

@@ -7,6 +7,10 @@
 {% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
 {% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'plus-square': path('timesheet_create')}) }}{% endblock %}
 
+{% block main_before %}
+    {{ toolbar.toolbar(toolbarForm, 'collapseTimesheet') }}
+{% endblock %}
+
 {% block main %}
 
     {% if entries.count == 0 %}
@@ -27,7 +31,7 @@
         'label.actions': '',
     }) %}
 
-    {{ tables.data_table_header(columns, toolbarForm, 'collapseTimesheet') }}
+    {{ tables.data_table_header(columns) }}
 
     {% for entry in entries %}
         <tr>