Move to Font Awesome 6 icons

tobias-93 · tobias-93 · commit c8d6d8592390 · 2023-11-21T21:01:51.000+01:00
diff --git a/Form/Type/DatePickerType.php b/Form/Type/DatePickerType.php
@@ -35,8 +35,8 @@ public function configureOptions(OptionsResolver $resolver): void
             'width'     => null,
             'config'    => [
                 'icons'     => [
-                    'time'  => "fa fa-clock-o",
-                    'date'  => "fa fa-calendar",
+                    'time'  => "fa fa-clock fa-regular",
+                    'date'  => "fa fa-calendar-days fa-regular",
                     'up'    => "fa fa-arrow-up",
                     'down'  => "fa fa-arrow-down"
                 ]
diff --git a/Form/Type/DateTimePickerType.php b/Form/Type/DateTimePickerType.php
@@ -20,8 +20,8 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         $view->vars['width'] = $options['width'];
         $view->vars['config'] = array_replace($options['config'], array(
             'icons'         => array(
-                'time'  => "fa fa-clock-o",
-                'date'  => "fa fa-calendar",
+                'time'  => "fa fa-clock fa-regular",
+                'date'  => "fa fa-calendar-days fa-regular",
                 'up'    => "fa fa-arrow-up",
                 'down'  => "fa fa-arrow-down"
             )
@@ -44,8 +44,8 @@ public function configureOptions(OptionsResolver $resolver): void
             'config'    => [
                 'sideBySide'    => false,
                 'icons'     => [
-                    'time'  => "fa fa-clock-o",
-                    'date'  => "fa fa-calendar",
+                    'time'  => "fa fa-clock fa-regular",
+                    'date'  => "fa fa-calendar-days fa-regular",
                     'up'    => "fa fa-arrow-up",
                     'down'  => "fa fa-arrow-down"
                 ]
diff --git a/Form/Type/TimePickerType.php b/Form/Type/TimePickerType.php
@@ -22,7 +22,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
 
         if ($options['with_minutes'] && $options['with_seconds']) {
             $widgetFormat = 'HH:mm:ss';
-        } else if ($options['with_minutes']) {            
+        } else if ($options['with_minutes']) {
             $widgetFormat = 'HH:mm';
         } else {
             $widgetFormat = 'HH';
@@ -31,9 +31,9 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         if ($view->vars['value']) {
             $view->vars['widget_value'] = $view->vars['value'];
         }
-        
+
         $view->vars['widget_format'] = $widgetFormat;
-        
+
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -43,8 +43,8 @@ public function configureOptions(OptionsResolver $resolver)
             'width'     => null,
             'config'        => [
                 'icons'         => [
-                    'time'  => "fa fa-clock-o",
-                    'date'  => "fa fa-calendar",
+                    'time'  => "fa fa-clock fa-regular",
+                    'date'  => "fa fa-calendar-days fa-regular",
                     'up'    => "fa fa-arrow-up",
                     'down'  => "fa fa-arrow-down"
                 ]
diff --git a/Resources/public/bootstrap-collection/css/bootstrap-collection.css b/Resources/public/bootstrap-collection/css/bootstrap-collection.css
@@ -72,19 +72,19 @@ tr.collection-item .panel-heading .panel-toggle:focus label.control-label {
     text-decoration: underline;
 }
 
-tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-right {
+tr.collection-item .panel-heading .panel-toggle .fa-chevron-right {
     display: none;
 }
 
-tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-down {
+tr.collection-item .panel-heading .panel-toggle .fa-chevron-down {
     display: inline;
 }
 
-tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-down {
+tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-down {
     display: none;
 }
 
-tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-right {
+tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-right {
     display: inline;
 }
 
@@ -207,4 +207,4 @@ fieldset.collection-item > .collection-item-actions > .btn-toggle > input[type="
     cursor: -webkit-grabbing; 
     cursor: -moz-grabbing;
     cursor: move\9; /* fallback cursor for IE */
-}
+}
diff --git a/Resources/public/bootstrap-collection/css/bootstrap-collection.min.css b/Resources/public/bootstrap-collection/css/bootstrap-collection.min.css
diff --git a/Resources/public/daterange-picker/js/daterangepicker.js b/Resources/public/daterange-picker/js/daterangepicker.js
@@ -97,21 +97,21 @@
                 '<div class="calendar left">' +
                     '<div class="daterangepicker_input">' +
                       '<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
-                      '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
+                      '<i class="fa fa-calendar-days fa-regular glyphicon glyphicon-calendar"></i>' +
                       '<div class="calendar-time">' +
                         '<div></div>' +
-                        '<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
+                        '<i class="fa fa-clock fa-regular glyphicon glyphicon-time"></i>' +
                       '</div>' +
                     '</div>' +
                     '<div class="calendar-table"></div>' +
                 '</div>' +
                 '<div class="calendar right">' +
                     '<div class="daterangepicker_input">' +
                       '<input class="input-mini form-control" type="text" name="daterangepicker_end" value="" />' +
-                      '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
+                      '<i class="fa fa-calendar-days fa-regular glyphicon glyphicon-calendar"></i>' +
                       '<div class="calendar-time">' +
                         '<div></div>' +
-                        '<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
+                        '<i class="fa fa-clock fa-regular glyphicon glyphicon-time"></i>' +
                       '</div>' +
                     '</div>' +
                     '<div class="calendar-table"></div>' +
diff --git a/Resources/public/daterange-picker/js/daterangepicker.min.js b/Resources/public/daterange-picker/js/daterangepicker.min.js
diff --git a/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig b/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig
@@ -1,11 +1,11 @@
 {% if allow_delete %}
 {% apply spaceless %}
 <a class="btn btn-danger batch-delete">
-    <i class="fa fa-trash-o"></i>
+    <i class="fa fa-trash-can fa-regular"></i>
     {{- ' ' ~ 's2a_bootstrap_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') -}}
 </a>
 <label class="btn btn-link btn-toggle input-append">
     <input type="checkbox" name="toggle">
 </label>
 {% endapply %}
-{% endif %}
+{% endif %}
diff --git a/Resources/views/Form/SingleUpload/controls.html.twig b/Resources/views/Form/SingleUpload/controls.html.twig
@@ -20,7 +20,7 @@
 {% if deleteable %}
     <div class="btn-wrapper">
         <button type="button" class="btn btn-danger delete" style="display: none;">
-            <i class="fa fa-trash-o"></i>
+            <i class="fa fa-trash-can fa-regular"></i>
             <span> {{ 's2a_single_upload.button.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
         </button>
     </div>
diff --git a/Resources/views/Form/SingleUpload/upload.html.twig b/Resources/views/Form/SingleUpload/upload.html.twig
@@ -2,5 +2,5 @@
     <i class="fa fa-plus"></i> {{ 's2a_single_upload.button.add'|trans({}, 'AdmingeneratorFormExtensions') }}
 </span>
 <span class="replace" {% if form.vars.data|default is empty %}style="display: none;"{% endif %}>
-    <i class="fa fa-refresh"></i> {{ 's2a_single_upload.button.replace'|trans({}, 'AdmingeneratorFormExtensions') }}
-</span>
+    <i class="fa fa-arrows-rotate"></i> {{ 's2a_single_upload.button.replace'|trans({}, 'AdmingeneratorFormExtensions') }}
+</span>
diff --git a/Resources/views/Form/UploadCollection/template_download.html.twig b/Resources/views/Form/UploadCollection/template_download.html.twig
@@ -94,7 +94,7 @@
                 {% if (file.uid) { %}
                 {% endverbatim %}
                     <button class="btn btn-warning remove">
-                        <i class="fa fa-trash-o"></i>
+                        <i class="fa fa-trash-can fa-regular"></i>
                         <span> {{ 's2a_upload_collection.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
                     </button>
                 {% verbatim %}
@@ -108,7 +108,7 @@
                     {% endif %}
                     {% if allow_delete %}
                     <button class="btn btn-danger delete">
-                        <i class="fa fa-trash-o"></i>
+                        <i class="fa fa-trash-can fa-regular"></i>
                         <span> {{ 's2a_upload_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
                     </button>
                     <span class="btn btn-toggle btn-link input-append">
diff --git a/Resources/views/Form/form_html.html.twig b/Resources/views/Form/form_html.html.twig
@@ -146,15 +146,15 @@
             {% endif %}
             {% if allow_delete %}
             <button type="button" class="btn btn-danger delete">
-                <i class="fa fa-fw fa-trash"></i>
+                <i class="fa fa-fw fa-trash-can"></i>
                 <span> {{ 's2a_upload_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
             </button>
             <label class="btn btn-toggle btn-link input-append">
                 <input type="checkbox" class="toggle">
             </label>
             {% endif %}
             <div class="fileupload-progressbar">
-                <i class="fa fa-fw fa-cog fa-2x fa-spin"></i>
+                <i class="fa fa-fw fa-gear fa-2x fa-spin"></i>
             </div>
         </div>
         {% endif %}
@@ -281,21 +281,21 @@
 
 {% block s2a_datetime_picker_widget %}
 {% apply spaceless %}
-    {% set widgetIcon = 'fa fa-calendar' %}
+    {% set widgetIcon = 'fa-regular fa-calendar-days' %}
     {{ block('s2a_datetime_family_prototype') }}
 {% endapply %}
 {% endblock s2a_datetime_picker_widget %}
 
 {% block s2a_date_picker_widget %}
 {% apply spaceless %}
-    {% set widgetIcon = 'fa fa-calendar' %}
+    {% set widgetIcon = 'fa-regular fa-calendar-days' %}
     {{ block('s2a_datetime_family_prototype') }}
 {% endapply %}
 {% endblock s2a_date_picker_widget %}
 
 {% block s2a_time_picker_widget %}
 {% apply spaceless %}
-    {% set widgetIcon = 'fa fa-clock-o' %}
+    {% set widgetIcon = 'fa-regular fa-clock' %}
     {{ block('s2a_datetime_family_prototype') }}
 {% endapply %}
 {% endblock s2a_time_picker_widget %}
@@ -308,7 +308,7 @@
             <input id="{{ id ~ '_search' }}" type="text" class="s2a-gmap-input form-control" placeholder="{{ 's2a_google_map.placeholder'|trans({}, 'AdmingeneratorFormExtensions') }}">
             <span class="input-group-btn">
                 <button id="{{ id ~ '_search_button' }}" class="s2a-gmap-search_button btn btn-default" type="button">
-                    <i class="fa fa-search"></i> {{ 's2a_google_map.search'|trans({}, 'AdmingeneratorFormExtensions') }}
+                    <i class="fa fa-magnifying-glass"></i> {{ 's2a_google_map.search'|trans({}, 'AdmingeneratorFormExtensions') }}
                 </button>
             </span>
             <span class="input-group-btn">
@@ -338,7 +338,7 @@
 {% block s2a_daterange_picker_widget %}
 {% apply spaceless %}
    <div class="input-group">
-   <span class="input-group-addon"><i class="fa fa-calendar fa-fw"></i></span>
+   <span class="input-group-addon"><i class="fa fa-calendar-days fa-regular fa-fw"></i></span>
     {{ block('form_widget_simple') }}
 </div> 
 {% endapply %}

Original file line number	Diff line number	Diff line change
`@@ -72,19 +72,19 @@ tr.collection-item .panel-heading .panel-toggle:focus label.control-label {`
`72`	`72`	`text-decoration: underline;`
`73`	`73`	`}`
`74`	`74`
`75`		`-tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-right {`
	`75`	`+tr.collection-item .panel-heading .panel-toggle .fa-chevron-right {`
`76`	`76`	`display: none;`
`77`	`77`	`}`
`78`	`78`
`79`		`-tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-down {`
	`79`	`+tr.collection-item .panel-heading .panel-toggle .fa-chevron-down {`
`80`	`80`	`display: inline;`
`81`	`81`	`}`
`82`	`82`
`83`		`-tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-down {`
	`83`	`+tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-down {`
`84`	`84`	`display: none;`
`85`	`85`	`}`
`86`	`86`
`87`		`-tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-right {`
	`87`	`+tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-right {`
`88`	`88`	`display: inline;`
`89`	`89`	`}`
`90`	`90`
`@@ -207,4 +207,4 @@ fieldset.collection-item > .collection-item-actions > .btn-toggle > input[type="`
`207`	`207`	`cursor: -webkit-grabbing;`
`208`	`208`	`cursor: -moz-grabbing;`
`209`	`209`	`cursor: move\9; /* fallback cursor for IE */`
`210`		`-}`
	`210`	`+}`