diff --git a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js index e0bcb55c..3b074a87 100644 --- a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js +++ b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js @@ -495,7 +495,7 @@ $(function(){ return false; } if(canSubmit) { - $("#actionForm").submit();//submit + //$("#actionForm").submit();//submit } }); diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl index 3ea91f9e..59c047d9 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl @@ -12,20 +12,20 @@ -
+ diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl index d789609d..6865fbdb 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl @@ -58,7 +58,7 @@ $(function(){ + action="<@base/>/apps/updateExtendAttr" class="needs-validation" novalidate>
<@locale code="userinfo.id" />: - +
<@locale code="userinfo.username" />: - + " wurl="<@base/>/userinfo/select" wwidth="800" @@ -37,14 +37,14 @@
<@locale code="userinfo.displayName" />: - +
<@locale code="apps.name" />: - + " wurl="<@base/>/apps/select" wwidth="800" @@ -73,7 +73,7 @@ - "/> + "/> "/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl index 090a561e..9fda5473 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl @@ -29,7 +29,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl index f275e6de..2200458d 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl @@ -39,7 +39,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl index 98eea2c1..2791ad5e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl @@ -29,7 +29,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl index 582b8152..94ee9831 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl @@ -39,7 +39,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl index 246d57b5..c041d451 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl @@ -68,7 +68,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl index 30b45460..5348ef0f 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl @@ -75,7 +75,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl index a29b14b9..4c41b2d5 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl @@ -35,7 +35,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl index a9ef4e62..1a3f8463 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl @@ -39,7 +39,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl index 92b894ee..0120149e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl @@ -34,7 +34,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl index f1e49f3d..d23be4a2 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl @@ -39,7 +39,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl index 7763c130..419fa99c 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl @@ -20,7 +20,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl index da84fbe0..95536b10 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl @@ -29,7 +29,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl index 13a6f750..f669556f 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl @@ -21,7 +21,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl index 6742f074..db42c43e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl @@ -34,7 +34,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl index 817761f3..79a8e610 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl @@ -35,7 +35,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl index e4923428..0dcc49ba 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl @@ -42,7 +42,8 @@ $(function(){ + enctype="multipart/form-data" + class="needs-validation" novalidate>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl index 272c490b..d2311b5c 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl @@ -63,14 +63,14 @@

<@locale code="login.passwordpolicy"/>

- +
- +
@@ -78,7 +78,7 @@
- +
@@ -88,7 +88,7 @@
- +
@@ -96,7 +96,7 @@
- +
@@ -106,7 +106,7 @@
- +
@@ -114,7 +114,7 @@
- +
@@ -124,7 +124,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -142,7 +142,7 @@
- +
@@ -163,7 +163,7 @@
- +
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl index 941e4d73..d7446034 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl @@ -11,7 +11,7 @@ - +
@@ -24,7 +24,7 @@ diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl index 700f8799..fdcadfbf 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl @@ -11,7 +11,7 @@ - +
- "> + "> ">
@@ -30,7 +30,7 @@ diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl index e4b29640..39234707 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl @@ -1,7 +1,6 @@ <#-- javascript js begin --> <#-- jquery base --> - <#-- bootstrap-4.4.1 --> @@ -31,9 +30,7 @@ <#-- serializeObject --> - <#-- validation --> - - + diff --git a/maxkey-web-manage/src/main/resources/templates/views/login.ftl b/maxkey-web-manage/src/main/resources/templates/views/login.ftl index df302ec7..d65a5fcc 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/login.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/login.ftl @@ -26,7 +26,7 @@
- +
"> diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl index 23bd6124..ddbeb4f9 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl @@ -20,7 +20,7 @@ $(function () { - +
- "> + "> ">
@@ -134,7 +134,7 @@ $(function () {
- "/> + "/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl index 375d2a73..eb4b010c 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl @@ -19,7 +19,7 @@ $(function () { - + - + - + - +
@@ -46,15 +46,15 @@ $(function () {
<@locale code="org.id" />:
<@locale code="org.name" />:
<@locale code="org.fullname" />:
<@locale code="org.xpath" /> : @@ -133,7 +133,7 @@ $(function () {
- "/> + "/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl index 216d1467..da7601bb 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl @@ -12,7 +12,7 @@ - + @@ -34,19 +34,19 @@ diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl index 07584cbc..877ecaa3 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl @@ -30,7 +30,8 @@ type="alert" action="<@base/>/userinfo/add" autoclose="true" - enctype="multipart/form-data"> + enctype="multipart/form-data" + class="needs-validation" novalidate>
    diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl index 3b7da6ec..279ab0e9 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl @@ -26,7 +26,8 @@ type="alert" action="<@base/>/userinfo/update" autoclose="true" - enctype="multipart/form-data"> + enctype="multipart/form-data" + class="needs-validation" novalidate>
      diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl index f4a6f1d8..3f428500 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl @@ -1,7 +1,6 @@ <#-- javascript js begin --> <#-- jquery base --> - <#-- bootstrap-4.4.1 -->
<@locale code="login.password.newPassword" />: - +
<@locale code="login.password.confirmPassword" />: - +
- "/> + "/>