From b3004e6d834d28622fb78925e982ebe9d5684633 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Wed, 5 Jan 2022 16:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/include/oxwindow.class.php    | 56 +++++++++++--------------------
 src/templets/plus/win_templet.htm | 44 ++++++++++--------------
 2 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/src/include/oxwindow.class.php b/src/include/oxwindow.class.php
index 31913d8a..d86b3272 100755
--- a/src/include/oxwindow.class.php
+++ b/src/include/oxwindow.class.php
@@ -1,21 +1,21 @@
-<?php if (!defined('DEDEINC')) exit("Request Error!");
+<?php
+if (!defined('DEDEINC')) exit("Request Error!");
 /**
  * 提示窗口对话框类
  *
  * @version        $Id: oxwindow.class.php 2 13:53 2010-11-11 tianya $
- * @package        DedeBIZ.Libraries
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
+ * @package        .Libraries
+ * @copyright      Copyright (c) 2021, .COM
+ * @license        https://www..com/license
+ * @link           https://www..com
  */
 require_once(DEDEINC . "/dedetag.class.php");
-
 /**
  * 提示窗口对话框类
  *
  * @package          OxWindow
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
+ * @subpackage       .Libraries
+ * @link             https://www..com
  */
 class OxWindow
 {
@@ -25,7 +25,6 @@ class OxWindow
     var $formName = "";
     var $tmpCode = "//checkcode";
     var $hasStart = false;
-
     /**
      *  初始化为含表单的页面
      *
@@ -49,8 +48,6 @@ class OxWindow
         $this->formName = $formname;
         $this->myWin .= "<form name='$formname' method='$formmethod' onSubmit='return CheckSubmit();' action='$formaction'>\r\n";
     }
-
-    //
     /**
      *  增加隐藏域
      *
@@ -62,7 +59,6 @@ class OxWindow
     {
         $this->myWin .= "<input type='hidden' name='$iname' value='$ivalue'>\r\n";
     }
-
     /**
      *  开始创建窗口
      *
@@ -70,9 +66,8 @@ class OxWindow
      */
     function StartWin()
     {
-        $this->myWin .= "<table width='100%'  border='0' cellpadding='3' cellspacing='1' bgcolor='#DADADA'>\r\n";
+        $this->myWin .= "<table width='100%'  border='0' cellpadding='3' cellspacing='1'>\r\n";
     }
-
     /**
      *  增加一个两列的行
      *
@@ -88,7 +83,6 @@ class OxWindow
         $this->myWinItem .= "<td width='75%'>$ivalue</td>\r\n";
         $this->myWinItem .= "</tr>\r\n";
     }
-
     /**
      *  增加一个单列的消息行
      *
@@ -114,7 +108,6 @@ class OxWindow
         $this->myWinItem .= "<td $colspan $height> $ivalue </td>\r\n";
         $this->myWinItem .= "</tr>\r\n";
     }
-
     /**
      *  增加单列的标题行
      *
@@ -131,11 +124,10 @@ class OxWindow
         } else {
             $colspan = "";
         }
-        $this->myWinItem .= "<tr bgcolor='#DADADA'>\r\n";
-        $this->myWinItem .= "<td $colspan background='{$cfg_static_dir}/img/wbg.gif' height='26'><font color='#666600'><b>$title</b></font></td>\r\n";
+        $this->myWinItem .= "<tr>\r\n";
+        $this->myWinItem .= "<td $colspan height='26'>$title</td>\r\n";
         $this->myWinItem .= "</tr>\r\n";
     }
-
     /**
      *  结束Window
      *
@@ -150,7 +142,6 @@ class OxWindow
             $this->myWin .= "</table></form>\r\n";
         }
     }
-
     /**
      *  增加自定义JS脚本
      *
@@ -164,7 +155,6 @@ class OxWindow
             $this->myWin = substr_replace($this->myWin, $scripts, $pos, strlen($this->tmpCode));
         }
     }
-
     /**
      *  获取窗口
      *
@@ -200,19 +190,15 @@ class OxWindow
             if ($wintype != "hand") {
                 $this->myWin .= "
 <tr>
-<td colspan='2' bgcolor='#F9FCEF'>
-<table width='270' border='0' cellpadding='0' cellspacing='0'>
-<tr align='center' height='28'>
-<td width='90'><button type='submit' class='btn btn-success'>$tt</button></td>
-<td width='90'><button onClick='this.form.reset();return false;' type='button' class='btn btn-success'>重置</button></td>
-<td><button onClick='history.go(-1);' type='button' class='btn btn-success'>返回</button></td>
-</tr>
-</table>
+<td colspan='2' height='30'>
+<button type='submit' class='btn btn-success'>$tt</button>&nbsp;&nbsp;
+<button type='button' class='btn btn-success' onClick='this.form.reset();return false;'>重置</button>&nbsp;&nbsp;
+<button type='button' class='btn btn-success' onClick='history.go(-1);'>返回</button>
 </td>
 </tr>";
             } else {
                 if ($msg != '') {
-                    $this->myWin .= "<tr><td bgcolor='#F5F5F5'>$msg</td></tr>";
+                    $this->myWin .= "<tr><td>$msg</td></tr>";
                 } else {
                     $this->myWin .= '';
                 }
@@ -221,7 +207,6 @@ class OxWindow
         $this->CloseWin($isform);
         return $this->myWin;
     }
-
     /**
      *  显示页面
      *
@@ -233,7 +218,7 @@ class OxWindow
     {
         global $cfg_templets_dir, $wecome_info, $cfg_basedir;
         if (empty($wecome_info)) {
-            $wecome_info = "DedeBIZ OX 通用对话框：";
+            $wecome_info = "通用对话框：";
         }
         $ctp = new DedeTagParse();
         if ($modfile == '') {
@@ -250,8 +235,7 @@ class OxWindow
         $ctp->Display();
         $ctp->Clear();
     }
-} //End Class
-
+}//End Class
 /**
  *  显示一个不带表单的普通提示
  *
@@ -264,9 +248,9 @@ function ShowMsgWin($msg, $title)
 {
     $win = new OxWindow();
     $win->Init();
-    $win->mainTitle = "DedeBIZ系统提示：";
+    $win->mainTitle = "系统提示：";
     $win->AddTitle($title);
     $win->AddMsgItem("<div style='padding-left:20px;line-height:150%'>$msg</div>");
     $winform = $win->GetWindow("hand");
     $win->Display();
-}
+}
\ No newline at end of file
diff --git a/src/templets/plus/win_templet.htm b/src/templets/plus/win_templet.htm
index 4ebdbf77..2f424842 100755
--- a/src/templets/plus/win_templet.htm
+++ b/src/templets/plus/win_templet.htm
@@ -1,32 +1,22 @@
+<!DOCTYPE html>
 <html>
-
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}">
-  <title>{dede:wintitle/}</title>
-  <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/css/bootstrap.min.css">
-  <link href="{dede:global name='cfg_static_dir'/}/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="{dede:global name='cfg_static_dir'/}/img/base.css">
-  <script language="javascript" src="{dede:global name='cfg_static_dir'/}/js/jquery.js"></script>
+    <meta charset="{dede:global.cfg_soft_lang/}">
+    <title>{dede:wintitle/}</title>
+    <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/css/bootstrap.min.css">
+    <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{dede:global name='cfg_static_dir'/}/img/base.css">
+    <script language="javascript" src="{dede:global name='cfg_static_dir'/}/js/jquery.js"></script>
 </head>
-
-<body background='{dede:global name=' cfg_static_dir'/}/img/allbg.gif' leftmargin="8" topmargin='8'>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#DFF9AA" class="table maintable table-bordered mt-3">
-    <tr>
-      <td height="28" style="border:1px solid #DADADA" background='{dede:global name=' cfg_static_dir'/}/img/wbg.gif'>
-        &nbsp;<b>◇{dede:wecome_info/}</b>
-      </td>
-    </tr>
-    <tr>
-      <td width="100%" style="padding-top:5px" bgcolor='#ffffff' class="table table-borderless pt-3">
-        {dede:winform/}
-      </td>
-    </tr>
-  </table>
-  <p align="center">
-    {dede:lang_cms_powerby/}
-    <br>
-    <br>
-  </p>
+<body background="{dede:global name='cfg_static_dir'/}/img/allbg.gif" leftmargin="8" topmargin="8">
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="table maintable table-bordered mt-3">
+        <tr>
+            <td height="26" background="{dede:global name='cfg_static_dir'/}/img/wbg.gif" style="border:1px solid #DADADA">&nbsp;◇{dede:wecome_info/}</td>
+        </tr>
+        <tr>
+            <td width="100%" class="table table-borderless pt-3" style="margin-top:10px;background:#ffffff">{dede:winform/}</td>
+        </tr>
+    </table>
+    <p align="center">{dede:lang_cms_powerby/}</p>
 </body>
-
 </html>
\ No newline at end of file