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 40eb006cd9bf215afb7e015eb6b198e0e7dcc633..7294b978667fd251ed7ac9e729f7d96ff2ce9da4 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 0000000000000000000000000000000000000000..1efafa20a7bec3b3f19dcb54d25b3b37a67708b4 --- /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 ce6a6b9ff74b789348e2781ae0a2f461cbc00bd5..10dbd0346f306e929ed252528e71833528b884ff 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 6865fbdb4e7570afb60f6c004ef488f4da6ab028..0e4f86bce46b487dba6c3d4e826df5366e361d8b 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 9fda5473b507d40065d3a02328b505c0bc825930..0aeff967e2dd6c0d1148a2319e67f2c34370c0df 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 2200458dde0f1c59a99e7bd4ee4dead8f6b2ea57..04766c09e1868a80b66064f284aab20a1579ee4e 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 95536b10d1a9acc4fe18ea5707d1cfdcc12b0609..7b873b0aeb8f89ea1c96090396af522940d0a230 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 f669556f6bc6f9c93ad5b16d257ce5dd539ebdb6..58abe4177166f47e2bc148d058cfbf40e8c755a7 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 3222a0d583a870a3710056bab8c6f7b52747cfab..1c3f1f29222188b04ebad4a11626c1902bf80689 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 79a8e610bd0553d74fe8510750755d549035b628..1605666faa2bc50a20d955bf1b122bdb20ab425f 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 77f316355ffcb249679530aff81ec5c67f384eac..ec83e9a8156e2c3abd7ac5a8ed4d68a6a5da8523 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" />: - - + "/>