Code formatting in views (#1259)

sonata-project · Jan 14, 2021 · ef945eb · ef945eb
1 parent 4098faf
commit ef945eb
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 49 deletions.
diff --git a/src/Resources/views/Block/block_audit.html.twig b/src/Resources/views/Block/block_audit.html.twig
@@ -26,7 +26,7 @@ file that was distributed with this source code.
                             <h4 class="panel-title">
                                 <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{ loop.index }}">
                                     {{ revision.revision.rev }} - {{ revision.revision.username }}
-                                    - {{ revision.revision.timestamp | date }}
+                                    - {{ revision.revision.timestamp|date }}
                                 </a>
                             </h4>
                         </div>
@@ -47,5 +47,4 @@ file that was distributed with this source code.
             </div>
         </div>
     </div>
-
 {% endblock %}
diff --git a/src/Resources/views/CRUD/edit_orm_many_to_many.html.twig b/src/Resources/views/CRUD/edit_orm_many_to_many.html.twig
@@ -86,12 +86,11 @@ file that was distributed with this source code.
 
             {% if sonata_admin.field_description.associationadmin.hasroute('create') and sonata_admin.field_description.associationadmin.hasAccess('create') and btn_add %}
                 <span id="field_actions_{{ id }}" >
-                    <a
-                        href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                         onclick="return start_field_retrieve_{{ id }}(this);"
                         class="btn btn-success btn-sm sonata-ba-action"
                         title="{{ btn_add|trans({}, btn_catalogue) }}"
-                        >
+                    >
                         <i class="fa fa-plus-circle"></i>
                         {{ btn_add|trans({}, btn_catalogue) }}
                     </a>
@@ -109,12 +108,11 @@ file that was distributed with this source code.
 
                 <span id="field_actions_{{ id }}" class="field-actions">
                     {% if sonata_admin.field_description.associationadmin.hasRoute('create') and sonata_admin.field_description.associationadmin.hasAccess('create') and btn_add %}
-                        <a
-                            href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                        <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                             onclick="return start_field_dialog_form_add_{{ id }}(this);"
                             class="btn btn-success btn-sm sonata-ba-action"
                             title="{{ btn_add|trans({}, btn_catalogue) }}"
-                            >
+                        >
                             <i class="fa fa-plus-circle"></i>
                             {{ btn_add|trans({}, btn_catalogue) }}
                         </a>

diff --git a/src/Resources/views/CRUD/edit_orm_many_to_one.html.twig b/src/Resources/views/CRUD/edit_orm_many_to_one.html.twig
@@ -35,11 +35,11 @@ file that was distributed with this source code.
                 {% endif %}
             </span>
             <span style="display: none" >
-                {{ form_widget(form) }}
+                {{- form_widget(form) -}}
             </span>
         {% else %}
             <span id="field_widget_{{ id }}" >
-                {{ form_widget(form) }}
+                {{- form_widget(form) -}}
             </span>
         {% endif %}
 
@@ -49,22 +49,22 @@ file that was distributed with this source code.
             {% if display_btn_list or display_btn_add %}
             <div class="btn-group">
                 {% if display_btn_list %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('list', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('list', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                         onclick="return start_field_dialog_form_list_{{ id }}(this);"
                         class="btn btn-info btn-sm sonata-ba-action"
                         title="{{ btn_list|trans({}, btn_catalogue) }}"
-                        >
+                    >
                         <i class="fa fa-list"></i>
                         {{ btn_list|trans({}, btn_catalogue) }}
                     </a>
                 {% endif %}
 
                 {% if display_btn_add %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                         onclick="return start_field_dialog_form_add_{{ id }}(this);"
                         class="btn btn-success btn-sm sonata-ba-action"
                         title="{{ btn_add|trans({}, btn_catalogue) }}"
-                        >
+                    >
                         <i class="fa fa-plus-circle"></i>
                         {{ btn_add|trans({}, btn_catalogue) }}
                     </a>
@@ -73,14 +73,14 @@ file that was distributed with this source code.
             {% endif %}
 
             {% if sonata_admin.edit == 'list' and sonata_admin.field_description.associationadmin.hasRoute('delete') and sonata_admin.field_description.associationadmin.hasAccess('delete') and btn_delete %}
-                <a  href=""
+                <button
                     onclick="return remove_selected_element_{{ id }}(this);"
                     class="btn btn-danger btn-sm sonata-ba-action"
                     title="{{ btn_delete|trans({}, btn_catalogue) }}"
-                    >
+                >
                     <i class="fa fa-minus-circle"></i>
                     {{ btn_delete|trans({}, btn_catalogue) }}
-                </a>
+                </button>
             {% endif %}
         </div>
 

diff --git a/src/Resources/views/CRUD/edit_orm_one_to_many.html.twig b/src/Resources/views/CRUD/edit_orm_one_to_many.html.twig
@@ -47,8 +47,7 @@ file that was distributed with this source code.
 
             {% if display_create_button %}
                 <span id="field_actions_{{ id }}" >
-                    <a
-                        href="{{ sonata_admin.field_description.associationadmin.generateUrl(
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl(
                             'create',
                             sonata_admin.field_description.getOption('link_parameters', {})
                         ) }}"
@@ -77,8 +76,7 @@ file that was distributed with this source code.
         {% else %}
             <span id="field_actions_{{ id }}" >
                 {% if display_create_button %}
-                    <a
-                        href="{{ sonata_admin.field_description.associationadmin.generateUrl(
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl(
                             'create',
                             sonata_admin.field_description.getOption('link_parameters', {})
                         ) }}"

diff --git a/src/Resources/views/CRUD/edit_orm_one_to_many_inline_tabs.html.twig b/src/Resources/views/CRUD/edit_orm_one_to_many_inline_tabs.html.twig
@@ -18,8 +18,7 @@ file that was distributed with this source code.
                 <ul class="nav nav-tabs">
                     {% for name, form_group in associationAdmin.formgroups %}
                         <li class="{% if loop.first %}active{% endif %}">
-                            <a
-                                href="#{{ associationAdmin.uniqid }}_{{ loop.parent.loop.index }}_{{ loop.index }}"
+                            <a href="#{{ associationAdmin.uniqid }}_{{ loop.parent.loop.index }}_{{ loop.index }}"
                                 data-toggle="tab"
                             >
                                 <i class="icon-exclamation-sign has-errors hide"></i>

diff --git a/src/Resources/views/CRUD/edit_orm_one_to_one.html.twig b/src/Resources/views/CRUD/edit_orm_one_to_one.html.twig
@@ -30,16 +30,16 @@ file that was distributed with this source code.
                     })) }}
                 {% elseif sonata_admin.field_description.options.placeholder is defined and sonata_admin.field_description.options.placeholder %}
                     <span class="inner-field-short-description">
-                        {{ sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') }}
+                        {{- sonata_admin.field_description.options.placeholder|trans({}, 'SonataAdminBundle') -}}
                     </span>
                 {% endif %}
             </span>
             <span style="display: none" >
-                {{ form_widget(form) }}
+                {{- form_widget(form) -}}
             </span>
         {% else %}
             <span id="field_widget_{{ id }}" >
-                {{ form_widget(form) }}
+                {{- form_widget(form) -}}
             </span>
         {% endif %}
 
@@ -49,22 +49,22 @@ file that was distributed with this source code.
             {% if display_btn_list or display_btn_add %}
             <div class="btn-group">
                 {% if display_btn_list %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('list', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('list', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                         onclick="return start_field_dialog_form_list_{{ id }}(this);"
                         class="btn btn-info btn-sm sonata-ba-action"
                         title="{{ btn_list|trans({}, btn_catalogue) }}"
-                        >
+                    >
                         <i class="fa fa-list"></i>
                         {{ btn_list|trans({}, btn_catalogue) }}
                     </a>
                 {% endif %}
 
                 {% if display_btn_add %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('create', sonata_admin.field_description.getOption('link_parameters', {})) }}"
                         onclick="return start_field_dialog_form_add_{{ id }}(this);"
                         class="btn btn-success btn-sm sonata-ba-action"
                         title="{{ btn_add|trans({}, btn_catalogue) }}"
-                        >
+                    >
                         <i class="fa fa-plus-circle"></i>
                         {{ btn_add|trans({}, btn_catalogue) }}
                     </a>
@@ -73,14 +73,14 @@ file that was distributed with this source code.
             {% endif %}
 
             {% if sonata_admin.edit == 'list' and sonata_admin.field_description.associationadmin.hasRoute('delete') and sonata_admin.field_description.associationadmin.hasAccess('delete') and btn_delete %}
-                <a  href=""
+                <button
                     onclick="return remove_selected_element_{{ id }}(this);"
                     class="btn btn-danger btn-sm sonata-ba-action"
                     title="{{ btn_delete|trans({}, btn_catalogue) }}"
-                    >
+                >
                     <i class="fa fa-minus-circle"></i>
                     {{ btn_delete|trans({}, btn_catalogue) }}
-                </a>
+                </button>
             {% endif %}
         </div>
 

diff --git a/src/Resources/views/CRUD/list_orm_many_to_one.html.twig b/src/Resources/views/CRUD/list_orm_many_to_one.html.twig
@@ -22,7 +22,7 @@ file that was distributed with this source code.
               field_description.associationadmin.hasAccess(route_name, value)
         %}
             <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, value, field_description.options.route.parameters) }}">
-                {{ value|render_relation_element(field_description) }}
+                {{- value|render_relation_element(field_description) -}}
             </a>
         {% else %}
             {{ value|render_relation_element(field_description) }}

diff --git a/src/Resources/views/CRUD/list_orm_one_to_one.html.twig b/src/Resources/views/CRUD/list_orm_one_to_one.html.twig
@@ -19,7 +19,9 @@ file that was distributed with this source code.
     and field_description.associationadmin.id(value)
     and field_description.associationadmin.hasRoute(route_name)
     and field_description.associationadmin.hasAccess(route_name, value) %}
-        <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, value, field_description.options.route.parameters) }}">{{ value|render_relation_element(field_description) }}</a>
+        <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, value, field_description.options.route.parameters) }}">
+            {{- value|render_relation_element(field_description) -}}
+        </a>
     {% else %}
         {{ value|render_relation_element(field_description) }}
     {% endif %}

diff --git a/src/Resources/views/CRUD/show_orm_many_to_many.html.twig b/src/Resources/views/CRUD/show_orm_many_to_many.html.twig
@@ -22,7 +22,7 @@ file that was distributed with this source code.
                 and field_description.associationadmin.hasRoute(route_name)
                 and field_description.associationadmin.hasAccess(route_name, element) %}
                     <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, element, field_description.options.route.parameters) }}">
-                        {{ element|render_relation_element(field_description) }}
+                        {{- element|render_relation_element(field_description) -}}
                     </a>
                 {% else %}
                     {{ element|render_relation_element(field_description) }}

diff --git a/src/Resources/views/CRUD/show_orm_many_to_one.html.twig b/src/Resources/views/CRUD/show_orm_many_to_one.html.twig
@@ -20,7 +20,7 @@ file that was distributed with this source code.
         and field_description.associationadmin.hasRoute(route_name)
         and field_description.associationadmin.hasAccess(route_name, value) %}
             <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, value, field_description.options.route.parameters) }}">
-                {{ value|render_relation_element(field_description) }}
+                {{- value|render_relation_element(field_description) -}}
             </a>
         {% else %}
             {{ value|render_relation_element(field_description) }}

diff --git a/src/Resources/views/CRUD/show_orm_one_to_many.html.twig b/src/Resources/views/CRUD/show_orm_one_to_many.html.twig
@@ -22,7 +22,7 @@ file that was distributed with this source code.
         and field_description.associationadmin.hasAccess(route_name, element) %}
             <li>
                 <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, element, field_description.options.route.parameters) }}">
-                    {{ element|render_relation_element(field_description) }}
+                    {{- element|render_relation_element(field_description) -}}
                 </a>
             </li>
         {% else %}

diff --git a/src/Resources/views/CRUD/show_orm_one_to_one.html.twig b/src/Resources/views/CRUD/show_orm_one_to_one.html.twig
@@ -20,7 +20,7 @@ file that was distributed with this source code.
     and field_description.associationadmin.hasRoute(route_name)
     and field_description.associationadmin.hasAccess(route_name, value) %}
         <a href="{{ field_description.associationadmin.generateObjectUrl(route_name, value, field_description.options.route.parameters) }}">
-            {{ value|render_relation_element(field_description) }}
+            {{- value|render_relation_element(field_description) -}}
         </a>
     {% else %}
         {{ value|render_relation_element(field_description) }}

diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig
@@ -72,11 +72,11 @@ file that was distributed with this source code.
         <span id="field_actions_{{ id }}" class="field-actions">
             <span class="btn-group">
                 {% if sonata_admin.field_description.associationadmin.hasroute('list') and sonata_admin.field_description.associationadmin.hasAccess('list') and btn_list %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('list') }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('list') }}"
                         onclick="return start_field_dialog_form_list_{{ id }}(this);"
                         class="btn btn-info btn-sm sonata-ba-action"
                         title="{{ btn_list|trans({}, btn_catalogue) }}"
-                            >
+                    >
                         <i class="fa fa-list"></i>
                         {{ btn_list|trans({}, btn_catalogue) }}
                     </a>
@@ -86,11 +86,11 @@ file that was distributed with this source code.
                     and sonata_admin.field_description.associationadmin.hasAccess('create')
                     and btn_add
                 %}
-                    <a  href="{{ sonata_admin.field_description.associationadmin.generateUrl('create') }}"
+                    <a href="{{ sonata_admin.field_description.associationadmin.generateUrl('create') }}"
                         onclick="return start_field_dialog_form_add_{{ id }}(this);"
                         class="btn btn-success btn-sm sonata-ba-action"
                         title="{{ btn_add|trans({}, btn_catalogue) }}"
-                            >
+                    >
                         <i class="fa fa-plus-circle"></i>
                         {{ btn_add|trans({}, btn_catalogue) }}
                     </a>
@@ -99,13 +99,13 @@ file that was distributed with this source code.
                     and sonata_admin.field_description.associationadmin.hasAccess('edit')
                     and btn_edit
                 %}
-                    <a  href="{{ sonata_admin.value == null ? '' : sonata_admin.field_description.associationadmin.generateUrl('edit', {
+                    <a href="{{ sonata_admin.value == null ? '' : sonata_admin.field_description.associationadmin.generateUrl('edit', {
                             'id' : sonata_admin.field_description.associationadmin.normalizedIdentifier(sonata_admin.value)})
                         }}"
                         onclick="return start_field_dialog_form_edit_{{ id }}(this);"
                         class="btn btn-warning btn-sm sonata-ba-action {% if sonata_admin.value == null %}hidden{% endif %}"
                         title="{{ btn_edit|trans({}, btn_catalogue) }}"
-                            >
+                    >
                         <i class="fa fa-pencil"></i>
                         {{ btn_edit|trans({}, btn_catalogue) }}
                     </a>
@@ -114,14 +114,14 @@ file that was distributed with this source code.
 
             <span class="btn-group">
                 {% if btn_delete %}
-                    <a  href=""
+                    <button
                         onclick="return remove_selected_element_{{ id }}(this);"
                         class="btn btn-danger btn-sm sonata-ba-action"
                         title="{{ btn_delete|trans({}, btn_catalogue) }}"
-                            >
+                    >
                         <i class="fa fa-minus-circle"></i>
                         {{ btn_delete|trans({}, btn_catalogue) }}
-                    </a>
+                    </button>
                 {% endif %}
             </span>
         </span>
@@ -174,4 +174,3 @@ file that was distributed with this source code.
         INVALID MODE : {{ id }} - type : CollectionType - mapping : {{ sonata_admin.field_description.mappingtype }}
     {% endif %}
 {% endblock %}
-