瀏覽代碼

mgt login ui

Crystal.Sea 3 年之前
父節點
當前提交
d45ecebff3

+ 31 - 22
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/nologintop.ftl

@@ -1,26 +1,35 @@
 
 <!--top-->
-<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: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 id="topBar">
+    <div class="container">
+    	<div  class="row" > 
+    		<div class="col-sm-7">
+                <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-1"></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="<@currUrl/>?language=en">
+                                        <@locale code="global.change.language.en"/>
+                                    </a>|
+                                    <a href="<@currUrl/>?language=zh_CN">
+                                        <@locale code="global.change.language.zh"/>
+                                    </a>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+    	</div>
+    </div>
 </div>
 <!--top end-->

+ 3 - 3
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl

@@ -5,14 +5,14 @@
 	<#include  "layout/common.cssjs.ftl"/>
 </head>
 <body >
-<#include  "layout/nologintop.ftl"/>
+    <#include  "layout/nologintop.ftl"/>
 	<div class="wrapper-page">
 		<div class="container">
 			<div class="row justify-content-center">
-				<div class="col-lg-4 col-md-12 col-xs-12">
+				<div class="col-lg-4 col-md-6 col-xs-6">
 					<div class="card">
                         <div class="card-header">
-							<@locale code="login.text.login.normal" />
+							&nbsp;<!--<@locale code="login.text.login.normal" />-->
 						</div>
 						<div class="card-body">
 						    <main class ="form-signin">

+ 1 - 1
maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css

@@ -251,7 +251,7 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 	border-bottom: 1px solid #e5e5e5;
 	min-width: 100%;
 	text-align:left;
-	height:60px;
+	min-height: 60px;
 	margin-bottom: 1px;
 }
 #topNav{