Pārlūkot izejas kodu

Merge pull request #3305 from core23/fa

replace glyphicons with font-awesome
Oskar Stark 9 gadi atpakaļ
vecāks
revīzija
97f9b07ffa

+ 1 - 1
Resources/views/Block/block_admin_list.html.twig

@@ -57,7 +57,7 @@ file that was distributed with this source code.
                                                         {% endif %}
                                                         {% if admin.hasroute('list') and admin.isGranted('LIST') %}
                                                             <a class="btn btn-link btn-flat" href="{{ admin.generateUrl('list')}}">
-                                                                <i class="glyphicon glyphicon-list"></i>
+                                                                <i class="fa fa-list"></i>
                                                                 {% trans from 'SonataAdminBundle' %}link_list{% endtrans -%}
                                                             </a>
                                                         {% endif %}

+ 1 - 1
Resources/views/CRUD/base_edit_form.html.twig

@@ -33,7 +33,7 @@
                         <div class="nav-tabs-custom">
                             <ul class="nav nav-tabs" role="tablist">
                                 {% for name, form_tab in admin.formtabs %}
-                                    <li{% if loop.index == 1 %} class="active"{% endif %}><a href="#tab_{{ admin.uniqid }}_{{ loop.index }}" data-toggle="tab"><span class="glyphicon glyphicon-exclamation-sign has-errors hide"></span> {{ admin.trans(name, {}, form_tab.translation_domain) }}</a></li>
+                                    <li{% if loop.index == 1 %} class="active"{% endif %}><a href="#tab_{{ admin.uniqid }}_{{ loop.index }}" data-toggle="tab"><i class="fa fa-exclamation-circle"></i> {{ admin.trans(name, {}, form_tab.translation_domain) }}</a></li>
                                 {% endfor %}
                             </ul>
                             <div class="tab-content">

+ 2 - 2
Resources/views/CRUD/base_list.html.twig

@@ -159,7 +159,7 @@ file that was distributed with this source code.
                                     {% if admin.hasRoute('export') and admin.isGranted("EXPORT") and admin.getExportFormats()|length %}
                                         <div class="btn-group">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                <i class="glyphicon glyphicon-export"></i>
+                                                <i class="fa fa-share-square-o"></i>
                                                 {{ "label_export_download"|trans({}, "SonataAdminBundle") }}
                                                 <span class="caret"></span>
                                             </button>
@@ -167,7 +167,7 @@ file that was distributed with this source code.
                                                 {% for format in admin.getExportFormats() %}
                                                 <li>
                                                     <a href="{{ admin.generateUrl('export', admin.modelmanager.paginationparameters(admin.datagrid, 0) + {'format' : format}) }}">
-                                                        <i class="glyphicon glyphicon-download"></i>
+                                                        <i class="fa fa-arrow-circle-o-down"></i>
                                                         {{ ("export_format_" ~ format)|trans({}, 'SonataAdminBundle') }}
                                                     </a>
                                                 <li>

+ 1 - 1
Resources/views/CRUD/batch_confirmation.html.twig

@@ -44,7 +44,7 @@ file that was distributed with this source code.
                     {{ 'delete_or'|trans({}, 'SonataAdminBundle') }}
 
                     <a class="btn btn-success" href="{{ admin.generateUrl('list') }}">
-                        <i class="glyphicon glyphicon-th-list"></i> {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}
+                        <i class="fa fa-th-list"></i> {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}
                     </a>
                 {% endif %}
             </form>

+ 2 - 2
Resources/views/CRUD/delete.html.twig

@@ -34,12 +34,12 @@ file that was distributed with this source code.
                     <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="glyphicon glyphicon-trash"></i> {{ 'btn_delete'|trans({}, 'SonataAdminBundle') }}</button>
+                    <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> {{ 'btn_delete'|trans({}, 'SonataAdminBundle') }}</button>
                     {% if admin.hasRoute('edit') and admin.isGranted('EDIT', object) %}
                         {{ 'delete_or'|trans({}, 'SonataAdminBundle') }}
 
                         <a class="btn btn-success" href="{{ admin.generateObjectUrl('edit', object) }}">
-                            <i class="glyphicon glyphicon-edit"></i>
+                            <i class="fa fa-pencil"></i>
                             {{ 'link_action_edit'|trans({}, 'SonataAdminBundle') }}</a>
                     {% endif %}
                 </form>

+ 1 - 1
Resources/views/CRUD/list__select.html.twig

@@ -13,7 +13,7 @@ file that was distributed with this source code.
 
 {% block field %}
     <a class="btn btn-default" href="{{ admin.generateObjectUrl('edit', object) }}">
-        <i class="glyphicon glyphicon-arrow-right"></i>
+        <i class="fa fa-arrow-right"></i>
         {{ 'list_select'|trans({}, 'SonataAdminBundle') }}
     </a>
 {% endblock %}

+ 2 - 2
Resources/views/CRUD/preview.html.twig

@@ -19,11 +19,11 @@ file that was distributed with this source code.
 
 {% block formactions %}
     <button class="btn btn-success" type="submit" name="btn_preview_approve">
-        <i class="glyphicon glyphicon-ok"></i>
+        <i class="fa fa-check"></i>
         {{ 'btn_preview_approve'|trans({}, 'SonataAdminBundle') }}
     </button>
     <button class="btn btn-danger" type="submit" name="btn_preview_decline">
-        <i class="glyphicon glyphicon-remove"></i>
+        <i class="fa fa-times"></i>
         {{ 'btn_preview_decline'|trans({}, 'SonataAdminBundle') }}
     </button>
 {% endblock %}

+ 1 - 1
Resources/views/Form/form_admin_fields.html.twig

@@ -16,7 +16,7 @@ file that was distributed with this source code.
         {% if not form.parent %}<div class="alert alert-danger">{% endif %}
             <ul class="list-unstyled">
                 {% for error in errors %}
-                    <li><i class="glyphicon glyphicon-exclamation-sign"></i> {{ error.message }}</li>
+                    <li><i class="fa fa-exclamation-circle"></i> {{ error.message }}</li>
                 {% endfor %}
             </ul>
         {% if not form.parent %}</div>{% endif %}