Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yujianwangzivayy
MaxKey
提交
b44b32a3
MaxKey
项目概览
yujianwangzivayy
/
MaxKey
与 Fork 源项目一致
Fork自
MaxKey单点登录官方(MaxKeyTop) / MaxKey
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b44b32a3
编写于
2月 04, 2022
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Login UI optimize
上级
72f1868e
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
61 addition
and
34 deletion
+61
-34
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
...web-maxkey/src/main/resources/messages/message.properties
+1
-1
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
...-maxkey/src/main/resources/messages/message_en.properties
+1
-1
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
...xkey/src/main/resources/messages/message_zh_CN.properties
+1
-1
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginmobile.ftl
...maxkey/src/main/resources/templates/views/loginmobile.ftl
+13
-9
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl
...maxkey/src/main/resources/templates/views/loginnormal.ftl
+18
-9
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logintfa.ftl
...eb-maxkey/src/main/resources/templates/views/logintfa.ftl
+3
-3
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl
...xkey-web-mgt/src/main/resources/templates/views/login.ftl
+4
-4
maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css
...xkey-web-resources/src/main/resources/static/css/base.css
+7
-5
maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
...-web-resources/src/main/resources/static/css_mgt/base.css
+1
-1
maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js
...s/src/main/resources/static/javascript/platform.common.js
+12
-0
未找到文件。
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message.properties
浏览文件 @
b44b32a3
...
...
@@ -59,7 +59,7 @@ login.text.username=\u7528\u6237\u540D
login.text.mobile
=
\u
624B
\u
673A
\u
53F7
\u7801
login.text.password
=
\u
5BC6
\u7801
login.text.captcha
=
\u
9A8C
\u
8BC1
\u7801
login.text.smscode
=
\u
77ED
\u
4FE1
\u
9A8C
\u
8BC1
\u7801
login.text.smscode
=
\u
9A8C
\u
8BC1
\u7801
login.text.remeberme
=
\u
8BB0
\u
4F4F
\u
767B
\u
5F55
login.text.forgotpassword
=
\u
5FD8
\u
8BB0
\u
5BC6
\u7801
login.button.login
=
\u
767B
\u
5F55
...
...
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_en.properties
浏览文件 @
b44b32a3
...
...
@@ -59,7 +59,7 @@ login.text.username=Username
login.text.mobile
=
Phone Number
login.text.password
=
Password
login.text.captcha
=
CAPTCHA
login.text.smscode
=
Message
Code
login.text.smscode
=
Code
login.text.remeberme
=
RemeberMe
login.text.forgotpassword
=
Forgot Password
login.button.login
=
Login
...
...
maxkey-webs/maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties
浏览文件 @
b44b32a3
...
...
@@ -59,7 +59,7 @@ login.text.username=\u7528\u6237\u540D
login.text.mobile
=
\u
624B
\u
673A
\u
53F7
\u7801
login.text.password
=
\u
5BC6
\u7801
login.text.captcha
=
\u
9A8C
\u
8BC1
\u7801
login.text.smscode
=
\u
77ED
\u
4FE1
\u
9A8C
\u
8BC1
\u7801
login.text.smscode
=
\u
9A8C
\u
8BC1
\u7801
login.text.remeberme
=
\u
8BB0
\u
4F4F
\u
767B
\u
5F55
login.text.forgotpassword
=
\u
5FD8
\u
8BB0
\u
5BC6
\u7801
login.button.login
=
\u
767B
\u
5F55
...
...
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginmobile.ftl
浏览文件 @
b44b32a3
...
...
@@ -7,23 +7,27 @@
</td>
</tr>
<tr>
<td><@locale code="login.text.mobile"/>
:
</td>
<td><@locale code="login.text.mobile"/></td>
<td>
<div class="wrapper">
<i class="fa fa-mobile"></i>
<input required="" class="form-control" type='text' id='mobile_j_username' name='username' value="" tabindex="1"/>
<div class="input-group" style="width:250px;">
<i class="fa fa-mobile"></i>
<input required="" class="form-control" type='text' id='mobile_j_username' name='username' value="" tabindex="1"/>
</div>
</div>
</td>
</tr>
<tr>
<td><@locale code="login.text.smscode"/>
:
</td>
<td><@locale code="login.text.smscode"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control" type='password' id='mobile_j_password' name='password' value="" tabindex="2" style="float: left;"/>
<button class="btn btn-outline-secondary" id="mobile_j_otp_button" tabindex="5" type="button" >
<@locale code="login.text.login.mobile.obtain"/>
</button>
<div class="input-group" style="width:250px;">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control" type='password' id='mobile_j_password' name='password' value="" tabindex="2" style="float: left;"/>
<button class="btn btn-outline-secondary" id="mobile_j_otp_button" tabindex="5" type="button" >
<@locale code="login.text.login.mobile.obtain"/>
</button>
</div>
</div>
</td>
</tr>
...
...
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/loginnormal.ftl
浏览文件 @
b44b32a3
...
...
@@ -7,30 +7,39 @@
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/>
:
</td>
<td><@locale code="login.text.username"/></td>
<td>
<div class="wrapper">
<i class="fa fa-user"></i>
<input required="" class="form-control" type='text' id='j_username' name='username' value="admin" tabindex="1"/>
<div class="input-group" style="width:250px;">
<i class="fa fa-user" ></i>
<input required="" class="form-control" type='text' id='j_username' name='username' value="admin" tabindex="1"/>
</div >
</div >
</td>
</tr>
<tr>
<td><@locale code="login.text.password"/>
:
</td>
<td><@locale code="login.text.password"/></td>
<td>
<div class="wrapper">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
<input required="" class="form-control" type='password' id='j_password' name='password' value="maxkey" tabindex="2"/>
<div class="input-group" style="width:250px;">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
<input required="" class="form-control" type='password' id='j_password' name='password' value="maxkey" tabindex="2"/>
<i class="passwdeye fa fa-eye-slash fa-2" style="left: 220px; color: gainsboro;" refid="j_password" ></i>
</div >
</div >
</td>
</tr>
<#if true==isCaptcha>
<tr>
<td><@locale code="login.text.captcha"/>
:
</td>
<td><@locale code="login.text.captcha"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
<input required="" class="form-control " type='text' id="j_captcha" name="captcha" tabindex="3" value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/>
<div class="input-group" style="width:250px;">
<i class="fa fa-lock fa-2" ></i>
<input required="" class="form-control " type='text' id="j_captcha" name="captcha" tabindex="3" value="" style="float: left;"/>
<img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/>
</div >
</div >
</td>
...
...
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/logintfa.ftl
浏览文件 @
b44b32a3
...
...
@@ -7,7 +7,7 @@
</td>
</tr>
<tr>
<td><@locale code="login.text.username"/>
:
</td>
<td><@locale code="login.text.username"/></td>
<td>
<div class="wrapper">
<i class="fa fa-user"></i>
...
...
@@ -16,7 +16,7 @@
</td>
</tr>
<tr>
<td><@locale code="login.text.password"/>
:
</td>
<td><@locale code="login.text.password"/></td>
<td>
<div class="wrapper">
<i class="fa fa-key fa-2" style="color: #FFD700;"></i>
...
...
@@ -26,7 +26,7 @@
</tr>
<#if true==isMfa >
<tr>
<td><@locale code="login.text.captcha"/>
:
</td>
<td><@locale code="login.text.captcha"/></td>
<td>
<div class="wrapper">
<i class="fa fa-lock fa-2"></i>
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl
浏览文件 @
b44b32a3
...
...
@@ -18,24 +18,24 @@
<div
class=
"card-body"
>
<main
class =
"form-signin"
>
<form
class=
"form-horizontal m-t-20 needs-validation"
id=
"loginForm"
name=
"loginForm"
action=
"<@base />/logon.do"
method=
"post"
novalidate
>
<div
class=
"row g-
3
"
>
<div
class=
"row g-
4
"
>
<div
class=
""
>
<div
class=
"input-group"
>
<span
class=
"input-group-text fa fa-user"
></span>
<span
class=
"input-group-text fa fa-user
d-flex justify-content-center
"
></span>
<input
id=
'j_username'
name=
'username'
value=
"admin"
class=
"form-control"
type=
"text"
required=
""
placeholder=
"<@locale code="
login.text.username
"
/>
">
</div>
</div>
<div
class=
""
>
<div
class=
"input-group"
>
<span
class=
"input-group-text fa fa-key"
></span>
<span
class=
"input-group-text fa fa-key
d-flex justify-content-center
"
></span>
<input
id=
'j_password'
name=
'password'
class=
"form-control"
type=
"password"
required=
""
placeholder=
"<@locale code="
login.text.password
"
/>
">
</div>
</div>
<
#if
true=
=isCaptcha
>
<div
class=
""
>
<div
class=
"input-group"
>
<span
class=
"input-group-text fa fa-refresh"
></span>
<span
class=
"input-group-text fa fa-refresh
d-flex justify-content-center
"
></span>
<input
id=
"j_captcha"
name=
"captcha"
class=
"form-control"
value=
""
type=
"text"
required=
""
placeholder=
"<@locale code="
login.text.captcha
"
/>
">
<img
id=
"j_captchaimg"
class=
"captcha-image"
src=
"<@base/>/captcha"
/>
</div>
...
...
maxkey-webs/maxkey-web-resources/src/main/resources/static/css/base.css
浏览文件 @
b44b32a3
...
...
@@ -256,8 +256,8 @@ body{
}
.login_form_table
td
,
.login_form_table
th
{
padding
:
.2rem
;
vertical-align
:
top
;
height
:
60px
;
vertical-align
:
middle
;
border-top
:
1px
solid
#dee2e6
;
}
...
...
@@ -283,7 +283,7 @@ body{
#j_captchaimg
{
width
:
70px
;
height
:
3
3
px
;
height
:
3
5
px
;
vertical-align
:
top
;
}
...
...
@@ -308,6 +308,7 @@ body{
#register
a
{
font-weight
:
bold
;
color
:
white
;
text-decoration-line
:
none
;
}
.login_error_message
{
...
...
@@ -346,8 +347,9 @@ body{
position
:
absolute
;
top
:
5px
;
left
:
5px
;
font-size
:
22px
;
color
:
gray
;
font-size
:
24px
;
color
:
black
;
z-index
:
20
;
}
#tfa_j_otp_button
,
#mobile_j_otp_button
{
...
...
maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
浏览文件 @
b44b32a3
...
...
@@ -534,7 +534,7 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
#j_captchaimg
{
width
:
70px
;
height
:
3
3
px
;
height
:
3
5
px
;
vertical-align
:
top
;
}
...
...
maxkey-webs/maxkey-web-resources/src/main/resources/static/javascript/platform.common.js
浏览文件 @
b44b32a3
...
...
@@ -33,6 +33,18 @@ $(function(){
$
(
'
.captcha-image
'
).
click
(
function
()
{
//
$
(
this
).
attr
(
"
src
"
,
webContextPath
+
"
/captcha?
"
+
(
new
Date
()).
getTime
());
});
//passwdeye
$
(
'
.passwdeye
'
).
click
(
function
()
{
//
if
(
$
(
this
).
hasClass
(
"
fa-eye-slash
"
)){
$
(
this
).
removeClass
(
"
fa-eye-slash
"
).
addClass
(
"
fa-eye
"
);
$
(
"
#
"
+
$
(
this
).
attr
(
"
refid
"
)).
attr
(
"
type
"
,
"
text
"
);
}
else
{
$
(
this
).
removeClass
(
"
fa-eye
"
).
addClass
(
"
fa-eye-slash
"
);
$
(
"
#
"
+
$
(
this
).
attr
(
"
refid
"
)).
attr
(
"
type
"
,
"
password
"
);
}
});
/*side-nav-menu side navigation*/
if
(
$
(
'
#side-nav-menu
'
).
length
>
0
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录