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

Filter in hidden toolbar - improved mobile #151 (#155)

Browse Source 
* improved toolbar: hide data table form in collapsible + filter button
* added collapsible area for toolbar form #151
This commit is contained in:
Kevin Papst
2018-06-05 21:49:13 +02:00
committed by GitHub
parent 7206d064a5
commit 451cf4cd1d
22 changed files with 87 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/admin/activity.html.twig
View File

@@ -4,7 +4,7 @@
{% 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({'plus-square': path('admin_activity_create')}) }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'plus-square': path('admin_activity_create')}) }}{% endblock %}
{% block main %}
{% if entries.count == 0 %}
@@ -18,7 +18,7 @@
'label.comment': 'hidden-xs',
'label.visible': 'hidden-xs',
'label.actions': '',
}, toolbarForm) }}
}, toolbarForm, 'collapseActivityAdmin') }}
{% for entry in entries %}
<tr>

4
templates/admin/customer.html.twig
View File

@@ -4,7 +4,7 @@
{% 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({'plus-square': path('admin_customer_create')}) }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'plus-square': path('admin_customer_create')}) }}{% endblock %}
{% block main %}
{% if entries.count == 0 %}
@@ -20,7 +20,7 @@
'label.currency': 'hidden-xs',
'label.visible': 'hidden-xs',
'label.actions': '',
}, toolbarForm) }}
}, toolbarForm, 'collapseCustomerAdmin') }}
{% for entry in entries %}
<tr>

4
templates/admin/project.html.twig
View File

@@ -4,7 +4,7 @@
{% 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({'plus-square': path('admin_project_create')}) }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'plus-square': path('admin_project_create')}) }}{% endblock %}
{% block main %}
{% if entries.count == 0 %}
@@ -18,7 +18,7 @@
'label.budget': 'hidden-xs',
'label.visible': 'hidden-xs',
'label.actions': '',
}, toolbarForm) }}
}, toolbarForm, 'collapseProjectAdmin') }}
{% for entry in entries %}
<tr>

4
templates/admin/timesheet.html.twig
View File

@@ -4,7 +4,7 @@
{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'plus-square': path('admin_timesheet_create')}) }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'plus-square': path('admin_timesheet_create')}) }}{% endblock %}
{% block main %}
{% if entries.count == 0 %}
@@ -26,7 +26,7 @@
'label.actions': '',
}) %}
{{ tables.data_table_header(columns, toolbarForm) }}
{{ tables.data_table_header(columns, toolbarForm, 'collapseTimesheetAdmin') }}
{% for entry in entries %}
<tr>

4
templates/admin/user.html.twig
View File

@@ -4,7 +4,7 @@
{% 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({'plus-square': path('admin_user_create')}) }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'plus-square': path('admin_user_create')}) }}{% endblock %}
{% block main %}
{% if entries.count == 0 %}
@@ -20,7 +20,7 @@
'label.active': '',
'label.roles': '',
'label.actions': '',
}, toolbarForm) }}
}, toolbarForm, 'collapseUserAdmin') }}
{% for entry in entries %}
<tr>