diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl index 40eb006c..7294b978 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -75,5 +75,22 @@ + + <@locale code="apps.isAdapter" />: + + + + + + + + <@locale code="apps.adapter" />: + + + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl new file mode 100644 index 00000000..1efafa20 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl @@ -0,0 +1,36 @@ + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl index ce6a6b9f..10dbd034 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl @@ -1,15 +1,3 @@ - @@ -25,9 +13,8 @@ @@ -91,6 +78,23 @@ target="window"> + + + + + + + + + '; //Index html += ''; //attribute html += '
<@locale code="apps.secret"/>: - "/>
-
${model.secret!}
- + + "/>
<@locale code="apps.isAdapter" />: + + +
<@locale code="apps.adapter" />: + +
<@locale code="common.text.description"/>: 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 6865fbdb..0e4f86bc 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 @@ -18,7 +18,7 @@ $(function(){ var html = '
<@locale code="apps.extendAttr.parameter"/>:'; - html += '"/>'; + html += '"/>'; html += ''; 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 9fda5473..0aeff967 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 @@ -3,27 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - - + <#include "../appCommonHead.ftl"/>
- - 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 2200458d..04766c09 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 @@ -3,37 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - - + <#include "../appCommonHead.ftl"/>
<#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - + <#include "../appCommonHead.ftl"/> + <#include "../appCommonHead.ftl"/> - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - 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 95536b10..7b873b0a 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 @@ -3,27 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - + <#include "../appCommonHead.ftl"/> - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - + 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 f669556f..58abe417 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 @@ -3,19 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - + <#include "../appCommonHead.ftl"/> - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - 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 3222a0d5..1c3f1f29 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 @@ -3,32 +3,20 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - + //--> + - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - + 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 79a8e610..1605666f 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 @@ -3,33 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - - + <#include "../appCommonHead.ftl"/> - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - - - - - <@locale code="apps.adapter" />: - - 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 77f31635..ec83e9a8 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 @@ -3,40 +3,7 @@ <#include "../../layout/header.ftl"/> <#include "../../layout/common.cssjs.ftl"/> - - + <#include "../appCommonHead.ftl"/> <@locale code="apps.tokenbased.cookieName" />: - * + @@ -120,32 +87,11 @@ $(function(){ - <@locale code="apps.isAdapter" />: + - - - - - <@locale code="apps.adapter" />: - - - - - - <@locale code="apps.adapter" />: - - + "/>