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 9dab7553..26000614 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 @@ -315,6 +315,8 @@ apps.credentials=\u79d8\u94a5 apps.adapter.name=\u540D\u79F0 apps.adapter.adapter=\u9002\u914D\u5668 apps.adapter.protocol=\u534F\u8BAE + +apps.select.tip=\u8BF7\u9009\u62E9\u5E94\u7528\u7CFB\u7EDF #formbased apps.formbased.info=\u8868\u5355\u8ba4\u8bc1 apps.formbased.redirectUri=\u8ba4\u8bc1\u5730\u5740 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 a7d9fe45..f0dfd692 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 @@ -320,6 +320,7 @@ apps.adapter.name=name apps.adapter.adapter=adapter apps.adapter.protocol=protocol +apps.select.tip=Please Select Application System #formbased apps.formbased.info=formbased Info apps.formbased.redirectUri=redirectUri 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 bf145e22..ff5331be 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 @@ -318,6 +318,8 @@ apps.adapter.name=\u540D\u79F0 apps.adapter.adapter=\u9002\u914D\u5668 apps.adapter.protocol=\u534F\u8BAE +apps.select.tip=\u8BF7\u9009\u62E9\u5E94\u7528\u7CFB\u7EDF + #formbased apps.formbased.info=\u8868\u5355\u8ba4\u8bc1 apps.formbased.redirectUri=\u8ba4\u8bc1\u5730\u5740 diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adaptersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adaptersList.ftl index dab2221b..69a3373b 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adaptersList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adaptersList.ftl @@ -72,44 +72,46 @@ - + +
| + | Id | +<@locale code="apps.adapter.name"/> | +<@locale code="apps.adapter.protocol"/> | +<@locale code="common.text.sortindex"/> | +<@locale code="common.text.description"/> | +<@locale code="common.text.createdby"/> | +<@locale code="common.text.createddate"/> | +<@locale code="common.text.modifiedby"/> | +<@locale code="common.text.modifieddate"/> | + +
|---|
| - | Id | -<@locale code="apps.adapter.name"/> | -<@locale code="apps.adapter.protocol"/> | -<@locale code="common.text.sortindex"/> | -<@locale code="common.text.description"/> | -<@locale code="common.text.createdby"/> | -<@locale code="common.text.createddate"/> | -<@locale code="common.text.modifiedby"/> | -<@locale code="common.text.modifieddate"/> | - -
|---|
| <@locale code="apps.name"/>: | @@ -148,61 +148,67 @@
| + | Id | +<@locale code="apps.icon"/> | +<@locale code="apps.name"/> | +<@locale code="apps.protocol"/> | +<@locale code="apps.category"/> | +<@locale code="apps.vendor"/> | +<@locale code="log.loginhistory.loginUrl"/> | + +
|---|
| - | Id | -<@locale code="apps.icon"/> | -<@locale code="apps.name"/> | -<@locale code="apps.protocol"/> | -<@locale code="apps.category"/> | -<@locale code="apps.vendor"/> | -<@locale code="log.loginhistory.loginUrl"/> | - -
|---|
| <@locale code="group.name"/>: | @@ -80,7 +80,7 @@ | -
+ |
">
"
wurl="<@base/>/groupPrivileges/delete" />
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 0cb5b96c..ef1e1a98 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
@@ -41,7 +41,7 @@
-
+
-
+
+
+
-
-
-
-
-
+
+
+
-
-
-
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
index bf52a153..d6d9c89d 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
@@ -264,54 +264,55 @@ $('#datagrid').on('click-row.bs.table', function (row, element, field) {
|
- |
+
"/>
+
+
+
+
-
-
-
- |
+
"
wurl="<@base/>/resources/forwardAdd"
wwidth="500"
@@ -207,51 +207,51 @@ $(function () {
| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ <@locale code="apps.select.tip"/>
+
+ |
+
+
|
+
| - - - | -
-
|
-
| + | Id | +<@locale code="role.name"/> | +<@locale code="group.dynamic"/> | +<@locale code="common.text.description"/> | +<@locale code="common.text.createdby"/> | +<@locale code="common.text.createddate"/> | +<@locale code="common.text.modifiedby"/> | +<@locale code="common.text.modifieddate"/> | + +
|---|
| - | Id | -<@locale code="role.name"/> | -<@locale code="group.dynamic"/> | -<@locale code="common.text.description"/> | -<@locale code="common.text.createdby"/> | -<@locale code="common.text.createddate"/> | -<@locale code="common.text.modifiedby"/> | -<@locale code="common.text.modifieddate"/> | - -
|---|
| <@locale code="role.name"/>: | @@ -87,7 +87,7 @@ | -
+ |
">
"
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizersList.ftl
index 6eb33ed7..538c9649 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizersList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizersList.ftl
@@ -68,41 +68,41 @@
| ||
| + | Id | +<@locale code="synchronizers.name"/> | +<@locale code="common.text.description"/> | +<@locale code="common.text.createdby"/> | +<@locale code="common.text.createddate"/> | +<@locale code="common.text.modifiedby"/> | +<@locale code="common.text.modifieddate"/> | + +
|---|
| - | Id | -<@locale code="synchronizers.name"/> | -<@locale code="common.text.description"/> | -<@locale code="common.text.createdby"/> | -<@locale code="common.text.createddate"/> | -<@locale code="common.text.modifiedby"/> | -<@locale code="common.text.modifieddate"/> | - -
|---|
| + + | +