调整模板错误

src/admin/templets/diy_field_add.htm

@@ -46,7 +46,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split"> 是</label>
 						<label><input type="radio" name="spage" value="no" checked="1"> 否</label>
-						<span>（如果文档需要分页符，不论何种文档，都可以用#P#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
+						<span>（如果文档需要分页符，不论何种文档，都可以用#p#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -99,7 +99,7 @@
 			</table>
 		</form>
 		<script>
-			var notAllow = " <?php echo $f;?> ";
+			var notAllow = "<?php echo $f;?>";
 			function GetFields()
 			{
 				var theform = document.form1;

src/admin/templets/diy_field_edit.htm

@@ -71,7 +71,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split" <?php if ($ctag->GetAtt('page')=='split') echo "checked='1'";?>> 是</label>
 						<label><input type="radio" name="spage" value="no" <?php if ($ctag->GetAtt('page')=='no'||$ctag->GetAtt('page')=='') echo "checked='1'";?>> 否</label>
-						<span>（如果文档需要分页符，不论何种文档，都可以用#P#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
+						<span>（如果文档需要分页符，不论何种文档，都可以用#p#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/mychannel_field_add.htm

@@ -60,7 +60,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split"> 是</label>
 						<label><input type="radio" name="spage" value="no" checked="1"> 否</label>
-						<span>（如果文档需要分页符，不论何种文档，都可以用#P#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
+						<span>（如果文档需要分页符，不论何种文档，都可以用#p#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -137,7 +137,7 @@
 			</table>
 		</form>
 		<script>
-			var notAllow = " <?php echo $f;?> ";
+			var notAllow = "<?php echo $f;?>";
 			function GetFields()
 			{
 				var theform = document.form1;

src/admin/templets/mychannel_field_edit.htm

@@ -117,7 +117,7 @@
 						<input name="isnull" type="hidden" value="1">
 						<label><input type="radio" name="spage" value="split" <?php if ($ctag->GetAtt('page')=='split') echo "checked='1'";?>> 是</label>
 						<label><input type="radio" name="spage" value="no" <?php if ($ctag->GetAtt('page')=='no'||$ctag->GetAtt('page')=='') echo "checked='1'";?>> 否</label>
-						<span>（如果文档需要分页符，不论何种文档，都可以用#P#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
+						<span>（如果文档需要分页符，不论何种文档，都可以用#p#副标题#e#作为分页符号实现文档分页，但一个模型里仅允许一个这样的字段）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/templets_default.htm

@@ -14,7 +14,7 @@
 				<td colspan="4" bgcolor="#f5f5f5">
 					<?php
 					if ($acdir=='plus') echo '插件模板';
-					else if ($acdir=='system') echo '底层模板';
+					else if ($acdir=='system') echo '系统模板';
 					else echo '模板管理 &gt; '.$acdir;
 					?>
 				</td>
@@ -56,12 +56,8 @@
 		</table>
 		<script>
 			function DelTpl(filename) {
-				DedeConfirm("您确实要删除这个模板吗").then((v)=>{
-					location = 'tpl.php?action=del&acdir=<?php echo $acdir;?>&filename=' +
-						filename;
-				}).catch((e)=>{
-					console.log(e)
-				});
+				if (window.confirm('您确实要删除这个模板吗')) location = 'tpl.php?action=del&acdir=<?php echo $acdir; ?>&filename=' + filename;
+				else return false;
 			}
 		</script>
 	</body>

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 = "<form name='form1' action='tag_test_action.php' target='blank' method='post'>
-        <label><input type='hidden' name='dopost' value='make'> 标签测试（环境变量标签不支持测试）</label><br>
-        <textarea name='partcode' cols='150' rows='6' style='width:90%'>{dede:{$tagname}}{/dede:{$tagname}}</textarea><br>
-        <button type='submit' name='B1' class='btn btn-success btn-sm'>确定</button>
+        <div class='mb-3'><label><input type='hidden' name='dopost' value='make'> 标签测试（环境变量标签不支持测试）</label></div>
+        <div class='mb-3'><textarea name='partcode' cols='150' rows='6' class='admin-textarea-xl'>{dede:{$tagname}}{/dede:{$tagname}}</textarea></div>
+        <div class='text-center'><button type='submit' name='B1' class='btn btn-success btn-sm'>确定</button></div>
     </form>";
     $wintitle = "成功操作文件";
     $wecome_info = "<a href='templets_tagsource.php'>标签源码管理</a> &gt; 新建修改标签";

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;

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());

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;

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;

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);

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);

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 = '';

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);
 

src/theme/dedebiz/article_default.htm

@@ -14,7 +14,6 @@
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/bootstrap.min.js"></script>
 	</head>
-	<body>
 	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}