From 75a1c67aacdc48c6458a4448bc914b36e6070de5 Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Sun, 10 Jan 2021 22:21:57 +0800
Subject: [PATCH] ui optimize

---
 .../templates/views/layout/common.cssjs.ftl   |  1 +
 .../templates/views/layout/footer.ftl         |  2 +-
 .../templates/views/layout/nologintop.ftl     | 12 ++++++++++++
 .../main/resources/templates/views/login.ftl  | 19 ++++---------------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
index 6a7d8184..e3e399d7 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
@@ -65,6 +65,7 @@
 	        $.datetimepicker.setLocale('<@locale/>'.substring(0, 2));
 			$(".datetimepicker").datetimepicker({format:'Y-m-d H:i'});
 			$(".datepicker").datetimepicker({timepicker:false,format:'Y-m-d'});
+			$(".timepicker").datetimepicker({datepicker:false,format:'H:i',step:10});
 			
 			$(".multipleselect").multipleSelect({}); 
 			
diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
index 670c4b0a..49287a26 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/layout/footer.ftl
@@ -1,5 +1,5 @@
      <#-- footer -->
- 	<div class="footer" >
+ 	<div class="row" >
 	    <div class="container">
 		    <table cellpadding="2" cellspacing="0" style="margin-top: 30px;width:100%;height:100%; border:0;">
 		        <TR>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/nologintop.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/nologintop.ftl
index 96bfea46..abd43b12 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/layout/nologintop.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/layout/nologintop.ftl
@@ -5,7 +5,19 @@
 			<div style="letter-spacing:2px;font-size:28px;font-weight:bolder;"><@locale code="global.application"/></div>
 		</div>
 		<div style="margin-top:30px;margin-right:10px;float:right;">
+			<div class="float-right">
+				<a href="<@basePath />/login?language=en">
+					<@locale code="global.change.language.en" />
+				</a>
+				|
+				<a href="<@basePath />/login?language=zh_CN">
+					<@locale code="global.change.language.zh" />
+				</a>
+			</div>
+			<div class="float-left">
+				<@locale code="global.change.language" />&nbsp;&nbsp;
 
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/login.ftl b/maxkey-web-manage/src/main/resources/templates/views/login.ftl
index f8567207..9ab6d3b6 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/login.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/login.ftl
@@ -64,20 +64,7 @@
 									</button>
 								</div>
 								<div class="form-group">
-									<div class="float-right">
-										Locale : <@locale/>
-										<a href="<@basePath />/login?language=en">
-											<@locale code="global.change.language.en" />
-										</a>
-										|
-										<a href="<@basePath />/login?language=zh_CN">
-											<@locale code="global.change.language.zh" />
-										</a>
-									</div>
-									<div class="float-left">
-										<@locale code="global.change.language" />：
-
-									</div>
+									
 								</div>
 							</form>
 						</div>
@@ -86,9 +73,11 @@
 			</div>
 		</div>
 	</div>
+	<div id="footer">
+		<#include  "layout/footer.ftl"/>
+	</div>
 	<div id="preloader">
 		<div class="loader" id="loader-1"></div>
-		<#include  "layout/footer.ftl"/>
 	</div>
 </body>
 </html>
-- 
GitLab