diff --git a/.classpath b/.classpath
index eb19361b..b7188c9c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
diff --git a/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-web-maxkey/src/main/resources/messages/message.properties
index 815cb7fa..5763d44a 100644
--- a/maxkey-web-maxkey/src/main/resources/messages/message.properties
+++ b/maxkey-web-maxkey/src/main/resources/messages/message.properties
@@ -34,6 +34,8 @@ common.text.createdby=\u521B\u5EFA\u4EBA
common.text.createddate=\u521B\u5EFA\u65F6\u95F4
common.text.modifiedby=\u4FEE\u6539\u4EBA
common.text.modifieddate=\u4FEE\u6539\u65F6\u95F4
+common.text.status.enabled=\u542F\u7528
+common.text.status.disabled=\u505C\u7528
login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6
login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801
@@ -139,6 +141,14 @@ userinfo.authnType.authnType.8=RSA\u4EE4\u724C
userinfo.authnType.authnType.9=\u6570\u5B57\u8BC1\u4E66
userinfo.authnType.authnType.10=USB Key
+#account
+account.username=\u7528\u6237\u540D
+account.displayName=\u7528\u6237\u59D3\u540D
+account.appId=\u5E94\u7528\u7F16\u53F7
+account.appName=\u5E94\u7528\u540D\u79F0
+account.relatedUsername=\u7528\u6237\u8D26\u53F7
+account.relatedPassword=\u8D26\u53F7\u5BC6\u7801
+
login.totp.sharedSecret=\u5171\u4EAB\u5BC6\u7801
login.totp.period=\u5468\u671F
login.totp.digits=\u6570\u5B57
@@ -160,10 +170,12 @@ login.counter.crypto=\u52A0\u5BC6\u65B9\u5F0F
login.counter.generate=\u91CD\u65B0\u751F\u6210
login.counter.title=Counter Based One Time Password
+apps.number=\u5E8F\u53F7
apps.icon=\u56FE\u6807
apps.name=\u5E94\u7528\u540D\u79F0
apps.protocol=\u8BBF\u95EE\u534F\u8BAE
apps.category=\u7C7B\u578B
+apps.account=\u8D26\u53F7
button.text.action=\u8BBF\u95EE
button.text.visit=\u8BBF\u95EE
@@ -212,8 +224,7 @@ navs.setting=\u8BBE\u7F6E
navs.setting.security=\u5B89\u5168\u8BBE\u7F6E
navs.setting.sociallink=\u8BA4\u8BC1\u5173\u8054
navs.setting.changepassword=\u5BC6\u7801\u4FEE\u6539
-navs.setting.apppassword=\u5E94\u7528\u767B\u5F55\u5BC6\u7801
-navs.setting.appsetting=\u5E94\u7528\u914D\u7F6E
+navs.setting.appaccount=\u5E94\u7528\u8D26\u53F7
navs.setting.timetoken=\u65F6\u95F4\u4EE4\u724C
navs.myprofile=\u6211\u7684\u8D44\u6599
diff --git a/maxkey-web-maxkey/src/main/resources/messages/message_en.properties b/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
index 90096e1d..346d6f57 100644
--- a/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
+++ b/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
@@ -33,6 +33,8 @@ common.text.createdby=CreatedBy
common.text.createddate=CreatedDate
common.text.modifiedby=ModifiedBy
common.text.modifieddate=ModifiedDate
+common.text.status.enabled=enabled
+common.text.status.disabled=disabled
login.text.login.twofactor.obtain.valid=Regain
login.text.login.twofactor.obtain=Get dynamic verification code
@@ -138,6 +140,14 @@ userinfo.authnType.authnType.8=RSA Token
userinfo.authnType.authnType.9=Digital Certificate
userinfo.authnType.authnType.10=USB Key
+#account
+account.username=username
+account.displayName=displayName
+account.appId=appId
+account.appName=appName
+account.relatedUsername=relatedUsername
+account.relatedPassword=relatedPassword
+
login.totp.sharedSecret=sharedSecret
login.totp.period=period
login.totp.digits=digits
@@ -159,10 +169,12 @@ login.counter.crypto=crypto
login.counter.generate=generate
login.counter.title=Counter Based One Time Password
+apps.number=No.
apps.icon=Icon
apps.name=appName
apps.protocol=protocol
apps.category=category
+apps.account=account
button.text.action=Action
button.text.visit=Visit
@@ -213,7 +225,7 @@ navs.setting.security=Security
navs.setting.sociallink=SocialLink
navs.setting.changepassword=ChangePassword
navs.setting.apppassword=AppsPassword
-navs.setting.appsetting=AppsSettings
+navs.setting.appaccount=AppsAccount
navs.setting.timetoken=Timetoken
navs.myprofile=My Profile
diff --git a/maxkey-web-maxkey/src/main/resources/static/css/base.css b/maxkey-web-maxkey/src/main/resources/static/css/base.css
index 9f1076ea..6efeff60 100644
--- a/maxkey-web-maxkey/src/main/resources/static/css/base.css
+++ b/maxkey-web-maxkey/src/main/resources/static/css/base.css
@@ -57,6 +57,13 @@ body{
/*border-top: 1px solid #e5e5e5;*/
}
+#topBar .grid_list_sel{
+ width: 31px;
+ height: 31px;
+ border: 1px solid;
+ border-color: #A9A9A9;
+}
+
.container {
width: 990px;
margin-left: auto;
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl
index c55ec683..b2cad19c 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl
@@ -27,16 +27,10 @@
<@locale code="navs.setting.changepassword"/>
-
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl
index fe8bb177..75070076 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl
@@ -17,17 +17,11 @@
<#if Session["current_user"].gridList==0 >
-
- |
-
-
+
|
<#else>
-
- |
-
-
+
|
#if>
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl
index d90eb985..c2717f66 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl
@@ -1,86 +1,57 @@
-
-<%if(WebContext.getUserInfo().getGridList()==0) {%>
-
-<%}else{%>
- |