From 52d27f2875ee72c9e668ffe6054b95c03461ac31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
<93301500+xushubieli@users.noreply.github.com>
Date: Tue, 29 Nov 2022 16:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/static/web/css/user.css | 111 ++++++++++-------------
src/system/archive/archives.class.php | 4 +-
src/user/templets/album_add.htm | 2 +-
src/user/templets/album_edit.htm | 2 +-
src/user/templets/archives_add.htm | 2 +-
src/user/templets/archives_edit.htm | 2 +-
src/user/templets/archives_sg_add.htm | 2 +-
src/user/templets/archives_sg_edit.htm | 2 +-
src/user/templets/article_add.htm | 2 +-
src/user/templets/article_edit.htm | 2 +-
src/user/templets/buy.htm | 2 +-
src/user/templets/buy_action_payment.htm | 2 +-
src/user/templets/content_list.htm | 16 ++--
src/user/templets/content_sg_list.htm | 16 ++--
src/user/templets/edit_baseinfo.htm | 2 +-
src/user/templets/edit_email.htm | 2 +-
src/user/templets/edit_face.htm | 2 +-
src/user/templets/index.htm | 6 +-
src/user/templets/info.htm | 12 ---
src/user/templets/mypay.htm | 4 +-
src/user/templets/mystow.htm | 6 +-
src/user/templets/operation.htm | 4 +-
src/user/templets/pm-main.htm | 24 ++---
src/user/templets/soft_add.htm | 2 +-
src/user/templets/soft_edit.htm | 2 +-
25 files changed, 103 insertions(+), 130 deletions(-)
delete mode 100644 src/user/templets/info.htm
diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css
index d6180fc0..7d2bdd7d 100644
--- a/src/static/web/css/user.css
+++ b/src/static/web/css/user.css
@@ -1,84 +1,69 @@
.login-from {
- margin: 6rem 0
+ margin:6rem 0
}
-
.login-box {
- padding: 1.25rem;
- width: 500px;
- background: #fff
+ padding:1.25rem;
+ width:500px;
+ background:#fff
}
-
#validateimg {
- border-radius: 0 .2rem .2rem 0
+ border-radius:0 .2rem .2rem 0
}
-
-.member-actions {
- line-height: 40px;
- text-align: right
+.user-actions {
+ line-height:40px;
+ text-align:right
}
-
-.member-logo {
- max-width: 60px;
- min-height: 60px;
- border-radius: 50%
+.user-logo {
+ max-width:60px;
+ min-height:60px;
+ border-radius:50%
}
-
-.member-type span {
- position: relative;
- padding: .3rem;
- font-size: 14px;
- font-weight: 400;
- top: -10px
+.user-img {
+ margin-right:10px;
+ width:30px;
+ height:30px;
+ border-radius:50%;
+ border:1px solid #dee2e6
}
-
-.dropdown {
- display: inline-block;
- margin-left: .25rem;
- content: "";
- border-top: .3em solid;
- border-right: .3em solid transparent;
- border-bottom: 0;
- border-left: .3em solid transparent;
- vertical-align: .25rem
+.user-type span {
+ position:relative;
+ padding:.3rem;
+ font-size:14px;
+ font-weight:400;
+ top:-10px
}
-
-.pannel-main .pannel-main-container {
- padding: 1rem;
- background: #fff
+.user-meter i {
+ font-size:24px !important
+}
+.pannel-main-container {
+ padding:1rem;
+ background:#fff
}
-
.list-group-item.active a {
- color: #fff
+ color:#fff
}
-
.list-group-flush>.list-group-item {
- cursor: pointer
+ cursor:pointer
}
-
-.pannel-main .nav-link.active {
- font-weight: 600
+.nav-link.active {
+ color:#ec982c
}
-
-.user-meter i {
- font-size: 24px !important
-}
-
-.user-img {
- margin-right: 10px;
- width: 30px;
- height: 30px;
- border-radius: 50%;
- border: 1px solid #dee2e6
+.dropdown {
+ display:inline-block;
+ margin-left:.25rem;
+ content:"";
+ border-top:.3em solid;
+ border-right:.3em solid transparent;
+ border-bottom:0;
+ border-left:.3em solid transparent;
+ vertical-align:.25rem
}
-
.form-control {
- height: 36px;
- line-height: 36px
+ height:36px;
+ line-height:36px
}
-
@media (max-width:480px) {
- .login-from,
- .login-box {
- width: 100%
- }
+ .login-from,.login-box {
+ width:100%
+}
}
\ No newline at end of file
diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index 1d8e2316..05c7d9c5 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -707,7 +707,7 @@ class Archives
$this->PreNext['pre'] = "上一篇：<a href='$mlink'>{$preRow['title']}</a>";
$this->PreNext['preimg'] = "<a href='$mlink'><img src=\"{$preRow['litpic']}\" alt=\"{$nextRow['title']}\" title=\"{$preRow['title']}\"></a> ";
} else {
- $this->PreNext['pre'] = "";
+ $this->PreNext['pre'] = "上一篇：暂无";
$this->PreNext['preimg'] = "";
}
if (is_array($nextRow)) {
@@ -736,7 +736,7 @@ class Archives
$this->PreNext['next'] = "下一篇：<a href='$mlink'>{$nextRow['title']}</a> ";
$this->PreNext['nextimg'] = "<a href='$mlink'><img src=\"{$nextRow['litpic']}\" alt=\"{$nextRow['title']}\" title=\"{$preRow['title']}\"></a> ";
} else {
- $this->PreNext['next'] = "";
+ $this->PreNext['next'] = "下一篇：暂无";
$this->PreNext['nextimg'] = "";
}
}
diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm
index 809d55bf..8974a28f 100755
--- a/src/user/templets/album_add.htm
+++ b/src/user/templets/album_add.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm
index ddffea39..b913e1b3 100755
--- a/src/user/templets/album_edit.htm
+++ b/src/user/templets/album_edit.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm
index 1aba3344..8f2a0c66 100755
--- a/src/user/templets/archives_add.htm
+++ b/src/user/templets/archives_add.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm
index ee71bad6..2fee5cd5 100755
--- a/src/user/templets/archives_edit.htm
+++ b/src/user/templets/archives_edit.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm
index c1c95968..f13033cd 100755
--- a/src/user/templets/archives_sg_add.htm
+++ b/src/user/templets/archives_sg_add.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm
index e112963c..a1f72cfb 100755
--- a/src/user/templets/archives_sg_edit.htm
+++ b/src/user/templets/archives_sg_edit.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm
index 26b3e940..862d1893 100755
--- a/src/user/templets/article_add.htm
+++ b/src/user/templets/article_add.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm
index 587213f2..785c1dc5 100755
--- a/src/user/templets/article_edit.htm
+++ b/src/user/templets/article_edit.htm
@@ -15,7 +15,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm
index 03e0f0c3..68395994 100755
--- a/src/user/templets/buy.htm
+++ b/src/user/templets/buy.htm
@@ -14,7 +14,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm
index 9f73bf3d..fa0e9483 100755
--- a/src/user/templets/buy_action_payment.htm
+++ b/src/user/templets/buy_action_payment.htm
@@ -14,7 +14,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm
index 0ae62f07..613aed73 100755
--- a/src/user/templets/content_list.htm
+++ b/src/user/templets/content_list.htm
@@ -29,10 +29,10 @@
$_menu_conex = true;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
- <ul class="navbar-nav mr-auto mt-2">
+ <ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link <?php echo ($arcrank=='')? 'active' : '';?>" href="content_list.php?channelid=<?php echo $channelid;?>">全部</a></li>
<li class="nav-item"><a class="nav-link<?php echo ($arcrank=='1')? ' active' : '';?>" href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=1">已审核</a></li>
<li class="nav-item"><a class="nav-link<?php echo ($arcrank=='-1')? ' active' : '';?>" href="content_list.php?channelid=<?php echo $channelid;?>&arcrank=-1">未审核</a></li>
@@ -44,11 +44,11 @@
<table width="100%" cellpadding="0" cellspacing="0" class="table">
<thead>
<tr>
- <th width="28%">文档标题</th>
+ <th width="20%">文档标题</th>
<th width="10%">类目</th>
<th width="12%">状态</th>
<th width="10%">点击</th>
- <th width="10%">时间</th>
+ <th width="16%">时间</th>
<th align="center">操作</th>
</tr>
</thead>
@@ -60,13 +60,14 @@
<td>
<?php
if ($fields['arcrank']>=0) echo '<span class="btn btn-outline-success btn-sm">已审核</span>';
- else if ($fields['arcrank']==-2) echo '<span class="text-danger">审核失败</span>';
+ else if ($fields['arcrank']==-2) echo '<span class="btn btn-outline-danger btn-sm">审核失败</span>';
else echo '<span class="btn btn-outline-danger btn-sm">未审核</span>';
?>
</td>
<td><?php echo $fields['click'];?></td>
<td><?php echo GetDateMk($fields['senddate']);?></td>
- <td align="center" class="doPost">
+ <td align="center">
+ <a href="javascript:viewArc(<?php echo $fields['id'];?>);" class="btn btn-success btn-sm">预览</a>
<?php
if ($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime)
{
@@ -78,14 +79,13 @@
echo "<span class='btn btn-sm'>无操作</span>";
}
?>
- <a href="javascript:viewArc(<?php echo $fields['id'];?>);" class="btn btn-success btn-sm">预览</a>
</td>
</tr>
{/dede:datalist}
</tbody>
</table>
</div>
- <nav>{dede:pagelist listsize='6'/}</nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm
index 85c0ad39..29283720 100755
--- a/src/user/templets/content_sg_list.htm
+++ b/src/user/templets/content_sg_list.htm
@@ -29,10 +29,10 @@
$_menu_conex = true;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
- <ul class="navbar-nav mr-auto mt-2">
+ <ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link <?php echo ($arcrank=='')? 'active' : '';?>" href="content_sg_list.php?channelid=<?php echo $channelid;?>">全部</a></li>
<li class="nav-item"><a class="nav-link<?php echo ($arcrank=='1')? ' active' : '';?>" href="content_sg_list.php?channelid=<?php echo $channelid;?>&arcrank=1">已审核</a></li>
<li class="nav-item"><a class="nav-link<?php echo ($arcrank=='-1')? ' active' : '';?>" href="content_sg_list.php?channelid=<?php echo $channelid;?>&arcrank=-1">未审核</a></li>
@@ -44,11 +44,11 @@
<table width="100%" cellpadding="0" cellspacing="0" class="table">
<thead>
<tr>
- <th width="28%">文档标题</th>
+ <th width="20%">文档标题</th>
<th width="10%">类目</th>
<th width="12%">状态</th>
<th width="10%">点击</th>
- <th width="10%">时间</th>
+ <th width="16%">时间</th>
<th align="center">操作</th>
</tr>
</thead>
@@ -60,23 +60,23 @@
<td>
<?php
if ($fields['arcrank']>=0) echo '<span class="btn btn-outline-success btn-sm">已审核</span>';
- else if ($fields['arcrank']==-2) echo '<span class="text-danger">审核失败</span>';
+ else if ($fields['arcrank']==-2) echo '<span class="btn btn-outline-danger btn-sm">审核失败</span>';
else echo '<span class="btn btn-outline-danger btn-sm">未审核</span>';
?>
</td>
<td><?php echo $fields['click'];?></td>
<td><?php echo GetDateMk($fields['senddate']);?></td>
- <td align="center" class="doPost">
+ <td align="center">
+ <a href="javascript:viewArc(<?php echo $fields['aid'];?>);" class="btn btn-success btn-sm">预览</a>
<a href="javascript:editArc(<?php echo $fields['aid']?>,<?php echo $fields['channel']?>);" class="btn btn-success btn-sm">修改</a>
<a href="javascript:delArc(<?php echo $fields['aid']?>);" class="btn btn-danger btn-sm">删除</a>
- <a href="javascript:viewArc(<?php echo $fields['aid'];?>);" class="btn btn-success btn-sm">预览</a>
</td>
</tr>
{/dede:datalist}
</tbody>
</table>
</div>
- <nav>{dede:pagelist listsize='6'/}</nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index 6ab24b5e..18ac2c68 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -19,7 +19,7 @@
$_menu_edtitem = 'base';
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" href="edit_baseinfo.php">账号安全</a></li>
diff --git a/src/user/templets/edit_email.htm b/src/user/templets/edit_email.htm
index aeec43bc..f13fe566 100644
--- a/src/user/templets/edit_email.htm
+++ b/src/user/templets/edit_email.htm
@@ -19,7 +19,7 @@
$_menu_edtitem = 'email';
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link" href="edit_baseinfo.php">账号安全</a></li>
diff --git a/src/user/templets/edit_face.htm b/src/user/templets/edit_face.htm
index 31a0aadf..0d447993 100755
--- a/src/user/templets/edit_face.htm
+++ b/src/user/templets/edit_face.htm
@@ -19,7 +19,7 @@
$_menu_edtitem = 'face';
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link" href="edit_baseinfo.php">账号安全</a></li>
diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm
index 68a8389f..da33af46 100755
--- a/src/user/templets/index.htm
+++ b/src/user/templets/index.htm
@@ -18,13 +18,13 @@
$_menu_home = true;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pb-3">
<div class="pannel-main-container shadow-sm rounded">
<div class="media-body row">
<div class="col-12 col-md-4 text-center">
- <a href="<?php echo $cfg_memberurl;?>/"><img src="<?php echo $cfg_ml->fields['face'];?>" title="<?php echo $cfg_ml->M_LoginID;?>" class="member-logo"></a>
- <div class="member-type"><span class="badge badge-success"><?php echo $cfg_ml->M_LoginID;?></span></div>
+ <a href="<?php echo $cfg_memberurl;?>/"><img src="<?php echo $cfg_ml->fields['face'];?>" title="<?php echo $cfg_ml->M_LoginID;?>" class="user-logo"></a>
+ <div class="user-type"><span class="badge badge-success"><?php echo $cfg_ml->M_LoginID;?></span></div>
</div>
<div class="col-12 col-md-8">
<p><?php echo $cfg_ml->M_MbType;?>积分<span class="text-primary"><?php echo $cfg_ml->M_Scores;?></span>分，金币<span class="text-primary"><?php echo $cfg_ml->M_Money;?></span>个</p>
diff --git a/src/user/templets/info.htm b/src/user/templets/info.htm
deleted file mode 100644
index a54c6429..00000000
--- a/src/user/templets/info.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="container py-3">
- <div class="text-center member-info">
- <a href="<?php echo $cfg_memberurl;?>/"><img class="member-logo" src="<?php echo $cfg_ml->fields['face'];?>" title="<?php echo $cfg_ml->M_MbType;?>"></a>
- <div class="member-type"><span class="badge badge-success"><?php echo $cfg_ml->M_MbType;?>用户</span></div>
- <h4><?php echo $cfg_ml->M_LoginID;?></h4>
- <div class="member-rank text-danger">积分：<?php echo $cfg_ml->M_Scores;?> 金币：<?php echo $cfg_ml->M_Money;?> <a href="buy.php" class="btn btn-danger">充值</a></div>
- <ul class="nav justify-content-center">
- <li class="nav-item"><a class="nav-link" href="pm.php">短消息</a></li>
- <li class="nav-item"><a class="nav-link" href="mystow.php">收藏</a></li>
- </ul>
- </div>
-</div>
\ No newline at end of file
diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm
index fdfe5ee5..8f0e6d4a 100755
--- a/src/user/templets/mypay.htm
+++ b/src/user/templets/mypay.htm
@@ -19,7 +19,7 @@
$_menu_orderstate = 0;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<div class="table-responsive">
<table width="100%" cellpadding="0" cellspacing="0" class="table">
@@ -58,7 +58,7 @@
</form>
</table>
</div>
- <nav>{dede:pagelist listsize='6'/}</nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/mystow.htm b/src/user/templets/mystow.htm
index b171e4ef..d6e723bd 100755
--- a/src/user/templets/mystow.htm
+++ b/src/user/templets/mystow.htm
@@ -18,7 +18,7 @@
$_menu_stow = true;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link <?php echo $rank===''? 'active' : '';?>" href="mystow.php">我的收藏</a></li>
@@ -29,7 +29,7 @@
{dede:datalist}
<tr>
<td colspan="5"><a href="archives_do.php?dopost=viewArchives&aid={dede:field.aid/}" target="_blank">{dede:field.title/}</a></td>
- <td width="25%" align="center" class="doPost">
+ <td width="25%" align="center">
<a href="../apps/recommend.php?type={dede:field.type/}&aid={dede:field.aid/}" target="_blank" class="btn btn-success btn-sm">推荐</a>
<a href="archives_do.php?dopost=delStow&type={dede:field.type/}&aid={dede:field.aid/}" class="btn btn-danger btn-sm">删除</a>
</td>
@@ -40,7 +40,7 @@
{/dede:datalist}
</tbody>
</table>
- <nav>{dede:pagelist listsize='6'/}</nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/operation.htm b/src/user/templets/operation.htm
index 39369f47..b452107e 100755
--- a/src/user/templets/operation.htm
+++ b/src/user/templets/operation.htm
@@ -19,7 +19,7 @@
$_menu_orderstate = 2;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
<div class="table-responsive">
<table width="100%" cellpadding="0" cellspacing="0" class="table">
@@ -55,7 +55,7 @@
</tbody>
</table>
</div>
- <nav>{dede:pagelist listsize='6'/}</nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm
index 3d5a2933..d5f4373c 100755
--- a/src/user/templets/pm-main.htm
+++ b/src/user/templets/pm-main.htm
@@ -39,13 +39,16 @@
$_menu_pmstate = $state;
?>
<?php include(DEDEMEMBER."/templets/menu.htm");?>
- <div class="pannel-main col-md-9">
+ <div class="col-md-9">
<div class="pannel-main-container shadow-sm rounded">
- <ul class="nav mt-2">
- <li class="nav-item"><a class="nav-link<?php if ($state === 0) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>">全部</a></li>
- <li class="nav-item"><a class="nav-link<?php if ($state === 1) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>&state=1">已阅读</a></li>
- <li class="nav-item"><a class="nav-link<?php if ($state === -1) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>&state=-1">未阅读</a></li>
- </ul>
+ <nav class="navbar navbar-expand-lg mb-3 p-0">
+ <ul class="navbar-nav mr-auto">
+ <li class="nav-item"><a class="nav-link<?php if ($state === 0) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>">全部</a></li>
+ <li class="nav-item"><a class="nav-link<?php if ($state === 1) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>&state=1">已阅读</a></li>
+ <li class="nav-item"><a class="nav-link<?php if ($state === -1) echo ' active';?>" href="pm.php?folder=<?php echo $folder;?>&state=-1">未阅读</a></li>
+ </ul>
+ <span class="navbar-text"><button type="button" class="btn btn-danger" onclick="DoSubmit('<?php echo $folder;?>')">删除</button></span>
+ </nav>
<div class="table-responsive">
<form action="pm.php" method="post" name="form1">
<input type="hidden" name="dopost" value="del">
@@ -53,7 +56,7 @@
<table class="table">
<thead>
<tr>
- <th scope="col"></th>
+ <th scope="col">选择</th>
<th scope="col">标题</th>
<th scope="col">
<?php
@@ -86,7 +89,7 @@
<td>
<div class="pm-read-status" for="<?php echo $fields['id'];?>">
<?php
- $readmsg = ($fields['hasview']==0 ? "<span class='text-primary'>未阅读</span>" : '已阅读');
+ $readmsg = ($fields['hasview']==0 ? "<span class='btn btn-outline-danger btn-sm'>未阅读</span>" : "<span class='btn btn-outline-success btn-sm'>已阅读</span>");
echo $readmsg;
?>
</div>
@@ -98,10 +101,7 @@
</table>
</form>
</div>
- <nav>
- <button type="button" onclick="DoSubmit('<?php echo $folder;?>')" class="btn btn-danger">删除</button>
- {dede:pagelist listsize='6'/}
- </nav>
+ {dede:pagelist listsize='6'/}
</div>
</div>
</div>
diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm
index 87c4550f..49f6d399 100755
--- a/src/user/templets/soft_add.htm
+++ b/src/user/templets/soft_add.htm
@@ -32,7 +32,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">
diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm
index ab1fc54f..b3fa714f 100755
--- a/src/user/templets/soft_edit.htm
+++ b/src/user/templets/soft_edit.htm
@@ -32,7 +32,7 @@
<?php pasterTempletDiy('top.htm');?>
<div class="container py-3">
<div class="row">
- <div class="pannel-main col-md-12">
+ <div class="col-md-12">
<div class="pannel-main-container shadow-sm rounded">
<nav class="navbar navbar-expand-lg mb-3 p-0">
<ol class="breadcrumb mr-auto">