Merge pull request #1905 from dunglas/patch-2

HTML cleanup

Resources/views/CRUD/base_acl.html.twig

@@ -57,7 +57,7 @@ file that was distributed with this source code.
 
         {% block formactions %}
             <div class="well well-small form-actions">
-                <input class="btn btn-primary" type="submit" name="btn_create_and_edit" value="{{ 'btn_update_acl'|trans({}, 'SonataAdminBundle') }}"/>
+                <input class="btn btn-primary" type="submit" name="btn_create_and_edit" value="{{ 'btn_update_acl'|trans({}, 'SonataAdminBundle') }}">
             </div>
         {% endblock formactions %}
     </form>

Resources/views/CRUD/base_edit_form.html.twig

@@ -65,9 +65,9 @@
                 <div class="well well-small form-actions">
                     {% if app.request.isxmlhttprequest %}
                         {% if admin.id(object) is not null %}
-                            <input type="submit" class="btn btn-primary" name="btn_update" value="{{ 'btn_update'|trans({}, 'SonataAdminBundle') }}"/>
+                            <input type="submit" class="btn btn-primary" name="btn_update" value="{{ 'btn_update'|trans({}, 'SonataAdminBundle') }}">
                         {% else %}
-                            <input type="submit" class="btn" name="btn_create" value="{{ 'btn_create'|trans({}, 'SonataAdminBundle') }}"/>
+                            <input type="submit" class="btn" name="btn_create" value="{{ 'btn_create'|trans({}, 'SonataAdminBundle') }}">
                         {% endif %}
                     {% else %}
                         {% if admin.supportsPreviewMode %}
@@ -77,10 +77,10 @@
                             </button>
                         {% endif %}
                         {% if admin.id(object) is not null %}
-                            <input type="submit" class="btn btn-primary" name="btn_update_and_edit" value="{{ 'btn_update_and_edit_again'|trans({}, 'SonataAdminBundle') }}"/>
+                            <input type="submit" class="btn btn-primary" name="btn_update_and_edit" value="{{ 'btn_update_and_edit_again'|trans({}, 'SonataAdminBundle') }}">
 
                             {% if admin.hasroute('list') %}
-                                <input type="submit" class="btn" name="btn_update_and_list" value="{{ 'btn_update_and_return_to_list'|trans({}, 'SonataAdminBundle') }}"/>
+                                <input type="submit" class="btn" name="btn_update_and_list" value="{{ 'btn_update_and_return_to_list'|trans({}, 'SonataAdminBundle') }}">
                             {% endif %}
 
                             {% if admin.hasroute('delete') and admin.isGranted('DELETE', object) %}
@@ -93,12 +93,12 @@
                             {% endif %}
                         {% else %}
                             {% if admin.hasroute('edit') %}
-                                <input class="btn btn-primary" type="submit" name="btn_create_and_edit" value="{{ 'btn_create_and_edit_again'|trans({}, 'SonataAdminBundle') }}"/>
+                                <input class="btn btn-primary" type="submit" name="btn_create_and_edit" value="{{ 'btn_create_and_edit_again'|trans({}, 'SonataAdminBundle') }}">
                             {% endif %}
                             {% if admin.hasroute('list') %}
-                                <input type="submit" class="btn" name="btn_create_and_list" value="{{ 'btn_create_and_return_to_list'|trans({}, 'SonataAdminBundle') }}"/>
+                                <input type="submit" class="btn" name="btn_create_and_list" value="{{ 'btn_create_and_return_to_list'|trans({}, 'SonataAdminBundle') }}">
                             {% endif %}
-                            <input class="btn" type="submit" name="btn_create_and_create" value="{{ 'btn_create_and_create_a_new_one'|trans({}, 'SonataAdminBundle') }}"/>
+                            <input class="btn" type="submit" name="btn_create_and_create" value="{{ 'btn_create_and_create_a_new_one'|trans({}, 'SonataAdminBundle') }}">
                         {% endif %}
                     {% endif %}
                 </div>

Resources/views/CRUD/base_filter_field.html.twig

@@ -17,7 +17,7 @@ file that was distributed with this source code.
         {% else %}
             {{ form_label(filter_form) }}
         {% endif %}
-        <br />
+        <br>
     {% endblock %}
 
     <div class="sonata-ba-field{% if filter_form.vars.errors %} sonata-ba-field-error{% endif %}">

Resources/views/CRUD/base_history.html.twig

@@ -48,7 +48,7 @@ file that was distributed with this source code.
 
     </div>
 
-    <script type="text/javascript">
+    <script>
         jQuery(document).ready(function() {
 
             jQuery('a.revision-link').bind('click', function(event) {

Resources/views/CRUD/base_inline_edit_field.html.twig

@@ -18,7 +18,7 @@ file that was distributed with this source code.
             {% else %}
                 {{ form_label(field_element) }}
             {% endif %}
-            <br />
+            <br>
         {% endif %}
     {% endblock %}
 

Resources/views/CRUD/base_list.html.twig

@@ -29,7 +29,7 @@ file that was distributed with this source code.
     {% if admin.datagrid.results|length > 0 %}
         {% if admin.hasRoute('batch') %}
         <form action="{{ admin.generateUrl('batch', {'filter': admin.filterParameters}) }}" method="POST" >
-            <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}" />
+            <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}">
         {% endif %}
             <table class="table table-bordered table-striped">
                 {% block table_header %}
@@ -38,7 +38,7 @@ file that was distributed with this source code.
                             {% for field_description in admin.list.elements %}
                                 {% if admin.hasRoute('batch') and field_description.getOption('code') == '_batch' and batchactions|length > 0 %}
                                     <th class="sonata-ba-list-field-header sonata-ba-list-field-header-batch">
-                                      <input type="checkbox" id="list_batch_checkbox" />
+                                      <input type="checkbox" id="list_batch_checkbox">
                                     </th>
                                 {% elseif field_description.getOption('code') == '_select' %}
                                     <th class="sonata-ba-list-field-header sonata-ba-list-field-header-select"></th>
@@ -84,7 +84,7 @@ file that was distributed with this source code.
                                 {% if not app.request.isXmlHttpRequest %}
                                     {% if admin.hasRoute('batch') and batchactions|length > 0  %}
                                         {% block batch %}
-                                            <script type="text/javascript">
+                                            <script>
                                                 {% block batch_javascript %}
                                                     jQuery(document).ready(function ($) {
                                                         $('#list_batch_checkbox').click(function () {
@@ -99,7 +99,7 @@ file that was distributed with this source code.
 
                                             {% block batch_actions %}
                                                 <label class="checkbox" for="{{ admin.uniqid }}_all_elements">
-                                                    <input type="checkbox" name="all_elements" id="{{ admin.uniqid }}_all_elements"/>
+                                                    <input type="checkbox" name="all_elements" id="{{ admin.uniqid }}_all_elements">
                                                     {{ 'all_elements'|trans({}, 'SonataAdminBundle') }}
                                                 </label>
 
@@ -111,7 +111,7 @@ file that was distributed with this source code.
                                             {% endblock %}
                                         {% endblock %}
 
-                                        <input type="submit" class="btn btn-small btn-primary" value="{{ 'btn_batch'|trans({}, 'SonataAdminBundle') }}"/>
+                                        <input type="submit" class="btn btn-small btn-primary" value="{{ 'btn_batch'|trans({}, 'SonataAdminBundle') }}">
                                     {% endif %}
 
                                     <div class="pull-right">
@@ -174,18 +174,18 @@ file that was distributed with this source code.
                         {% endfor %}
                     </div>
 
-                    <input type="hidden" name="filter[_page]" id="filter__page" value="1" />
+                    <input type="hidden" name="filter[_page]" id="filter__page" value="1">
 
                     {% set foo = form.children['_page'].setRendered() %}
                     {{ form_rest(form) }}
 
-                    <input type="submit" class="btn btn-primary" value="{{ 'btn_filter'|trans({}, 'SonataAdminBundle') }}" />
+                    <input type="submit" class="btn btn-primary" value="{{ 'btn_filter'|trans({}, 'SonataAdminBundle') }}">
 
                     <a class="btn" href="{{ admin.generateUrl('list', {filters: 'reset'}) }}">{{ 'link_reset_filter'|trans({}, 'SonataAdminBundle') }}</a>
                 </div>
 
                 {% for paramKey, paramValue in admin.persistentParameters %}
-                    <input type="hidden" name="{{ paramKey }}" value="{{ paramValue }}" />
+                    <input type="hidden" name="{{ paramKey }}" value="{{ paramValue }}">
                 {% endfor %}
             </fieldset>
         </form>

Resources/views/CRUD/batch_confirmation.html.twig

@@ -32,9 +32,9 @@ file that was distributed with this source code.
 
         <div class="well well-small form-actions">
             <form action="{{ admin.generateUrl('batch', {'filter': admin.filterParameters}) }}" method="POST" >
-                <input type="hidden" name="confirmation" value="ok" />
-                <input type="hidden" name="data" value="{{ data|json_encode }}" />
-                <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}" />
+                <input type="hidden" name="confirmation" value="ok">
+                <input type="hidden" name="data" value="{{ data|json_encode }}">
+                <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}">
 
                 <div style="display: none">
                     {{ form_rest(form) }}

Resources/views/CRUD/delete.html.twig

@@ -30,8 +30,8 @@ file that was distributed with this source code.
 
         <div class="well well-small form-actions">
             <form method="POST" action="{{ admin.generateObjectUrl('delete', object) }}">
-                <input type="hidden" name="_method" value="DELETE" />
-                <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}" />
+                <input type="hidden" name="_method" value="DELETE">
+                <input type="hidden" name="_sonata_csrf_token" value="{{ csrf_token }}">
 
                 <button type="submit" class="btn btn-danger"><i class="icon-trash icon-white"></i> {{ 'btn_delete'|trans({}, 'SonataAdminBundle') }}</button>
                 {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object) %}

Resources/views/CRUD/edit_boolean.html.twig

@@ -18,7 +18,7 @@ file that was distributed with this source code.
             {% else %}
                 {{ form_label(field_element) }}
             {% endif %}
-            <br />
+            <br>
         {% endblock %}
 
         <div class="sonata-ba-field-error-messages">

Resources/views/CRUD/list__batch.html.twig

@@ -12,5 +12,5 @@ file that was distributed with this source code.
 {% extends admin.getTemplate('base_list_field') %}
 
 {% block field %}
-    <input type="checkbox" name="idx[]" value="{{ admin.id(object) }}" />
+    <input type="checkbox" name="idx[]" value="{{ admin.id(object) }}">
 {% endblock %}

Resources/views/Core/search.html.twig

@@ -18,7 +18,7 @@ file that was distributed with this source code.
     <div class="row-fluid">
         <form action="{{ url('sonata_admin_search') }}" method="GET"  class="form-search">
             <div class="input-append">
-                <input type="text" name="q" value="{{ query }}" class="input-large search-query"/>
+                <input type="text" name="q" value="{{ query }}" class="input-large search-query">
                 <button type="submit" class="btn">Search</button>
             </div>
         </form>

Resources/views/Form/silex_form_div_layout.html.twig

@@ -41,7 +41,7 @@
 {% block form_widget_simple %}
 {% spaceless %}
     {% set type = type|default('text') %}
-    <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}" />
+    <input type="{{ type }}" {{ block('widget_attributes') }} value="{{ value }}">
 {% endspaceless %}
 {% endblock form_widget_simple %}
 

Resources/views/standard_layout.html.twig

@@ -21,21 +21,21 @@ file that was distributed with this source code.
 <!DOCTYPE html>
 <html {% block html_attributes %}class="no-js"{% endblock %}>
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta charset="UTF-8">
 
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         {% block stylesheets %}
             <!-- jQuery code -->
-            <link rel="stylesheet" href="{{ asset('bundles/sonatajquery/themes/flick/jquery-ui-1.8.16.custom.css') }}" type="text/css" media="all" />
+            <link rel="stylesheet" href="{{ asset('bundles/sonatajquery/themes/flick/jquery-ui-1.8.16.custom.css') }}" media="all">
 
-            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/bootstrap/css/bootstrap.min.css') }}" type="text/css" media="all"  />
-            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/bootstrap/css/bootstrap-responsive.min.css') }}" type="text/css" media="all" />
+            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/bootstrap/css/bootstrap.min.css') }}" media="all">
+            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/bootstrap/css/bootstrap-responsive.min.css') }}" media="all">
 
-            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/x-editable/css/bootstrap-editable.css') }}" type="text/css" media="all" />
+            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/x-editable/css/bootstrap-editable.css') }}" media="all">
 
             {% if admin_pool is defined and admin_pool.getOption('use_select2') %}
-                <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/select2/select2.css') }}" type="text/css" media="all" />
+                <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/select2/select2.css') }}" media="all">
                 <style>
                     div.select2-container {
                         margin-left: 0px !important;
@@ -48,13 +48,13 @@ file that was distributed with this source code.
             {% endif %}
 
             <!-- base application asset -->
-            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/css/layout.css') }}" type="text/css" media="all" />
-            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/css/colors.css') }}" type="text/css" media="all" />
+            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/css/layout.css') }}" media="all">
+            <link rel="stylesheet" href="{{ asset('bundles/sonataadmin/css/colors.css') }}" media="all">
 
         {% endblock %}
 
         {% block javascripts %}
-            <script type="text/javascript">
+            <script>
                 window.SONATA_CONFIG = {
                     CONFIRM_EXIT: {% if admin_pool is defined and admin_pool.getOption('confirm_exit') %}true{% else %}false{% endif %},
                     USE_SELECT2: {% if admin_pool is defined and admin_pool.getOption('use_select2') %}true{% else %}false{% endif %}
@@ -63,21 +63,21 @@ file that was distributed with this source code.
                     CONFIRM_EXIT:  '{{ 'confirm_exit'|trans({}, 'SonataAdminBundle')|escape('js') }}'
                };
             </script>
-            <script src="{{ asset('bundles/sonatajquery/jquery-1.8.3.js') }}" type="text/javascript"></script>
-            <script src="{{ asset('bundles/sonatajquery/jquery-ui-1.8.23.js') }}" type="text/javascript"></script>
-            <script src="{{ asset('bundles/sonatajquery/jquery-ui-i18n.js') }}" type="text/javascript"></script>
+            <script src="{{ asset('bundles/sonatajquery/jquery-1.8.3.js') }}"></script>
+            <script src="{{ asset('bundles/sonatajquery/jquery-ui-1.8.23.js') }}"></script>
+            <script src="{{ asset('bundles/sonatajquery/jquery-ui-i18n.js') }}"></script>
 
-            <script src="{{ asset('bundles/sonataadmin/bootstrap/js/bootstrap.min.js') }}" type="text/javascript"></script>
+            <script src="{{ asset('bundles/sonataadmin/bootstrap/js/bootstrap.min.js') }}"></script>
 
             <script src="{{ asset('bundles/sonataadmin/x-editable/js/bootstrap-editable.min.js') }}"></script>
 
             {% if admin_pool is defined and admin_pool.getOption('use_select2') %}
-                <script src="{{ asset('bundles/sonataadmin/select2/select2.min.js') }}" type="text/javascript"></script>
+                <script src="{{ asset('bundles/sonataadmin/select2/select2.min.js') }}"></script>
             {% endif %}
 
-            <script src="{{ asset('bundles/sonataadmin/jquery/jquery.form.js') }}" type="text/javascript"></script>
-            {% if admin_pool is defined and admin_pool.getOption('confirm_exit') %}<script src="{{ asset('bundles/sonataadmin/jquery/jquery.confirmExit.js') }}" type="text/javascript"></script>{% endif %}
-            <script src="{{ asset('bundles/sonataadmin/base.js') }}" type="text/javascript"></script>
+            <script src="{{ asset('bundles/sonataadmin/jquery/jquery.form.js') }}"></script>
+            {% if admin_pool is defined and admin_pool.getOption('confirm_exit') %}<script src="{{ asset('bundles/sonataadmin/jquery/jquery.confirmExit.js') }}"></script>{% endif %}
+            <script src="{{ asset('bundles/sonataadmin/base.js') }}"></script>
         {% endblock %}
 
         <title>
@@ -115,7 +115,7 @@ file that was distributed with this source code.
 
                         {% block logo %}
                             <a href="{{ url('sonata_admin_dashboard') }}" class="brand">
-                                <img src="{{ asset(admin_pool.titlelogo) }}"  alt="{{ admin_pool.title }}" />
+                                <img src="{{ asset(admin_pool.titlelogo) }}"  alt="{{ admin_pool.title }}">
                                 {{ admin_pool.title }}
                             </a>
                         {% endblock %}
@@ -166,7 +166,7 @@ file that was distributed with this source code.
                                     {% if app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
                                         <form action="{{ url('sonata_admin_search') }}" method="GET"  class="navbar-search">
                                             <div class="input-append">
-                                                <input type="text" name="q" value="{{ app.request.get('q') }}" class="input-large search-query" placeholder="{{ 'search_placeholder'|trans({}, 'SonataAdminBundle') }}"/>
+                                                <input type="text" name="q" value="{{ app.request.get('q') }}" class="input-large search-query" placeholder="{{ 'search_placeholder'|trans({}, 'SonataAdminBundle') }}">
                                             </div>
                                         </form>
                                     {% endif %}