From 2f9434cb024788d26957c0095927833cf52a139b Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Wed, 9 Feb 2022 22:04:33 +0800
Subject: [PATCH] Login UI optimize

---
 .../src/main/resources/messages/message.properties          | 2 +-
 .../src/main/resources/messages/message_zh_CN.properties    | 2 +-
 .../src/main/resources/templates/views/login.ftl            | 1 +
 .../src/main/resources/templates/views/loginnormal.ftl      | 6 +++---
 .../src/main/resources/messages/message.properties          | 2 +-
 .../src/main/resources/messages/message_zh_CN.properties    | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
index 8194ec76..aec1f483 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
@@ -51,7 +51,7 @@ login.text.login.mobile.validTime=\u5269\u4F59\u65F6\u95F4
 login.text.login.mobile.validTime.unit=\u79D2
 
 login.text.login.twofactor=\u5B89\u5168\u8BA4\u8BC1
-login.text.login.normal=\u8D26\u53F7\u5BC6\u7801
+login.text.login.normal=\u8D26\u53F7\u767B\u5F55
 login.text.login.mobile=\u624B\u673A\u767B\u5F55
 login.text.login.qrcode=\u626B\u7801\u767B\u5F55
 
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
index ece7df61..d69052c4 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
@@ -51,7 +51,7 @@ login.text.login.mobile.validTime=\u5269\u4F59\u65F6\u95F4
 login.text.login.mobile.validTime.unit=\u79D2
 
 login.text.login.twofactor=\u5B89\u5168\u8BA4\u8BC1
-login.text.login.normal=\u8D26\u53F7\u5BC6\u7801
+login.text.login.normal=\u8D26\u53F7\u767B\u5F55
 login.text.login.mobile=\u624B\u673A\u767B\u5F55
 login.text.login.qrcode=\u626B\u7801\u767B\u5F55
 
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
index a0d6bc52..2d58744c 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl
@@ -62,6 +62,7 @@
 								<!---->
 								<li id="qrcodelogin"   class="switch_tab_class col-md-4">
                                     <a href="javascript:void(0);">
+                                    <i class="fa fa-qrcode" aria-hidden="true"></i>
                                     <@locale code="login.text.login.qrcode"/>
                                     </a>
                                 </li>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl
index 5228ecde..536469b6 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl
@@ -47,14 +47,14 @@
 		</#if>
 		<#if true==isRemeberMe>
 		<tr>
-			<td colspan="2">
-			    <div class="col-sm-6 float-left" style="line-height: 30px;">
+			<td colspan="2" style ="height: 20px;">
+			    <div class="col-sm-6 float-left" style="line-height: 20px;">
 			         <span class="form_checkbox_label">
                         <input type='checkbox' id="remeberMe" name="remeberMe"  class="checkbox"   tabindex="4"  value="remeberMe" />
                         <@locale code="login.text.remeberme"/>
                     </span>
 			    </div>
-			    <div class="col-sm-6  float-left"  style="line-height: 30px;">
+			    <div class="col-sm-6  float-left"  style="line-height: 20px;">
 			         <a href="<@base />/forgotpassword/forward"><@locale code="login.text.forgotpassword"/></a>
                 </div>
 			</td>								
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties
index 92bf73ba..1217e1fa 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties
@@ -557,7 +557,7 @@ button.text.delete=\u5220\u9664
 button.text.select=\u8BF7\u9009\u62E9
 button.text.search=\u67E5\u8BE2
 button.text.expandsearch=\u5C55\u5F00
-button.text.collapsesearch=\u6536\u7F29
+button.text.collapsesearch=\u6298\u53E0
 button.text.cancel=\u53D6\u6D88
 button.text.add.member=\u65B0\u589E\u6210\u5458
 button.text.delete.member=\u5220\u9664\u6210\u5458
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties
index e43f8471..6804e29e 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties
@@ -557,7 +557,7 @@ button.text.delete=\u5220\u9664
 button.text.select=\u8BF7\u9009\u62E9
 button.text.search=\u67E5\u8BE2
 button.text.expandsearch=\u5C55\u5F00
-button.text.collapsesearch=\u6536\u7F29
+button.text.collapsesearch=\u6298\u53E0
 button.text.cancel=\u53D6\u6D88
 button.text.add.member=\u65B0\u589E\u6210\u5458
 button.text.delete.member=\u5220\u9664\u6210\u5458
-- 
GitLab