Merge pull request #3410 from OskarStark/bool

use bool labels instead of icons

Resources/views/CRUD/show_boolean.html.twig

@@ -14,11 +14,9 @@ file that was distributed with this source code.
 {% block field %}
 {% spaceless %}
     {% if value %}
-        <i class="fa fa-check-circle-o"></i>
-        {%- trans from 'SonataAdminBundle' %}label_type_yes{% endtrans -%}
+        <span class="label label-success">{%- trans from 'SonataAdminBundle' %}label_type_yes{% endtrans -%}</span>
     {% else %}
-        <i class="fa fa-ban"></i>
-        {%- trans from 'SonataAdminBundle' %}label_type_no{% endtrans -%}
+        <span class="label label-danger">{%- trans from 'SonataAdminBundle' %}label_type_no{% endtrans -%}</span>
     {% endif %}
 {% endspaceless %}
 {% endblock %}

Tests/Twig/Extension/SonataAdminExtensionTest.php

@@ -507,8 +507,8 @@ class SonataAdminExtensionTest extends \PHPUnit_Framework_TestCase
             array('<th>Data</th> <td> GBP 51.23456 </td>', 'currency', 51.23456, array('currency' => 'GBP')),
             array('<th>Data</th> <td> [1 => First] <br> [2 => Second] </td>', 'array', array(1 => 'First', 2 => 'Second'), array('safe' => false)),
             array('<th>Data</th> <td> [1 => First] [2 => Second] </td>', 'array', array(1 => 'First', 2 => 'Second'), array('safe' => false, 'inline' => true)),
-            array('<th>Data</th> <td><i class="fa fa-check-circle-o"></i>yes</td>', 'boolean', true, array()),
-            array('<th>Data</th> <td><i class="fa fa-ban"></i>no</td>', 'boolean', false, array()),
+            array('<th>Data</th> <td><span class="label label-success">yes</span></td>', 'boolean', true, array()),
+            array('<th>Data</th> <td><span class="label label-danger">no</span></td>', 'boolean', false, array()),
             array('<th>Data</th> <td> Delete </td>', 'trans', 'action_delete', array('safe' => false, 'catalogue' => 'SonataAdminBundle')),
             array('<th>Data</th> <td>Status1</td>', 'choice', 'Status1', array('safe' => false)),
             array('<th>Data</th> <td>Alias1</td>', 'choice', 'Status1', array('safe' => false, 'choices' => array('Status1' => 'Alias1', 'Status2' => 'Alias2', 'Status3' => 'Alias3'))),
@@ -602,7 +602,7 @@ class SonataAdminExtensionTest extends \PHPUnit_Framework_TestCase
             array('<th>Data</th> <td> </td>', 'currency', new NoValueException(), array('currency' => 'EUR')),
             array('<th>Data</th> <td> </td>', 'currency', new NoValueException(), array('currency' => 'GBP')),
             array('<th>Data</th> <td> </td>', 'array', new NoValueException(), array('safe' => false)),
-            array('<th>Data</th> <td><i class="fa fa-ban"></i>no</td>', 'boolean', new NoValueException(), array()),
+            array('<th>Data</th> <td><span class="label label-danger">no</span></td>', 'boolean', new NoValueException(), array()),
             array('<th>Data</th> <td> </td>', 'trans', new NoValueException(), array('safe' => false, 'catalogue' => 'SonataAdminBundle')),
             array('<th>Data</th> <td></td>', 'choice', new NoValueException(), array('safe' => false, 'choices' => array())),
             array('<th>Data</th> <td></td>', 'choice', new NoValueException(), array('safe' => false, 'choices' => array(), 'multiple' => true)),