Merge pull request #973 from TomAdam/pr-fix-action-button-styling-master

Fix action button styling - master

Resources/views/CRUD/base_edit.html.twig

@@ -21,18 +21,16 @@ file that was distributed with this source code.
 
 {% block actions %}
     <div class="sonata-actions">
-        <ul>
-            {% if admin.hasroute('show') and admin.id(object) and admin.isGranted('VIEW', object) and admin.show|length > 0 %}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateObjectUrl('show', object) }}">{{ 'link_action_show'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-            {% if admin.hasroute('history') and admin.id(object) and admin.isGranted('EDIT', object) %}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateObjectUrl('history', object) }}">{{ 'link_action_history'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-            {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
-            {% if admin.hasroute('list') and admin.isGranted('LIST')%}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-        </ul>
+        {% if admin.hasroute('show') and admin.id(object) and admin.isGranted('VIEW', object) and admin.show|length > 0 %}
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('show', object) }}">{{ 'link_action_show'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
+        {% if admin.hasroute('history') and admin.id(object) and admin.isGranted('EDIT', object) %}
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('history', object) }}">{{ 'link_action_history'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
+        {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
+        {% if admin.hasroute('list') and admin.isGranted('LIST')%}
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
     </div>
 {% endblock %}
 

Resources/views/CRUD/base_list.html.twig

@@ -13,9 +13,7 @@ file that was distributed with this source code.
 
 {% block actions %}
     <div class="sonata-actions">
-        <ul>
-            {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
-        </ul>
+        {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
     </div>
 {% endblock %}
 

Resources/views/CRUD/base_show.html.twig

@@ -13,18 +13,16 @@ file that was distributed with this source code.
 
 {% block actions %}
     <div class="sonata-actions">
-        <ul>
-            {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object)%}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateObjectUrl('edit', object) }}">{{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-            {% if admin.hasroute('history') and admin.id(object) and admin.isGranted('EDIT', object) %}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateObjectUrl('history', object) }}">{{ 'link_action_history'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-            {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
-            {% if admin.hasroute('list') and admin.isGranted('LIST')%}
-                <li class="btn sonata-action-element"><a href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a></li>
-            {% endif %}
-        </ul>
+        {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object)%}
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">{{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
+        {% if admin.hasroute('history') and admin.id(object) and admin.isGranted('EDIT', object) %}
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('history', object) }}">{{ 'link_action_history'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
+        {% include 'SonataAdminBundle:Core:create_button.html.twig' %}
+        {% if admin.hasroute('list') and admin.isGranted('LIST')%}
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
+        {% endif %}
     </div>
 {% endblock %}
 

Resources/views/CRUD/batch_confirmation.html.twig

@@ -16,7 +16,6 @@ file that was distributed with this source code.
         {% if admin.hasRoute('list') and admin.isGranted('LIST')%}
             <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
-
         {% if admin.hasRoute('create') and admin.isGranted('CREATE')%}
             <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}

Resources/views/CRUD/delete.html.twig

@@ -16,7 +16,6 @@ file that was distributed with this source code.
         {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object)%}
             <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">{{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
-
         {% if admin.hasRoute('create') and admin.isGranted('CREATE')%}
             <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}

Resources/views/Core/create_button.html.twig

@@ -11,7 +11,7 @@ file that was distributed with this source code.
 
 {% if admin.hasRoute('create') and admin.isGranted('CREATE')%}
     {% if admin.subClasses is empty %}
-        <li class="btn sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
+        <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
     {% else %}
         <span class="btn-group sonata-action-element">
             <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">