Skip to content

Commit

Permalink
Merge pull request sonata-project#2481 from juherpin/ftr-ui-list-table
Browse files Browse the repository at this point in the history
UI improvements for ajax layout and filters
  • Loading branch information
rande committed Oct 9, 2014
2 parents d1402c5 + da82288 commit e6ce0a6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Resources/public/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,17 @@ form.sonata-filter-form.form-stacked {
height: 23px;
}

body.fixed .sonata-list-table {
position: relative;
margin-left: 15px;
margin-right: 15px;
margin-bottom: 5px;
}

.navbar-nav.navbar-right:last-child {
margin-right: 0;
}

/* Overrides */

/* x-editable */
Expand Down
7 changes: 7 additions & 0 deletions Resources/views/ajax_layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ file that was distributed with this source code.
{% if _list_table is not empty or _list_filters is not empty %}
<div class="row">

<div class="navbar navbar-default sonata-list-table">

<div class="container-fluid">

{% if admin is defined and action is defined and action == 'list' and admin.listModes|length > 1 %}
<div class="nav navbar-right btn-group">
{% for mode, settings in admin.listModes %}
Expand All @@ -36,7 +40,10 @@ file that was distributed with this source code.
{{ _list_filters_actions|raw }}
{% endif %}

</div>

</div>
</div>

{% if _list_filters|trim %}
<div class="row">
Expand Down

0 comments on commit e6ce0a6

Please sign in to comment.