diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl index cc82a7eb..7ae3fd70 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl @@ -9,7 +9,7 @@
<#include "../layout/nologintop.ftl">
-
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/pwdreseted.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/pwdreseted.ftl index ba3cf57f..77fef114 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/pwdreseted.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/pwdreseted.ftl @@ -9,7 +9,7 @@
<#include "../layout/nologintop.ftl">
-
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/resetpwd.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/resetpwd.ftl index 7746fad1..f3d45487 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/resetpwd.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/resetpwd.ftl @@ -9,7 +9,7 @@
<#include "../layout/nologintop.ftl">
-
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl index 270fdf4d..a0e17f73 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginAppsList.ftl @@ -8,7 +8,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl index e9d079b2..67c126af 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/sessionList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/sessionList.ftl index 51fcb086..24e51748 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/sessionList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/sessionList.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index 18e7716d..a0d6bc52 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -25,7 +25,7 @@
<#include "layout/nologintop.ftl">
-
+
@@ -96,10 +96,11 @@
- + - + - + - + - + - + - + - + @@ -91,5 +94,8 @@ + + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appUpdate.ftl index 446ea97d..7962795b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appUpdate.ftl @@ -7,6 +7,9 @@ <#setting number_format="#"> +
+
+
- + - + - + - + - + - + - + - + @@ -91,5 +94,8 @@
+ <#list sspLogin.socialSignOnProviders as ssop> <#if (ssop_index)%4==0> diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl index c2717f66..31f1a794 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl @@ -18,7 +18,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
- + diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/activated.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/activated.ftl index 167d2480..d5397426 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/activated.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/activated.ftl @@ -14,7 +14,7 @@ -
+
<#if 0 == activate> url expired. diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/initPassword.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/initPassword.ftl index 177a4e3d..5454c1b7 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/initPassword.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/initPassword.ftl @@ -13,7 +13,7 @@ -
+
<#if null != model>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl index 5cec5295..ab7c0945 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl @@ -15,35 +15,26 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
<#if Session["current_user"].gridList==0 > <#list appList as app> <#if (app_index)%4==0>
-
- +
+
-
- <#if "Desktop"==app.protocol> - - - - - <#if "Desktop"!=app.protocol> - href="${app.loginUrl}" <#if "IDP"==app.inducer> href="<@base/>/authz/${app.id}" - - target="_blank" title="${app.name}" > + > - - +
+ ${app.name}
${app.name}
<#if (app_index +1)%4==0> @@ -74,12 +65,7 @@
${app_index +1 } - <#if app.protocol?contains("Desktop")> - - - - <#else> + href="${app.loginUrl}" @@ -90,27 +76,19 @@ target="_blank" title="${app.name}" > - ${app.name}${app.name} - <#if app.protocol ?contains("Desktop")> - - <@locale code="button.text.visit"/> - - <#else> - - href="${app.loginUrl}" - - <#if "IDP"==app.inducer> - href="<@base/>/authz/${app.id}" - - target="_blank" title="${app.name}" > - <@locale code="button.text.visit"/> - - + + href="${app.loginUrl}" + + <#if "IDP"==app.inducer> + href="<@base/>/authz/${app.id}" + + target="_blank" title="${app.name}" > + <@locale code="button.text.visit"/> +
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl index ac5a5607..f024d574 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl @@ -9,7 +9,7 @@
<#include "../layout/nologintop.ftl">
-
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/registerInst.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/registerInst.ftl index ff31f7ff..0e1b2544 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/registerInst.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/registerInst.ftl @@ -9,7 +9,7 @@
<#include "../layout/nologintop.ftl">
-
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl index aceaf8bc..9e94d325 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl index 15109a12..e1f4ba88 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl index deee29ba..911caa09 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl index 38fe4f55..b9947f5f 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
<@locale code="login.totp.title" /> diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl index 538716dd..1a0ff112 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl @@ -7,7 +7,7 @@ <#include "../layout/top.ftl"/> <#include "../layout/nav_primary.ftl"/> -
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties index 9b057d29..92bf73ba 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties @@ -568,6 +568,7 @@ button.text.import=\u5BFC\u5165 button.text.adjunct=\u517C\u4EFB\u673A\u6784 button.text.sync=\u540C\u6B65 button.text.terminate=\u7EC8\u6B62 +button.text.confirm=\u786E\u5B9A #loginhistory log.loginhistory.id=\u7F16\u53F7 log.loginhistory.sessionId=\u4F1A\u8BDD diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties index a79fd45f..18e4b8cb 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties @@ -577,6 +577,7 @@ button.text.import=Import button.text.adjunct=Adjoint Depts button.text.sync=Sync button.text.terminate=Terminate +button.text.confirm=Confirm log.loginhistory.id=id log.loginhistory.sessionId=sessionId diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties index d6cb9738..e43f8471 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties @@ -568,6 +568,7 @@ button.text.import=\u5BFC\u5165 button.text.adjunct=\u517C\u4EFB\u673A\u6784 button.text.sync=\u540C\u6B65 button.text.terminate=\u7EC8\u6B62 +button.text.confirm=\u786E\u5B9A #loginhistory log.loginhistory.id=\u7F16\u53F7 log.loginhistory.sessionId=\u4F1A\u8BDD diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl index d53d5f2a..a2d29e33 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl @@ -46,75 +46,67 @@
- + - - + - + + - + - - + - - - - - - - + - +
+ + "/> +
+ - + + + + - + @@ -148,5 +151,8 @@ $(function(){ + + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl index e938daf5..7a7c514c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl @@ -26,6 +26,9 @@ $(function(){ +
+
+
- + @@ -135,5 +138,8 @@ $(function(){
<@locale code="userinfo.id" />：<@locale code="userinfo.id" /> -
<@locale code="userinfo.username" />：<@locale code="userinfo.username" /> - - - - " - wurl="<@base/>/userinfo/select" +
+ + " + wurl="<@base/>/userinfo/select" wwidth="800" wheight="620" target="window"/> -
<@locale code="userinfo.displayName" />：<@locale code="userinfo.displayName" /> + -
<@locale code="apps.name" />：<@locale code="apps.name" /> - - - - - " - wurl="<@base/>/accountsstrategy/select" +
+ + " + wurl="<@base/>/accountsstrategy/select" wwidth="800" wheight="620" target="window"/> -
<@locale code="account.relatedUsername" />： - - + - "/> -
<@locale code="account.relatedPassword" />：<@locale code="account.relatedUsername" /> - - - "/> - "/> - -
+ <@locale code="account.relatedPassword" /> +
+ + "/> + "/> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl index 3b3b7463..6f54ef91 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl @@ -57,23 +57,25 @@
- <@locale code="account.username"/>: + <@locale code="account.username"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
- " + " wurl="<@base/>/accounts/forwardAdd" wwidth="960" wheight="600" target="window"> - " + " wurl="<@base/>/accounts/forwardUpdate" wwidth="700" wheight="400" @@ -94,14 +96,16 @@
<@locale code="apps.name"/> - - - - " +
+ + + + " wurl="<@base/>/apps/select" wwidth="700" wheight="500" target="window"> +
<@locale code="account.relatedUsername"/> diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsUpdate.ftl index 3ac08d4e..0eb6abb4 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsUpdate.ftl @@ -33,66 +33,53 @@ - + - - + - - + - - + - - + - - + - - + - - - + - + - + - + @@ -90,5 +93,8 @@ $(function(){
<@locale code="userinfo.id" />：<@locale code="userinfo.id" /> -
<@locale code="userinfo.username" />：<@locale code="userinfo.username" /> - -
<@locale code="userinfo.displayName" />：<@locale code="userinfo.displayName" /> -
<@locale code="apps.name" />：<@locale code="apps.name" /> - -
<@locale code="account.relatedUsername" />：<@locale code="account.relatedUsername" /> -
<@locale code="account.relatedPassword" />：<@locale code="account.relatedPassword" /> - - - "/> - "/> - +
+ + "/> + "/> +
<@locale code="common.text.status" />：<@locale code="common.text.status" />
+ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl index 57cef718..be3afd73 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl @@ -165,32 +165,34 @@ function showOrgsTree() { - + - + - + - + - + - + - + - + - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl index 9089ba76..e8ea7a31 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl @@ -49,27 +49,29 @@
- +
<@locale code="accounts.strategy.id" />：<@locale code="accounts.strategy.id" />
<@locale code="accounts.strategy.name" />：<@locale code="accounts.strategy.name" />
<@locale code="apps.name"/>：<@locale code="apps.name"/> - - - - " - wurl="<@base/>/apps/select" - wwidth="700" - wheight="500" - target="window"> +
+ + + + " + wurl="<@base/>/apps/select" + wwidth="700" + wheight="540" + target="window"> +
<@locale code="accounts.strategy.mapping" />：<@locale code="accounts.strategy.mapping" />
<@locale code="accounts.strategy.suffixes" />：<@locale code="accounts.strategy.suffixes" />
<@locale code="accounts.strategy.createType" />：<@locale code="accounts.strategy.createType" />
<@locale code="accounts.strategy.orgidslist" />：<@locale code="accounts.strategy.orgidslist" />
<@locale code="accounts.strategy.filters" />：<@locale code="accounts.strategy.filters" />
<@locale code="common.text.description" />：<@locale code="common.text.description" />
- +
<@locale code="accounts.strategy.name"/>:<@locale code="accounts.strategy.name"/>
- - "> - +
+ + "> + +
- " + " wurl="<@base/>/accountsstrategy/forwardAdd" wwidth="800" - wheight="550" + wheight="560" target="window"> - " + " wurl="<@base/>/accountsstrategy/forwardUpdate" wwidth="800" wheight="550" @@ -82,10 +84,11 @@
- - + - + - + - + - + - + - + - + - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl index cb51ab46..c6950507 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl @@ -32,29 +32,33 @@ -
<@locale code="accounts.strategy.id" />：<@locale code="accounts.strategy.id" />
<@locale code="accounts.strategy.name" />：<@locale code="accounts.strategy.name" />
<@locale code="apps.name"/>：<@locale code="apps.name"/> @@ -199,7 +199,7 @@ function showOrgsTree() {
<@locale code="accounts.strategy.mapping" />：<@locale code="accounts.strategy.mapping" />
<@locale code="accounts.strategy.suffixes" />：<@locale code="accounts.strategy.suffixes" />
<@locale code="accounts.strategy.createType" />：<@locale code="accounts.strategy.createType" />
<@locale code="accounts.strategy.orgidslist" />：<@locale code="accounts.strategy.orgidslist" />
<@locale code="accounts.strategy.filters" />：<@locale code="accounts.strategy.filters" />
<@locale code="common.text.description" />：<@locale code="common.text.description" />
- - - - - -
<@locale code="accounts.strategy.name"/>: -
- - "> - -
- 		-
- " /> -
-
- - + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/cas/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/cas/appUpdate.ftl index 9e7be3b9..5dbf4f9f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/cas/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/cas/appUpdate.ftl @@ -37,6 +37,9 @@ $(function(){ +
+
+
<@locale code="apps.cas.info"/>
<@locale code="apps.cas.info"/>
<@locale code="apps.cas.service"/>：<@locale code="apps.cas.service"/>
<@locale code="apps.cas.callbackUrl"/>：<@locale code="apps.cas.callbackUrl"/>
<@locale code="apps.cas.expires"/>：<@locale code="apps.cas.expires"/>
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl index e1818d3b..d3cfd171 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl @@ -26,6 +26,9 @@ $(function(){ +
+
+
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl index 80b455d4..754e469f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl @@ -26,6 +26,9 @@ $(function(){ +
+
+
"/> "/>
+
+
+
\ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl index 1fb24444..7688eb00 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl @@ -26,6 +26,9 @@ $(function(){ +
+
+
<@locale code="apps.formbased.info"/>
<@locale code="apps.formbased.info"/>
<@locale code="apps.formbased.redirectUri"/>：
<@locale code="apps.formbased.info"/>
<@locale code="apps.formbased.info"/>
<@locale code="apps.formbased.redirectUri"/>：
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appAdd.ftl index 72ae3d81..c952171a 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/jwt/appAdd.ftl @@ -6,6 +6,9 @@ <#include "../appCommonHead.ftl"/> +
+
+
<@locale code="apps.jwt.info" />
<@locale code="apps.jwt.info" />
<@locale code="apps.jwt.redirectUri" />：<@locale code="apps.jwt.redirectUri" />
<@locale code="apps.jwt.tokenType" />：<@locale code="apps.jwt.tokenType" /> <@locale code="apps.jwt.cookieName" />：<@locale code="apps.jwt.cookieName" />
<@locale code="apps.jwt.algorithm" />：<@locale code="apps.jwt.algorithm" /> * <@locale code="apps.jwt.algorithmKey" />：<@locale code="apps.jwt.algorithmKey" /> ${model.algorithmKey!} @@ -65,11 +68,11 @@
<@locale code="apps.jwt.content" />：<@locale code="apps.jwt.content" /> <#include "../userPropertys.ftl"/> <@locale code="apps.jwt.expires" />：<@locale code="apps.jwt.expires" />
<@locale code="apps.jwt.info" />
<@locale code="apps.jwt.info" />
<@locale code="apps.jwt.redirectUri" />：<@locale code="apps.jwt.redirectUri" />
<@locale code="apps.jwt.tokenType" />：<@locale code="apps.jwt.tokenType" /> <@locale code="apps.jwt.cookieName" />：<@locale code="apps.jwt.cookieName" />
<@locale code="apps.jwt.algorithm" />：<@locale code="apps.jwt.algorithm" /> <@locale code="apps.jwt.algorithmKey" />：<@locale code="apps.jwt.algorithmKey" /> ${model.algorithmKey} @@ -68,11 +71,11 @@
<@locale code="apps.jwt.content" />：<@locale code="apps.jwt.content" /> <#include "../userPropertys.ftl"/> <@locale code="apps.jwt.expires" />：<@locale code="apps.jwt.expires" />
+
+
+
\ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl index 3afb947c..cc17cc2f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl @@ -21,6 +21,9 @@ +
+
+
- <@locale code="apps.oauth.v2.0.info" /> +
<@locale code="apps.oauth.v2.0.info" />
- - <@locale code="apps.oauth.v2.0.clientId" />： + + <@locale code="apps.oauth.v2.0.clientId" /> ${model.clientId} - <@locale code="apps.oauth.v2.0.clientSecret" />： + <@locale code="apps.oauth.v2.0.clientSecret" /> ${model.clientSecret} @@ -55,7 +58,7 @@ - <@locale code="apps.oauth.scope" />： + <@locale code="apps.oauth.scope" /> @@ -74,7 +77,7 @@ - + - + - - + + - + - +
<@locale code="apps.oauth.GrantTypes" />：<@locale code="apps.oauth.GrantTypes" /> @@ -91,26 +94,26 @@ - + - + - + - + - + - + - + - + - + - + - + - + - +
<@locale code="apps.oauth.registeredRedirectUris" />：<@locale code="apps.oauth.registeredRedirectUris" /> *
<@locale code="apps.oauth.accessTokenValiditySeconds" />：<@locale code="apps.oauth.accessTokenValiditySeconds" /> * <@locale code="apps.oauth.refreshTokenValiditySeconds" />：<@locale code="apps.oauth.refreshTokenValiditySeconds" /> *
PKCE：PKCE <@locale code="apps.oauth.approvalPrompt" />：<@locale code="apps.oauth.approvalPrompt" />
<@locale code="apps.oauth.connect.info" />
<@locale code="apps.oauth.connect.info" />
<@locale code="apps.oauth.connect.idTokenSigningAlgorithm" />：<@locale code="apps.oauth.connect.idTokenSigningAlgorithm" /> <@locale code="apps.oauth.connect.userInfoSigningAlgorithm" />：<@locale code="apps.oauth.connect.userInfoSigningAlgorithm" />
<@locale code="apps.oauth.connect.jwksUri" />：<@locale code="apps.oauth.connect.jwksUri" />
<@locale code="apps.oauth.connect.idTokenEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.idTokenEncryptedAlgorithm" /> <@locale code="apps.oauth.connect.userInfoEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.userInfoEncryptedAlgorithm" />
<@locale code="apps.oauth.connect.idTokenEncryptionMethod" />：<@locale code="apps.oauth.connect.idTokenEncryptionMethod" /> <@locale code="apps.oauth.connect.userInfoEncryptionMethod" />：<@locale code="apps.oauth.connect.userInfoEncryptionMethod" />
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl index 3ad6be09..485a5488 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl @@ -7,6 +7,9 @@ <#setting number_format="#"> +
+
+
<@locale code="apps.oauth.v2.0.info" />
<@locale code="apps.oauth.v2.0.info" />
<@locale code="apps.oauth.v2.0.clientId" />：
<@locale code="apps.oauth.v2.0.clientId" /> ${model.clientId} <@locale code="apps.oauth.v2.0.clientSecret" />：<@locale code="apps.oauth.v2.0.clientSecret" /> ${model.clientSecret} @@ -42,7 +45,7 @@
<@locale code="apps.oauth.scope" />：<@locale code="apps.oauth.scope" /> @@ -61,7 +64,7 @@ - + - + - + - + @@ -59,17 +62,17 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -211,5 +214,8 @@
<@locale code="apps.oauth.GrantTypes" />：<@locale code="apps.oauth.GrantTypes" /> @@ -78,26 +81,26 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
<@locale code="apps.oauth.registeredRedirectUris" />：<@locale code="apps.oauth.registeredRedirectUris" />
<@locale code="apps.oauth.accessTokenValiditySeconds" />：<@locale code="apps.oauth.accessTokenValiditySeconds" /> <@locale code="apps.oauth.refreshTokenValiditySeconds" />：<@locale code="apps.oauth.refreshTokenValiditySeconds" />
PKCE：PKCE <@locale code="apps.oauth.approvalPrompt" />：<@locale code="apps.oauth.approvalPrompt" />
<@locale code="apps.oauth.connect.idTokenSigningAlgorithm" />：<@locale code="apps.oauth.connect.idTokenSigningAlgorithm" /> <@locale code="apps.oauth.connect.userInfoSigningAlgorithm" />：<@locale code="apps.oauth.connect.userInfoSigningAlgorithm" />
<@locale code="apps.oauth.connect.jwksUri" />：<@locale code="apps.oauth.connect.jwksUri" />
<@locale code="apps.oauth.connect.idTokenEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.idTokenEncryptedAlgorithm" /> <@locale code="apps.oauth.connect.userInfoEncryptedAlgorithm" />：<@locale code="apps.oauth.connect.userInfoEncryptedAlgorithm" />
<@locale code="apps.oauth.connect.idTokenEncryptionMethod" />：<@locale code="apps.oauth.connect.idTokenEncryptionMethod" /> <@locale code="apps.oauth.connect.userInfoEncryptionMethod" />：<@locale code="apps.oauth.connect.userInfoEncryptionMethod" /> "/> "/> + + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl index d3c5ee9f..8055ee59 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl @@ -22,6 +22,9 @@ +
+
+
<@locale code="apps.saml.v2.0.info" />
<@locale code="apps.saml.v2.0.info" />
<@locale code="apps.saml.spAcsUrl" />：<@locale code="apps.saml.spAcsUrl" />
<@locale code="apps.saml.entityId" />：<@locale code="apps.saml.entityId" />
<@locale code="apps.saml.issuer" />：<@locale code="apps.saml.issuer" /> <@locale code="apps.saml.audience" />：<@locale code="apps.saml.audience" />
<@locale code="apps.saml.signature" />：<@locale code="apps.saml.signature" /> <@locale code="apps.saml.digestMethod" />：<@locale code="apps.saml.digestMethod" />
<@locale code="apps.saml.nameidFormat" />：<@locale code="apps.saml.nameidFormat" /> * <@locale code="apps.saml.nameIdConvert" />：<@locale code="apps.saml.nameIdConvert" />
<@locale code="apps.saml.binding" />：<@locale code="apps.saml.binding" /> * <@locale code="apps.saml.validityInterval" />：<@locale code="apps.saml.validityInterval" />
<@locale code="apps.saml.fileType" />：<@locale code="apps.saml.fileType" /> * <@locale code="apps.saml.metaFile" />：<@locale code="apps.saml.metaFile" />
upload certificate or metadata file @@ -171,7 +174,7 @@
<@locale code="apps.saml.encrypted" />：<@locale code="apps.saml.encrypted" />
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appUpdate.ftl index 90b4e5ea..34f97945 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appUpdate.ftl @@ -22,6 +22,9 @@ +
+
+
<@locale code="apps.saml.v2.0.info" />
<@locale code="apps.saml.v2.0.info" />
<@locale code="apps.saml.spAcsUrl" />：<@locale code="apps.saml.spAcsUrl" />
<@locale code="apps.saml.entityId" />：<@locale code="apps.saml.entityId" />
<@locale code="apps.saml.issuer" />：<@locale code="apps.saml.issuer" /> <@locale code="apps.saml.audience" />：<@locale code="apps.saml.audience" />
<@locale code="apps.saml.signature" />：<@locale code="apps.saml.signature" /> <@locale code="apps.saml.digestMethod" />：<@locale code="apps.saml.digestMethod" />
<@locale code="apps.saml.nameidFormat" />：<@locale code="apps.saml.nameidFormat" /> <@locale code="apps.saml.nameIdConvert" />：<@locale code="apps.saml.nameIdConvert" />
<@locale code="apps.saml.binding" />：<@locale code="apps.saml.binding" /> <@locale code="apps.saml.validityInterval" />：<@locale code="apps.saml.validityInterval" />
<@locale code="apps.saml.fileType" />：<@locale code="apps.saml.fileType" /> <@locale code="apps.saml.metaFile" />：<@locale code="apps.saml.metaFile" />
upload certificate or metadata file @@ -171,7 +174,7 @@
<@locale code="apps.saml.encrypted" />：<@locale code="apps.saml.encrypted" />
<@locale code="apps.saml.certIssuer" />：<@locale code="apps.saml.certIssuer" /> ${model.certIssuer!} <@locale code="apps.saml.certExpiration" />：<@locale code="apps.saml.certExpiration" /> ${model.certExpiration!}
<@locale code="apps.saml.certSubject" />：<@locale code="apps.saml.certSubject" /> ${model.certSubject!}
+ + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl index 55aa399c..a9ce2849 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl @@ -27,17 +27,19 @@
- + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl index 067598b7..a9b20d06 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl @@ -6,6 +6,9 @@ <#include "../appCommonHead.ftl"/> +
+
+
- + - + - + - + - + - + - + - + @@ -91,5 +94,8 @@ + + + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl index a611ae49..808a0442 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl @@ -7,6 +7,9 @@ <#setting number_format="#"> +
+
+
- + - + - + - + - + - + - + - + @@ -91,5 +94,8 @@
<@locale code="apps.name"/>:<@locale code="apps.name"/>
- - +
+ + + "> +
-
- "> - " /> +
+ " />
<@locale code="apps.tokenbased.info" />
<@locale code="apps.tokenbased.info" />
<@locale code="apps.tokenbased.redirectUri" />：<@locale code="apps.tokenbased.redirectUri" />
<@locale code="apps.tokenbased.tokenType" />：<@locale code="apps.tokenbased.tokenType" /> <@locale code="apps.tokenbased.cookieName" />：<@locale code="apps.tokenbased.cookieName" />
<@locale code="apps.tokenbased.algorithm" />：<@locale code="apps.tokenbased.algorithm" /> * <@locale code="apps.tokenbased.algorithmKey" />：<@locale code="apps.tokenbased.algorithmKey" /> ${model.algorithmKey!} @@ -65,11 +68,11 @@
<@locale code="apps.tokenbased.token.content" />：<@locale code="apps.tokenbased.token.content" /> <#include "../userPropertys.ftl"/> <@locale code="apps.tokenbased.expires" />：<@locale code="apps.tokenbased.expires" />
<@locale code="apps.tokenbased.info" />
<@locale code="apps.tokenbased.info" />
<@locale code="apps.tokenbased.redirectUri" />：<@locale code="apps.tokenbased.redirectUri" />
<@locale code="apps.tokenbased.tokenType" />：<@locale code="apps.tokenbased.tokenType" /> <@locale code="apps.tokenbased.cookieName" />：<@locale code="apps.tokenbased.cookieName" />
<@locale code="apps.tokenbased.algorithm" />：<@locale code="apps.tokenbased.algorithm" /> <@locale code="apps.tokenbased.algorithmKey" />：<@locale code="apps.tokenbased.algorithmKey" /> ${model.algorithmKey} @@ -68,11 +71,11 @@
<@locale code="apps.tokenbased.token.content" />：<@locale code="apps.tokenbased.token.content" /> <#include "../userPropertys.ftl"/> <@locale code="apps.tokenbased.expires" />：<@locale code="apps.tokenbased.expires" />
+
+ + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl index 9ed0b1a3..b92abc44 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl @@ -68,7 +68,7 @@
- +
@@ -77,7 +77,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -123,7 +123,7 @@
- +
@@ -132,7 +132,7 @@
- +
@@ -157,7 +157,7 @@
- +
@@ -183,7 +183,7 @@
- +
@@ -204,7 +204,7 @@
- +
@@ -214,7 +214,7 @@
- +
@@ -222,7 +222,7 @@
- +
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/emailsenders/updateEmailSenders.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/emailsenders/updateEmailSenders.ftl index 7bebd2da..a62cc27c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/emailsenders/updateEmailSenders.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/emailsenders/updateEmailSenders.ftl @@ -43,7 +43,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -75,7 +75,7 @@
- +
@@ -85,7 +85,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -115,7 +115,7 @@
- +
@@ -125,7 +125,7 @@
- +
@@ -133,7 +133,7 @@
- +
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl index 66d35a34..7a84543d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl @@ -41,18 +41,20 @@
- +
- - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl index 05539759..68ecb06f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl @@ -66,23 +66,26 @@
<@locale code="apps.name"/>: + <@locale code="apps.name"/>
- - "> +
+ + "> +
-
- "> +
+ ">
- +
<@locale code="group.name"/>:<@locale code="group.name"/>
- - - " +
+ + + + " wurl="<@base/>/groups/selectGroupsList" wwidth="700" wheight="500" target="window"> - "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
- "> + "> " wurl="<@base/>/groupPrivileges/delete" />
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupAdd.ftl index 1ab68265..1fd25318 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupAdd.ftl @@ -165,19 +165,19 @@ function showOrgsTree() { - + - + - + - + - + - + - + - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupUpdate.ftl index b0f28516..39dda361 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupUpdate.ftl @@ -179,19 +179,19 @@ function showOrgsTree() {
<@locale code="group.id" />：<@locale code="group.id" />
<@locale code="group.name" />：<@locale code="group.name" />
<@locale code="group.dynamic" />：<@locale code="group.dynamic" />
<@locale code="group.resumeTime" />：<@locale code="group.resumeTime" />
<@locale code="group.suspendTime" />：<@locale code="group.suspendTime" />
<@locale code="group.orgidslist" />：<@locale code="group.orgidslist" />
<@locale code="group.filters" />：<@locale code="group.filters" />
<@locale code="common.text.description" />：<@locale code="common.text.description" />
- + - + - + - + - + - + - + - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl index ef1e1a98..deac5154 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl @@ -44,24 +44,26 @@
<@locale code="group.id" />：<@locale code="group.id" />
<@locale code="group.name" />：<@locale code="group.name" />
<@locale code="group.dynamic" />：<@locale code="group.dynamic" />
<@locale code="group.resumeTime" />：<@locale code="group.resumeTime" />
<@locale code="group.suspendTime" />：<@locale code="group.suspendTime" />
<@locale code="group.orgidslist" />：<@locale code="group.orgidslist" />
<@locale code="group.filters" />：<@locale code="group.filters" />
<@locale code="common.text.description" />：<@locale code="common.text.description" />
- +
<@locale code="group.name"/>:<@locale code="group.name"/>
- +
+ "> - +
- " + " wurl="<@base/>/groups/forwardAdd" wwidth="500" wheight="600" target="window"> - " + " wurl="<@base/>/groups/forwardUpdate" wwidth="500" wheight="600" diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl index 54e293b8..0cf10396 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/selectGroupsList.ftl @@ -22,18 +22,20 @@
- +
- - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl index 4d6d9ddc..76bdd400 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl @@ -51,18 +51,20 @@
-
<@locale code="group.name"/>: + <@locale code="group.name"/>
- - "> +
+ + "> +
- " > + " >
+
- - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl index 8f301b36..faca3589 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl @@ -72,24 +72,26 @@
<@locale code="userinfo.username"/>: + <@locale code="userinfo.username"/>
- - "> +
+ + "> +
-
- "> +
+ ">
- +
<@locale code="group.name"/>:<@locale code="group.name"/>
- - - " - wurl="<@base/>/groups/selectGroupsList" - wwidth="700" - wheight="500" - target="window"> - "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - +
+ + + " + wurl="<@base/>/groups/selectGroupsList" + wwidth="700" + wheight="500" + target="window"> + + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
- "> + "> " wurl="<@base/>/groupMember/delete"/>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/connectorHistoryList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/connectorHistoryList.ftl index 048884bc..e7b54a34 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/connectorHistoryList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/connectorHistoryList.ftl @@ -45,15 +45,17 @@
-
- <@locale code="log.connector.id"/>: + + <@locale code="log.connector.id"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl index da3f16ce..c4f11988 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl @@ -46,14 +46,16 @@
- <@locale code="userinfo.username"/>: + <@locale code="userinfo.username"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginHistoryList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginHistoryList.ftl index a1f1ab70..96f4477b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginHistoryList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginHistoryList.ftl @@ -46,14 +46,16 @@
- <@locale code="userinfo.username"/>: + <@locale code="userinfo.username"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/sessionList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/sessionList.ftl index 88798d4d..c0d17c3d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/sessionList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/sessionList.ftl @@ -49,10 +49,12 @@
+
"> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/synchronizerHistoryList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/synchronizerHistoryList.ftl index 2fe93e13..1e432d54 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/synchronizerHistoryList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/synchronizerHistoryList.ftl @@ -46,14 +46,16 @@
- <@locale code="log.synchronizer.syncId"/>: + <@locale code="log.synchronizer.syncId"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/systemLogsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/systemLogsList.ftl index f4176a8a..578d6f39 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/systemLogsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/systemLogsList.ftl @@ -46,14 +46,16 @@
- <@locale code="userinfo.username"/>: + <@locale code="userinfo.username"/>
- +
+ "> - " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl index ee770ae4..81ca9e31 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/institutions/updateInstitutions.ftl @@ -43,7 +43,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -62,13 +62,13 @@
- +
- " + " wurl="<@base/>/localization/forward/global.title" wwidth="650" wheight="200" @@ -78,12 +78,12 @@
- +
- " + " wurl="<@base/>/localization/forward/global.consoleTitle" wwidth="650" wheight="200" @@ -95,7 +95,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -151,7 +151,7 @@
- +
@@ -159,7 +159,7 @@
- +
@@ -169,7 +169,7 @@
- +
@@ -178,7 +178,7 @@
- +
@@ -189,7 +189,7 @@
- +
@@ -197,7 +197,7 @@
- +
@@ -208,7 +208,7 @@
- +
@@ -220,7 +220,7 @@
- +
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/ldapcontext/updateLdapContext.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/ldapcontext/updateLdapContext.ftl index 1703045e..31762440 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/ldapcontext/updateLdapContext.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/ldapcontext/updateLdapContext.ftl @@ -43,7 +43,7 @@
- +
@@ -67,7 +67,7 @@
- +
@@ -75,7 +75,7 @@
- +
@@ -85,7 +85,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -143,7 +143,7 @@
- +
@@ -154,7 +154,7 @@
- +
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/localization/updateLocalization.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/localization/updateLocalization.ftl index 0e7f677a..6649839b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/localization/updateLocalization.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/localization/updateLocalization.ftl @@ -11,7 +11,7 @@