Browse Source

Fix some layout issue

Thomas Rabaix 13 years ago
parent
commit
f2dc2fc8cf

+ 6 - 1
Resources/views/CRUD/base_list_field.html.twig

@@ -10,7 +10,12 @@ file that was distributed with this source code.
 #}
 
 <td class="sonata-ba-list-field sonata-ba-list-field-{{ field_description.type }}" objectId="{{ admin.id(object) }}">
-    {% if field_description.options.identifier is defined and admin.isGranted(field_description.options.route.name == 'show' ? 'VIEW' : field_description.options.route.name|upper, object) and admin.hasRoute(field_description.options.route.name) %}
+    {% if
+            field_description.options.identifier is defined
+        and field_description.options.route is defined
+        and admin.isGranted(field_description.options.route.name == 'show' ? 'VIEW' : field_description.options.route.name|upper, object)
+        and admin.hasRoute(field_description.options.route.name)
+    %}
         <a href="{{ admin.generateObjectUrl(field_description.options.route.name, object, field_description.options.route.parameters) }}">
             {%- block field %}{{ value }}{% endblock -%}
         </a>

+ 15 - 8
Resources/views/CRUD/batch_confirmation.html.twig

@@ -34,16 +34,23 @@ file that was distributed with this source code.
 
         {% trans from 'SonataAdminBundle' %}message_batch_confirmation{% endtrans %}
 
-        <form action="{{ admin.generateUrl('batch', admin.filterParameters) }}" method="POST" >
-            <input type="hidden" name="confirmation" value="ok" />
-            <input type="hidden" name="data" value="{{ data }}" />
+        <div class="actions">
+            <form action="{{ admin.generateUrl('batch', admin.filterParameters) }}" method="POST" >
+                <input type="hidden" name="confirmation" value="ok" />
+                <input type="hidden" name="data" value="{{ data }}" />
 
-            <div style="display: none">
-                {{ form_rest(form) }}
-            </div>
+                <div style="display: none">
+                    {{ form_rest(form) }}
+                </div>
 
-            <input type="submit" value="{% trans from 'SonataAdminBundle' %}btn_execute_batch_action{% endtrans %}" />
-        </form>
+                <input type="submit" class="btn danger" value="{% trans from 'SonataAdminBundle' %}btn_execute_batch_action{% endtrans %}" />
 
+                {% if admin.hasRoute('list') and admin.isGranted('LIST') %}
+                    {% trans from 'SonataAdminBundle' %}delete_or{% endtrans %}
+
+                    <a class="btn success" href="{{ admin.generateUrl('list') }}">{% trans from 'SonataAdminBundle' %}link_action_list{% endtrans %}</a>
+                {% endif %}
+            </form>
+        </div>
     </div>
 {% endblock %}