修正安装插件调转，界面按钮提示

src/admin/module_main.php

@@ -274,8 +274,8 @@ else if ($action == 'setupstart') {
         }
         ReWriteConfigAuto();
         $rflwft = "<script>\r\n";
-        $rflwft .= "if(window.navigator.userAgent.indexOf('MSIE')>=1) top.document.frames.menu.location = 'index_menu_module.php';\r\n";
-        $rflwft .= "else top.document.getElementById('menufra').src = 'index_menu_module.php';\r\n";
+        $rflwft .= "if(window.navigator.userAgent.indexOf('MSIE')>=1) top.document.frames.menu.location = 'index_menu.php';\r\n";
+        $rflwft .= "else top.document.getElementById('menufra').src = 'index_menu.php';\r\n";
         $rflwft .= "</script>";
         echo $rflwft;
         UpDateCatCache();
@@ -440,8 +440,8 @@ else if ($action == 'uninstallok') {
         }
         ReWriteConfigAuto();
         $rflwft = "<script>\r\n";
-        $rflwft .= "if(window.navigator.userAgent.indexOf('MSIE')>=1) top.document.frames.menu.location = 'index_menu_module.php';\r\n";
-        $rflwft .= "else top.document.getElementById('menufra').src = 'index_menu_module.php';\r\n";
+        $rflwft .= "if(window.navigator.userAgent.indexOf('MSIE')>=1) top.document.frames.menu.location = 'index_menu.php';\r\n";
+        $rflwft .= "else top.document.getElementById('menufra').src = 'index_menu.php';\r\n";
         $rflwft .= "</script>";
         echo $rflwft;
         ShowMsg('模块卸载完成', 'module_main.php');

src/admin/mychannel_main.php

@@ -20,9 +20,9 @@ $dlist->display();
 function GetSta($sta, $id)
 {
     if ($sta == 1) {
-        return ($id != -1 ? "<span class='text-success'>启用</span> &gt; <a href='mychannel_edit.php?dopost=hide&id=$id'>禁用</a>" : "固定项目");
+        return ($id != -1 ? "已启用 <a href='mychannel_edit.php?dopost=hide&id=$id' class='btn btn-outline-danger btn-sm'>禁用</a>" : "固定项目");
     } else {
-        return "<span class='text-danger'>禁用</span> &gt; <a href='mychannel_edit.php?dopost=show&id=$id'>启用</a>";
+        return "已禁用 <a href='mychannel_edit.php?dopost=show&id=$id' class='btn btn-outline-success btn-sm'>启用</a>";
     }
 }
 function IsSystem($s)

src/admin/plus_main.php

@@ -20,8 +20,8 @@ $dlist->display();
 function GetSta($sta, $id, $title)
 {
     if ($sta == 1) {
-        return "启用 &gt; <a href='plus_edit.php?dopost=hide&aid=$id' class='text-danger'>禁用</a> <a href='plus_edit.php?dopost=edit&aid=$id'>修改</a> <a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."'>删除</a>";
+        return "已启用 <a href='plus_edit.php?dopost=hide&aid=$id' class='btn btn-outline-danger btn-sm'>禁用</a><a href='plus_edit.php?dopost=edit&aid=$id' class='btn btn-outline-success btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-outline-danger btn-sm'>删除</a>";
     } else {
-        return "禁用 &gt; <a href='plus_edit.php?dopost=show&aid=$id' class='text-success'>启用</a> <a href='plus_edit.php?aid=$id'>修改</a> <a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."'>册除</a>";
+        return "已禁用 <a href='plus_edit.php?dopost=show&aid=$id' class='btn btn-outline-success btn-sm'>启用</a><a href='plus_edit.php?aid=$id' class='btn btn-outline-success btn-sm' class='btn btn-outline-success btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-outline-danger btn-sm'>册除</a>";
     }
 }

src/admin/templets/module_main.htm

@@ -65,9 +65,9 @@
 						$file = DEDEDATA."/module/{$v['hash']}.xml";
 						if(file_exists($file)) {
 							if(file_exists(DEDEDATA."/module/{$v['hash']}-readme.php")){
-								echo "已安装 <a class='text-danger' href='module_main.php?action=uninstall&hash={$v['hash']}'>卸载</a>";
+								echo "已安装 <a href='module_main.php?action=uninstall&hash={$v['hash']}' class='btn btn-outline-danger btn-sm'>卸载</a>";
 							} else {
-								echo "未安装 <a class='text-success' href='module_main.php?action=setup&hash={$v['hash']}'>安装</a>";
+								echo "未安装 <a href='module_main.php?action=setup&hash={$v['hash']}' class='btn btn-outline-success btn-sm'>安装</a>";
 							}
 						} else {
 							echo "<div id=\"status_{$v['hash']}\"><a class=\"text-danger\" href=\"javascript:getmodule('download','{$v['hash']}')\">下载</a></div>";

src/static/web/css/admin.css

@@ -369,9 +369,6 @@ span.page-link {
 	color:#fff;
 	background:#1eb867
 }
-a.btn {
-	color:#fff!important
-}
 .btn-xs {
 	padding:2px;
 	line-height:12px;

src/static/web/css/jquery.fileupload.css

@@ -1 +1,21 @@
-.fileinput-button{position:relative;overflow:hidden;display:inline-block}.fileinput-button input{position:absolute;top:0;right:0;margin:0;opacity:0;direction:ltr;cursor:pointer}@media screen\9{.fileinput-button input{filter:alpha(opacity=0);font-size:100%;height:100%}}
+.fileinput-button {
+	position:relative;
+	overflow:hidden;
+	display:inline-block
+}
+.fileinput-button input {
+	position:absolute;
+	top:0;
+	right:0;
+	margin:0;
+	opacity:0;
+	direction:ltr;
+	cursor:pointer
+}
+@media screen\9 {
+	.fileinput-button input {
+	filter:alpha(opacity=0);
+	font-size:100%;
+	height:100%
+}
+}

src/static/web/css/member.css

@@ -1,16 +1,3 @@
-body {
-	line-height:1.5;
-	font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
-	color:#545b62;
-	background:#fff
-}
-main.login-from {
-	background-image:url('../img/member_bg.jpg');
-	background-repeat:no-repeat;
-	background-position:top center;
-	height:620px;
-	padding-top:5rem
-}
 .login-area {
 	background-color:white;
 	max-width:500px;

src/static/web/css/style.css

@@ -1,8 +1,43 @@
 body {
 	line-height:1.5;
 	font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
+	color:#545b62;
+	letter-spacing:.6px
+}
+a {
 	color:#545b62
 }
+a:hover {
+	color:#ff8400;
+	text-decoration:none
+}
+img {
+	max-width:100%;
+	border-radius:.25rem
+}
+ul,ol {
+	margin:0;
+	padding:0;
+	list-style:none
+}
+h1,h2,h3,h4,h5,h6 {
+	margin:0;
+	line-height:1.5;
+	font-weight:600;
+	color:#393d49
+}
+h1 {
+	font-size:32px
+}
+h2 {
+	font-size:24px
+}
+h3,h4 {
+	font-size:18px
+}
+h5,h6 {
+	font-size:16px
+}
 .flink,.flink a,.copyright,.copyright a {
 	color:white
 }
@@ -486,8 +521,7 @@ nav.location .dede li.active .nav-link {
 	line-height:1.5rem
 }
 .article-meta small {
-	color:#868686;
-	margin-left:1rem
+	color:#868686
 }
 .article-main .body {
 	word-break:break-all

src/theme/templets/footer.htm

@@ -1,5 +1,5 @@
 <footer class="bg-success">
-    <div class="copyright py-3">
+    <div class="copyright py-5">
         <p class="text-center mb-0">{dede:global.cfg_powerby/} Powered by <a href="https://www.dedebiz.com" target="_blank">DedeBIZ开发团队</a></p>
     </div>
 </footer>

src/theme/templets/index.htm

@@ -15,64 +15,59 @@
 	<body>
 		{dede:include filename='header.htm'/}
 		<main class="container mt-3">
-			<div class="col-12">
-				<div class="row">
-					<div class="col-12 col-lg-9 litpics mb-3">
-						<div class="row">
-							<div id="carouselIndex" class="col-12 carousel slide" data-ride="carousel">
-								<ol class="carousel-indicators">
-									{dede:arclist channelid='1' flag='f' row='6'}
-									<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>
-									{/dede:arclist}
-								</ol>
-								<div class="carousel-inner">
-									{dede:arclist channelid='1' flag='f' row='6'}
-									<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]">
-										<a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" class="mr-3" alt="[field:fulltitle/]"></a>
-									</div>
-									{/dede:arclist}
+			<div class="row">
+				<div class="col-12 col-lg-9 litpics mb-3">
+					<div class="row">
+						<div id="carouselIndex" class="col-12 carousel slide" data-ride="carousel">
+							<ol class="carousel-indicators">
+								{dede:arclist channelid='1' flag='f' row='6'}
+								<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>
+								{/dede:arclist}
+							</ol>
+							<div class="carousel-inner">
+								{dede:arclist channelid='1' flag='f' row='6'}
+								<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]">
+									<a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" alt="[field:fulltitle/]"></a>
 								</div>
-								<a class="carousel-control-prev" href="#carouselIndex" role="button" data-slide="prev">
-									<span class="carousel-control-prev-icon"></span>
-									<span class="sr-only">上一个</span>
-								</a>
-								<a class="carousel-control-next" href="#carouselIndex" role="button" data-slide="next">
-									<span class="carousel-control-next-icon"></span>
-									<span class="sr-only">下一个</span>
-								</a>
+								{/dede:arclist}
 							</div>
+							<a class="carousel-control-prev" href="#carouselIndex" role="button" data-slide="prev">
+								<span class="carousel-control-prev-icon"></span>
+								<span class="sr-only">上一个</span>
+							</a>
+							<a class="carousel-control-next" href="#carouselIndex" role="button" data-slide="next">
+								<span class="carousel-control-next-icon"></span>
+								<span class="sr-only">下一个</span>
+							</a>
 						</div>
 					</div>
-					<div class="col-12 col-lg-3 toutiao mb-3 mb-md-3">
-						<div class="row">
-							<div class="col-12 card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-8 caption"><span>推荐头条</span></div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist flag='h' titlelen='100' row='7' orderby='pubdate'}
-									<li>
-										<i class="fa fa-bookmark-o"></i>
-										<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a>
-									</li>
-									{/dede:arclist}
-								</ul>
+				</div>
+				<div class="col-12 col-lg-3 toutiao mb-3">
+					<div class="row">
+						<div class="col-12 card ddcard-normal">
+							<div class="card-header">
+								<div class="col-8 caption"><span>推荐头条</span></div>
+							
 							</div>
+							<ul class="list-group list-group-flush">
+								{dede:arclist flag='h' titlelen='100' row='7' orderby='pubdate'}
+								<li>
+									<i class="fa fa-bookmark-o"></i>
+									<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a>
+								</li>
+								{/dede:arclist}
+							</ul>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col-12 col-lg-9 index-left">
-					<div class="spec row">
+				<div class="col-12 col-lg-9">
+					<div class="row spec">
 						<div class="col-md-12">
-							<div class="dede-title">
+							<div class="dede-title mb-3">
 								<h4 class="dede">图文资讯</h4>
 							</div>
 						</div>
-						<div class="col-md-12 mt-3">
+						<div class="col-md-12 mb-3">
 							<div class="row row-cols-2 row-cols-md-4">
 								{dede:arclist row='4' orderby='pubdate' type='image.'}
 								<div class="col">
@@ -90,7 +85,7 @@
 					</div>
 					<div class="row">
 						{dede:channelartlist}
-						<div class="col-md-6 mt-3">
+						<div class="col-md-6 mb-3">
 							<div class="card ddcard-normal">
 								<div class="card-header">
 									<div class="row">