2
0
shimingxy 5 жил өмнө
parent
commit
564359d024
19 өөрчлөгдсөн 77 нэмэгдсэн , 797 устгасан
  1. 17 1
      maxkey-web-manage/src/main/resources/messages/message.properties
  2. 3 0
      maxkey-web-manage/src/main/resources/static/css/base.css
  3. 0 492
      maxkey-web-manage/src/main/resources/static/css/base2.css
  4. 3 3
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
  5. 3 3
      maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl
  6. 4 3
      maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl
  7. 4 3
      maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
  8. 3 3
      maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl
  9. 4 3
      maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
  10. 15 15
      maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
  11. 4 3
      maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl
  12. 0 85
      maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList2.ftl
  13. 4 3
      maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl
  14. 0 93
      maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList2.ftl
  15. 4 3
      maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl
  16. 0 73
      maxkey-web-manage/src/main/resources/templates/views/logs/logsList2.ftl
  17. 3 5
      maxkey-web-manage/src/main/resources/templates/views/main.ftl
  18. 3 3
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
  19. 3 3
      maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl

+ 17 - 1
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
+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

+ 3 - 0
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;
 }

+ 0 - 492
maxkey-web-manage/src/main/resources/static/css/base2.css

@@ -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;
-}
-
-

+ 3 - 3
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl

@@ -21,12 +21,12 @@
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.accounts"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="active">/ <@locale code="navs.accounts"/></li>
 								</ol>
 							</div>
 						</div>

+ 3 - 3
maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl

@@ -99,12 +99,12 @@
 		<div class="container-fluid">
 			<div class="breadcrumb-wrapper row">
 				<div class="col-12 col-lg-3 col-md-6">
-					<h4 class="page-title">Dashboard 2</h4>
+					<h4 class="page-title"><@locale code="navs.apps"/></h4>
 				</div>
 				<div class="col-12 col-lg-9 col-md-6">
 					<ol class="breadcrumb float-right">
-						<li><a href="<@base/>/main">Dashboard</a></li>
-						<li class="active">/ Dashboard 2</li>
+						<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+						<li class="active">/ <@locale code="navs.apps"/></li>
 					</ol>
 				</div>
 			</div>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl

@@ -45,12 +45,13 @@
 		<div class="container-fluid">
 			<div class="breadcrumb-wrapper row">
 				<div class="col-12 col-lg-3 col-md-6">
-					<h4 class="page-title">Dashboard 2</h4>
+					<h4 class="page-title"><@locale code="navs.conf.passwordpolicy"/></h4>
 				</div>
 				<div class="col-12 col-lg-9 col-md-6">
 					<ol class="breadcrumb float-right">
-						<li><a href="<@base/>/main">Dashboard</a></li>
-						<li class="active">/ Dashboard 2</li>
+						<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+						<li class="inactive">/ <@locale code="navs.conf"/></li>
+						<li class="active">/ <@locale code="navs.conf.passwordpolicy"/></li>
 					</ol>
 				</div>
 			</div>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl

@@ -40,12 +40,13 @@
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.groups.privileges"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="inactive" >/ <@locale code="navs.groups"/></li>
+									<li class="active">/ <@locale code="navs.groups.privileges"/></li>
 								</ol>
 							</div>
 						</div>

+ 3 - 3
maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl

@@ -21,12 +21,12 @@
 		<div class="container-fluid">
 			<div class="breadcrumb-wrapper row">
 				<div class="col-12 col-lg-3 col-md-6">
-					<h4 class="page-title">Dashboard 2</h4>
+					<h4 class="page-title"><@locale code="navs.groups"/></h4>
 				</div>
 				<div class="col-12 col-lg-9 col-md-6">
 					<ol class="breadcrumb float-right">
-						<li><a href="<@base/>/main">Dashboard</a></li>
-						<li class="active">/ Dashboard 2</li>
+						<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+						<li class="active">/ <@locale code="navs.groups"/></li>
 					</ol>
 				</div>
 			</div>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl

@@ -41,12 +41,13 @@
 		<div class="container-fluid">
 			<div class="breadcrumb-wrapper row">
 				<div class="col-12 col-lg-3 col-md-6">
-					<h4 class="page-title">Dashboard 2</h4>
+					<h4 class="page-title"><@locale code="navs.groups.member"/></h4>
 				</div>
 				<div class="col-12 col-lg-9 col-md-6">
 					<ol class="breadcrumb float-right">
-						<li><a href="<@base/>/main">Dashboard</a></li>
-						<li class="active">/ Dashboard 2</li>
+						<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+						<li class="inactive" >/ <@locale code="navs.groups"/></li>
+						<li class="active">/ <@locale code="navs.groups.member"/></li>
 					</ol>
 				</div>
 			</div>

+ 15 - 15
maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl

@@ -3,56 +3,56 @@
 	<li>
 		<a class="" href="<@base />/main/">
        		<span class="fa fa-fw fa-github fa-lg"></span>
-       		首&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;页
+       		<@locale code="navs.home"/>
     	</a>
 	</li>
    	<li>
      	<a class="" href="<@base />/orgs/list/">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		机构管理
+       		<@locale code="navs.orgs"/>
      	</a>
    	</li>
    	<li>
      	<a class="" href="<@base />/userinfo/list/">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		用户管理
+       		<@locale code="navs.users"/>
      	</a>
    	</li>
    	<li>
      	<a class="" href="<@base />/apps/list/">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		应用管理
+       		<@locale code="navs.apps"/>
      	</a>
    	</li>
    	
  	<li>
      	<a class="" href="<@base />/app/accounts/list">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		账号管理
+       		<@locale code="navs.accounts"/>
      	</a>
    	</li>  	
    	<li>
      	<a class="has-arrow" href="#">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		组管理
+       		<@locale code="navs.groups"/>
      	</a>
      	<ul>
      		<li>
 	         <a href="<@base />/groups/list/">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 组管理	
+	         	<@locale code="navs.groups"/>	
 	         </a>
 	       </li>
 	       <li>
 	         <a href="<@base />/groupMember/list">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 成员管理	
+	         	<@locale code="navs.groups.member"/>
 	         </a>
 	       </li>
 	       <li>
 	         <a href="<@base />/groupPrivileges/list">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 权限管理	
+	         	 <@locale code="navs.groups.privileges"/>
 	         </a>
 	       </li>
 	    </ul>
@@ -61,13 +61,13 @@
    	<li>
      	<a class="has-arrow" href="#">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		配置管理
+       		<@locale code="navs.conf"/>
      	</a>
      	<ul>
      		<li>
 	         <a href="<@base />/config/passwordpolicy/forward">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 密码策略
+	         	<@locale code="navs.conf.passwordpolicy"/>
 	         </a>
 	       </li>
 	    </ul>
@@ -75,25 +75,25 @@
    	<li>
      	<a class="has-arrow" href="#">
       		<span class="fa fa-fw fa-github fa-lg"></span>
-       		日志审计
+       		<@locale code="navs.audit"/>
      	</a>
      	<ul>
 	       <li>
 	         <a href="<@base />/logs/loginHistoryList">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 登录日志
+	         	<@locale code="navs.audit.login"/>
 	         </a>
 	       </li>
 	       <li>
 	         <a href="<@base />/logs/loginAppsHistoryList">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	 访问日志
+	         	 <@locale code="navs.audit.loginapps"/>
 	         </a>
 	       </li>
 	       <li>
 	         <a href="<@base />/logs/list">
 	           <span class="fa fa-fw fa-code-fork"></span>
-	         	  操作日志
+	         	  <@locale code="navs.audit.operate"/>
 	         </a>
 	       </li>
 	    </ul>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl

@@ -34,12 +34,13 @@
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.audit.loginapps"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="inactive" >/ <@locale code="navs.audit"/></li>
+									<li class="active">/ <@locale code="navs.audit.loginapps"/></li>
 								</ol>
 							</div>
 						</div>

+ 0 - 85
maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList2.ftl

@@ -1,85 +0,0 @@
-<!DOCTYPE HTML >
-<html>
-<head>
-	<#include  "../layout/header.ftl"/>
-	<#include  "../layout/common.cssjs.ftl"/>
-	<script type="text/javascript" src="<@base/>/static/jquery/jsonformatter.js"></script>
-</head>
-<body>
-<#include  "../layout/top.ftl"/>
-<#include  "../layout/nav_primary.ftl"/>
-
-<div class="container">
-	<div id="tool_box">
-		<table  class="datatable">
-			<tr>
-				<td  width="120px">
-			 		 <@locale code="apps.name"/>:
-				</td>
-				<td  width="375px">
-					<form id="basic_search_form">
-				 			<input  class="form-control"  name="appName" type="text" style ="width:150px;float:left;">
-				 			<input class="button btn btn-primary mr-3"  id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
-				 			<input class="button btn btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">
-					 	</form>
-				</td>
-				<td colspan="2"> 
-					 
-				</td>
-			</tr>
-		</table>
- 		
-		
- 	</div>
- 	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
- 			<table   class="datatable">
-			 <tr>
-	 				<td width="120px"><@locale code="common.text.startdate"/></td>
-		 			<td width="360px">
-		 				<input  class="form-control datetimepicker"  name="startDate" type="text" >
-		 			</td>
-		 			<td width="120px"><@locale code="common.text.enddate"/></td>
-		 			<td width="360px">
-						<input  class="form-control datetimepicker"  style="width:70%" type="text" id="endDate" name="endDate"  title="" value=""/>
-			 		</td>
-			 </tr>
-			</table>
- 		</form>
- 	</div>
-
-<div  class="mainwrap" id="main">
-		<table 	data-url="<@base />/logs/loginAppsHistory/grid"
-				id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-			<thead>
-				<tr>
-					<th data-sortable="true" data-field="id"  data-visible="false"><@locale code="log.loginappshistory.id" /></th>
-					<th data-field="sessionId" ><@locale code="log.loginappshistory.sessionId" /></th>
-					<th data-field="uid"   data-visible="false"><@locale	code="log.loginappshistory.uid" /></th>
-					<th data-field="username" ><@locale	code="log.loginappshistory.username" /></th>
-					<th data-field="displayName" ><@locale	code="log.loginappshistory.displayName" /></th>
-					<th data-field="appId"   data-visible="false"><@locale	code="log.loginappshistory.appId" /></th>
-					<th data-field="appName" ><@locale	code="log.loginappshistory.appName" /></th>
-					<th data-field="loginTime" ><@locale  code="log.loginappshistory.loginTime" /></th>
-				</tr>
-			</thead>
-		</table>
-	</div>
-	
-</div>
-<div id="footer">
-	<#include   "../layout/footer.ftl"/>
-</div>
-</body>
-</html>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl

@@ -34,12 +34,13 @@
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.audit.login"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="inactive" >/ <@locale code="navs.audit"/></li>
+									<li class="active">/ <@locale code="navs.audit.login"/></li>
 								</ol>
 							</div>
 						</div>

+ 0 - 93
maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList2.ftl

@@ -1,93 +0,0 @@
-<!DOCTYPE HTML >
-<html>
-<head>
-	<#include  "../layout/header.ftl"/>
-	<#include  "../layout/common.cssjs.ftl"/>
-	<script type="text/javascript" src="<@base/>/static/jquery/jsonformatter.js"></script>
-</head>
-<body>
-<#include  "../layout/top.ftl"/>
-<#include  "../layout/nav_primary.ftl"/>
-<div class="container">
-	<div id="tool_box">
-		<table  class="table table-bordered">
-			<tr>
-				<td  width="120px">
-				<@locale code="log.loginhistory.sourceIp"/>
-				</td>
-				<td  width="375px">
-					<form id="basic_search_form">
-				 			<input class="form-control" name="sourceIp" type="text" style ="width:150px;float:left;">
-				 			<input class="button btn btn-primary mr-3"  id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
-				 			<input class="button btn btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">
-					 	</form>
-				</td>
-				<td colspan="2"> 
-					 
-				</td>
-			</tr>
-		</table>
- 		
-		
- 	</div>
- 	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
- 			<table   class="table table-bordered">
-			 <tr>
-	 				<td width="120px"><@locale code="common.text.startdate"/></td>
-		 			<td width="360px">
-		 				<input class="datetimepicker form-control" name="startDate" type="text" >
-		 			</td>
-		 			<td width="120px"><@locale code="common.text.enddate"/></td>
-		 			<td width="360px">
-						<input style="width:70%"  class="datetimepicker form-control"  type="text" id="endDate" name="endDate"  title="" value=""/>
-			 		</td>
-			 </tr>
-			</table>
- 		</form>
- 	</div>
- 	
-<div class="mainwrap" id="main">
-
-	<table  data-url="<@base />/logs/loginHistory/grid"
-			id="datagrid"
-			data-toggle="table"
-			data-classes="table table-bordered table-hover table-striped"
-			data-pagination="true"
-			data-total-field="records"
-			data-page-list="[10, 25, 50, 100]"
-			data-search="false"
-			data-locale="zh-CN"
-			data-query-params="dataGridQueryParams"
-			data-query-params-type="pageSize"
-			data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-sortable="true" data-field="id"   data-visible="false"><@locale code="log.loginhistory.id"/></th>
-				<th data-field="sessionId"><@locale code="log.loginhistory.sessionId"/></th>
-				<th data-field="username"><@locale code="log.loginhistory.username"/></th>
-				<th data-field="displayName"><@locale code="log.loginhistory.displayName"/></th>
-				<th data-field="provider"><@locale code="log.loginhistory.provider"/></th>
-				<th data-field="message"><@locale code="log.loginhistory.message"/></th>
-				<th data-field="loginType"><@locale code="log.loginhistory.loginType"/></th>
-				<th data-field="sourceIp"><@locale code="log.loginhistory.sourceIp"/></th>
-				<th data-field="browser"><@locale code="log.loginhistory.browser"/></th>
-				<th data-field="loginTime"><@locale code="log.loginhistory.loginTime"/></th>
-				<th data-field="logoutTime"><@locale code="log.loginhistory.logoutTime"/></th>
-				<th data-field="platform"><@locale code="log.loginhistory.platform"/></th>
-				<th data-field="application"><@locale code="log.loginhistory.application"/></th>
-				<th data-field="loginUrl"><@locale code="log.loginhistory.loginUrl"/></th>
-				<th data-field="code"><@locale code="log.loginhistory.code"/></th>
-				<th data-field="rpUserInfo"><@locale code="log.loginhistory.rpUserInfo"/></th>
-	
-			</tr>
-		</thead>
-	</table>
-</div>
-</div>
-<div id="footer">
-	<#include   "../layout/footer.ftl"/>
-</div>
-</body>
-</html>

+ 4 - 3
maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl

@@ -34,12 +34,13 @@
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.audit.operate"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="inactive" >/ <@locale code="navs.audit"/></li>
+									<li class="active">/ <@locale code="navs.audit.operate"/></li>
 								</ol>
 							</div>
 						</div>

+ 0 - 73
maxkey-web-manage/src/main/resources/templates/views/logs/logsList2.ftl

@@ -1,73 +0,0 @@
-<!DOCTYPE HTML >
-<html>
-<head>
-	<#include  "../layout/header.ftl"/>
-	<#include  "../layout/common.cssjs.ftl"/>
-	<script type="text/javascript" src="<@base/>/static/jquery/jsonformatter.js"></script>
-	<script type="text/javascript">
-		function viewformatter (value, options, rData){
-			return "<a href='javascript:void(0);' selid='"+rData["id"]+"' class='viewJsonObject' title='view more' >view more</a>";
-		}
-					
-		$(".viewJsonObject").on("click",function(){
-				var content=$("#list").getRowData($(this).attr("selid")+"")["content"]; 
-				var jsonHtml='<textarea name="jsondata" id="formatteddata" rows="20" cols="70">';
-					jsonHtml+=FormatJSON(eval("("+content+")"));
-					jsonHtml+='</textarea>';
-				$.alert({
-					title		: 	"JSON Data View",
-					type		:	null,
-				    content		: 	jsonHtml,
-				    okVal		:	null,
-				    cancelVal	:	$.platform.messages.alert.no,
-				    ok			: 	null,
-				    cancel		: 	function (){}
-				});
-			});
-	
-	</script>
-</head>
-<body>
-<#include  "../layout/top.ftl"/>
-<#include  "../layout/nav_primary.ftl"/>
-
-<div class="container">
-
-<div class="mainwrap" id="main">
-	
-	<table  data-url="<@base />/logs/grid"
-			id="datagrid"
-			data-toggle="table"
-			data-classes="table table-bordered table-hover table-striped"
-			data-pagination="true"
-			data-total-field="records"
-			data-page-list="[10, 25, 50, 100]"
-			data-search="false"
-			data-locale="zh-CN"
-			data-query-params="dataGridQueryParams"
-			data-query-params-type="pageSize"
-			data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-sortable="true" data-field="id"   data-visible="false">id</th>
-				<th data-field="serviceName"><@locale code="log.operate.servicename"/></th>
-				<th data-field="message"><@locale code="log.operate.message"/></th>
-				<th data-field="view"><@locale code="log.operate.content"/></th>
-				<th data-field="messageType"><@locale code="log.operate.messageType"/></th>
-				<th data-field="operateType"><@locale code="log.operate.operateType"/></th>
-				<th data-field="username"><@locale code="log.operate.username"/></th>
-				<th data-field="createdBy"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate"><@locale code="common.text.modifieddate"/></th>
-			</tr>
-		</thead>
-	</table>
-	
-</div>
-</div>
-<div id="footer">
-	<#include   "../layout/footer.ftl"/>
-</div>
-</body>
-</html>

+ 3 - 5
maxkey-web-manage/src/main/resources/templates/views/main.ftl

@@ -21,8 +21,6 @@
 	<div class="col-md-3 sidebar-nav side-nav" >
 		<#include  "layout/sidenav.ftl"/>
 	</div>
- <div class="swlink">Collect from <a href="http://www.scnoob.com/" title="网站模板">网站模板</a></div>
-
 <div class="page-container">
 
 <div class="main-content">
@@ -30,12 +28,12 @@
 
 <div class="breadcrumb-wrapper row">
 <div class="col-12 col-lg-3 col-md-6">
-<h4 class="page-title">Dashboard 2</h4>
+<h4 class="page-title"><@locale code="navs.home"/></h4>
 </div>
 <div class="col-12 col-lg-9 col-md-6">
 <ol class="breadcrumb float-right">
-<li><a href="<@base/>/main">Dashboard</a></li>
-<li class="active"> / Dashboard 2</li>
+<li><a href="<@base/>/main"><@locale code="navs.system"/></a></li>
+<li class="active"> / <@locale code="navs.home"/></li>
 </ol>
 </div>
 </div>

+ 3 - 3
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl

@@ -151,12 +151,12 @@ $(function () {
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.orgs"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="active">/ <@locale code="navs.orgs"/></li>
 								</ol>
 							</div>
 						</div>

+ 3 - 3
maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl

@@ -161,12 +161,12 @@ $(function () {
 
 						<div class="breadcrumb-wrapper row">
 							<div class="col-12 col-lg-3 col-md-6">
-								<h4 class="page-title">Dashboard 2</h4>
+								<h4 class="page-title"><@locale code="navs.users"/></h4>
 							</div>
 							<div class="col-12 col-lg-9 col-md-6">
 								<ol class="breadcrumb float-right">
-									<li><a href="<@base/>/main">Dashboard</a></li>
-									<li class="active">/ Dashboard 2</li>
+									<li><a href="<@base/>/main"><@locale code="navs.home"/></a></li>
+									<li class="active">/ <@locale code="navs.users"/></li>
 								</ol>
 							</div>
 						</div>