diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.8' into 3.0

Browse Source 
* 2.8:
  Improved Bootstrap form theme for hidden fields
  [WebProfilerBundle] Fix design issue in profiler when having errors in forms
  bumped Symfony version to 2.8.4
  updated VERSION for 2.8.3
  updated CHANGELOG for 2.8.3
  bumped Symfony version to 2.7.11
  updated VERSION for 2.7.10
  updated CHANGELOG for 2.7.10
This commit is contained in:
Fabien Potencier 2016-03-01 08:32:53 +01:00
commit e93ad7d030
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
View File

@ -3,7 +3,7 @@
{# Widgets #}
{% block form_widget_simple -%}
{% if type is not defined or 'file' != type %}
{% if type is not defined or type not in ['file', 'hidden'] %}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
{% endif %}
{{- parent() -}}

2
src/Symfony/Bridge/Twig/composer.json
View File

@ -22,7 +22,7 @@
"require-dev": {
"symfony/asset": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
"symfony/form": "~2.8.3|~3.0",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.8|~3.0",

8
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
View File

@ -427,6 +427,10 @@
{% import _self as tree %}
<li>
<div class="tree-inner" data-tab-target-id="{{ data.id }}-details">
{% if data.errors is defined and data.errors|length > 0 %}
<div class="badge-error">{{ data.errors|length }}</div>
{% endif %}
{% if data.children is not empty %}
<a class="toggle-button" data-toggle-target-id="{{ data.id }}-children" href="#"><span class="toggle-icon"></span></a>
{% else %}
@ -434,10 +438,6 @@
{% endif %}
{{ name|default('(no name)') }} {% if data.type_class is defined %}[<abbr title="{{ data.type_class }}">{{ data.type_class|split('\\')|last }}</abbr>]{% endif %}
{% if data.errors is defined and data.errors|length > 0 %}
<div class="badge-error">{{ data.errors|length }}</div>
{% endif %}
</div>
{% if data.children is not empty %}

18
src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
View File

@ -687,7 +687,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -843,7 +843,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -879,7 +879,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)][@class="foo&bar"]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -925,7 +925,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1007,7 +1007,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1052,7 +1052,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1218,7 +1218,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1264,7 +1264,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
]
/following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
/following-sibling::input[@type="hidden"][@id="name__token"]
]
'
);
@ -1766,7 +1766,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
'/input
[@type="hidden"]
[@name="name"]
[@class="my&class form-control"]
[@class="my&class"]
[@value="foo&bar"]
'
);