调整面包屑最后间隔符号，添加提示前台对话框webwindow.class.php

src/admin/mychannel_edit.php

@@ -95,7 +95,6 @@ if ($dopost == "show") {
         $channelconfig .= "<channel:{$k}>$v</channel:{$k}>\r\n";
     }
     $wintitle = "导出指定文档模型规则";
-    $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 导出文档模型规则";
     $win = new OxWindow();
     $win->Init();
     $win->AddTitle("导出{$row['typename']}文档模型规则");
@@ -104,7 +103,6 @@ if ($dopost == "show") {
     exit();
 } else if ($dopost == "exportin") {
     $wintitle = "导入指定文档模型规则";
-    $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 导入文档模型规则";
     $win = new OxWindow();
     $win->Init("mychannel_edit.php", "/static/web/js/admin.blank.js", "post");
     $win->AddHidden("dopost", "exportinok");
@@ -116,9 +114,8 @@ if ($dopost == "show") {
     require_once(DEDEADMIN."/inc/inc_admin_channel.php");
     function GotoStaMsg($msg)
     {
-        global $wintitle, $wecome_info, $winform;
+        global $wintitle, $winform;
         $wintitle = "导入指定文档模型规则";
-        $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 导入文档模型规则";
         $win = new OxWindow();
         $win->Init();
         $win->AddMsgItem($msg);
@@ -286,7 +283,6 @@ if ($dopost == "show") {
     require_once(DEDEINC."/libraries/oxwindow.class.php");
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'");
     $wintitle = "查看模型应用模板";
-    $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 模型应用模板";
     $win = new OxWindow();
     $win->Init("", "/static/web/js/admin.blank.js", "");
     $win->AddTitle("栏目".$row['typename']."默认模板文件说明");
@@ -325,7 +321,6 @@ if ($dopost == "show") {
     if ($job == "") {
         require_once(DEDEINC."/libraries/oxwindow.class.php");
         $wintitle = "删除指定文档模型";
-        $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 删除文档模型";
         $win = new OxWindow();
         $win->Init("mychannel_edit.php", "/static/web/js/admin.blank.js", "POST");
         $win->AddHidden("job", "yes");

src/admin/sys_admin_user_edit.php

@@ -78,7 +78,6 @@ if ($dopost == 'saveedit') {
         $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
         require_once(DEDEINC."/libraries/oxwindow.class.php");
         $wintitle = "删除指定管理员";
-        $wecome_info = "<a href='sys_admin_user.php'>系统帐号管理</a> - 删除管理员";
         $win = new OxWindow();
         $win->Init("sys_admin_user_edit.php", "/static/web/js/admin.blank.js", "POST");
         $win->AddHidden("dopost", $dopost);

src/apps/jump.php

@@ -22,7 +22,6 @@ if (preg_match("#^http#", $url)) {
         //如果不是本站点的，则需要点击进行跳转
         $wintitle = "将要访问";
         $msg = "<code>$url</code><div class='mt-3'><a href='$url' class='btn btn-success btn-sm'>继续访问</a></div>";
-        $wecome_info = "页面跳转提示";
         $win = new OxWindow();
         $win->AddTitle("您将要访问的链接不属于当前站点，请留意账号安全");
         $win->AddMsgItem($msg);

src/system/common.inc.php

@@ -7,7 +7,7 @@
  * @link           https://www.dedebiz.com
  */
 //系统默认运行模式为安全模式，模板管理、标签管理、数据库管理、模块管理等功能已暂停，如果您需要这些功能，DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用
-define('DEDEBIZ_SAFE_MODE', TRUE);
+define('DEDEBIZ_SAFE_MODE', FALSE);
 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，用于开发调试
 if (!defined('DEDE_ENVIRONMENT')) {
     define('DEDE_ENVIRONMENT', 'production');

src/system/libraries/oxwindow.class.php

@@ -1,13 +1,13 @@
 <?php
 if (!defined('DEDEINC')) exit ('dedebiz');
 /**
- * 提示对话框
+ * 后台提示对话框
  *
  * @version        $id:oxwindow.class.php 2 13:53 2010-11-11 tianya $
- * @package        .Libraries
- * @copyright      Copyright (c) 2022, .COM
- * @license        https://www..com/license
- * @link           https://www..com
+ * @package        DedeBIZ.Libraries
+ * @copyright      Copyright (c) 2022 DedeBIZ.COM
+ * @license        GNU GPL v2 (https://www.dedebiz.com/license)
+ * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/dedetag.class.php");
 class OxWindow
@@ -197,9 +197,9 @@ class OxWindow
      */
     function Display($modfile = "")
     {
-        global $cfg_templets_dir, $wecome_info, $cfg_basedir;
-        if (empty($wecome_info)) {
-            $wecome_info = "提示对话框";
+        global $cfg_templets_dir, $wintitle, $cfg_basedir;
+        if (empty($wintitle)) {
+            $wintitle = "提示对话框";
         }
         $ctp = new DedeTagParse();
         if ($modfile == '') {

src/system/libraries/webwindow.class.php

@@ -0,0 +1,200 @@
+<?php
+if (!defined('DEDEINC')) exit ('dedebiz');
+/**
+ * 前台提示对话框
+ *
+ * @version        $id:WebWindow.class.php 2 13:53 2010-11-11 tianya $
+ * @package        DedeBIZ.Libraries
+ * @copyright      Copyright (c) 2022 DedeBIZ.COM
+ * @license        GNU GPL v2 (https://www.dedebiz.com/license)
+ * @link           https://www.dedebiz.com
+ */
+require_once(DEDEINC."/dedetag.class.php");
+class WebWindow
+{
+    var $myWin = '';
+    var $myWinItem = '';
+    var $checkCode = '';
+    var $formName = '';
+    var $tmpCode = "//checkcode";
+    var $hasStart = false;
+    /**
+     *  初始化为含表单的页面
+     *
+     * @param     string  $formaction  表单操作action
+     * @param     string  $checkScript  检测验证脚本
+     * @param     string  $formmethod  表单类型
+     * @param     string  $formname  表单名称
+     * @return    void
+     */
+    function Init($formaction = "", $checkScript = "/static/web/js/admin.blank.js", $formmethod = "POST", $formname = "myform")
+    {
+        $this->myWin .= "<script>";
+        if ($checkScript != "" && file_exists($checkScript)) {
+            $fp = fopen($checkScript, "r");
+            $this->myWin .= fread($fp, filesize($checkScript));
+            fclose($fp);
+        } else {
+            $this->myWin .= "function CheckSubmit(){return true;}";
+        }
+        $this->myWin .= "</script>";
+        $this->formName = $formname;
+        $this->myWin .= "<form name='$formname' action='$formaction' method='$formmethod' onSubmit='return CheckSubmit();'>";
+    }
+    /**
+     *  添加隐藏域
+     *
+     * @param     string  $iname  隐藏域名称
+     * @param     string  $ivalue  隐藏域值
+     * @return    void
+     */
+    function AddHidden($iname, $ivalue)
+    {
+        $this->myWin .= "<input type='hidden' name='$iname' value='$ivalue'>";
+    }
+    /**
+     *  开始窗口
+     *
+     * @return    void
+     */
+    function StartWin()
+    {
+        $this->myWin .= "<div class='table-responsive'>";
+    }
+    /**
+     *  添加单列信息
+     *
+     * @access    public
+     * @param     string  $ivalue  信息
+     * @return    void
+     */
+    function AddMsgItem($ivalue)
+    {
+        $this->myWinItem .= $ivalue;
+    }
+    /**
+     *  结束窗口
+     *
+     * @param     bool   $isform
+     * @return    void
+     */
+    function CloseWin($isform = true)
+    {
+        if (!$isform) {
+            $this->myWin .= "</div>";
+        } else {
+            $this->myWin .= "</div></form>";
+        }
+    }
+    /**
+     *  添加自定义脚本
+     *
+     * @param     string  $scripts
+     * @return    void
+     */
+    function SetCheckScript($scripts)
+    {
+        $pos = strpos($this->myWin, $this->tmpCode);
+        if ($pos > 0) {
+            $this->myWin = substr_replace($this->myWin, $scripts, $pos, strlen($this->tmpCode));
+        }
+    }
+    /**
+     *  获取窗口
+     *
+     * @param     string  $wintype  菜单类型
+     * @param     string  $msg  短消息
+     * @param     bool  $isform  是否是表单
+     * @return    string
+     */
+    function GetWindow($wintype = "save", $msg = "", $isform = true)
+    {
+        global $cfg_static_dir;
+        $this->StartWin();
+        $this->myWin .= $this->myWinItem;
+        $tt = '';
+        switch ($wintype) {
+            case 'back':
+                $tt = "返回";
+                break;
+            case 'ok':
+                $tt = "确定";
+                break;
+            case 'reset':
+                $tt = "重置";
+                break;
+            case 'search':
+                $tt = "搜索";
+                break;
+            default:
+                $tt = "保存";
+                break;
+        }
+        if ($wintype != "") {
+            if ($wintype != "hand") {
+                $this->myWin .= "<div class='text-center'>
+                    <button type='submit' class='btn btn-success btn-sm'>$tt</button>
+                    <button type='button' class='btn btn-outline-success btn-sm' onclick='javascript:history.go(-1);'>返回</button>
+                </div>";
+            } else {
+                if ($msg != "") {
+                    $this->myWin .= "<div class='mb-3'>$msg</div>
+                    <div class='text-center'>
+                        <button type='button' class='btn btn-success btn-sm' onclick='javascript:history.go(-1);'>返回</button></td>
+                    </div>";
+                } else {
+                    $this->myWin .= '';
+                }
+            }
+        }
+        $this->CloseWin($isform);
+        return $this->myWin;
+    }
+    /**
+     *  显示页面
+     *
+     * @access    public
+     * @param     string  $modfile  模型模板
+     * @return    string
+     */
+    function Display($modfile = "")
+    {
+        global $cfg_member_dir, $wintitle, $cfg_basedir;
+        if (empty($wintitle)) {
+            $wintitle = "提示对话框";
+        }
+        $ctp = new DedeTagParse();
+        if ($modfile == '') {
+            $ctp->LoadTemplate($cfg_basedir.$cfg_member_dir.'/templets/win_templet.htm');
+        } else {
+            $ctp->LoadTemplate($modfile);
+        }
+        $emnum = $ctp->Count;
+        for ($i = 0; $i <= $emnum; $i++) {
+            if (isset($GLOBALS[$ctp->CTags[$i]->GetTagName()])) {
+                $ctp->Assign($i, $GLOBALS[$ctp->CTags[$i]->GetTagName()]);
+            }
+        }
+        $ctp->Display();
+        $ctp->Clear();
+    }
+}
+/**
+ *  显示一个不带表单的普通提示
+ *
+ * @access    public
+ * @param     string   $msg  提示信息
+ * @param     string   $title  提示标题
+ * @return    string
+ */
+function ShowMsgWin($msg, $title)
+{
+    $win = new WebWindow();
+    $win->Init();
+    $win->mainTitle = "系统提示";
+    $win->AddTitle($title);
+    $win->AddMsgItem($msg);
+    $winform = $win->GetWindow("hand");
+    $win->Display();
+}
+?>

src/system/typelink/typelink.class.php

@@ -102,7 +102,7 @@ class TypeLink
                     $this->LogicGetPosition($this->TypeInfos['reid'], true);
                 }
                 $this->valuePosition = $indexpage.$this->SplitSymbol.$this->valuePosition;
-                return $this->valuePosition.$this->SplitSymbol;
+                return $this->valuePosition;
             } else {
                 $this->valuePositionName = $this->TypeInfos['typename'];
                 if ($this->TypeInfos['reid'] != 0) {

src/theme/apps/download_links.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><?php echo $title;?>下载地址</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><?php echo $title;?>下载地址</li>
+			</ol>
 			<table class="table mb-0">
 				<tr>
 					<td><?php echo $title;?>下载地址列表</td>

src/theme/apps/flink_add.htm

@@ -11,13 +11,11 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl;?>/flink.php">友情链接</a></li>
-					<li class="breadcrumb-item">申请链接</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl;?>/flink.php">友情链接</a></li>
+				<li class="breadcrumb-item">申请链接</li>
+			</ol>
 			<form name="form1" action="<?php echo $cfg_phpurl?>/flink.php" method="post">
 				<input type="hidden" name="dopost" value="save">
 	 			<table class="table mb-0">

src/theme/apps/flink_list.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item">友情链接</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item">友情链接</li>
+			</ol>
 			<div class="mb-3">
 				<a href="<?php echo $cfg_phpurl;?>/flink.php?dopost=add" class="btn btn-success btn-sm">申请链接</a>
 			</div>

src/theme/apps/list_diyform.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
+			</ol>
 			<div class="mb-3">
 				<a href="<?php echo $cfg_phpurl?>/diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">发布信息</a>
 			</div>

src/theme/apps/post_diyform.htm

@@ -12,13 +12,11 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
-					<li class="breadcrumb-item"><?php echo $diy->name;?>发布</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
+				<li class="breadcrumb-item"><?php echo $diy->name;?>发布</li>
+			</ol>
 			<div class="mb-3">
 				<a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">返回列表</a>
 			</div>

src/theme/apps/recommend.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item">推荐<?php echo $title;?></li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item">推荐<?php echo $title;?></li>
+			</ol>
 			<form name="form1" action="<?php echo $cfg_phpurl?>/recommend.php" method="post">
 				<input type="hidden" name="arcurl" value="<?php echo $arcurl;?>">
 				<input type="hidden" name="action" value="send">

src/theme/apps/showphoto.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><?php echo $arctitle;?></li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><?php echo $arctitle;?></li>
+			</ol>
 			<table class="table mb-0">
 				<tr>
 					<td>

src/theme/apps/view_diyform.htm

@@ -11,13 +11,11 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
-					<li class="breadcrumb-item"><?php echo $diy->name;?>查看</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><a href="<?php echo $cfg_phpurl?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
+				<li class="breadcrumb-item"><?php echo $diy->name;?>查看</li>
+			</ol>
 			<div class="mb-3">
 				<a href="<?php echo $cfg_phpurl?>/diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">发布信息</a>
 			</div>

src/theme/apps/view_msg.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item">文档错误提示</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item">文档错误提示</li>
+			</ol>
 			<table class="table mb-0">
 				<tr>
 					<td colspan="2"><?php echo $moremsg;?></td>

src/theme/apps/view_msg_catalog.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item">栏目错误提示</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item">栏目错误提示</li>
+			</ol>
 			<table class="table mb-0">
 				<tr>
 					<td colspan="2"><?php echo $moremsg;?></td>

src/theme/apps/vote.htm

@@ -11,12 +11,10 @@
 	<body>
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb">
-					<li class="breadcrumb-item"><a href="/">首页</a></li>
-					<li class="breadcrumb-item"><?php echo $voname?></li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item"><a href="/">首页</a></li>
+				<li class="breadcrumb-item"><?php echo $voname?></li>
+			</ol>
 			<p>投票开始时间：<?php echo $starttime;?></p>
 			<p>投票结束时间：<?php echo $endtime;?></p>
 			<p>投票人数：<?php echo $totalcount;?></p>

src/theme/dedebiz/article_article.htm

@@ -15,12 +15,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_default.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_default_sg.htm

@@ -15,12 +15,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_image.htm

@@ -62,12 +62,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_infos.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_soft.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/article_spec.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/index_article.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/index_default.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/index_default_sg.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/index_image.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<section class="container py-3">
 			<div class="row biz-mb">{dede:channelartlist}

src/theme/dedebiz/index_infos.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/index_soft.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<section class="container py-3">
 			<div class="row biz-mb">{dede:channelartlist}

src/theme/dedebiz/list_article.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_default.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_default_sg.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_free.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_image.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_infos.htm

@@ -15,12 +15,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_soft.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/list_spec.htm

@@ -14,12 +14,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					{dede:field name='position'/}
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				{dede:field name='position'/}
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/theme/dedebiz/tag.htm

@@ -15,12 +15,10 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					<li class="breadcrumb-item">标签页</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				<li class="breadcrumb-item">标签页</li>
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="item-tag mb-3">

src/theme/dedebiz/tag_list.htm

@@ -14,13 +14,11 @@
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
-			<nav aria-label="breadcrumb">
-				<ol class="breadcrumb mb-0">
-					<li class="breadcrumb-item">当前位置</li>
-					<li class="breadcrumb-item"><a href="{dede:field.position/}">标签云</a></li>
-					<li class="breadcrumb-item">{dede:field.title/}</li>
-				</ol>
-			</nav>
+			<ol class="breadcrumb mb-0">
+				<li class="breadcrumb-item">当前位置</li>
+				<li class="breadcrumb-item"><a href="{dede:field.position/}">标签云</a></li>
+				<li class="breadcrumb-item">{dede:field.title/}</li>
+			</ol>
 		</div>
 		<main class="container py-3">
 			<div class="row">

src/user/album_add.php

@@ -147,8 +147,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='album_edit.php?aid=".$arcID."&channelid=$channelid' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功发布图片文档";
-    $wecome_info = "图片管理 - 发布图片文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/album_edit.php

@@ -125,8 +125,7 @@ if (empty($dopost)) {
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>返回文档列表</a>";
     //提交后返回提交页面
     $wintitle = "成功修改图片文档";
-    $wecome_info = "图片管理 - 修改图片文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/archives_add.php

@@ -124,8 +124,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功发布自定义文档";
-    $wecome_info = "文档管理 - 发布自定义文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/archives_edit.php

@@ -92,8 +92,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a class='btn btn-success btn-sm' href='$artUrl' target='_blank'>浏览文档</a><a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功修改自定义文档";
-    $wecome_info = "文档管理 - 修改自定义文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/archives_sg_add.php

@@ -43,7 +43,7 @@ if (empty($dopost)) {
     exit();
 } else if ($dopost == 'save') {
     include_once(DEDEINC."/image.func.php");
-    include_once(DEDEINC."/libraries/oxwindow.class.php");
+    include_once(DEDEINC."/libraries/webwindow.class.php");
     //游客需要校验验证码
     if ($cfg_ml->M_ID === 0) {
         $svali = GetCkVdValue();
@@ -154,8 +154,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='archives_sg_add.php?channelid=$channelid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_sg_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='content_sg_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功发布分类文档";
-    $wecome_info = "文档管理 - 发布分类文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/archives_sg_edit.php

@@ -36,7 +36,7 @@ if (empty($dopost)) {
     exit();
 } else if ($dopost == 'save') {
     require_once(DEDEINC."/image.func.php");
-    require_once(DEDEINC."/libraries/oxwindow.class.php");
+    require_once(DEDEINC."/libraries/webwindow.class.php");
     $flag = '';
     $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;
     $userip = GetIP();
@@ -108,8 +108,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改文档</a><a href='content_sg_list.php?channelid=$channelid' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功修改分类文档";
-    $wecome_info = "文档管理 - 修改分类文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/article_add.php

@@ -113,8 +113,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='article_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>返回管理文档</a>";
     $wintitle = "成功发布文档";
-    $wecome_info = "文档管理 - 发布文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/article_edit.php

@@ -87,8 +87,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='archives_do.php?channelid=$channelid&aid=".$aid."&dopost=edit' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>返回管理文档</a>";
     $wintitle = "成功修改文档";
-    $wecome_info = "文档管理 - 修改文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/buy_action.php

@@ -178,7 +178,7 @@ if ($paytype === 0) {
     }
     if ($paytype === 1) {
         //微信支付
-        include_once(DEDEINC.'/libraries/oxwindow.class.php');
+        include_once(DEDEINC.'/libraries/webwindow.class.php');
         $pInfo = $dsql->GetOne("SELECT * FROM `#@__sys_payment` WHERE id = $paytype");
         $pData = (array)json_decode($pInfo['config']);
         $config = array(
@@ -205,9 +205,8 @@ if ($paytype === 0) {
                 height : 300,
                 correctLevel : 3
             });qrcode.makeCode("'.$payurl.'");</script>';
-            $wintitle = "使用微信支付";
-            $wecome_info = "微信支付";//这个空格不要去
-            $win = new OxWindow();
+            $wintitle = "微信支付";//这个空格不要去
+            $win = new WebWindow();
             $win->AddMsgItem($msg);
             $winform = $win->GetWindow("hand", false);
             $win->Display(DEDEMEMBER."/templets/win_templet.htm");
@@ -216,7 +215,7 @@ if ($paytype === 0) {
             exit;
         }
     } elseif ($paytype === 2) {
-        include_once(DEDEINC.'/libraries/oxwindow.class.php');
+        include_once(DEDEINC.'/libraries/webwindow.class.php');
         $pInfo = $dsql->GetOne("SELECT * FROM `#@__sys_payment` WHERE id = $paytype");
         $pData = (array)json_decode($pInfo['config']);
         $config = array(
@@ -243,14 +242,13 @@ if ($paytype === 0) {
             exit;
         }
     }  elseif ($paytype === 3) {
-        include_once(DEDEINC.'/libraries/oxwindow.class.php');
+        include_once(DEDEINC.'/libraries/webwindow.class.php');
         //银行转账
         $pInfo = $dsql->GetOne("SELECT * FROM `#@__sys_payment` WHERE id = $paytype");
         $pData = (array)json_decode($pInfo['config']);
         $msg = "<p>请汇款至如下账户：</p><p>账户名：{$pData['AccountName']}</p><p>账号：{$pData['AccountNO']}</p><p>开户行：{$pData['Name']}</p><p>备注：{$buyid}</p><p>如您已经完成转账，请点击下面按钮，等待管理员确认后即可完成充值</p><div><a href='buy_action.php?dopost=bank_ok&buyid={$buyid}' class='btn btn-success btn-sm'>已完成银行转账</a> <a href='operation.php' class='btn btn-outline-success btn-sm'>返回订单管理</a></div>";
-        $wintitle = "使用银行转账";
-        $wecome_info = "银行转账";//这个空格不要去
-        $win = new OxWindow();
+        $wintitle = "银行转账";//这个空格不要去
+        $win = new WebWindow();
         $win->AddMsgItem($msg);
         $winform = $win->GetWindow("hand", false);
         $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/inc/archives_check.php

@@ -10,7 +10,7 @@ if (!defined('DEDEMEMBER')) exit ('dedebiz');
  * @link           https://www.dedebiz.com
  */
 include_once(DEDEINC.'/image.func.php');
-include_once(DEDEINC.'/libraries/oxwindow.class.php');
+include_once(DEDEINC.'/libraries/webwindow.class.php');
 //校验CSRF
 CheckCSRF();
 $flag = '';

src/user/inc/archives_check_edit.php

@@ -10,7 +10,7 @@ if (!defined('DEDEMEMBER')) exit ('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/image.func.php");
-require_once(DEDEINC."/libraries/oxwindow.class.php");
+require_once(DEDEINC."/libraries/webwindow.class.php");
 $flag = '';
 $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;
 $userip = GetIP();

src/user/index_do.php

@@ -204,32 +204,32 @@ if ($fmdo == 'sendMail') {
         exit();
     }
 } else if ($fmdo == 'purl'){
-    require_once(DEDEINC.'/libraries/oxwindow.class.php');
+    require_once(DEDEINC.'/libraries/webwindow.class.php');
     CheckRank(0, 0);//禁止游客操作
     $row = $dsql->GetOne("SELECT count(*) as dd FROM `#@__member` WHERE `pmid`='{$cfg_ml->M_ID}' ");
     $msg = "<p>您已经邀请了{$row['dd']}人：</p>
     <div class='media mb-3'>
-        <span class='btn btn-primary btn-sm mr-2'>链</span>
+        <span class='btn btn-primary btn-sm mr-3'>链</span>
         <div class='media-body pb-3 border-bottom border-gray'>
-            <div class='d-flex justify-content-between align-items-center w-100'>
-                <h5>链接邀请</h5>
+            <div class='d-flex justify-content-between align-items-center'>
+                <h4>链接邀请</h4>
                 <a href='javascript:Copylink()' class='btn btn-outline-primary btn-sm'>复制链接</a>
             </div>
             <span class='d-block'>复制链接分享给其他人，对方通过链接注册后双方均可获得{$cfg_userad_adds}积分<span id='text' style='font-size:0'>{$cfg_basehost}{$cfg_memberurl}/index_do.php?fmdo=user&dopost=regnew&pid={$cfg_ml->M_LoginID}</span>
         </div>
     </div>
     <div class='media mb-3'>
-        <span class='btn btn-success btn-sm mr-2'>码</span>
+        <span class='btn btn-success btn-sm mr-3'>码</span>
         <div class='media-body pb-3 border-bottom border-gray'>
-            <div class='d-flex justify-content-between align-items-center w-100'>
-                <h5>二维码邀请</h5>
+            <div class='d-flex justify-content-between align-items-center'>
+                <h4>二维码邀请</h4>
                 <a href='javascript:ShowQrcode()' class='btn btn-outline-success btn-sm'>查看二维码</a>
             </div>
             <span class='d-block'>分享二维码到移动设备，通过二维码扫码注册，双方均可获得{$cfg_userad_adds}积分</span>
         </div>
     </div>
-    <div class='text-center'><a href='index.php' class='btn btn-success btn-sm'>返回</a></div>
     <div id='qrcode'></div>
+    <div class='text-center'><a href='index.php' class='btn btn-success btn-sm'>返回</a></div>
     <style>.modal-body img{margin:0 auto}#qrcode{display:none;margin:15px auto;width:200px;height:200px}</style>
     <script>
         var qrcode = new QRCode(document.getElementById(\"qrcode\"), {
@@ -250,9 +250,8 @@ if ($fmdo == 'sendMail') {
             ShowMsg(document.getElementById('qrcode').innerHTML);
         }
     </script>";
-    $wintitle = "快来邀请好友赚积分啦";
-    $wecome_info = "邀请好友赚积分";
-    $win = new OxWindow();
+    $wintitle = "邀请好友赚积分";
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/soft_add.php

@@ -163,8 +163,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='soft_edit.php?channelid=$channelid&aid=$arcID' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid={$channelid}' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功发布文档文档";
-    $wecome_info = "软件管理 - 发布软件文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/soft_edit.php

@@ -167,8 +167,7 @@ if (empty($dopost)) {
     //返回成功信息
     $msg = "<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>浏览文档</a><a href='soft_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布文档</a><a href='soft_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>返回文档列表</a>";
     $wintitle = "成功修改软件文档";
-    $wecome_info = "软件管理 - 修改软件文档";
-    $win = new OxWindow();
+    $win = new WebWindow();
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");

src/user/templets/album_add.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/album_add.php" method="post" enctype="multipart/form-data">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/album_edit.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/album_edit.php" method="post" enctype="multipart/form-data">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="aid" value="<?php echo $row['id'];?>">

src/user/templets/archives_add.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/archives_edit.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/archives_sg_add.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_sg_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/archives_sg_edit.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/archives_sg_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/article_add.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/article_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/article_edit.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/article_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="aid" value="<?php echo $row['id'];?>">

src/user/templets/buy.htm

@@ -15,13 +15,6 @@
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item"><a href="/">首页</a></li>
-								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-								<li class="breadcrumb-item">积分钱包</li></li>
-							</ol>
-						</nav>
 						<div class="alert alert-success"><?php echo $cfg_ml->GetSta();?></div>
 						<?php if ($cfg_money_scores > 0) {?>
 						<?php $canCav = floor($cfg_ml->fields['scores'] / $cfg_money_scores);?>

src/user/templets/buy_action_payment.htm

@@ -15,14 +15,6 @@
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item"><a href="/">首页</a></li>
-								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/buy.php">积分钱包</a></li>
-								<li class="breadcrumb-item">确认订单</li></li>
-							</ol>
-						</nav>
 						<div class="alert alert-success">您申请购买的产品如下，确认无误后请点击购买并支付按钮，进行网上支付，如果支付失败，请与管理员联系其它支付方式</div>
 						<h3 class="py-3">订单确认</h3>
 						<form name="E_FORM" action="<?php echo $cfg_memberurl;?>/buy_action.php" method="post">

src/user/templets/content_list.htm

@@ -25,15 +25,15 @@
 							<li class="nav-item"><a href="<?php echo $cfg_memberurl;?>/archives_do.php?dopost=addArc&channelid=<?php echo $channelid;?>" class="nav-link">发布</a></li>
 						</ul>
 						<div class="table-responsive">
-							<table class="table">
+							<table class="table table-borderless table-hover">
 								<thead>
 									<tr>
-										<th width="8%">#</th>
-										<th width="26%">文档标题</th>
-										<th width="16%">栏目</th>
-										<th width="16%">状态</th>
-										<th width="16%">更新时间</th>
-										<th>操作</th>
+										<th scope="col">#</th>
+										<th scope="col">文档标题</th>
+										<th scope="col">栏目</th>
+										<th scope="col">状态</th>
+										<th scope="col">更新时间</th>
+										<th scope="col">操作</th>
 									</tr>
 								</thead>
 								<tbody>

src/user/templets/content_sg_list.htm

@@ -25,15 +25,15 @@
 							<li class="nav-item"><a href="<?php echo $cfg_memberurl;?>/archives_do.php?dopost=addArc&channelid=<?php echo $channelid;?>" class="nav-link">发布</a></li>
 						</ul>
 						<div class="table-responsive">
-							<table class="table">
+							<table class="table table-borderless table-hover">
 								<thead>
 									<tr>
-										<th width="8%">#</th>
-										<th width="26%">文档标题</th>
-										<th width="16%">栏目</th>
-										<th width="16%">状态</th>
-										<th width="16%">更新时间</th>
-										<th>操作</th>
+										<th scope="col">#</th>
+										<th scope="col">文档标题</th>
+										<th scope="col">栏目</th>
+										<th scope="col">状态</th>
+										<th scope="col">更新时间</th>
+										<th scope="col">操作</th>
 									</tr>
 								</thead>
 								<tbody>

src/user/templets/mypay.htm

@@ -19,19 +19,19 @@
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
-						<div class="table-responsive">
-							<table class="table">
-								<thead>
-									<tr>
-										<th width="8%">#</th>
-										<th width="8%">选择</th>
-										<th>标题</th>
-										<th width="16%">需要金币</th>
-										<th width="16%">消费时间</th>
-									</tr>
-								</thead>
-								<form name="form1" action="<?php echo $cfg_memberurl;?>/mypay.php" method="post">
-									<input type="hidden" name="dopost" value="del">
+						<form name="form1" action="<?php echo $cfg_memberurl;?>/mypay.php" method="post">
+							<input type="hidden" name="dopost" value="del">
+							<div class="table-responsive">
+								<table class="table table-borderless table-hover">
+									<thead>
+										<tr>
+											<th scope="col">#</th>
+											<th scope="col">选择</th>
+											<th scope="col">标题</th>
+											<th scope="col">需要金币</th>
+											<th scope="col">消费时间</th>
+										</tr>
+									</thead>
 									<tbody>
 										{dede:datalist}
 										<tr>
@@ -49,9 +49,9 @@
 											</td>
 										</tr>
 									</tbody>
-								</form>
-							</table>
-						</div>
+								</table>
+							</div>
+						</form>
 						{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}
 					</div>
 				</div>

src/user/templets/mystow.htm

@@ -22,16 +22,16 @@
 							<li class="nav-item"><a href="<?php echo $cfg_memberurl;?>/mystow.php" class="nav-link <?php echo $rank==='' ? 'active' : '';?>">我的收藏</a></li>
 							<li class="nav-item"><a href="<?php echo $cfg_memberurl;?>/mystow.php?rank=top" class="nav-link <?php echo $rank==='top' ? 'active' : '';?>">收藏排行</a></li>
 						</ul>
-						<table class="table">
+						<table class="table table-borderless table-hover">
+							<thead>
+								<tr>
+									<th scope="col">#</th>
+									<th scope="col">标题</th>
+									<th scope="col">收藏时间</th>
+									<th scope="col">操作</th>
+								</tr>
+							</thead>
 							<tbody>
-								<thead>
-									<tr>
-										<th width="8%">#</th>
-										<th>标题</th>
-										<th width="26%">收藏时间</th>
-										<th width="26%">操作</th>
-									</tr>
-								</thead>
 								{dede:datalist}
 								<tr>
 									<td>{dede:field.aid/}</td>

src/user/templets/operation.htm

@@ -19,22 +19,22 @@
 				<?php include(DEDEMEMBER."/templets/menu.htm");?>
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
-						<div class="table-responsive">
-							<table class="table">
-								<thead>
-									<tr>
-										<th width="8%">#</th>
-										<th width="8%">选择</th>
-										<th width="16%">订单号</th>
-										<th>产品</th>
-										<th width="16%">信息</th>
-										<th width="12%">状态</th>
-										<th width="16%">时间</th>
-									</tr>
-								</thead>
-								<tbody>
-									<form name="form1" action="<?php echo $cfg_memberurl;?>/operation.php" method="post">
-										<input type="hidden" name="ftype" value="del">
+						<form name="form1" action="<?php echo $cfg_memberurl;?>/operation.php" method="post">
+							<input type="hidden" name="ftype" value="del">
+							<div class="table-responsive">
+								<table class="table table-borderless table-hover">
+									<thead>
+										<tr>
+											<th scope="col">#</th>
+											<th scope="col">选择</th>
+											<th scope="col">订单号</th>
+											<th scope="col">产品</th>
+											<th scope="col">信息</th>
+											<th scope="col">状态</th>
+											<th scope="col">时间</th>
+										</tr>
+									</thead>
+									<tbody>
 										{dede:datalist}
 										<tr>
 											<td>{dede:field.aid/}</td>
@@ -52,10 +52,10 @@
 												<button type="button" onclick="DoSubmit();" class="btn btn-danger btn-sm">删除</button>
 											</td>
 										</tr>
-									</form>
-								</tbody>
-							</table>
-						</div>
+									</tbody>
+								</table>
+							</div>
+						</form>
 						{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}
 					</div>
 				</div>

src/user/templets/pm-main.htm

@@ -25,24 +25,24 @@
 							<li class="nav-item"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=<?php echo $folder;?>&state=-1" class="nav-link <?php if ($state === -1) echo 'active';?>">未阅读</a></li>
 							<li class="nav-item"><a href="javascript:;" class="nav-link" onclick="DoSubmit('<?php echo $folder;?>')">删除</a></li>
 						</ul>
-						<div class="table-responsive">
-							<form action="<?php echo $cfg_memberurl;?>/pm.php" method="post" name="form1">
-								<input type="hidden" name="dopost" value="del">
+						<form action="<?php echo $cfg_memberurl;?>/pm.php" method="post" name="form1">
+							<input type="hidden" name="dopost" value="del">
+							<div class="table-responsive">
 								<div id="feedback-alert"></div>
-								<table class="table">
+								<table class="table table-borderless table-hover">
 									<thead>
 										<tr>
-											<th width="8%">#</th>
-											<th width="8%">选择</th>
-											<th>标题</th>
-											<th width="16%">
+											<th scope="col">#</th>
+											<th scope="col">选择</th>
+											<th scope="col">标题</th>
+											<th scope="col">
 												<?php
 												if ($folder == "inbox") echo "发件人";
 												else echo "收件人";
 												?>
 											</th>
-											<th width="12%">状态</th>
-											<th width="16%">发布时间</th>
+											<th scope="col">状态</th>
+											<th scope="col">发布时间</th>
 										</tr>
 									</thead>
 									<tbody>
@@ -77,8 +77,8 @@
 										{/dede:datalist}
 									</tbody>
 								</table>
-							</form>
-						</div>
+							</div>
+						</form>
 						{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}
 					</div>
 				</div>

src/user/templets/soft_add.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/soft_add.php" method="post" enctype="multipart/form-data">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="channelid" value="<?php echo $channelid;?>">

src/user/templets/soft_edit.htm

@@ -12,13 +12,6 @@
 		<?php obtaintheme('top.htm');?>
 		<main class="container py-3">
 			<div class="pannel-main-container shadow-sm rounded">
-				<nav aria-label="breadcrumb">
-					<ol class="breadcrumb">
-						<li class="breadcrumb-item"><a href="/">首页</a></li>
-						<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
-						<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-					</ol>
-				</nav>
 				<form name="addcontent" action="<?php echo $cfg_memberurl;?>/soft_edit.php" method="post" enctype="multipart/form-data">
 					<input type="hidden" name="dopost" value="save">
 					<input type="hidden" name="aid" value="<?php echo $row['id'];?>">

src/user/templets/win_templet.htm

@@ -13,11 +13,10 @@
 	<body>
 		{dede:include filename='top.htm'/}
 		<main class="container py-3">
-			<div class="card">
-				<div class="card-header">{dede:wecome_info/}</div>
+			<div class="card shadow-sm">
+				<div class="card-header">{dede:wintitle/}</div>
 				<div class="card-body">
-					<h5 class="card-title">{dede:wintitle/}</h5>
-					<div class="card-text">{dede:winform/}</div>
+					{dede:winform/}
 				</div>
 			</div>
 		</main>