diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index 07db7845..34c8faf4 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -46,7 +46,7 @@ - （如果文档需要分页符，不论何种文档，都可以用#P#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段） + （如果文档需要分页符，不论何种文档，都可以用#p#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段） @@ -99,7 +99,7 @@ diff --git a/src/admin/tpl.php b/src/admin/tpl.php index 645b74c0..de437694 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -27,7 +27,7 @@ if (preg_match("#\.#", $acdir)) { //修改模板 if ($action == 'edit' || $action == 'newfile') { if ($filename == '' && $action == 'edit') { - ShowMsg('未指定要修改的文件', '-1'); + ShowMsg('未指定要修改的模板', '-1'); exit(); } if (!file_exists($templetdird.'/'.$filename) && $action == 'edit') { @@ -89,17 +89,17 @@ else if ($action == 'saveedit') { $fp = fopen($truefile, 'w'); fwrite($fp, $content); fclose($fp); - ShowMsg('成功修改或新建文件', 'templets_main.php?acdir='.$acdir); + ShowMsg('修改或新建模板成功', 'templets_main.php?acdir='.$acdir); exit(); } //删除模板 else if ($action == 'del') { $truefile = $templetdird.'/'.$filename; if (unlink($truefile)) { - ShowMsg('删除文件成功', 'templets_main.php?acdir='.$acdir); + ShowMsg('删除模板成功', 'templets_main.php?acdir='.$acdir); exit(); } else { - ShowMsg('删除文件失败', '-1'); + ShowMsg('删除模板失败', '-1'); exit(); } } @@ -133,7 +133,7 @@ else if ($action == 'upload') { else if ($action == 'uploadok') { CheckCSRF(); if (!is_uploaded_file($upfile)) { - ShowMsg("貌似您什么都没有上传哦", "javascript:;"); + ShowMsg("请选择上传的模板文件", "javascript:;"); exit(); } else { if (!preg_match("#\.(htm|html)$#", $upfile_name)) { @@ -158,11 +158,11 @@ else if ($action == 'edittag' || $action == 'addnewtag') { if (!defined('DEDEINC')) { exit(\"Request Error!\"); } -function lib_demotag(&\$ctag,&\$refObj) +function lib_demotag(\$ctag, \$refObj) { - global \$dsql,\$envs; + global \$dsql, \$envs; //属性处理 - \$attlist=\"row|12,titlelen|24\"; + \$attlist = \"row|12,titlelen|30\"; FillAttsDefault(\$ctag->CAttribute->Items,\$attlist); extract(\$ctag->CAttribute->Items, EXTR_SKIP); \$revalue = ''; @@ -202,9 +202,9 @@ else if ($action == 'savetagfile') { fwrite($fp, $content); fclose($fp); $msg = "
-
-
- +
+
+
"; $wintitle = "成功操作文件"; $wecome_info = "标签源码管理 > 新建修改标签"; diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index d985ab17..46c93f37 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -23,8 +23,7 @@ border-radius:.5rem } * { - font-size:12px; - font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif + font-size:12px } body { margin:0; @@ -253,7 +252,7 @@ body.hidemenu .body-right { } .btn-version { float:left; - margin-top:16px; + margin-top:18px; margin-left:5px } .top-item ul li { @@ -282,12 +281,7 @@ body.hidemenu .body-right { border:0 } .search-input { - width:160px; - height:28px; - line-height:28px; - font-size:12px; - background:#fff; - border:0 + width:160px } .top-admin { float:right; diff --git a/src/system/taglib/feedback.lib.php b/src/system/taglib/feedback.lib.php index 39e777c7..438a190d 100755 --- a/src/system/taglib/feedback.lib.php +++ b/src/system/taglib/feedback.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_feedback(&$ctag, &$refObj) { global $dsql; - $attlist = "row|12,titlelen|24,infolen|100,orderby|"; + $attlist = "row|12,titlelen|30,infolen|100,orderby|"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $innertext = trim($ctag->GetInnerText()); diff --git a/src/system/taglib/flink.lib.php b/src/system/taglib/flink.lib.php index 61e85b85..dec2f18d 100755 --- a/src/system/taglib/flink.lib.php +++ b/src/system/taglib/flink.lib.php @@ -12,9 +12,8 @@ if (!defined('DEDEINC')) exit ('dedebiz'); helper('cache'); function lib_flink(&$ctag, &$refObj) { - global $dsql, $cfg_soft_lang; - $attlist = "type|textall,row|24,titlelen|24,linktype|1,typeid|0"; + $attlist = "type|textall,row|30,titlelen|30,linktype|1,typeid|0"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $totalrow = $row; diff --git a/src/system/taglib/flinktype.lib.php b/src/system/taglib/flinktype.lib.php index 967edfb3..db5b5a86 100755 --- a/src/system/taglib/flinktype.lib.php +++ b/src/system/taglib/flinktype.lib.php @@ -13,7 +13,7 @@ require_once(DEDEINC."/taglib/flink.lib.php"); function lib_flinktype(&$ctag, &$refObj) { global $dsql; - $attlist = "row|24,titlelen|24"; + $attlist = "row|30,titlelen|30"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); $totalrow = $row; diff --git a/src/system/taglib/infoguide.lib.php b/src/system/taglib/infoguide.lib.php index e3eb9970..9e5e8bb4 100755 --- a/src/system/taglib/infoguide.lib.php +++ b/src/system/taglib/infoguide.lib.php @@ -13,7 +13,7 @@ function lib_infoguide(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_cmspath, $cfg_mainsite; //属性处理 - //$attlist="row|12,titlelen|24"; + //$attlist="row|12,titlelen|30"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); $cmspath = ((empty($cfg_cmspath) || preg_match('#[/$]#', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath); diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php index 2d1310c9..196bf0e8 100755 --- a/src/system/taglib/infolink.lib.php +++ b/src/system/taglib/infolink.lib.php @@ -27,7 +27,7 @@ function lib_infolink(&$ctag, &$refObj) { global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_cmspath, $cfg_mainsite, $em_nativeplaces, $em_infotypes; //属性处理 - //$attlist="row|12,titlelen|24"; + //$attlist="row|12,titlelen|30"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); $cmspath = ((empty($cfg_cmspath) || !preg_match("#\/$#", $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath); diff --git a/src/system/taglib/softmsg.lib.php b/src/system/taglib/softmsg.lib.php index 3a262265..13146e7d 100755 --- a/src/system/taglib/softmsg.lib.php +++ b/src/system/taglib/softmsg.lib.php @@ -12,7 +12,7 @@ if (!defined('DEDEINC')) exit ('dedebiz'); function lib_softmsg(&$ctag, &$refObj) { global $dsql; - //$attlist="type|textall,row|24,titlelen|24,linktype|1"; + //$attlist="type|textall,row|30,titlelen|30,linktype|1"; //FillAttsDefault($ctag->CAttribute->Items,$attlist); //extract($ctag->CAttribute->Items, EXTR_SKIP); $revalue = ''; diff --git a/src/system/taglib/vote.lib.php b/src/system/taglib/vote.lib.php index bbeb5196..498994c9 100755 --- a/src/system/taglib/vote.lib.php +++ b/src/system/taglib/vote.lib.php @@ -13,7 +13,7 @@ require_once(DEDEINC.'/dedevote.class.php'); function lib_vote(&$ctag, &$refObj) { global $dsql; - $attlist = "id|0,lineheight|24,tablewidth|100%,titlebgcolor|#EDEDE2,titlebackgroup|,tablebg|#ffffff"; + $attlist = "id|0,lineheight|30,tablewidth|100%,titlebgcolor|#EDEDE2,titlebackgroup|,tablebg|#ffffff"; FillAttsDefault($ctag->CAttribute->Items, $attlist); extract($ctag->CAttribute->Items, EXTR_SKIP); diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index 2911172e..0ab4f377 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -14,7 +14,6 @@ - {dede:include filename='top.htm'/} {dede:include filename='head.htm'/}