优化登录页、安装页UI和登录页设置新增是否显示管理员登录按钮

2026-03-11 22:52:43 +08:00 · 2024-07-19 18:14:47 +08:00
parent 7e9e4e9113
commit 00854ea103
18 changed files with 93 additions and 126 deletions
--- a/admin/setting/template/main.htm
+++ b/admin/setting/template/main.htm
@@ -672,6 +672,14 @@
          </div>
          </div>
        </div>
+        <div class="row mb-3">
+          <label class="col-sm-2" for="settingnew[loginset][lwaveanimation]">管理员登录按钮</label>
+					<div class="col-sm-10">
+              <div class="form-check form-switch">
+                <input type="checkbox" name="settingnew[loginset][adminlogin]" id="settingnew[loginset][adminlogin]" class="form-check-input" <!--{if $setting[loginset][adminlogin]}-->checked="checked"<!--{/if}-->> 
+              </div>
+          </div>
+        </div>
        <div class="row mb-3">
          <label class="col-sm-2">{lang Login template}</label>
          <div class="col-sm-10">
--- a/core/core_version.php
+++ b/core/core_version.php
@@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) {
 	define('CORE_VERSION', '2.02');
 	define('CORE_RELEASE', '20180909');
 	define('CORE_FIXBUG' , '20000000');
-	define('CORE_XHVERSION', '1.88.1');
-	define('CORE_XHRELEASE', '20240714');
+	define('CORE_XHVERSION', '1.88.2');
+	define('CORE_XHRELEASE', '20240719');
 	define('CORE_XHFIXBUG' , '20240706');
 }
--- a/core/template/default/common/adminlogin.htm
+++ b/core/template/default/common/adminlogin.htm
@@ -52,7 +52,7 @@
 <!--{template common/beijing}-->
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if $_G['setting'][loginset][template] == 2}-->
-<div class="row vh-100" style="position: absolute;width: 100%">
+<div class="row vh-100 overflow-auto" style="position: absolute;width: 100%;">
  <div class="col-md-6 col-lg-7 col-xl-8 d-none d-md-block">
    <div class="d-flex vh-100">
      <div class="p-5 align-self-end">
@@ -90,7 +90,7 @@
  </div>
 </div>
 <!--{elseif $_G['setting'][loginset][template] == 3}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">

@@ -124,7 +124,7 @@
  </div>
 </div>
 <!--{else}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
  <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="register_form">
    <div class="text-center mb-3">
      $avastar
--- a/install/data/install_data.sql
+++ b/install/data/install_data.sql
@@ -11,7 +11,7 @@ INSERT INTO `dzz_app_market` (`appid`,`mid`, `appname`, `appico`, `appdesc`, `ap
 (7, 7, '分享管理', 'appico/201712/21/165535t47bad99b7qqqdwq.png', '管理和查阅所有分享', '{dzzscript}?mod=share', '', '', 0, 7, '乐云网络', 0, 1, 1, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'share', 'dzz', 1, '2.0', '', 20180206, ''),
 (8, 8, '系统日志', 'appico/201712/21/113527zz2665xg7d3h2777.png', 'Dzz 日志记录', '{adminscript}?mod=systemlog', '{adminscript}?mod=systemlog&op=admin', '', 0, 8, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'systemlog', 'admin', 1, '2.0', '', 20171115, 'a:2:{s:11:\"installfile\";s:11:\"install.php\";s:13:\"uninstallfile\";s:13:\"uninstall.php\";}'),
 (9, 9, '系统工具', 'appico/201712/21/160537cikgw2v6s6z4scuv.png', '系统维护相关工具集合，如：更新缓存、数据库备份，计划任务，在线升级等', '{adminscript}?mod=system', '', '', 1377677136, 9, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'system', 'admin', 1, '2.0', '', 20171115, ''),
-(10, 10, '投票', 'appico/201712/21/150002d834yjjqnq82qj8z.png', 'Dzz 内置投票组件，结合其他应用使用，如新闻中用到投票插件，其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=dzzvote', '', '', 1378615073, 11, '乐云网络', 0, 0, 1, 0, '', '', 1, 0, 0, 2, 1, 1, 0, 'dzzvote', 'dzz', 1, '2.0', '', 20171115, ''), 
+(10, 10, '投票', 'appico/201712/21/150002d834yjjqnq82qj8z.png', 'Dzz 内置投票组件，结合其他应用使用，如新闻中用到投票插件，其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=dzzvote', '', '', 1378615073, 11, '乐云网络', 0, 0, 1, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'dzzvote', 'dzz', 1, '2.0', '', 20171115, ''), 
 (11, 11, '评论', 'appico/201712/21/128754pb0s666i6sjws1jc.png', 'Dzz 系统评论组件，结合在其他应用使用，如新闻。其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=comment', '', '', 1378615073, 12, '乐云网络', 0, 1, 0, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'comment', 'dzz', 1, '2.0', '', 20171115, ''),
 (12, 37, '用户资料管理', 'appico/201712/21/103805dczcm89b0gi8i9gc.png', '管理用户资料、资料审核、认证等', '{adminscript}?mod=member', '', '', 1378615073, 13, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'member', 'admin', 1, '2.0', '', 20171115, ''),
 (13, 0, 'DPlayer', 'appico/202308/19/205443f8ucb4pueqebbrvp.png', 'DPlayer，支持MP3,mp4,flv,wav等格式', '{dzzscript}?mod=DPlayer', '', '', 1378615073, 0, '小胡', 1, 0, 1, 0, '', 'mp3,mp4,flv,webm,ogv,ogg,wav,m3u8', 0, 0, 1, 2, 1, 1, 0, 'DPlayer', 'dzz', 1, '1.2', '', 20230819, '');
@@ -164,7 +164,7 @@ INSERT INTO `dzz_setting` VALUES('attachurl', 'data/attachment');
 INSERT INTO `dzz_setting` VALUES('jspath', 'static/js/');
 INSERT INTO `dzz_setting` VALUES('seccodestatus', '5');
 INSERT INTO `dzz_setting` VALUES('oltimespan', '15');
-INSERT INTO `dzz_setting` VALUES('sitecopyright', 'Copyright ©2012-2023 DzzOffice  All Rights Reserved');
+INSERT INTO `dzz_setting` VALUES('sitecopyright', 'Copyright ©2012-2024 DzzOffice  All Rights Reserved');
 INSERT INTO `dzz_setting` VALUES('imgdir', 'static/image/common');
 INSERT INTO `dzz_setting` VALUES('avatarmethod', '1');
 INSERT INTO `dzz_setting` VALUES('reglinkname', '立即注册');
@@ -214,7 +214,7 @@ INSERT INTO `dzz_setting` VALUES('at_range', 'a:3:{i:9;s:1:"1";i:2;s:1:"2";i:1;s
 INSERT INTO `dzz_setting` VALUES('loginset', 'a:5:{s:5:"title";s:9:"DzzOffice";s:8:"subtitle";s:18:"协同办公平台";s:10:"background";s:0:"";s:8:"template";s:1:"1";s:6:"bcolor";s:0:"";}');
 INSERT INTO `dzz_setting` VALUES('privacy', 'a:1:{s:7:"profile";a:17:{s:9:"education";i:1;s:8:"realname";i:-1;s:7:"address";i:0;s:9:"telephone";i:0;s:15:"affectivestatus";i:0;s:10:"department";i:0;s:8:"birthday";i:0;s:13:"constellation";i:0;s:9:"bloodtype";i:0;s:6:"gender";i:0;s:6:"mobile";i:0;s:2:"qq";i:0;s:7:"zipcode";i:0;s:11:"nationality";i:0;s:14:"graduateschool";i:0;s:8:"interest";i:0;s:3:"bio";i:0;}}');
 INSERT INTO `dzz_setting` VALUES('thumbsize', 'a:3:{s:5:"small";a:2:{s:5:"width";i:256;s:6:"height";i:256;}s:6:"middle";a:2:{s:5:"width";i:800;s:6:"height";i:600;}s:5:"large";a:2:{s:5:"width";i:1440;s:6:"height";i:900;}}');
-INSERT INTO `dzz_setting` VALUES('verify', 'a:8:{i:1;a:9:{s:4:"desc";s:0:"";s:9:"available";s:1:"1";s:8:"showicon";s:1:"0";s:5:"field";a:1:{s:8:"realname";s:8:"realname";}s:8:"readonly";i:1;s:5:"title";s:12:"实名认证";s:4:"icon";s:31:"common/verify/1/verify_icon.jpg";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:2;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:3;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:4;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:5;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:6;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:7;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}s:7:"enabled";b:1;}');
+INSERT INTO `dzz_setting` VALUES('verify', 'a:8:{i:1;a:9:{s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:5:"field";a:1:{s:8:"realname";s:8:"realname";}s:8:"readonly";i:1;s:5:"title";s:12:"实名认证";s:4:"icon";s:31:"common/verify/1/verify_icon.jpg";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:2;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:3;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:4;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:5;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:6;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:7;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}s:7:"enabled";b:1;}');
 INSERT INTO `dzz_setting` VALUES('systemlog_open', '1');
 INSERT INTO `dzz_setting` VALUES('systemlog_setting','a:7:{s:8:"errorlog";a:3:{s:5:"title";s:12:"系统错误";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:5:"cplog";a:3:{s:5:"title";s:12:"后台访问";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:9:"deletelog";a:3:{s:5:"title";s:12:"数据删除";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:9:"updatelog";a:3:{s:5:"title";s:12:"数据更新";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"loginlog";a:3:{s:5:"title";s:12:"用户登录";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"sendmail";a:3:{s:5:"title";s:12:"邮件发送";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"otherlog";a:3:{s:5:"title";s:12:"其他信息";s:7:"is_open";i:1;s:8:"issystem";i:1;}}');

--- a/static/bootstrap/css/bootstrap.min.css
+++ b/static/bootstrap/css/bootstrap.min.css
@@ -15999,7 +15999,7 @@ fieldset:disabled .btn {
 .error-msg{
 	color: #FF0000;
 }
-.avatar,.img-avatar{
+.avatar, .img-avatar{
 	-webkit-box-pack: center;
 	-ms-flex-pack: center;
 	justify-content: center;
@@ -16015,7 +16015,7 @@ fieldset:disabled .btn {
    line-height: 48px;
 	max-width: inherit;
    color: #fff;
-    font-size: 18px;
+    font-size: large;
    visibility: visible;
    border: 2px solid #fff;
    box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%);
@@ -16238,7 +16238,7 @@ fieldset:disabled .btn {
 .user-ul li .user-a .cavatar {
 	position:absolute;
 	left:6px;
-	top:5px;
+	top:3px;
 }
 .user-ul li .user-a .cavatar .img-avatar {
 	width:35px;
@@ -16262,9 +16262,6 @@ fieldset:disabled .btn {
 	display: flex;
 	flex-wrap: wrap;
 }
-.signin-form{
-	max-width: 480px;
-}

 .main-content {
    width: 100%;
--- a/user/login/template/getpasswd.htm
+++ b/user/login/template/getpasswd.htm
@@ -26,9 +26,6 @@
    text-align: center;
    pointer-events: none;
 }
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -42,7 +39,7 @@
 </style>
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="<!--{if !$_G['setting']['bbclosed']}-->{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->" style="max-height: 60px;">
--- a/user/login/template/getpasswd2.htm
+++ b/user/login/template/getpasswd2.htm
@@ -3,9 +3,6 @@
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -23,7 +20,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<div class="row vh-100" id="lostpw_container_$loginhash" style="position: absolute;width: 100%">
+<div class="row vh-100 overflow-auto" id="lostpw_container_$loginhash" style="position: absolute;width: 100%;">
  <div class="col-md-6 col-lg-7 col-xl-8 d-none d-md-block">

    <div class="d-flex vh-100">
--- a/user/login/template/getpasswd3.htm
+++ b/user/login/template/getpasswd3.htm
@@ -3,9 +3,6 @@
 <link rel="stylesheet" type="text/css" href="static/dzzicon/materialdesignicons.min.css?{VERHASH}">
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <style>
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -24,7 +21,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
 <div class="flex-box login-box">
  <div class="login-left p-5">
--- a/user/login/template/login_single1.htm
+++ b/user/login/template/login_single1.htm
@@ -26,9 +26,6 @@
    text-align: center;
    pointer-events: none;
 }
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -42,7 +39,7 @@
 </style>
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
  <div class="text-center mb-3">
  	<img alt="light year admin" src="<!--{if !$_G['setting']['bbclosed']}-->{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->">
@@ -50,51 +47,52 @@
 		<!--{if $_G[setting][loginset][subtitle]}--><p>$_G[setting][loginset][subtitle]</p><!--{/if}-->
  </div>
  <form action="user.php?mod=login&op=logging&action=login&loginsubmit=yes{if !empty($_GET['handlekey'])}&handlekey=$_GET[handlekey]{/if}{if isset($_GET['frommessage'])}&frommessage{/if}&loginhash=$loginhash" method="post" class="signin-form needs-validation" name="login" id="loginform_$loginhash" role="form" onsubmit="{if $_G['setting']['pwdsafety']}pwmd5('password3_$loginhash');{/if}pwdclear = 1; loginsub('loginform_$loginhash', 'returnmessage_$loginhash');return false;">
-		<input type="hidden" name="formhash" value="{FORMHASH}" />
-    <input type="hidden" name="referer" value="{$referer}" />
+	<input type="hidden" name="formhash" value="{FORMHASH}" />
+	<input type="hidden" name="referer" value="{$referer}" />
    <!--{if $auth}-->
    <div class="mb-3 has-feedback">
      <input type="hidden" class="form-control" name="auth" value="$auth" required/>
    </div>
    <!--{else}-->
    <div class="mb-3 has-feedback">
-			<span class="mdi mdi-account" aria-hidden="true"></span>
-      <input type="text" class="form-control" id="email_$loginhash" name="email" autocomplete="off" placeholder="{lang email_username}" required/>
+		<span class="mdi mdi-account" aria-hidden="true"></span>
+      	<input type="text" class="form-control" id="email_$loginhash" name="email" autocomplete="off" placeholder="{lang email_username}" required/>
    </div>
    <div class="mb-3 has-feedback">
-			<span class="mdi mdi-lock" aria-hidden="true"></span>
-      <input type="password" class="form-control" id="password3_$loginhash" name="password" onfocus="this.type='password'" autocomplete="off" placeholder="{lang user_login_password}" required/>
+		<span class="mdi mdi-lock" aria-hidden="true"></span>
+      	<input type="password" class="form-control" id="password3_$loginhash" name="password" onfocus="this.type='password'" autocomplete="off" placeholder="{lang user_login_password}" required/>
    </div>
    <!--{/if}-->
    <!--{if $seccodecheck}-->
-		<div class="mb-3 has-feedback">
+	<div class="mb-3 has-feedback">
    <!--{template common/seccheck}--> 
    </div>
    <!--{/if}-->
-
    <div class="mb-3">
      <div class="form-check">
        <input type="checkbox" class="form-check-input" id="cookietime_$loginhash" name="cookietime" type="checkbox" value="2592000" $cookietimecheck>
        <label class="form-check-label not-user-select" for="cookietime_$loginhash">记住我？</label>
-				<!--{if !$_G['setting']['bbclosed']}--><a href="user.php?mod=login&op=logging&action=lostpasswd" class="text-indigo-400 hover:text-blue-500">忘记密码？</a><!--{/if}-->
+		<!--{if !$_G['setting']['bbclosed']}--><a href="user.php?mod=login&op=logging&action=lostpasswd" class="text-indigo-400 hover:text-blue-500">忘记密码？</a><!--{/if}-->
      </div>
    </div>
-		<div class="mb-3 d-grid">
-			<button class="btn btn-round btn-primary" name="loginsubmit" type="submit">立即登录</button>
-			<a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
-		</div>
-		<p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
-		<!--{if !$_G['setting']['bbclosed']}-->
-		<!--{if $_G['setting']['regstatus']>0}--> 
-		<p class="text-center">
-			<span>还没有账号？</span>
-			<a href="user.php?mod=register&referer={eval echo urlencode($referer);}" <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a>
-		</p>
-		<!--{/if}-->
-		<!--{if $_G['setting']['qq_login']>0}-->
-		<p class="text-center"><a href="user.php?mod=qqlogin" title="{lang qq_login}"><i class="mdi mdi-qqchat"></i></a></p>
-		<!--{/if}-->
+	<div class="mb-3 d-grid">
+		<button class="btn btn-round btn-primary" name="loginsubmit" type="submit">立即登录</button>
+		<!--{if $_G[setting][loginset][adminlogin]}-->
+		<a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
 		<!--{/if}-->
+	</div>
+	<p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
+	<!--{if !$_G['setting']['bbclosed']}-->
+	<!--{if $_G['setting']['regstatus']>0}--> 
+	<p class="text-center">
+		<span>还没有账号？</span>
+		<a href="user.php?mod=register&referer={eval echo urlencode($referer);}" <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a>
+	</p>
+	<!--{/if}-->
+	<!--{if $_G['setting']['qq_login']>0}-->
+	<p class="text-center"><a href="user.php?mod=qqlogin" title="{lang qq_login}"><i class="mdi mdi-qqchat"></i></a></p>
+	<!--{/if}-->
+	<!--{/if}-->
  </form>
  <p class="text-center mb-0"><!--{template common/copyright}--></p>
 </div>
--- a/user/login/template/login_single2.htm
+++ b/user/login/template/login_single2.htm
@@ -3,9 +3,6 @@
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -22,9 +19,8 @@
 <![endif]-->
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="row vh-100" style="position: absolute;width: 100%">
+<div class="row vh-100 overflow-auto" style="position: absolute;width: 100%;">
  <div class="col-md-6 col-lg-7 col-xl-8 d-none d-md-block">
-
    <div class="d-flex vh-100">
      <div class="p-5 align-self-end">
         <!--{if $_G[setting][loginset][subtitle]}--><h1>$_G[setting][loginset][subtitle]</h1><!--{/if}-->
@@ -32,34 +28,31 @@
        <!--{if $_G[setting][metadescription]}--><p class="text-white">$_G[setting][metadescription]</p><!--{/if}-->
      </div>
    </div>
-
  </div>
-
  <div class="col-md-6 col-lg-5 col-xl-4 align-self-center" style="background-color: <!--{if $_G['setting']['loginset']['kbcolor']}-->$_G['setting']['loginset']['kbcolor']<!--{else}-->#fff<!--{/if}-->;height: 100%;display: flex;align-items: center;justify-content: center;">
-    <div class="p-5">
+    <div style="width: 100%;">
      <div class="text-center">
        <img alt="light year admin" src="<!--{if !$_G['setting']['bbclosed']}-->{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->">
      </div>
      <h2 class="text-center"><!--{if $_G[setting][loginset][title]}-->$_G[setting][loginset][title]<!--{else}-->$_G[setting][sitename]<!--{/if}--></h2>
      <form class="signin-form needs-validation" action="user.php?mod=login&op=logging&action=login&loginsubmit=yes{if !empty($_GET['handlekey'])}&handlekey=$_GET[handlekey]{/if}{if isset($_GET['frommessage'])}&frommessage{/if}&loginhash=$loginhash" method="POST" name="login" id="loginform_$loginhash" role="form" onsubmit="{if $_G['setting']['pwdsafety']}pwmd5('password3_$loginhash');{/if}pwdclear = 1; loginsub('loginform_$loginhash', 'returnmessage_$loginhash');return false;">
-				<input type="hidden" name="formhash" value="{FORMHASH}" />
-				<input type="hidden" name="referer" value="{$referer}" />
-				<!--{if $auth}-->
-				<div class="mb-3 has-feedback">
-					<span class="mdi mdi-account" aria-hidden="true"></span>
-          <input type="text" class="form-control" id="auth" name="auth" value="$auth">
+		<input type="hidden" name="formhash" value="{FORMHASH}" />
+		<input type="hidden" name="referer" value="{$referer}" />
+		<!--{if $auth}-->
+		<div class="mb-3 has-feedback">
+			<span class="mdi mdi-account" aria-hidden="true"></span>
+			<input type="text" class="form-control" id="auth" name="auth" value="$auth">
+		</div>
+		<!--{else}-->
+		<div class="mb-3 has-feedback">
+			<span class="mdi mdi-account" aria-hidden="true"></span>
+         	<input type="text" class="form-control" id="email_$loginhash" name="email" autocomplete="off" placeholder="{lang email_username}" required>
        </div>
-				<!--{else}-->
-				<div class="mb-3 has-feedback">
-					<span class="mdi mdi-account" aria-hidden="true"></span>
-          <input type="text" class="form-control" id="email_$loginhash" name="email" autocomplete="off" placeholder="{lang email_username}" required>
-        </div>
-
        <div class="mb-3 has-feedback">
 			<span class="mdi mdi-lock" aria-hidden="true"></span>
-          <input type="password" class="form-control" type="password" id="password3_$loginhash" name="password" onfocus="this.type='password'" autocomplete="off" placeholder="{lang user_login_password}" required>
+          	<input type="password" class="form-control" type="password" id="password3_$loginhash" name="password" onfocus="this.type='password'" autocomplete="off" placeholder="{lang user_login_password}" required>
        </div>
-				<!--{/if}-->
+		<!--{/if}-->
        <!--{if $seccodecheck}-->
 		<!--{template common/seccheck}--> 
 		<!--{/if}-->
@@ -68,25 +61,27 @@
          <div class="form-check">
            <input type="checkbox" class="form-check-input" id="cookietime_$loginhash" name="cookietime" type="checkbox" value="2592000" $cookietimecheck>
            <label class="form-check-label not-user-select" for="cookietime_$loginhash">记住我</label>
-						<!--{if !$_G['setting']['bbclosed']}--><a href="user.php?mod=login&op=logging&action=lostpasswd" class="text-indigo-400 hover:text-blue-500">忘记密码？</a><!--{/if}-->
+			<!--{if !$_G['setting']['bbclosed']}--><a href="user.php?mod=login&op=logging&action=lostpasswd" class="text-indigo-400 hover:text-blue-500">忘记密码？</a><!--{/if}-->
          </div>
        </div>
       <div class="mb-3 d-grid">
          <button class="btn btn-round btn-primary" name="loginsubmit" type="submit">立即登录</button>
-					<a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+		  <!--{if $_G[setting][loginset][adminlogin]}-->
+			<a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+		<!--{/if}-->
        </div>
-				<p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
-				<!--{if !$_G['setting']['bbclosed']}-->
-				<!--{if $_G['setting']['regstatus']>0}--> 
-				<p class="text-center">
-					<span>还没有账号？</span>
-					<a href="user.php?mod=register&referer={eval echo urlencode($referer);}" <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a>
-				</p>
-				<!--{/if}-->
-				<!--{if $_G['setting']['qq_login']>0}-->
-				<p class="text-center"><a href="user.php?mod=qqlogin" title="{lang qq_login}"><i class="mdi mdi-qqchat"></i></a></p>
-				<!--{/if}-->
-				<!--{/if}-->
+		<p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
+		<!--{if !$_G['setting']['bbclosed']}-->
+		<!--{if $_G['setting']['regstatus']>0}--> 
+		<p class="text-center">
+			<span>还没有账号？</span>
+			<a href="user.php?mod=register&referer={eval echo urlencode($referer);}" <!--{if !empty($_GET['inajax'])}-->onclick="_login.register($referer);return false;"<!--{/if}--> title="$_G['setting']['reglinkname']">$_G['setting']['reglinkname']</a>
+		</p>
+		<!--{/if}-->
+		<!--{if $_G['setting']['qq_login']>0}-->
+		<p class="text-center"><a href="user.php?mod=qqlogin" title="{lang qq_login}"><i class="mdi mdi-qqchat"></i></a></p>
+		<!--{/if}-->
+		<!--{/if}-->
      </form>
      <p class="text-center text-muted mt-3"><!--{template common/copyright}--></p>
    </div>
--- a/user/login/template/login_single3.htm
+++ b/user/login/template/login_single3.htm
@@ -4,9 +4,6 @@
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	body{
-		overflow:auto;
-	}
 	.signin-form .has-feedback {
    position: relative;
 }
@@ -54,7 +51,7 @@
 <![endif]-->
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="center-vh p-2">
+<div class="center-vh p-2 overflow-auto">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">
      <div class="login-left p-5">
@@ -92,7 +89,9 @@

          <div class="mb-3 d-grid">
            <button class="btn btn-round btn-primary" name="loginsubmit" type="submit">立即登录</button>
-            <a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+            <!--{if $_G[setting][loginset][adminlogin]}-->
+              <a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+            <!--{/if}-->
          </div>
          <p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
          <!--{if !$_G['setting']['bbclosed']}-->
--- a/user/login/template/login_single4.htm
+++ b/user/login/template/login_single4.htm
@@ -26,9 +26,6 @@
    text-align: center;
    pointer-events: none;
 }
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -42,7 +39,7 @@
 </style>
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
  <div class="text-center mb-3">
  	<img alt="light year admin" src="<!--{if !$_G['setting']['bbclosed']}-->{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->">
@@ -68,7 +65,9 @@
    </ul>
    <div class="mb-3 d-grid">
      <button class="btn btn-round btn-primary btn-block disabled" id="loginsubmit" name="loginsubmit" type="submit" value="true">立即登录</button>
-      <a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+      <!--{if $_G[setting][loginset][adminlogin]}-->
+        <a class="btn btn-round btn-success" href="admin.php">管理员登录</a>
+      <!--{/if}-->
    </div>
 	<p class="error-msg text-center" id="returnmessage_$loginhash"><!--{if $_G[setting][bbclosed]}-->{lang site_closed_please_admin}<!--{/if}--></p>
    <!--{if !$_G['setting']['bbclosed']}-->
--- a/user/login/template/lostpasswd.htm
+++ b/user/login/template/lostpasswd.htm
@@ -7,9 +7,6 @@
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{template common/beijing}-->
 <style>
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -22,7 +19,7 @@
 	<!--{/if}-->
 </style>
 <!--{template common/beijing}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="lostpw_container_$loginhash" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="<!--{if !$_G['setting']['bbclosed']}-->{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->" style="max-height: 60px;">
--- a/user/login/template/lostpasswd2.htm
+++ b/user/login/template/lostpasswd2.htm
@@ -3,9 +3,6 @@
 <link rel="stylesheet" type="text/css" href="static/dzzicon/materialdesignicons.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -23,7 +20,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<div class="row vh-100" id="lostpw_container_$loginhash" style="position: absolute;width: 100%">
+<div class="row vh-100 overflow-auto" id="lostpw_container_$loginhash" style="position: absolute;width: 100%;">
  <div class="col-md-6 col-lg-7 col-xl-8 d-none d-md-block">

    <div class="d-flex vh-100">
--- a/user/login/template/lostpasswd3.htm
+++ b/user/login/template/lostpasswd3.htm
@@ -5,9 +5,6 @@
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	body{
-		overflow:auto;
-	}
 	.signin-form .has-feedback {
    position: relative;
 }
@@ -56,7 +53,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box" id="lostpw_container_$loginhash">
        <div class="login-left p-5">
--- a/user/register/template/register.htm
+++ b/user/register/template/register.htm
@@ -29,9 +29,6 @@
    text-align: center;
    pointer-events: none;
 }
-	html, body{
-		overflow:auto;
-	}
 	<!--{if $_G[setting][loginset][kbcolor]}-->
 	.card{
 		background-color:$_G[setting][loginset][kbcolor];
@@ -43,7 +40,7 @@
 	}
 	<!--{/if}-->
 </style>
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="register_form">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}" style="max-height: 60px;">
--- a/user/register/template/register2.htm
+++ b/user/register/template/register2.htm
@@ -1,17 +1,12 @@
 <!--{template common/header_common}-->
 <link rel="stylesheet" type="text/css" href="static/dzzicon/materialdesignicons.min.css?{VERHASH}">
 <!--{template common/beijing}-->
-<style>
-	body{
-		overflow:auto;
-	}
-</style>
 <!--[if lt IE 9]>
  <script src="static/js/jquery.placeholder.js" type="text/javascript"></script>
 <![endif]-->
 <script src="user/scripts/register.js?{VARHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="row vh-100" style="position: absolute;width: 100%">
+<div class="row vh-100 overflow-auto" style="position: absolute;width: 100%;">
  <div class="col-md-6 col-lg-7 col-xl-8 d-none d-md-block">
    <div class="d-flex vh-100">
      <div class="p-5 align-self-end">
--- a/user/register/template/register3.htm
+++ b/user/register/template/register3.htm
@@ -4,9 +4,6 @@
 <link rel="stylesheet" type="text/css" href="static/css/style.min.css?{VERHASH}">
 <!--{template common/beijing}-->
 <style>
-	body{
-		overflow:auto;
-	}
 	.signin-form .has-feedback {
    position: relative;
 }
@@ -54,7 +51,7 @@
 <![endif]-->
 <script src="user/scripts/register.js?{VARHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<div class="center-vh">
+<div class="center-vh overflow-auto">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">
        <div class="login-left p-5">