From d026f3af60831331ebc115381d6fa8a6b788f61d Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Thu, 13 Jan 2022 10:47:23 +0800
Subject: [PATCH] =?UTF-8?q?LOGO=E6=8F=90=E7=A4=BA=E6=A1=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/css/frame.css       |  6 +++---
 src/dede/templets/index2.htm | 18 +++++++++---------
 src/dede/templets/login.htm  | 16 ++++++++++------
 src/include/common.func.php  |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css
index 6f825eb3..0e1deda5 100644
--- a/src/dede/css/frame.css
+++ b/src/dede/css/frame.css
@@ -9,8 +9,8 @@ form{margin:0;padding:0}
 .head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}
 .top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 100%);overflow:hidden;clear:both}
 .top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}
-.top .top_logo a{font-size:20px;font-weight:600;color:#fff}
-.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#fff}
+.top .top_logo a{font-size:22px;color:#fff}
+.top .top_version{display:inline-block;margin-top:18px;margin-left:10px;color:#fff}
 .top .top_link{float:right;margin-right:30px}
 .top .top_link ul{float:left;line-height:46px;overflow:hidden}
 .top .top_link ul li.welcome img{margin-top:-4px;margin-right:10px;width:30px;height:30px;vertical-align:middle}
@@ -56,7 +56,7 @@ body.hidemenu .right{left:0}
 .qucikmenu ul li a:hover{background:#F7F7F7}
 .pagemask{width:100%;height:100%;background:#000;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}
 .iframemask{position:absolute;z-index:80;top:0;left:0;background:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}
-.allmenu{width:800px;background:#fff;z-index:999;position:absolute;left:50%;top:76px;margin-left:-400px;display:none;padding:10px}
+.allmenu{margin-left:-400px;padding:10px;display:none;width:800px;position:absolute;top:76px;left:50%;z-index:999;background:#fff;border-radius:.2rem}
 .allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}
 .maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}
 .maptop dt.bigitem{padding:5px 10px;background:#333;color:#fff;line-height:18px;font-weight:600}
diff --git a/src/dede/templets/index2.htm b/src/dede/templets/index2.htm
index 87d80173..5413890e 100755
--- a/src/dede/templets/index2.htm
+++ b/src/dede/templets/index2.htm
@@ -40,13 +40,13 @@
             <div class="top_version"><?php echo $cfg_version_detail; ?></div>
             <div class="top_link">
                 <ul>
-                    <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php" target="_top">注销</a></li>
-                    <li><a href="javascript:;" onclick="JumpFrame('catalog_menu.php','public_guide.php');">发布文档</a></li>
-                    <li><a href="javascript:;" onclick="JumpFrame('index_menu.php','content_list.php');">所有文档</a></li>
-                    <li><a href="javascript:;" onclick="JumpFrame('index_menu.php','catalog_main.php');">栏目管理</a></li>
-                    <li><a href="javascript:;" onclick="JumpFrame('index_menu.php','file_manage_main.php');">文件管理</a></li>
-                    <li><a href="javascript:;" onclick="JumpFrame('index_menu.php','templets_main.php');">模板管理</a></li>
-                    <?php echo ($cfg_mb_open == 'Y')?'<li><a href="../member" target="_blank">会员中心</a></li>':''; ?>
+                    <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php">注销</a></li>
+                    <li><a href="public_guide.php" target="main">发布文档</a></li>
+                    <li><a href="content_list.php" target="main">所有文档</a></li>
+                    <li><a href="catalog_main.php" target="main">栏目管理</a></li>
+                    <li><a href="file_manage_main.php" target="main">文件管理</a></li>
+                    <li><a href="templets_main.php" target="main">模板管理</a></li>
+                    <?php echo ($cfg_mb_open=='Y')?'<li><a href="../member" target="_blank">会员中心</a></li>':''; ?>
                     <li><a href="../index.php?upcache=1" target="_blank">网站主页</a></li>
                 </ul>
             </div>
@@ -66,7 +66,7 @@
                 <div class="scroll">
                     <form action="action_search.php" target="main" method="post">
                         <input name="keyword" type="text" placeholder="功能搜索" class="allsearch">
-                        <input name="" type="submit" value="搜索" class="np">
+                        <input type="submit" value="搜索" class="np">
                         <a href="<?php echo $cfg_biz_gitUrl;?>" target="_blank">代码托管</a>
                         <a href="<?php echo $cfg_biz_helpUrl;?>" target="_blank">帮助中心</a>
                     </form>
@@ -81,7 +81,7 @@
     </div>
     <div class="right">
         <div class="main">
-            <iframe id="main" name="main" frameborder="0" src="index_body.php"></iframe>
+            <iframe src="index_body.php" id="main" name="main" frameborder="0"></iframe>
         </div>
     </div>
     <div class="qucikmenu" id="qucikmenu">
diff --git a/src/dede/templets/login.htm b/src/dede/templets/login.htm
index 14926a3b..3008f6d7 100755
--- a/src/dede/templets/login.htm
+++ b/src/dede/templets/login.htm
@@ -9,15 +9,18 @@
 <link rel="stylesheet" href="../static/css/dede.css">
 <title><?php echo $cfg_webname; ?>后台登录</title>
 <style>
-body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background:#f8f8f8}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f8f8f8}
 header{background:#ffffff}
-header .logo{width:260px;padding:1rem 0}
+h1{font-size:22px}
+.system{height:60px;line-height:60px;font-size:22px}
+.model{margin-left:10px;font-size:12px}
+.goindex{line-height:60px}
+.fa{font-size:16px}
 .login-from{max-width:580px;width:100%}
 .login-area{background:#ffffff;padding:2rem;border-radius:.25rem}
 .login-area .btnLogin{width:100%}
 .login-power{padding-top:1rem}
-.login-power a,.goindex a{color:#3DB058}
-.goindex{line-height:60px}
+.login-power a,.goindex a{color:#3db058}
 </style>
 </head>
 <body>
@@ -25,7 +28,8 @@ header .logo{width:260px;padding:1rem 0}
 		<div class="container top">
 			<div class="row">
 				<div class="col-6">
-					<img class="logo" src="../static/img/admin-logo.png" title="<?php echo $cfg_soft_enname; ?>">
+					<span class="system"><?php echo $cfg_webname; ?>系统</span>
+					<span class="model"><?php echo $cfg_version_detail; ?></span>
 				</div>
 				<div class="col-6 d-flex justify-content-end goindex">
 					<a href="../index.php" target="_blank"><i class="fa fa-home" aria-hidden="true"></i></a>
@@ -36,7 +40,7 @@ header .logo{width:260px;padding:1rem 0}
 	<main class="container login-from mt-5">
 		<?php echo $redmsg; ?>
 		<div class="login-area">
-			<h4 class="mb-4 text-center">后台登录</h4>
+			<h1 class="mb-4 text-center">后台登录</h1>
 			<form name="form1" method="post" action="login.php">
 				<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>">
 				<input type="hidden" name="dopost" value="login">
diff --git a/src/include/common.func.php b/src/include/common.func.php
index fec41b17..ac0ad7eb 100755
--- a/src/include/common.func.php
+++ b/src/include/common.func.php
@@ -203,7 +203,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         }
         $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
         $rmsg = $func;
-        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.6;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#666;background:#f2f2f2}a{color:#28a745;text-decoration:none}.xushu-tips{margin:68px auto 0;padding:0;width:360px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.tips{margin:0 20px;padding:12px 0;border-bottom:1px solid #f6f6f6}.tips p{margin:0;padding-left:10px;line-height:16px;font-size:14px;color:#424b51;text-align:left;border-left:3px solid #ff5722}.frame{padding:20px;height:120px}.go a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;color:#fff;background:#28a745;border:1px solid #28a745;box-sizing:border-box;border-radius:.2rem;text-align:center;transition:all .4s}.go a:hover{color:#fff;opacity:.8}@media (max-width:768px){body{padding:0 14px}.xushu-tips{width:100%}}</style>\");";
+        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.6;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#666;background:#f2f2f2}a{color:#28a745;text-decoration:none}.xushu-tips{margin:68px auto 0;padding:0;width:400px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.tips{margin:0 20px;padding:12px 0;border-bottom:1px solid #f6f6f6}.tips p{margin:0;padding-left:10px;line-height:16px;font-size:14px;color:#424b51;text-align:left;border-left:3px solid #ff5722}.frame{padding:20px;height:120px}.go a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;color:#fff;background:#28a745;border:1px solid #28a745;box-sizing:border-box;border-radius:.2rem;text-align:center;transition:all .4s}.go a:hover{color:#fff;opacity:.8}@media (max-width:768px){body{padding:0 14px}.xushu-tips{width:100%}}</style>\");";
         $rmsg .= "document.write(\"<div class='xushu-tips'>";
         $rmsg .= "<div class='tips'><p>提示信息</p></div>\");";
         $rmsg .= "document.write(\"<div class='frame'>\");";