diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index e507ccb9..f0d607e6 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -356,8 +356,8 @@ else if ($dopost == 'moveArchives') { - - + + @@ -609,8 +609,8 @@ else if ($dopost == 'quickEdit') { - - + + @@ -885,8 +885,8 @@ else if ($dopost == 'attsDlg') { - - + + @@ -911,8 +911,8 @@ else if ($dopost == 'getCatMap') {
ListAllType($channelid); ?>
- - + +
请稍后，正在操作中 - +
- - - diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index bfb5c9eb..62a48ebe 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -232,9 +232,9 @@ if ($dopost == 'time') { -
如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理（必须设置好模板项） @@ -99,9 +99,6 @@ function DoRand(jobname) $okmsg
请按说明修改设置：
- - + + +
diff --git a/src/admin/css/indexbody.css b/src/admin/css/indexbody.css index 5c4fe1cb..50a9165c 100644 --- a/src/admin/css/indexbody.css +++ b/src/admin/css/indexbody.css @@ -1 +1 @@ -.title{color:#28a745}.title span{padding-left:6px}#addTab{position:absolute;left:460px;top:260px;min-width:360px;height:200px;z-index:2;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}#editTab{position:absolute;left:460px;top:260px;min-width:360px;height:300px;z-index:1;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #ccc;color:#dc3545;font-weight:bold}.verline{border-bottom:1px dashed #ccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#ccc;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../../static/web/img/wbg.gif)repeat-x}.dbox dd{padding:0}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}.dboxtable td.nline{height:26px;border-bottom:1px dashed #CFD7C4}.dboxtable1 ul li{float:left;display:inline;width:48%;height:26px;line-height:26px;border-bottom:1px dashed #CFD7C4;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px} \ No newline at end of file +.title{color:#28a745}.title span{padding-left:6px}#addTab{position:absolute;left:460px;top:260px;min-width:360px;height:200px;z-index:2;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}#editTab{position:absolute;left:460px;top:260px;min-width:360px;height:300px;z-index:1;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #ccc;color:#dc3545;font-weight:bold}.verline{border-bottom:1px dashed #ccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#eee;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../../static/web/img/wbg.gif)repeat-x}.dbox dd{padding:0}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}.dboxtable td.nline{height:26px;border-bottom:1px dashed #CFD7C4}.dboxtable1 ul li{float:left;display:inline;width:48%;height:26px;line-height:26px;border-bottom:1px dashed #CFD7C4;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px} \ No newline at end of file diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index d98fde6d..101c1fb0 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -92,7 +92,7 @@ a{text-decoration:none!important} - + @@ -121,7 +121,7 @@ a{text-decoration:none!important} else if ($file == "..") { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); - $line = " + $line = "\r\n"; @@ -129,7 +129,7 @@ a{text-decoration:none!important} } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " + $line = " @@ -141,7 +141,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " @@ -153,7 +153,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 33339c76..d90f96fd 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -60,7 +60,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') { global $cfg_phpurl,$addsql; $start = ($pageno-1) * $pagesize; - $printhead ="
选择文件 文件大小 修改时间
上级目录 当前目录：$activepath
$file
$file $filesize KB $filetime
$file $filesize KB $filetime
+ $printhead ="
@@ -75,7 +75,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') while($row = $dsql->GetArray()) { $listurl = GetFreeListUrl($row['aid'],$row['namerule'],$row['listdir'],$row['defaultpage'],$row['nodefault']); - $line = " + $line = " diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 396f37d3..b24c23ec 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -35,15 +35,15 @@ $dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; if ($cuserLogin->getUserType() >= 10) { $adminMenu1 = " - - - - - + + + + + - + diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index 4d3462cf..f0573441 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -57,19 +57,15 @@ function GetMenus($userrank, $topos = 'main') } else { $addalt = '录入新内容'; } - if ($ctag2->GetAtt('addico') != '') { $addico = $ctag2->GetAtt('addico'); } else { $addico = '../static/web/img/gtk-sadd.png'; } - //an add icos , small items use att ischannel='1' addico='ico' addalt='msg' linkadd='' - $link = "
-
$link
-
- $addalt -
-
"; + $link = "
+
$link
+
$addalt
+
"; } else { $link .= ""; } @@ -78,7 +74,7 @@ function GetMenus($userrank, $topos = 'main') } } echo $footTemplet; - echo ""; + echo ""; } } }//End Function \ No newline at end of file diff --git a/src/admin/inc/inc_menu_map.php b/src/admin/inc/inc_menu_map.php index b9dd2aba..2d069f51 100644 --- a/src/admin/inc/inc_menu_map.php +++ b/src/admin/inc/inc_menu_map.php @@ -38,17 +38,17 @@ $menusMain = " - - $addset - - - + - + + + $addset + + @@ -63,7 +63,7 @@ $menusMain = " - + @@ -89,12 +89,12 @@ $menusMain = " - - - - - - + + + + + + diff --git a/src/admin/js/main.js b/src/admin/js/main.js index aaad8ec1..f4b8d605 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -682,7 +682,7 @@ $(document).ready(function () { //截取缩略图 function SetThumb(srcURL) { var footer = - "

使用原图 确定

"; + "

使用原图 确定

"; var optButton = `

"; + $prvdir .= ""; $prvdir .= "\r\n"; } $prvdir .= "
ID 列表名称
{$row['aid']} {$row['title']} {$row['templet']}
$k
$k$cw
"; @@ -162,11 +162,11 @@ else if ($action == 'setup') { $win->AddTitle(" 模块管理 > 安装模块：{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'setupstart'); - $msg = " + $msg = " - - + + @@ -189,16 +189,16 @@ else if ($action == 'setup') { - - + - + @@ -297,11 +297,11 @@ else if ($action == 'del') { $win->AddTitle("模块管理 > 删除模块：{$infos['name']}"); $win->AddHidden('hash', $hash); $win->AddHidden('action', 'delok'); - $msg = " + $msg = "
模块名称：{$infos['name']}模块名称：{$infos['name']}
语言：浏览
+
注意事项：安装时请确保文件列表中涉及的目录前可写入权限，此外“后台管理目录”、“后台管理目录/templets”目录也必须暂时设置可写入权限
目录权限检测：
../ 为根目录
./ 表示当前目录		目录权限检测：
../ 为根目录
./ 表示当前目录		 $prvdir
模块包含的所有文件列表：模块包含的所有文件列表：
- - + + @@ -362,11 +362,11 @@ else if ($action == 'uninstall') { $win->AddTitle("模块管理 > 卸载模块：{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); - $msg = " + $msg = "
模块名称：{$infos['name']}模块名称：{$infos['name']}
语言：
- - + + @@ -503,11 +503,11 @@ else if ($action == 'view') { $win->Init("", "js/blank.js", ""); $wecome_info = "模块管理"; $win->AddTitle("模块管理 > 模块详情：{$infos['name']}"); - $msg = " + $msg = "
模块名称：{$infos['name']}模块名称：{$infos['name']}
语言：
- - + + diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 3f20e6e3..f59a9da6 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -79,20 +79,21 @@ if ($action == 'upload') { $wecome_info = "模块管理 > 上传模块"; $win->AddTitle('请选择要上传的文件：'); $win->AddHidden("action", 'upload'); - $msg = "
模块名称：{$infos['name']}模块名称：{$infos['name']}
语言：
+ $msg = "
- - + + + - + - - + +
文件格式： + 文件格式： -
已有模块：
请选择文件：请选择文件：
"; $win->AddMsgItem("
$msg
"); diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index b260af14..8ce9e208 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -79,7 +79,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $dsql->Execute(); while ($row = $dsql->GetArray()) { $line = " - + {$row['aid']} @@ -95,7 +95,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') "; echo $line; } - echo " + echo " 反选 取消 diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index 2267c577..325bfb4b 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -17,7 +17,6 @@ if (isset($dopost) && $dopost == 'getone') { $y = intval(MyDate('Y', time())); $m = intval(MyDate('m', time())); $d = intval(MyDate('d', time())); - //全部 $sql = "SELECT addtable FROM `#@__channeltype` WHERE issystem='-1'"; $dsql->Execute('me', $sql); @@ -31,7 +30,6 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE mid='$uid'; "); $dd = $row['dd'] + $dd; $cc = $row['cc'] + $cc; - //季度 $starttime = 0; if (preg_match("#[123]#", $m) && $m < 10) $starttime = $y."-01-01 00:00:00"; @@ -51,7 +49,6 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $dds = $row['dd'] + $dds; $ccs = $row['cc'] + $ccs; - //当月 $starttime = $y."-{$m}-01 00:00:00"; $istarttime = GetMkTime($starttime); @@ -67,7 +64,6 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddm = $row['dd'] + $ddm; $ccm = $row['cc'] + $ccm; - //本周 $starttime = $y."-{$m}-{$d} 00:00:00"; $istarttime = GetMkTime($starttime) - (7 * 24 * 3600); @@ -83,7 +79,6 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddw = $row['dd'] + $ddw; $ccw = $row['cc'] + $ccw; - //当天 $starttime = $y."-{$m}-{$d} 00:00:00"; $istarttime = GetMkTime($starttime); @@ -99,7 +94,6 @@ if (isset($dopost) && $dopost == 'getone') { $row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; "); $ddd = $row['dd'] + $ddd; $ccd = $row['cc'] + $ccd; - $msg = " @@ -109,7 +103,7 @@ if (isset($dopost) && $dopost == 'getone') { - + @@ -122,5 +116,4 @@ if (isset($dopost) && $dopost == 'getone') { echo $msg; exit(); } - -include DedeInclude('templets/sys_admin_user_tj.htm'); +include DedeInclude('templets/sys_admin_user_tj.htm'); \ No newline at end of file diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index c3f7c87c..be10949c 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -114,7 +114,7 @@ EOT; $row['info'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['info']); $row['varname'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['varname']); ?> - +
管理员::统计信息近七天 当天
{$userid} {$dd} | {$cc} {$dds} | {$ccs}
： "; - $errall = "完成修正"; + $errall = "完成修正"; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); $msg .= "※微统计表记录数：{$row['dd']}
"; if ($row['dd'] == $allarcnum) { @@ -206,7 +206,7 @@ else if ($dopost == 3) { 完成所有修复操作，移除错误记录 {$errnum} 条

- 完成修正 + 完成修正
diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index b4578b2e..eae395ea 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -8,14 +8,14 @@ - +
- +
当前位置  > 搜索结果
""的搜索结果
diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index f222b334..f2e9f568 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -75,12 +75,12 @@ -
+
- @@ -168,7 +168,7 @@
广告管理 > 增加广告位置
+ @@ -89,7 +89,7 @@ - + @@ -106,8 +106,8 @@ - + @@ -157,7 +157,7 @@ - +
广告代码的调用方法：{dede:myad name='广告位标识'/}
广告位标识：广告位标识： （使用英文或数字表示的简洁标识）
GetOptionArray(0,0,0); - echo ""; + echo ""; echo $typeOptions; echo ""; ?> @@ -149,7 +149,7 @@
过期显示内容：
- @@ -177,7 +177,7 @@
广告代码:
+ 		广告代码:
请填写广告代码，支持html代码
- + @@ -197,7 +197,7 @@
文字内容 *文字内容 *
- + @@ -221,7 +221,7 @@
图片地址 *图片地址 *
- + diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 2daab8ac..1042712c 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -44,12 +44,12 @@ -
flash链接flash链接
+
-
广告管理 > 修改广告
+ @@ -68,12 +68,12 @@ - + - + @@ -113,7 +113,7 @@ - +
广告投放范围：广告投放范围： GetOptionArray($row['typeid'],0,0); - echo ""; + echo ""; echo $typeOptions; echo ""; ?> @@ -105,7 +105,7 @@ 正常显示内容：
过期显示内容：
diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 4e01da3f..59759ba1 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -9,37 +9,32 @@ - +
- + - - + @@ -49,7 +44,7 @@ {dede:datalist empty=''} - + diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index 0e437e6d..91b2bbe2 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -3,13 +3,15 @@ 广告分类管理 + + -
广告管理 增加一个新广告广告分类管理广告管理增加一个新广告广告分类管理
- - - - - + + + +
- - - - - - - - -
请选择分类： - 关键词：
+ 		+ + + + + + - - -
请选择分类： +
+ 		关键词：
+
编号 分类 广告名称管理
暂无内容
{dede:field.aid /} {dede:field.clsname function='TestType(@me,1)'/} {dede:field.adname /}
+
- + @@ -24,10 +26,10 @@ { $k++; ?> - + - + - + - + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index bcb382c1..5fc7a25b 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -63,7 +63,7 @@ table{border-collapse:separate}
广告分类管理 [广告管理]广告分类管理广告管理
类型ID
id; ?> 保留 保留
新增一个广告类型：
新增 新增
- +
图集列表 > 发布图集图集列表 > 发布图集 栏目管理
@@ -94,7 +94,7 @@ table{border-collapse:separate}
- +
@@ -106,7 +106,7 @@ table{border-collapse:separate}
 图集标题：
- +
 自定义属性： @@ -128,7 +128,7 @@ table{border-collapse:separate}