From 7df31058045155cc7a8d479b370b8803a912e547 Mon Sep 17 00:00:00 2001
From: Ayman Abi Abdallah <aabiabdallah@netvariant.com>
Date: Tue, 26 Jan 2021 12:58:22 +0200
Subject: [PATCH 1/4] In EntityDataFind, remove skip-form attribute to restore
 the Edit and Delete functionalities.

---
 .../tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
index bdc877c6f..654682b3f 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
@@ -62,7 +62,7 @@ along with this software (see the LICENSE.md file). If not, see
             <link url="../EntityDetail" parameter-map="[selectedEntity:selectedEntity]" text="See Entity Detail"/>
         </container>
         <container><label text="Find '${selectedEntity}' Entity Value" type="h3"/></container>
-        <form-list name="ListEntityValue" list="entityValueList" transition="listSubmit" header-dialog="true" skip-form="true" dynamic="true"
+        <form-list name="ListEntityValue" list="entityValueList" transition="listSubmit" header-dialog="true" dynamic="true"
                 show-csv-button="true" show-xlsx-button="true" show-page-size="true">
             <hidden-parameters><parameter name="selectedEntity"/></hidden-parameters>
             <field name="find"><header-field title="Find"><submit/></header-field></field>

From 62f6309e91c0a929f440ce8673766cb142aaa4ed Mon Sep 17 00:00:00 2001
From: Ayman Abi Abdallah <aabiabdallah@netvariant.com>
Date: Tue, 26 Jan 2021 13:03:29 +0200
Subject: [PATCH 2/4] In the Form List macros, wrap the "Clear Parameters" and
 "Order By" fields with a div to match the style of the remaining generated
 fields.

---
 template/screen-macro/DefaultScreenMacros.qvt.ftl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/template/screen-macro/DefaultScreenMacros.qvt.ftl b/template/screen-macro/DefaultScreenMacros.qvt.ftl
index 4b541dce0..667d8ad01 100644
--- a/template/screen-macro/DefaultScreenMacros.qvt.ftl
+++ b/template/screen-macro/DefaultScreenMacros.qvt.ftl
@@ -719,12 +719,14 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
                     </#assign>
                     <m-form-link name="${headerFormId}" id="${headerFormId}" action="${curUrlInstance.path}" v-slot:default="formProps"<#rt>
                             <#t> :fields-initial="${Static["org.moqui.util.WebUtilities"].fieldValuesEncodeHtmlJsSafe(sri.getFormListHeaderValues(formNode))}">
-                        <q-btn dense outline no-caps name="clearParameters" @click.prevent="formProps.clearForm" label="${ec.getL10n().localize("Clear Parameters")}"></q-btn>
-
-                        <#-- Always add an orderByField to select one or more columns to order by -->
-                        <q-select dense outlined options-dense multiple clearable emit-value map-options v-model="formProps.fields.orderByField"
-                                name="orderByField" id="${headerFormId}_orderByField" stack-label label="${ec.getL10n().localize("Order By")}"
-                                :options="[${orderByOptions}]"></q-select>
+                        <div class="q-mx-sm">
+                            <q-btn dense outline no-caps name="clearParameters" @click.prevent="formProps.clearForm" label="${ec.getL10n().localize("Clear Parameters")}"></q-btn>
+
+                            <#-- Always add an orderByField to select one or more columns to order by -->
+                            <q-select dense outlined options-dense multiple clearable emit-value map-options v-model="formProps.fields.orderByField"
+                                    name="orderByField" id="${headerFormId}_orderByField" stack-label label="${ec.getL10n().localize("Order By")}"
+                                    :options="[${orderByOptions}]"></q-select>
+                        </div>
 
                         <#t>${sri.pushSingleFormMapContext("")}
                         <#list formNode["field"] as fieldNode><#if fieldNode["header-field"]?has_content && fieldNode["header-field"][0]?children?has_content>

From 281d9f698f951657a49aa3dd11fbdf4a1cd1f234 Mon Sep 17 00:00:00 2001
From: Ayman Abi Abdallah <aabiabdallah@netvariant.com>
Date: Tue, 26 Jan 2021 13:12:11 +0200
Subject: [PATCH 3/4] Changed the System app icon from fa-hdd-o to fa-cog
 because "-o" icons have been removed from FA5 and replaced with styles (fas,
 far, fal ... etc.), so upgrading the default FA4 shipped with Moqui to FA5
 would result in a broken icon on the System app.

---
 base-component/tools/screen/System.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-component/tools/screen/System.xml b/base-component/tools/screen/System.xml
index 70d7dd719..0366c58b9 100644
--- a/base-component/tools/screen/System.xml
+++ b/base-component/tools/screen/System.xml
@@ -14,7 +14,7 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
-        default-menu-title="System" menu-image="fa fa-hdd-o" menu-image-type="icon">
+        default-menu-title="System" menu-image="fa fa-cog" menu-image-type="icon">
     <subscreens default-item="dashboard"/>
     <widgets>
         <subscreens-panel id="system-panel" type="popup"/>

From ba166f811d683400421382c78b98e421c727e156 Mon Sep 17 00:00:00 2001
From: Ayman Abi Abdallah <aabiabdallah@netvariant.com>
Date: Thu, 17 Jun 2021 12:35:00 +0300
Subject: [PATCH 4/4] Disabled autocomplete on username and password fields in
 the login screen.

---
 base-component/webroot/screen/webroot/Login.ftl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/base-component/webroot/screen/webroot/Login.ftl b/base-component/webroot/screen/webroot/Login.ftl
index eeefbd8a2..c3c278989 100644
--- a/base-component/webroot/screen/webroot/Login.ftl
+++ b/base-component/webroot/screen/webroot/Login.ftl
@@ -22,8 +22,8 @@
         <form method="post" action="${sri.buildUrl("login").url}" class="form-signin" id="login_form">
             <p class="text-muted text-center">${ec.l10n.localize("Enter your username and password to sign in")}</p>
             <#-- not needed for this request: <input type="hidden" name="moquiSessionToken" value="${ec.web.sessionToken}"> -->
-            <input type="text" name="username" value="${(ec.getWeb().getErrorParameters().get("username"))!""}" placeholder="${ec.l10n.localize("Username")}" required="required" class="form-control top" id="login_form_username">
-            <input type="password" name="password" placeholder="${ec.l10n.localize("Password")}" required="required" class="form-control bottom">
+            <input type="text" name="username" value="${(ec.getWeb().getErrorParameters().get("username"))!""}" placeholder="${ec.l10n.localize("Username")}" required="required" autocomplete="off" class="form-control top" id="login_form_username">
+            <input type="password" name="password" placeholder="${ec.l10n.localize("Password")}" required="required" autocomplete="off" class="form-control bottom">
             <button class="btn btn-lg btn-primary btn-block" type="submit">${ec.l10n.localize("Sign in")}</button>
         </form>
         <script>$("#login_form_username").focus();</script>
@@ -32,7 +32,7 @@
         <form method="post" action="${sri.buildUrl("resetPassword").url}" class="form-signin" id="reset_form">
             <p class="text-muted text-center">${ec.l10n.localize("Enter your username to reset and email your password")}</p>
             <input type="hidden" name="moquiSessionToken" value="${ec.web.sessionToken}">
-            <input type="text" name="username" placeholder="${ec.l10n.localize("Username")}" required="required" class="form-control">
+            <input type="text" name="username" placeholder="${ec.l10n.localize("Username")}" required="required" autocomplete="off" class="form-control">
             <button class="btn btn-lg btn-danger btn-block" type="submit">${ec.l10n.localize("Reset &amp; Email Password")}</button>
         </form>
     </div>
@@ -40,10 +40,10 @@
         <form method="post" action="${sri.buildUrl("changePassword").url}" class="form-signin" id="change_form">
             <p class="text-muted text-center">${ec.l10n.localize("Enter details to change your password")}</p>
             <input type="hidden" name="moquiSessionToken" value="${ec.web.sessionToken}">
-            <input type="text" name="username" value="${(ec.getWeb().getErrorParameters().get("username"))!""}" placeholder="${ec.l10n.localize("Username")}" required="required" class="form-control top">
-            <input type="password" name="oldPassword" placeholder="${ec.l10n.localize("Old Password")}" required="required" class="form-control middle">
-            <input type="password" name="newPassword" placeholder="${ec.l10n.localize("New Password")}" required="required" class="form-control middle">
-            <input type="password" name="newPasswordVerify" placeholder="${ec.l10n.localize("New Password Verify")}" required="required" class="form-control bottom">
+            <input type="text" name="username" value="${(ec.getWeb().getErrorParameters().get("username"))!""}" placeholder="${ec.l10n.localize("Username")}" required="required" autocomplete="off" class="form-control top">
+            <input type="password" name="oldPassword" placeholder="${ec.l10n.localize("Old Password")}" required="required" autocomplete="off" class="form-control middle">
+            <input type="password" name="newPassword" placeholder="${ec.l10n.localize("New Password")}" required="required" autocomplete="off" class="form-control middle">
+            <input type="password" name="newPasswordVerify" placeholder="${ec.l10n.localize("New Password Verify")}" required="required" autocomplete="off" class="form-control bottom">
             <button class="btn btn-lg btn-danger btn-block" type="submit">${ec.l10n.localize("Change Password")}</button>
         </form>
     </div>