Sfoglia il codice sorgente

Fix formatting issues

NLZ13 10 anni fa
parent
commit
678550db84

+ 0 - 1
Controller/CRUDController.php

@@ -803,7 +803,6 @@ class CRUDController extends Controller
             'elements'          => $this->admin->getShow(),
             'comparison'        => $comparison
         ));
-
     }
 
     /**

+ 27 - 27
Resources/doc/reference/templates.rst

@@ -110,33 +110,33 @@ You can specify your templates in the config.yml file, like so:
 
         sonata_admin:
             templates:
-                layout:  SonataAdminBundle::standard_layout.html.twig
-                ajax:    SonataAdminBundle::ajax_layout.html.twig
-                list:    SonataAdminBundle:CRUD:list.html.twig
-                show:    SonataAdminBundle:CRUD:show.html.twig
-                show_compare:       SonataAdminBundle:CRUD:show_compare.html.twig
-                edit:    SonataAdminBundle:CRUD:edit.html.twig
-                history: SonataAdminBundle:CRUD:history.html.twig
-                preview: SonataAdminBundle:CRUD:preview.html.twig
-                delete:  SonataAdminBundle:CRUD:delete.html.twig
-                batch:   SonataAdminBundle:CRUD:list__batch.html.twig
-                acl:     SonataAdminBundle:CRUD:acl.html.twig
-                action:  SonataAdminBundle:CRUD:action.html.twig
-                select:  SonataAdminBundle:CRUD:list__select.html.twig
-                filter:  SonataAdminBundle:Form:filter_admin_fields.html.twig
-                dashboard:           SonataAdminBundle:Core:dashboard.html.twig
-                search:              SonataAdminBundle:Core:search.html.twig
-                batch_confirmation:  SonataAdminBundle:CRUD:batch_confirmation.html.twig
-                inner_list_row:      SonataAdminBundle:CRUD:list_inner_row.html.twig
-                base_list_field:     SonataAdminBundle:CRUD:base_list_field.html.twig
-                list_block:          SonataAdminBundle:Block:block_admin_list.html.twig
-                user_block:          SonataAdminBundle:Core:user_block.html.twig
-                add_block:           SonataAdminBundle:Core:add_block.html.twig
-                pager_links:         SonataAdminBundle:Pager:links.html.twig
-                pager_results:       SonataAdminBundle:Pager:results.html.twig
-                history_revision_timestamp:  SonataAdminBundle:CRUD:history_revision_timestamp.html.twig
-                short_object_description:    SonataAdminBundle:Helper:short-object-description.html.twig
-                search_result_block: SonataAdminBundle:Block:block_search_result.html.twig
+                layout:                         SonataAdminBundle::standard_layout.html.twig
+                ajax:                           SonataAdminBundle::ajax_layout.html.twig
+                list:                           SonataAdminBundle:CRUD:list.html.twig
+                show:                           SonataAdminBundle:CRUD:show.html.twig
+                show_compare:                   SonataAdminBundle:CRUD:show_compare.html.twig
+                edit:                           SonataAdminBundle:CRUD:edit.html.twig
+                history:                        SonataAdminBundle:CRUD:history.html.twig
+                preview:                        SonataAdminBundle:CRUD:preview.html.twig
+                delete:                         SonataAdminBundle:CRUD:delete.html.twig
+                batch:                          SonataAdminBundle:CRUD:list__batch.html.twig
+                acl:                            SonataAdminBundle:CRUD:acl.html.twig
+                action:                         SonataAdminBundle:CRUD:action.html.twig
+                select:                         SonataAdminBundle:CRUD:list__select.html.twig
+                filter:                         SonataAdminBundle:Form:filter_admin_fields.html.twig
+                dashboard:                      SonataAdminBundle:Core:dashboard.html.twig
+                search:                         SonataAdminBundle:Core:search.html.twig
+                batch_confirmation:             SonataAdminBundle:CRUD:batch_confirmation.html.twig
+                inner_list_row:                 SonataAdminBundle:CRUD:list_inner_row.html.twig
+                base_list_field:                SonataAdminBundle:CRUD:base_list_field.html.twig
+                list_block:                     SonataAdminBundle:Block:block_admin_list.html.twig
+                user_block:                     SonataAdminBundle:Core:user_block.html.twig
+                add_block:                      SonataAdminBundle:Core:add_block.html.twig
+                pager_links:                    SonataAdminBundle:Pager:links.html.twig
+                pager_results:                  SonataAdminBundle:Pager:results.html.twig
+                history_revision_timestamp:     SonataAdminBundle:CRUD:history_revision_timestamp.html.twig
+                short_object_description:       SonataAdminBundle:Helper:short-object-description.html.twig
+                search_result_block:            SonataAdminBundle:Block:block_search_result.html.twig
 
 Notice that this is a global change, meaning it will affect all model mappings automatically,
 both for ``Admin`` mappings defined by you and by other bundles.

+ 1 - 11
Resources/views/CRUD/base_show_compare.html.twig

@@ -8,18 +8,8 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 
 #}
-{% extends 'SonataAdminBundle:CRUD:base_show.html.twig' %}
-
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
 
-#}
+{% extends 'SonataAdminBundle:CRUD:base_show.html.twig' %}
 
 {% block show %}
     <div class="sonata-ba-view">

+ 5 - 5
Twig/Extension/SonataAdminExtension.php

@@ -51,12 +51,12 @@ class SonataAdminExtension extends \Twig_Extension
     public function getFilters()
     {
         return array(
-            'render_list_element'     => new \Twig_Filter_Method($this, 'renderListElement', array('is_safe' => array('html'))),
-            'render_view_element'     => new \Twig_Filter_Method($this, 'renderViewElement', array('is_safe' => array('html'))),
+            'render_list_element'           => new \Twig_Filter_Method($this, 'renderListElement', array('is_safe' => array('html'))),
+            'render_view_element'           => new \Twig_Filter_Method($this, 'renderViewElement', array('is_safe' => array('html'))),
             'render_view_element_compare'   => new \Twig_Filter_Method($this, 'renderViewElementCompare', array('is_safe' => array('html'))),
-            'render_relation_element' => new \Twig_Filter_Method($this, 'renderRelationElement'),
-            'sonata_urlsafeid'        => new \Twig_Filter_Method($this, 'getUrlsafeIdentifier'),
-            'sonata_xeditable_type'   => new \Twig_Filter_Method($this, 'getXEditableType'),
+            'render_relation_element'       => new \Twig_Filter_Method($this, 'renderRelationElement'),
+            'sonata_urlsafeid'              => new \Twig_Filter_Method($this, 'getUrlsafeIdentifier'),
+            'sonata_xeditable_type'         => new \Twig_Filter_Method($this, 'getXEditableType'),
         );
     }