Manually merge #12

lcharette · Nov 28, 2023 · 659ce6a · 659ce6a
1 parent 6ce26d3
commit 659ce6a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/templates/FormGenerator/macros/alert.html.twig b/app/templates/FormGenerator/macros/alert.html.twig
@@ -1,5 +1,5 @@
 {% macro generate(input) %}
     <div class="alert {{input.class}}">
-    {% if input.icon %}<i class="icon fa {{input.icon}}"></i> {% endif %}{{ translate(input.value) }}
+    {% if input.icon %}<i class="icon {{input.icon}}"></i> {% endif %}{{ translate(input.value) }}
     </div>
 {% endmacro %}
diff --git a/app/templates/FormGenerator/macros/text.html.twig b/app/templates/FormGenerator/macros/text.html.twig
@@ -1,7 +1,7 @@
 {% macro generate(input) %}
     {% if input.icon %}
     <div class="input-group">
-        <span class="input-group-addon"><i class="fa {{input.icon}} fa-fw"></i></span>
+        <span class="input-group-addon"><i class="{{input.icon}}"></i></span>
     {% else %}
     <div class="form-group">
     {% endif %}

diff --git a/app/templates/FormGenerator/macros/textarea.html.twig b/app/templates/FormGenerator/macros/textarea.html.twig
@@ -1,5 +1,5 @@
 {% macro generate(input) %}
-    {% if input.icon %}<div class="input-group"><span class="input-group-addon"><i class="fa {{input.icon}} fa-fw"></i></span>{% endif %}
+    {% if input.icon %}<div class="input-group"><span class="input-group-addon"><i class="{{input.icon}}"></i></span>{% endif %}
     <textarea{% for type,value in input %} {{type}}="{{value}}"{% endfor %}>{{input.value}}</textarea>
     {% if input.icon %}</div>{% endif %}
 {% endmacro %}
diff --git a/public/schema/forms/formgenerator.json b/public/schema/forms/formgenerator.json
@@ -13,15 +13,15 @@
         "form" : {
             "type" : "text",
             "label" : "Project name",
-            "icon" : "fa-flag",
+            "icon" : "fas fa-flag",
             "placeholder" : "Project name"
         }
     },
     "owner" : {
         "form" : {
             "type" : "text",
             "label" : "Project Owner",
-            "icon" : "fa-user",
+            "icon" : "fas fa-user",
             "id" : "owner",
             "placeholder" : "Project Owner",
             "default" : "Foo"
@@ -31,7 +31,7 @@
         "form" : {
             "type" : "textarea",
             "label" : "Project description",
-            "icon" : "fa-pencil-alt",
+            "icon" : "fas fa-pencil-alt",
             "placeholder" : "Project description",
             "rows" : 5
         }
@@ -73,7 +73,7 @@
         },
         "form" : {
             "type" : "number",
-            "icon" : "fa-percent",
+            "icon" : "fas fa-percent",
             "default" : 10,
             "label" : "Project completion"
         }
@@ -88,7 +88,7 @@
         "form" : {
             "type" : "alert",
             "class" : "alert-success",
-            "icon" : "fa-rocket",
+            "icon" : "fas fa-rocket",
             "value" : "Form Generator is awesome!"
         }
     }

diff --git a/public/templates/pages/formgenerator.html.twig b/public/templates/pages/formgenerator.html.twig
@@ -39,10 +39,10 @@
                                         </button>
                                         <ul class="dropdown-menu dropdown-menu-right" role="menu">
                                             <li>
-                                                <a href="#" class="js-displayForm" data-formUrl="/{{project.id}}/edit"><i class="fa fa-edit"></i> Edit</a>
+                                                <a href="#" class="js-displayForm" data-formUrl="/{{project.id}}/edit"><i class="fas fa-edit"></i> Edit</a>
                                             </li>
                                             <li>
-                                                <a href="#" class="js-displayConfirm" data-confirm-title="Delete project" data-confirm-message="Are your sure you want to delete the project {{project.name}}" data-confirm-button="Yes, delete project" data-post-url="/{{project.id}}" data-post-method="DELETE"><i class="fa fa-trash-alt"></i> Delete</a>
+                                                <a href="#" class="js-displayConfirm" data-confirm-title="Delete project" data-confirm-message="Are your sure you want to delete the project {{project.name}}" data-confirm-button="Yes, delete project" data-post-url="/{{project.id}}" data-post-method="DELETE"><i class="fas fa-trash-alt"></i> Delete</a>
                                             </li>
                                         </ul>
                                     </div>
@@ -53,7 +53,7 @@
                         </table>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button class="btn btn-success js-displayForm" data-toggle="modal" data-formUrl="/new"><i class="fa fa-plus-square"></i> Create project</button>
+                        <button class="btn btn-success js-displayForm" data-toggle="modal" data-formUrl="/new"><i class="fas fa-plus-square"></i> Create project</button>
                     </div>
                 </div><!-- /.box -->
             </div><!-- /.col -->