diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties
index 3f41a0648..e2ec35aa4 100644
--- a/maxkey-web-manage/src/main/resources/messages/message.properties
+++ b/maxkey-web-manage/src/main/resources/messages/message.properties
@@ -423,4 +423,20 @@ log.operate.message=\u6D88\u606F
log.operate.content=\u5185\u5BB9
log.operate.messageType=\u6D88\u606F\u7C7B\u578B
log.operate.operateType=\u64CD\u4F5C\u7C7B\u578B
-log.operate.username=\u64CD\u4F5C\u4EBA
\ No newline at end of file
+log.operate.username=\u64CD\u4F5C\u4EBA
+
+navs.system=\u7CFB\u7EDF
+navs.home=\u9996\u9875
+navs.orgs=\u673A\u6784\u7BA1\u7406
+navs.users=\u7528\u6237\u7BA1\u7406
+navs.apps=\u5E94\u7528\u7BA1\u7406
+navs.accounts=\u8D26\u53F7\u7BA1\u7406
+navs.groups=\u7EC4\u7BA1\u7406
+navs.groups.member=\u6210\u5458\u7BA1\u7406
+navs.groups.privileges=\u6743\u9650\u7BA1\u7406
+navs.conf=\u914D\u7F6E\u7BA1\u7406
+navs.conf.passwordpolicy=\u5BC6\u7801\u7B56\u7565
+navs.audit=\u65E5\u5FD7\u5BA1\u8BA1
+navs.audit.login=\u767B\u5F55\u65E5\u5FD7
+navs.audit.loginapps=\u8BBF\u95EE\u65E5\u5FD7
+navs.audit.operate=\u64CD\u4F5C\u65E5\u5FD7
diff --git a/maxkey-web-manage/src/main/resources/static/css/base.css b/maxkey-web-manage/src/main/resources/static/css/base.css
index 1c23d76dd..6d1a1f468 100644
--- a/maxkey-web-manage/src/main/resources/static/css/base.css
+++ b/maxkey-web-manage/src/main/resources/static/css/base.css
@@ -197,6 +197,9 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
color: #8a8a8a;
cursor: pointer;
}
+.breadcrumb-wrapper .breadcrumb .inactive {
+ color: #8a8a8a;
+}
.breadcrumb-wrapper .breadcrumb .active {
color: #e22a6f;
}
diff --git a/maxkey-web-manage/src/main/resources/static/css/base2.css b/maxkey-web-manage/src/main/resources/static/css/base2.css
deleted file mode 100644
index 5d2f8f5b8..000000000
--- a/maxkey-web-manage/src/main/resources/static/css/base2.css
+++ /dev/null
@@ -1,492 +0,0 @@
-* { padding:0; margin:0; outline:0; }
-body{
- margin: 0;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- padding: 0 0 0 0px;
- font-size: 12px;
- text-align:center;
- float:center;
- font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
-}
-/*table td,select,button,input{
- font-size: 12px;
-}
-
-table.datatable {
- border: 1px solid #d8dcdf;
- border-collapse:collapse;
- border-spacing:0;
- width: 100%;
-}
-
-table.datatable th{
- border: 1px solid #d8dcdf;
- border-collapse:collapse;
- border-spacing:0;
- height: 40px;
-}
-
-table.datatable td{
- border: 1px solid #d8dcdf;
- border-collapse:collapse;
- border-spacing:0;
- height: 40px;
- text-align: left;
- text-indent: 5px;
-}
-
-table.datatable td.center{
- border: 1px solid #d8dcdf;
- border-collapse:collapse;
- border-spacing:0;
- height: 40px;
- text-align: center;
- text-indent: 0px;
-}
-
-table.hidetable {
- border-collapse:collapse;
- width: 100%;
- border: 0px;
-}
-
-table.hidetable th{
- border: 0px;
- border-collapse:collapse;
- border-spacing:0;
-}
-
-table.hidetable td{
- border-collapse:collapse;
- border-spacing:0;
- border: 0px;
-}
-*/
-.form_title_bar{
- width: 100%;
- height: 36px;
- text-align: left;
- text-indent: 30px;
- background-color: #f8f8f8;
-}
-
-.form_title_bar a {
- text-decoration: none;
- display: inline-block;
- height: 14px;
- color: #333;
- font-size: 14px;
- font-weight: bold;
- padding: 8px 0;
- vertical-align: central;
-}
-
-
-button,input{
- color: #393939;
-}
-
-#topBar{
- text-shadow: 0 1px 0 #fff;
- border-bottom: 1px solid #e5e5e5;
- min-width: 100%;
- align:left;
- height:60px;
- margin-bottom: 1px;
-}
-#topNav{
- border-bottom: 1px solid #e5e5e5;
-}
-
-#navs{
- border-bottom: 1px solid #e5e5e5;
-}
-
-#nav_primary{
- background: #414141;
-}
-
-#nav_second{
- height:31px;
-}
-#nav_third{
- /*border-top: 1px solid #e5e5e5;*/
-}
-
-.container {
- width: 990px;
- margin-left: auto;
- margin-right: auto;
- padding: 0 10px
-}
-
-#mainFrame{
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- display: block;
- width:990px;
- align:center;
-}
-
-#footer{
- text-shadow: 0 1px 0 #fff;
- border-top: 1px solid #e5e5e5;
- min-width: 100%;
- height:80px;
-
-}
-
-#content{
- margin-top: 10px;
- min-height:480px;
- *height:480px;
- margin-bottom: 10px;
-}
-
-#tool_box {
- margin-bottom: 10px;
- border: 1px solid #e5e5e5;
-}
-
-#tool_box_left {
- padding-left: 10px;
- float: left;
- height:30px;
- width:50%;
- text-align: left;
- border-right: 1px solid #e5e5e5;
-}
-
-#tool_box_right {
- height:32px;
- text-align: right;
- padding-right: 10px;
- width:484px;
-}
-
-#advanced_search {
- margin-top: 10px;
- min-height:30px;
- *height:40px;
- border: 1px solid #e5e5e5;
- margin-bottom: 10px;
- display: none;
-}
-
-#logout{
- width: 40px;
- background: #c00 ;
- color: #fff;
- font-weight: bold;
-}
-
-#manage{
- width: 40px;
- background-color: #2AA9A9;
- font-weight: bold;
-}
-
-#changepassword{
- width: 65px;
- background-color: #f28018;
- font-weight: bold;
-}
-
-#manage a,#logout a,#changepassword a{
- color: #fff;
-}
-
-a {
- color: #4183c4;
- text-decoration: none;
-}
-
-
-input[type="text"],
-input[type="password"],
-input[type="email"],
-input[type="number"],
-input[type="tel"],
-input[type="url"] {
- min-height: 27px;
- height: 27px;
- padding: 4px 8px;
- outline: none;
- color: #333;
- background-color: #fff;
- background-repeat: no-repeat;
- background-position: right center;
- border: 1px solid #ccc;
- border-radius: 3px;
- box-shadow: inset 0 1px 2px rgba(0,0,0,0.075);
- transition: all 0.15s ease-in;
- -webkit-transition: all 0.15s ease-in 0;
- vertical-align: middle;
- width:90%;
-}
-
-textarea {
- min-height: 27px;
- padding: 4px 8px;
- outline: none;
- color: #333;
- background-color: #fff;
- background-repeat: no-repeat;
- background-position: right center;
- border: 1px solid #ccc;
- border-radius: 3px;
- box-shadow: inset 0 1px 2px rgba(0,0,0,0.075);
- transition: all 0.15s ease-in;
- -webkit-transition: all 0.15s ease-in 0;
- vertical-align: middle;
- width:90%;
-}
-input[type="text"]:focus,
-input[type="text"].focus,
-input[type="password"].focus,
-input[type="password"]:focus,
-input[type="email"].focus,
-input[type="email"]:focus,
-input[type="number"].focus,
-input[type="number"]:focus,
-input[type="tel"].focus,
-input[type="tel"]:focus,
-input[type="url"].focus,
-input[type="url"]:focus,
-textarea.focus,
-textarea:focus {
- border-color: #51a7e8;
- box-shadow: inset 0 1px 2px rgba(0,0,0,0.075),0 0 5px rgba(81,167,232,0.5)
-}
-
-.button,.minibutton {
- position: relative;
- display: inline-block;
- padding: 7px 15px;
- font-size: 13px;
- font-weight: bold;
- color: #333;
- text-shadow: 0 1px 0 rgba(255,255,255,0.9);
- white-space: nowrap;
- background-color: #eaeaea;
- background-image: -moz-linear-gradient(#eaeaea, #eaeaea);
- background-image: -webkit-linear-gradient(#eaeaea, #eaeaea);
- background-image: linear-gradient(#eaeaea, #eaeaea);
- background-repeat: repeat-x;
- border-radius: 3px;
- border: 1px solid #ddd;
- border-bottom-color: #c5c5c5;
- box-shadow: 0 1px 3px rgba(0,0,0,0.05);
- vertical-align: middle;
- cursor: pointer;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- -webkit-appearance: none
-}
-
-.button:hover,.button:active,.button.zeroclipboard-is-hover,.button.zeroclipboard-is-active,.minibutton:hover,.minibutton:active,.minibutton.zeroclipboard-is-hover,.minibutton.zeroclipboard-is-active {
- text-decoration: none;
- background-color: #dadada;
- background-image: -moz-linear-gradient(#dadada, #dadada);
- background-image: -webkit-linear-gradient(#dadada, #dadada);
- background-image: linear-gradient(#dadada, #dadada);
- background-repeat: repeat-x;
- border-color: #ccc #ccc #b5b5b5
-}
-
-.button:active,.button.selected,.button.zeroclipboard-is-active,.minibutton:active,.minibutton.selected,.context-menu-container.active .minibutton.switcher,.context-menu-container.active .context-button,.minibutton.zeroclipboard-is-active {
- background-color: #dadada;
- background-image: none;
- border-color: #b5b5b5;
- box-shadow: inset 0 3px 5px rgba(0,0,0,0.15)
-}
-
-.button:disabled,.button:disabled:hover,.button.disabled,.button.disabled:hover,.minibutton:disabled,.minibutton:disabled:hover,.minibutton.disabled,.minibutton.disabled:hover {
- opacity: .5;
- color: #666;
- text-shadow: 0 1px 0 rgba(255,255,255,0.9);
- background-image: none;
- background-color: #e5e5e5;
- border-color: #c5c5c5;
- cursor: default;
- box-shadow: none
-}
-
-.button.primary,.minibutton.primary {
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
- background-color: #44b549;
- background-image: -moz-linear-gradient(#44b549, #44b549);
- background-image: -webkit-linear-gradient(#44b549, #44b549);
- background-image: linear-gradient(#44b549, #44b549);
- background-repeat: repeat-x;
- border-color: #44b549
-}
-
-.button.primary:hover,.minibutton.primary:hover {
- color: #fff;
- background-color: #4aaf33;
- background-image: -moz-linear-gradient(#4aaf33, #4aaf33);
- background-image: -webkit-linear-gradient(#4aaf33, #4aaf33);
- background-image: linear-gradient(#4aaf33, #4aaf33);
- background-repeat: repeat-x;
- border-color: #4aaf33
-}
-
-.button.primary:active,.button.primary.selected,.minibutton.primary:active,.minibutton.primary.selected,.context-menu-container.active .primary.minibutton.switcher,.context-menu-container.active .primary.context-button {
- background-color: #569e3d;
- background-image: none;
- border-color: #418737
-}
-
-.button.primary:disabled,.button.primary:disabled:hover,.button.primary.disabled,.button.primary.disabled:hover,.minibutton.primary:disabled,.minibutton.primary:disabled:hover,.minibutton.primary.disabled,.minibutton.primary.disabled:hover {
- color: #fff;
- text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
- background-color: #60b044;
- background-image: -moz-linear-gradient(#8add6d, #60b044);
- background-image: -webkit-linear-gradient(#8add6d, #60b044);
- background-image: linear-gradient(#8add6d, #60b044);
- background-repeat: repeat-x;
- border-color: #74bb5a #74bb5a #509338
-}
-
-.button,.minibutton {
- outline: none
-}
-
-.button:focus,.minibutton:focus {
- text-decoration: none;
- border-color: #51a7e8;
- box-shadow: 0 0 5px rgba(81,167,232,0.5)
-}
-
-.button img {
- position: relative;
- top: -1px;
- margin-right: 3px;
- vertical-align: middle
-}
-
-.button>.octicon {
- vertical-align: middle;
- margin-top: -1px
-}
-
-.minibutton {
- padding: 0 10px;
- line-height: 32px;
- box-shadow: none
-}
-
-.minibutton:hover .octicon-device-desktop:before {
- background-position: -18px 0
-}
-
-.minibutton i {
- font-weight: 500;
- font-style: normal;
- opacity: .6
-}
-
-.form_radio_label, .form_checkbox_label{
- display: inline-block;
- text-align: left;
- cursor: pointer;
- margin-right: 1em;
-}
-
-.icon_checkbox {
- background: url("../images/checkbox.png") 0 -83px no-repeat;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- display: inline-block;
- margin-top: -0.2em;
-}
-
-.icon_checkbox_selected{
- background: url("../images/checkbox.png") 0 -109px no-repeat;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- display: inline-block;
- margin-top: -0.2em;
-}
-
-.icon_radiobox {
- background: url("../images/checkbox.png") 0 -5px no-repeat;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- display: inline-block;
- margin-top: -0.2em;
-}
-
-.icon_radiobox_selected{
- background: url("../images/checkbox.png") 0 -31px no-repeat;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- display: inline-block;
- margin-top: -0.2em;
-}
-
-.select-menu-modal{
- position: absolute;
- display: none;
- z-index: 1989;
- width: 300px;
- margin-top: 4px;
- margin-bottom: 20px;
- overflow: hidden;
- font-size: 12px;
- color: #666;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #ccc;
- border: 1px solid rgba(0,0,0,0.15);
- border-radius: 5px;
- box-shadow: 0 3px 12px rgba(0,0,0,0.25);
-}
-
-.select-menu-item{
- cursor: pointer;
- line-height: 33px;
- border-bottom: 1px solid #eee;
- display: table;
- table-layout: fixed;
- width: 100%;
- overflow: hidden;
- color: inherit;
- text-align: left;
-}
-.select-menu-item a{
- text-decoration : none;
-}
-
-
-.select-menu-item a div{
- width: 140px;
- line-height: 33px;
-}
-
-
-
-
-.select-menu-item-selected{
- background-color: #4183c4;
- color: #fff;
-}
-
-.select-menu-item-selected a{
- color: #fff;
-}
-
-
diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
index eb272de3a..7e543102e 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
@@ -21,12 +21,12 @@
-
Dashboard 2
+ <@locale code="navs.accounts"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl
index fd5f8be12..8e09b5d3f 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl
@@ -99,12 +99,12 @@
-
Dashboard 2
+ <@locale code="navs.apps"/>
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 d26a5fedb..272c490b6 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
@@ -45,12 +45,13 @@
-
Dashboard 2
+ <@locale code="navs.conf.passwordpolicy"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
index 98d299f69..3a5276bef 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
@@ -40,12 +40,13 @@
-
Dashboard 2
+ <@locale code="navs.groups.privileges"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl
index b751b3b98..c18b97d32 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl
@@ -21,12 +21,12 @@
-
Dashboard 2
+ <@locale code="navs.groups"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
index 5a21b1547..3d82b8c96 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
@@ -41,12 +41,13 @@
-
Dashboard 2
+ <@locale code="navs.groups.member"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
index 46df320e6..da9d423e9 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
@@ -3,56 +3,56 @@
- 首 页
+ <@locale code="navs.home"/>
- 机构管理
+ <@locale code="navs.orgs"/>
- 用户管理
+ <@locale code="navs.users"/>
- 应用管理
+ <@locale code="navs.apps"/>
- 账号管理
+ <@locale code="navs.accounts"/>
- 组管理
+ <@locale code="navs.groups"/>
@@ -61,13 +61,13 @@
- 配置管理
+ <@locale code="navs.conf"/>
@@ -75,25 +75,25 @@
- 日志审计
+ <@locale code="navs.audit"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl
index cd8db5a16..729edbfdb 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl
@@ -34,12 +34,13 @@
-
Dashboard 2
+ <@locale code="navs.audit.loginapps"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList2.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList2.ftl
deleted file mode 100644
index c9c874ae3..000000000
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList2.ftl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- <#include "../layout/header.ftl"/>
- <#include "../layout/common.cssjs.ftl"/>
-
-
-
-<#include "../layout/top.ftl"/>
-<#include "../layout/nav_primary.ftl"/>
-
-
-
-
-
-
-
-
-
-
- | <@locale code="log.loginappshistory.id" /> |
- <@locale code="log.loginappshistory.sessionId" /> |
- <@locale code="log.loginappshistory.uid" /> |
- <@locale code="log.loginappshistory.username" /> |
- <@locale code="log.loginappshistory.displayName" /> |
- <@locale code="log.loginappshistory.appId" /> |
- <@locale code="log.loginappshistory.appName" /> |
- <@locale code="log.loginappshistory.loginTime" /> |
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl
index 52bc3403b..cf46c7dbd 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl
@@ -34,12 +34,13 @@
-
Dashboard 2
+ <@locale code="navs.audit.login"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList2.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList2.ftl
deleted file mode 100644
index 44f5d3d64..000000000
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList2.ftl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
- <#include "../layout/header.ftl"/>
- <#include "../layout/common.cssjs.ftl"/>
-
-
-
-<#include "../layout/top.ftl"/>
-<#include "../layout/nav_primary.ftl"/>
-
-
-
-
-
-
-
-
-
-
- | <@locale code="log.loginhistory.id"/> |
- <@locale code="log.loginhistory.sessionId"/> |
- <@locale code="log.loginhistory.username"/> |
- <@locale code="log.loginhistory.displayName"/> |
- <@locale code="log.loginhistory.provider"/> |
- <@locale code="log.loginhistory.message"/> |
- <@locale code="log.loginhistory.loginType"/> |
- <@locale code="log.loginhistory.sourceIp"/> |
- <@locale code="log.loginhistory.browser"/> |
- <@locale code="log.loginhistory.loginTime"/> |
- <@locale code="log.loginhistory.logoutTime"/> |
- <@locale code="log.loginhistory.platform"/> |
- <@locale code="log.loginhistory.application"/> |
- <@locale code="log.loginhistory.loginUrl"/> |
- <@locale code="log.loginhistory.code"/> |
- <@locale code="log.loginhistory.rpUserInfo"/> |
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl
index 91efca211..c7be381e8 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl
@@ -34,12 +34,13 @@
-
Dashboard 2
+ <@locale code="navs.audit.operate"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList2.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList2.ftl
deleted file mode 100644
index 6e35a4037..000000000
--- a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList2.ftl
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- <#include "../layout/header.ftl"/>
- <#include "../layout/common.cssjs.ftl"/>
-
-
-
-
-<#include "../layout/top.ftl"/>
-<#include "../layout/nav_primary.ftl"/>
-
-
-
-
-
-
-
-
- | id |
- <@locale code="log.operate.servicename"/> |
- <@locale code="log.operate.message"/> |
- <@locale code="log.operate.content"/> |
- <@locale code="log.operate.messageType"/> |
- <@locale code="log.operate.operateType"/> |
- <@locale code="log.operate.username"/> |
- <@locale code="common.text.createdby"/> |
- <@locale code="common.text.createddate"/> |
- <@locale code="common.text.modifiedby"/> |
- <@locale code="common.text.modifieddate"/> |
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/maxkey-web-manage/src/main/resources/templates/views/main.ftl b/maxkey-web-manage/src/main/resources/templates/views/main.ftl
index c788eca04..64408850b 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/main.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/main.ftl
@@ -21,8 +21,6 @@
-
-
@@ -30,12 +28,12 @@
-
Dashboard 2
+<@locale code="navs.home"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
index 5509ad504..0cdf12d7f 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
@@ -151,12 +151,12 @@ $(function () {
-
Dashboard 2
+ <@locale code="navs.orgs"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
index 166985ccc..80c5de74a 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
@@ -161,12 +161,12 @@ $(function () {
-
Dashboard 2
+ <@locale code="navs.users"/>