From bcacd7e084283ddc72bad7f0c99dfdc216fd4b95 Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Thu, 7 Jan 2021 23:56:36 +0800
Subject: [PATCH] layout

---
 .../src/main/resources/static/css/base.css    |  8 +--
 .../templates/views/layout/footer.ftl         |  4 +-
 .../templates/views/layout/nologintop.ftl     | 39 ++++++++---
 .../resources/templates/views/layout/top.ftl  |  4 +-
 .../main/resources/templates/views/login.ftl  | 66 +++++++------------
 5 files changed, 60 insertions(+), 61 deletions(-)

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 e7e12722..820399b3 100644
--- a/maxkey-web-maxkey/src/main/resources/static/css/base.css
+++ b/maxkey-web-maxkey/src/main/resources/static/css/base.css
@@ -30,14 +30,14 @@ body{
   vertical-align: central;
 }
 
-#topBar{
+#top{
 	text-shadow: 0 1px 0 #fff;
 	border-bottom: 1px solid #e5e5e5;
-	min-width: 100%;
 	align:left;
 	min-height: 60px;
-	margin-bottom: 1px;
+	margin-bottom: 5px;
 }
+
 #topNav{
 	border-bottom: 1px solid #e5e5e5;
 }
@@ -81,7 +81,7 @@ body{
 	border-top: 1px solid #e5e5e5;
 	min-width: 100%;
 	height:80px;
-	
+	margin-top: 5px;
 }
 
 #content{
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
index 61318333..505648ce 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl
@@ -1,6 +1,6 @@
      <#-- footer -->
- 	<div class="footer" >
-	    <div class="container row">
+ 	<div class="container" >
+	    <div class="row">
 	    	<div class="col-sm-4"></div>
 	    	<div class="col-sm-4">
 			    <table cellpadding="2" cellspacing="0" style="margin-top: 30px;width:100%;height:100%; border:0;">
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl
index 764976dd..115094db 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl
@@ -1,11 +1,30 @@
-<div id="topBar"  > 
-	<div class="container">
-		<div style="float:left;margin-left:20px;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
-		<div style="margin-top:15px;margin-left:10px;float:left">
-			<div style="letter-spacing:2px;font-size:24px;font-weight:bolder;"><@locale code="global.application"/></div>
-		</div>
-		<div style="margin-top:30px;margin-right:10px;float:right;">
-
-		</div>
+<div class="container">
+	<div class="row">
+			<div class="col-sm-6">
+				<div style="float:left;margin-left:20px;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
+				<div style="margin-top:15px;margin-left:10px;float:left">
+					<div style="letter-spacing:2px;font-size:24px;font-weight:bolder;"><@locale code="global.application"/></div>
+				</div>
+			</div>
+			<div class="col-sm-2"></div>
+			<div class="col-sm-4">
+				<div style="margin-top:30px;margin-right:10px;float:right;">
+					<table>
+						<tr >
+							<td ><@locale code="global.change.language"/> :</td>
+							<td >
+								<div > 
+									<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>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
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 7c3bde93..4f75366d 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
@@ -6,7 +6,7 @@
 				<div style="letter-spacing:2px;font-size:24px;font-weight:bolder;margin-top: 16px;float:left;"><@locale code="global.application"/></div>
 				</div>
 			</div>
-			<div class="col-sm-3">
+			<div class="col-sm-4">
 				<div  style="margin-top:25px;margin-right:10px;float:right;">
 					<table  style="height: 31px;">
 						<tr>
@@ -22,7 +22,7 @@
 					</table>
 				</div >
 			</div>
-			<div class="col-sm-4">
+			<div class="col-sm-3">
 				<div  style="margin-top:25px;margin-right:10px;float:right;">
 					<table  style="height: 31px;">
 						<tr>
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
index a9b6ae05..1721e019 100644
--- a/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
+++ b/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
@@ -357,49 +357,29 @@
 					</tr>
 					<tr>
 						<td>
-							<table>
-								<tr >
-									<td ><@locale code="global.change.language"/> :</td>
-									<td >
-										<div > 
-											<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>/ Locale : <@locale/>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="2">
-										 <div>
-									      	<table width="100%" frame="void" cellpadding="8px;" cellspacing="8px;">
-									      		<tr>
-									      			<td align="left"><@locale code="login.text.otherlogins"/>：</td>
-									      		</tr>
-									      		
-									      		<#list ssopList as ssop>
-									      			<#if (ssop_index)%3==0>
-										      			<tr>
-										      		</#if>
-										      			<td align="right" nowrap>
-												      			<a href="<@base />/logon/oauth20/authorize/${ssop.provider}"  title="${ssop.providerName}" >
-												      				<img src="<@base />/static/${ssop.icon}" title="${ssop.providerName}"  style="width=:32px;height:32px;border:0;"/>
-												      			</a>&nbsp;&nbsp;
-										      			</td>
-										      		<#if (ssop_index +1)%3==0>
-										      		</tr>
-										      		</#if>
-										      	</#list>
-										      	<#if (ssopList?size)%3!=0>
-										      		</tr>
-										      	</#if>
-									      	</table>
-								  		</div>
-									</td>
-								</tr>
-							</table>
+							
+					      	<table width="100%" frame="void" cellpadding="8px;" cellspacing="8px;">
+					      		<tr>
+					      			<td colspan="3" align="left"><@locale code="login.text.otherlogins"/>：</td>
+					      		</tr>
+					      		
+					      		<#list ssopList as ssop>
+					      			<#if (ssop_index)%3==0>
+						      			<tr>
+						      		</#if>
+						      			<td align="center" nowrap>
+								      			<a href="<@base />/logon/oauth20/authorize/${ssop.provider}"  title="${ssop.providerName}" >
+								      				<img src="<@base />/static/${ssop.icon}" title="${ssop.providerName}"  style="width=:32px;height:32px;border:0;"/>
+								      			</a>&nbsp;&nbsp;
+						      			</td>
+						      		<#if (ssop_index +1)%3==0>
+						      		</tr>
+						      		</#if>
+						      	</#list>
+						      	<#if (ssopList?size)%3!=0>
+						      		</tr>
+						      	</#if>
+					      	</table>
 						</td>
 					</tr>
 					<tr>