Merge pull request #1078 from aleste/master

Set bootstrap icons in the form actions buttons

Resources/views/CRUD/action.html.twig

@@ -14,10 +14,14 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% if admin.hasRoute('create') and admin.isGranted('CREATE')%}
-            <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">
+            	<i class="icon-plus"></i>
+            	{{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
         {% if admin.hasRoute('list') and  admin.isGranted('LIST')%}
-            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">
+            	<i class="icon-list"></i>
+            	{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}

Resources/views/CRUD/base_edit.html.twig

@@ -22,14 +22,20 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% 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>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('show', object) }}">
+                <i class="icon-zoom-in"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('history', object) }}">
+                <i class="icon-book"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">
+                <i class="icon-list"></i>
+                {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}

Resources/views/CRUD/base_history.html.twig

@@ -14,13 +14,19 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% if admin.hasroute('edit') and admin.id(object) and admin.isGranted('EDIT', object) and admin.show|length > 0 %}
-            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">{{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">
+                <i class="icon-edit"></i>
+                {{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
         {% if admin.hasroute('show') and admin.isGranted('VIEW', object)%}
-            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('show', object) }}">{{ 'link_action_show'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('show', object) }}">
+                <i class="icon-zoom-in"></i>
+                {{ 'link_action_show'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
         {% if admin.hasroute('list') and admin.isGranted('LIST')%}
-            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">
+                <i class="icon-list"></i>
+                {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}

Resources/views/CRUD/base_show.html.twig

@@ -14,14 +14,20 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% 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>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">
+                <i class="icon-edit"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('history', object) }}">
+                <i class="icon-book"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">
+                <i class="icon-list"></i>
+                {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}

Resources/views/CRUD/batch_confirmation.html.twig

@@ -14,10 +14,14 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% if admin.hasRoute('list') and admin.isGranted('LIST')%}
-            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">{{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}</a>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('list') }}">
+                <i class="icon-list"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">
+                <i class="icon-plus"></i>
+                {{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}

Resources/views/CRUD/delete.html.twig

@@ -14,10 +14,14 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         {% 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>
+            <a class="btn sonata-action-element" href="{{ admin.generateObjectUrl('edit', object) }}">
+                <i class="icon-edit"></i>
+                {{ '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>
+            <a class="btn sonata-action-element" href="{{ admin.generateUrl('create') }}">
+                <i class="icon-plus"></i>
+                {{ 'link_action_create'|trans({}, 'SonataAdminBundle') }}</a>
         {% endif %}
     </div>
 {% endblock %}
@@ -40,7 +44,9 @@ file that was distributed with this source code.
                 {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object) %}
                     {{ 'delete_or'|trans({}, 'SonataAdminBundle') }}
 
-                    <a class="btn btn-success" href="{{ admin.generateObjectUrl('edit', object) }}">{{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
+                    <a class="btn btn-success" href="{{ admin.generateObjectUrl('edit', object) }}">
+                        <i class="icon-edit"></i>
+                        {{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
                 {% endif %}
             </form>
         </div>

Resources/views/Core/create_button.html.twig

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