diff --git a/src/admin/album_add.php b/src/admin/album_add.php
index 8a6f1638..0a542efe 100644
--- a/src/admin/album_add.php
+++ b/src/admin/album_add.php
@@ -221,7 +221,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布图片文档修改图片文档浏览图片文档管理图片文档$backurl";
+ $msg = "
请选择后续操作:发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布图片文档";
$wecome_info = "文档管理 - 发布图片文档";
diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php
index a25f4f1b..a23cfb6c 100644
--- a/src/admin/album_edit.php
+++ b/src/admin/album_edit.php
@@ -263,7 +263,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布图片文档修改图片文档浏览图片文档管理图片文档$backurl";
+ $msg = "请选择后续操作:发布图片文档修改图片文档浏览图片文档管理图片文档$backurl |
";
$wintitle = "成功修改图片文档";
$wecome_info = "文档管理 - 修改图片文档";
$win = new OxWindow();
diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php
index 20b1872d..0892c962 100644
--- a/src/admin/archives_add.php
+++ b/src/admin/archives_add.php
@@ -167,7 +167,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布自定义文档修改自定义文档浏览自定义文档管理自定义文档$backurl";
+ $msg = "请选择后续操作:发布自定义文档修改自定义文档浏览自定义文档管理自定义文档$backurl |
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布自定义文档";
$wecome_info = "文档管理 - 发布自定义文档";
diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php
index d5110e30..b92bf518 100644
--- a/src/admin/archives_edit.php
+++ b/src/admin/archives_edit.php
@@ -152,7 +152,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布自定义文档修改自定义文档查看自定义文档管理自定义文档$backurl";
+ $msg = "请选择后续操作:发布自定义文档修改自定义文档查看自定义文档管理自定义文档$backurl |
";
$wintitle = "成功修改自定义文档";
$wecome_info = "文档管理 - 修改自定义文档";
$win = new OxWindow();
diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php
index 46063a8e..42db50bf 100644
--- a/src/admin/archives_sg_add.php
+++ b/src/admin/archives_sg_add.php
@@ -122,7 +122,7 @@ if ($dopost != 'save') {
}
ClearMyAddon($arcID, $title);
//返回成功信息
- $msg = "请选择后续操作:发布分类文档修改分类文档浏览分类文档管理分类文档";
+ $msg = "请选择后续操作:发布分类文档修改分类文档浏览分类文档管理分类文档 |
";
$wintitle = "成功发布分类文档";
$wecome_info = "文档管理 - 发布分类文档";
$win = new OxWindow();
diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php
index 8c050b0a..0e337911 100644
--- a/src/admin/archives_sg_edit.php
+++ b/src/admin/archives_sg_edit.php
@@ -105,7 +105,7 @@ if ($dopost != 'save') {
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$id";
ClearMyAddon($id, $title);
//返回成功信息
- $msg = "请选择后续操作:发布分类文档修改分类文档浏览分类文档管理分类文档";
+ $msg = "请选择后续操作:发布分类文档修改分类文档浏览分类文档管理分类文档 |
";
$wintitle = "成功修改分类文档";
$wecome_info = "文档管理 - 修改分类文档";
$win = new OxWindow();
diff --git a/src/admin/article_add.php b/src/admin/article_add.php
index 17bc662f..c952a439 100644
--- a/src/admin/article_add.php
+++ b/src/admin/article_add.php
@@ -198,7 +198,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布文档修改文档浏览文档管理文档$backurl";
+ $msg = "请选择后续操作:发布文档修改文档浏览文档管理文档$backurl |
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布文档";
$wecome_info = "文档管理 - 发布文档";
diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php
index 79b2a70d..3d87f1f3 100644
--- a/src/admin/article_edit.php
+++ b/src/admin/article_edit.php
@@ -166,7 +166,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布文档修改文档浏览文档管理文档$backurl";
+ $msg = "请选择后续操作:发布文档修改文档浏览文档管理文档$backurl |
";
$wintitle = "成功修改文档";
$wecome_info = "文档管理 - 修改文档";
$win = new OxWindow();
diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php
index 198a4621..7d842279 100644
--- a/src/admin/makehtml_freelist_action.php
+++ b/src/admin/makehtml_freelist_action.php
@@ -60,5 +60,5 @@ if ($nextpage == $totalpage) {
ShowMsg("更新列表".$tid.",继续更新列表", $gourl, 0, 100);
}
}
-$dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' where aid='$startid';");
+$dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' WHERE aid='$startid';");
?>
\ No newline at end of file
diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php
index eb7f1df7..e213ea39 100644
--- a/src/admin/makehtml_homepage.php
+++ b/src/admin/makehtml_homepage.php
@@ -82,11 +82,11 @@ if ($dopost == "view") {
$pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
$pv->SaveToHtml($homeFile);
echo "";
- ShowMsg("更新首页模式", $position, 0, -1, '浏览', '_blank');
+ ShowMsg("更新静态首页,点击浏览", "javascript:;");
} else {
//动态浏览
if (file_exists($homeFile)) @unlink($homeFile);
- ShowMsg("动态浏览模式", '../index.php', 0, -1,'浏览', '_blank');
+ ShowMsg("更新动态首页,点击浏览", "javascript:;");
}
$iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'";
$dsql->ExecuteNoneQuery($iquery);
diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php
index cd04ed4b..7d57a538 100644
--- a/src/admin/makehtml_list_action.php
+++ b/src/admin/makehtml_list_action.php
@@ -99,7 +99,7 @@ if ($nextpage >= $totalpage && $finishType) {
if (empty($reurl)) {
$reurl = '../apps/list.php?tid='.$tid;
}
- ShowMsg("完成所有栏目更新,浏览栏目", "javascript:;");
+ ShowMsg("完成所有栏目更新,点击浏览", "javascript:;");
exit();
} else if ($gotype == 'mkall' || $gotype == 'mkallct') {
ShowMsg("完成所有栏目更新,数据已优化", "makehtml_all.php?action=make&step=10");
diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php
index 57aa0f71..31ad0c80 100644
--- a/src/admin/makehtml_spec.php
+++ b/src/admin/makehtml_spec.php
@@ -15,7 +15,7 @@ if ($dopost == "ok") {
require_once(DEDEINC."/archive/specview.class.php");
$sp = new SpecView();
$rurl = $sp->MakeHtml(0);
- ShowMsg("完成所有专题更新", $rurl, 0, -1,'浏览专题', '_blank');
+ ShowMsg("完成所有专题更新,点击浏览", "javascript:;");
exit();
}
include DedeInclude('templets/makehtml_spec.htm');
diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php
index 8926c862..fe26d13e 100644
--- a/src/admin/makehtml_taglist_action.php
+++ b/src/admin/makehtml_taglist_action.php
@@ -45,7 +45,7 @@ if ($ctagid == 0 && $allfinish) {
$dlist->SetTagsDir($tagsdir);
$dlist->MakeHtml(1, 10);
$reurl = '..'.$tagsdir;
- ShowMsg("完成所有标签更新,浏览标签", "javascript:;");
+ ShowMsg("完成所有标签更新,点击浏览", "javascript:;");
exit;
}
$tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;");
@@ -75,12 +75,12 @@ if (is_array($tag) && count($tag) > 0) {
$dlist->MakeHtml(1, 10);
$reurl = '..'.$tagsdir;
if ($upall == 1) {
- ShowMsg("完成所有标签更新,浏览标签", "javascript:;");
+ ShowMsg("完成所有标签更新,点击浏览", "javascript:;");
} else {
$query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' ";
$dsql->ExecuteNoneQuery($query);
$reurl .= '/'.$ctagid;
- ShowMsg("更新标签".$tag['tag'].",浏览标签", "javascript:;");
+ ShowMsg("更新标签".$tag['tag'].",点击浏览", "javascript:;");
}
exit();
} else {
diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php
index 23ac6a63..677c4ec9 100644
--- a/src/admin/soft_add.php
+++ b/src/admin/soft_add.php
@@ -226,7 +226,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布软件文档修改软件文档浏览软件文档管理软件文档";
+ $msg = "请选择后续操作:发布软件文档修改软件文档浏览软件文档管理软件文档 |
";
$msg = "{$msg}".GetUpdateTest();
$wintitle = "成功发布软件文档";
$wecome_info = "文档管理 - 发布软件文档";
diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php
index 4ec18e64..c3da632b 100644
--- a/src/admin/soft_edit.php
+++ b/src/admin/soft_edit.php
@@ -208,7 +208,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布软件文档修改软件文档浏览软件文档管理软件文档";
+ $msg = "请选择后续操作:发布软件文档修改软件文档浏览软件文档管理软件文档 |
";
$wintitle = "成功修改软件文档";
$wecome_info = "文档管理 - 修改软件文档";
$win = new OxWindow();
diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php
index caf7f958..f0deb72c 100644
--- a/src/admin/spec_add.php
+++ b/src/admin/spec_add.php
@@ -176,7 +176,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布专题修改专题浏览专题管理专题";
+ $msg = "请选择后续操作:发布专题修改专题浏览专题管理专题 |
";
$wintitle = "成功发布专题";
$wecome_info = "专题管理 - 发布专题";
$win = new OxWindow();
diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php
index 9abbf445..75e3e0f7 100644
--- a/src/admin/spec_edit.php
+++ b/src/admin/spec_edit.php
@@ -189,7 +189,7 @@ if ($dopost != 'save') {
}
}
//返回成功信息
- $msg = "请选择后续操作:发布专题修改专题浏览专题管理专题 ";
+ $msg = "请选择后续操作:发布专题修改专题浏览专题管理专题 |
";
$wintitle = "成功修改专题";
$wecome_info = "专题管理 - 修改专题";
$win = new OxWindow();
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index a4e47952..a80db25a 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -289,7 +289,6 @@ class ListView
}
//创建封面模板文件
if ($this->TypeLink->TypeInfos['isdefault'] == -1) {
- echo DedeAlert('该栏目采用动态浏览', ALERT_WARNING);
return '../apps/list.php?tid='.$this->TypeLink->TypeInfos['id'];
}
//单独页面
diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php
index 219b5897..d4824d85 100755
--- a/src/system/archive/sglistview.class.php
+++ b/src/system/archive/sglistview.class.php
@@ -247,8 +247,7 @@ class SgListView
}
//创建封面模板文件
if ($this->TypeLink->TypeInfos['isdefault'] == -1) {
- echo DedeAlert('该栏目采用动态浏览', ALERT_WARNING);
- return '';
+ return '../apps/list.php?tid='.$this->TypeLink->TypeInfos['id'];
}
//单独页面
else if ($this->TypeLink->TypeInfos['ispart'] > 0) {
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 458b7eb2..4e952c71 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -324,7 +324,7 @@ if (!function_exists('file_put_contents')) {
* @param string $target 跳转类型
* @return void
*/
-function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0, $btnmsg='点击反应', $target="_self")
+function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
{
if (isset($GLOBALS['format']) && strtolower($GLOBALS['format'])==='json') {
echo json_encode(array(
@@ -360,8 +360,8 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0, $btnmsg='点击反
$rmsg .= "document.write(\"";
if ($onlymsg == 0) {
if ($gourl != 'javascript:;' && $gourl != '') {
- $rmsg .= "\");";
- $rmsg .= $litime > 0? "setTimeout('JumpUrl()',$litime);" : "";
+ $rmsg .= "\");";
+ $rmsg .= "setTimeout('JumpUrl()', $litime);";
} else {
$rmsg .= "\");";
}
diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php
index 336db12a..1ad83087 100755
--- a/src/system/libraries/oxwindow.class.php
+++ b/src/system/libraries/oxwindow.class.php
@@ -1,7 +1,7 @@
myWinItem .= "";
- $this->myWinItem .= "$ivalue | ";
- $this->myWinItem .= "
";
+ $this->myWinItem .= "$ivalue";
}
/**
* 添加两列
@@ -175,11 +168,11 @@ class OxWindow
if ($wintype != "") {
if ($wintype != "hand") {
$this->myWin .= "
-
-
-
- |
-
";
+
+
+
+ |
+ ";
} else {
if ($msg != '') {
$this->myWin .= "$msg |
";
diff --git a/src/user/album_add.php b/src/user/album_add.php
index 5d25d071..216bdf0e 100755
--- a/src/user/album_add.php
+++ b/src/user/album_add.php
@@ -153,7 +153,6 @@ if (empty($dopost)) {
$wintitle = "成功发布图片文档";
$wecome_info = "图片管理 - 发布图片文档";
$win = new OxWindow();
- $win->AddTitle("成功发布图片文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/album_edit.php b/src/user/album_edit.php
index 3618f6c5..5c92b12e 100755
--- a/src/user/album_edit.php
+++ b/src/user/album_edit.php
@@ -131,7 +131,6 @@ if (empty($dopost)) {
$wintitle = "成功修改图片文档";
$wecome_info = "图片管理 - 修改图片文档";
$win = new OxWindow();
- $win->AddTitle("成功修改图片文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/archives_add.php b/src/user/archives_add.php
index 0857b116..7c55c543 100755
--- a/src/user/archives_add.php
+++ b/src/user/archives_add.php
@@ -126,7 +126,6 @@ if (empty($dopost)) {
$wintitle = "成功发布自定义文档";
$wecome_info = "文档管理 - 发布自定义文档";
$win = new OxWindow();
- $win->AddTitle("成功发布自定义文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php
index 1fe0b28d..1f714e14 100755
--- a/src/user/archives_edit.php
+++ b/src/user/archives_edit.php
@@ -94,7 +94,6 @@ if (empty($dopost)) {
$wintitle = "成功修改自定义文档";
$wecome_info = "文档管理 - 修改自定义文档";
$win = new OxWindow();
- $win->AddTitle("成功修改自定义文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php
index 17492738..2bb9c15e 100755
--- a/src/user/archives_sg_add.php
+++ b/src/user/archives_sg_add.php
@@ -156,7 +156,6 @@ if (empty($dopost)) {
$wintitle = "成功发布分类文档";
$wecome_info = "文档管理 - 发布分类文档";
$win = new OxWindow();
- $win->AddTitle("成功发布分类文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php
index 1e858b0a..5224030a 100755
--- a/src/user/archives_sg_edit.php
+++ b/src/user/archives_sg_edit.php
@@ -110,7 +110,6 @@ if (empty($dopost)) {
$wintitle = "成功修改分类文档";
$wecome_info = "文档管理 - 修改分类文档";
$win = new OxWindow();
- $win->AddTitle("成功修改分类文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/article_add.php b/src/user/article_add.php
index c6682b6e..afb8f5a3 100755
--- a/src/user/article_add.php
+++ b/src/user/article_add.php
@@ -115,7 +115,6 @@ if (empty($dopost)) {
$wintitle = "成功发布文档";
$wecome_info = "文档管理 - 发布文档";
$win = new OxWindow();
- $win->AddTitle("成功发布文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/article_edit.php b/src/user/article_edit.php
index 576917c9..1464838d 100755
--- a/src/user/article_edit.php
+++ b/src/user/article_edit.php
@@ -89,7 +89,6 @@ if (empty($dopost)) {
$wintitle = "成功修改文档";
$wecome_info = "文档管理 - 修改文档";
$win = new OxWindow();
- $win->AddTitle("成功修改文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/soft_add.php b/src/user/soft_add.php
index 6ec69e7e..983a49ab 100755
--- a/src/user/soft_add.php
+++ b/src/user/soft_add.php
@@ -169,7 +169,6 @@ if (empty($dopost)) {
$wintitle = "成功发布文档文档";
$wecome_info = "软件管理 - 发布软件文档";
$win = new OxWindow();
- $win->AddTitle("成功发布软件文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php
index 9cf0dab0..fd680032 100755
--- a/src/user/soft_edit.php
+++ b/src/user/soft_edit.php
@@ -167,7 +167,6 @@ if (empty($dopost)) {
$wintitle = "成功修改软件文档";
$wecome_info = "软件管理 - 修改软件文档";
$win = new OxWindow();
- $win->AddTitle("成功修改软件文档");
$win->AddMsgItem($msg);
$winform = $win->GetWindow("hand", false);
$win->Display(DEDEMEMBER."/templets/win_templet.htm");
diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm
index 5601a7bc..629c4989 100755
--- a/src/user/templets/content_list.htm
+++ b/src/user/templets/content_list.htm
@@ -34,7 +34,7 @@
文档标题 |
栏目 |
- 状态 |
+ 状态 |
时间 |
操作 |
diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm
index 5354e922..dcb6ada0 100755
--- a/src/user/templets/content_sg_list.htm
+++ b/src/user/templets/content_sg_list.htm
@@ -34,7 +34,7 @@
文档标题 |
栏目 |
- 状态 |
+ 状态 |
时间 |
操作 |
diff --git a/src/user/templets/win_templet.htm b/src/user/templets/win_templet.htm
index e6c3370c..a6d01256 100644
--- a/src/user/templets/win_templet.htm
+++ b/src/user/templets/win_templet.htm
@@ -17,9 +17,9 @@
-
+
-
{dede:wecome_info/}
+
{dede:wintitle/}
{dede:winform/}