diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php index f7115b45..2af48d06 100644 --- a/src/admin/ad_edit.php +++ b/src/admin/ad_edit.php @@ -20,13 +20,12 @@ if ($dopost == 'delete') { exit(); } else if ($dopost == "gettag") { require_once(DEDEINC.'/libraries/oxwindow.class.php'); - $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' "); + $row = $dsql->GetOne("SELECT tagname FROM `#@__myad` WHERE aid='$aid' "); $tagcode = "{dede:myad name='{$row['tagname']}'/} <script src='{$cfg_phpurl}/ad_js.php?aid=$aid'></script>"; - $showhtml = "<p>2种方法调用</p><xmp>$tagcode</xmp>"; - $showhtml .= "<p>前台调用效果</p><iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='350'></iframe>"; + $showhtml = "<xmp>$tagcode</xmp>"; + $showhtml .= "<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='350'></iframe>"; $wintitle = "广告调用"; $win = new OxWindow(); - $win->Init(); $winform = $win->GetWindow("hand", $showhtml); $win->Display(); exit(); diff --git a/src/admin/mytag_tag_guide.php b/src/admin/mytag_tag_guide.php index 6c8512fb..6d365081 100644 --- a/src/admin/mytag_tag_guide.php +++ b/src/admin/mytag_tag_guide.php @@ -1,6 +1,6 @@ <?php /** - * 添加自定义宏标记 + * 自定义宏标记向导 * * @version $id:mytag_tag_guide.php 15:39 2010年7月20日 tianya $ * @package DedeBIZ.Administrator diff --git a/src/admin/mytag_tag_guide_ok.php b/src/admin/mytag_tag_guide_ok.php index 12822a4c..8fd76a8c 100644 --- a/src/admin/mytag_tag_guide_ok.php +++ b/src/admin/mytag_tag_guide_ok.php @@ -1,6 +1,6 @@ <?php /** - * 添加自定义宏标记预览 + * 自定义宏标记向导预览 * * @version $id:mytag_tag_guide_ok.php 15:39 2010年7月20日 tianya $ * @package DedeBIZ.Administrator diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 7cd434dc..1335f54a 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -57,7 +57,7 @@ echo $typeOptions; echo "</select>"; ?> - <span>(如果所选栏目找不到指定标记广告内容,系统会自动搜索父栏目)</span> + <span>(栏目找不到指定广告标记,则自动搜索父栏目)</span> </td> </tr> <tr> @@ -77,14 +77,12 @@ <tr> <td>广告内容</td> <td> - <div class="add-tab"> - <ul id="changeTab"> - <li id="t_code" class="active">代码</li> - <li id="t_txt">文字</li> - <li id="t_img">图片</li> - <li id="t_flash">Flash</li> - </ul> - </div> + <ul id="adTab" class="adtab"> + <li id="t_code" class="active">代码</li> + <li id="t_txt">文字</li> + <li id="t_img">图片</li> + <li id="t_flash">Flash</li> + </ul> <div id="advert"></div> </td> </tr> @@ -103,73 +101,26 @@ </div> </form> <div id="formtxt" style="display:none"> - <div class="content" id="code" style="display:none"> - <table> - <tr> - <td width="260">支持网页广告代码</td> - <td><textarea name="normbody[htmlcode]" class="admin-textarea-xl"></textarea></td> - </tr> - </table> + <div id="code" class="content"> + <textarea name="normbody[htmlcode]" class="admin-textarea-xl" placeholder="请输入广告,支持网页代码"></textarea> </div> - <div id="txt" class="content" style="display:none"> - <table> - <tr> - <td width="260">文字文档</td> - <td><input type="text" name="normbody[title]" class="admin-input-lg"></td> - </tr> - <tr> - <td>文字链接</td> - <td><input type="text" name="normbody[link]" class="admin-input-lg"></td> - </tr> - <tr> - <td>文字颜色</td> - <td><input type="text" name="normbody[color]" class="admin-input-lg"></td> - </tr> - <tr> - <td>文字大小</td> - <td><input type="text" name="normbody[size]" class="admin-input-lg"></td> - </tr> - </table> + <div id="txt" class="content"> + <p><input type="text" name="normbody[title]" class="admin-input-lg" placeholder="请输入文字标题"></p> + <p><input type="text" name="normbody[link]" class="admin-input-lg" placeholder="请输入文字链接"></p> + <p><input type="text" name="normbody[color]" class="admin-input-lg" placeholder="请输入文字颜色"></p> + <input type="text" name="normbody[size]" class="admin-input-lg" placeholder="请输入文字大小"> </div> - <div id="img" class="content" style="display:none"> - <table> - <tr> - <td width="260">图片地址</td> - <td><input type="text" name="normbody[url]" class="admin-input-lg"></td> - </tr> - <tr> - <td>图片链接</td> - <td><input type="text" name="normbody[link]" class="admin-input-lg"></td> - </tr> - <tr> - <td>图片宽度</td> - <td><input type="text" name="normbody[width]" class="admin-input-lg"></td> - </tr> - <tr> - <td>图片高度</td> - <td><input type="text" name="normbody[height]" class="admin-input-lg"></td> - </tr> - <tr> - <td>图片描述</td> - <td><input type="text" name="normbody[descrip]" class="admin-input-lg"></td> - </tr> - </table> + <div id="img" class="content"> + <p><input type="text" name="normbody[url]" class="admin-input-lg" placeholder="请输入图片地址"></p> + <p><input type="text" name="normbody[link]" class="admin-input-lg" placeholder="请输入图片链接"></p> + <p><input type="text" name="normbody[width]" class="admin-input-lg" placeholder="请输入图片宽度"></p> + <p><input type="text" name="normbody[height]" class="admin-input-lg" placeholder="请输入图片高度"></p> + <input type="text" name="normbody[descrip]" class="admin-input-lg" placeholder="请输入图片描述"> </div> - <div id="flash" class="content" style="display:none"> - <table> - <tr> - <td width="260">flash链接</td> - <td><input type="text" name="normbody[link]" class="admin-input-lg"></td> - </tr> - <tr> - <td>flash宽度</td> - <td><input type="text" name="normbody[width]" class="admin-input-lg"></td> - </tr> - <tr> - <td>flash高度</td> - <td><input type="text" name="normbody[height]" class="admin-input-lg"></td> - </tr> - </table> + <div id="flash" class="content"> + <p><input type="text" name="normbody[link]" class="admin-input-lg" placeholder="请输入flash链接"></p> + <p><input type="text" name="normbody[width]" class="admin-input-lg" placeholder="请输入flash宽度"></p> + <input type="text" name="normbody[height]" class="admin-input-lg" placeholder="请输入flash高度"> </div> </div> </div> @@ -181,12 +132,12 @@ } showcode('code'); $(document).ready(function() { - $("#changeTab>li").click(function() { + $("#adTab>li").click(function() { var tabLi = $(this); var thistab = tabLi[0].id; $(".content").each(function() { if ("t_" + $(this)[0].id == thistab) { - $("#changeTab>li").removeClass("active"); + $("#adTab>li").removeClass("active"); $("#t_" + $(this)[0].id).addClass("active"); showcode($(this)[0].id); } diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index eeb0c947..a978f2a1 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -19,7 +19,7 @@ <li class="breadcrumb-item active">修改广告</li> </ol> <div class="card shadow-sm"> - <div class="card-header"><a href="ad_main.php">修改广告</div> + <div class="card-header">修改广告</div> <div class="card-body"> <form name="form1" action="ad_edit.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="aid" value="<?php echo $aid?>"> @@ -56,7 +56,7 @@ echo $typeOptions; echo "</select>"; ?> - <span>(如果所选栏目找不到指定标记广告内容,系统会自动搜索父栏目)</span> + <span>(栏目找不到指定广告标记,则自动搜索父栏目)</span> </td> </tr> <tr> diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index 9e359f9b..295fa6ee 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -17,7 +17,7 @@ <div class="card shadow-sm mb-3"> <div class="card-body"> <a href="mytag_add.php" class="btn btn-success btn-sm">添加自定义宏标记</a> - <a href="mytag_tag_guide.php" class="btn btn-success btn-sm">添加自定义宏标记</a> + <a href="mytag_tag_guide.php" class="btn btn-success btn-sm">自定义宏标记向导</a> </div> </div> <div class="card shadow-sm"> diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm index 5a7d20e8..bcd860c6 100644 --- a/src/admin/templets/mytag_tag_guide.htm +++ b/src/admin/templets/mytag_tag_guide.htm @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> - <title>添加自定义宏标记</title> + <title>自定义宏标记向导</title> <link rel="stylesheet" href="/static/web/css/font-awesome.min.css"> <link rel="stylesheet" href="/static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="/static/web/css/admin.css"> @@ -20,10 +20,10 @@ <ol class="breadcrumb"> <li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li> <li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标记</a></li> - <li class="breadcrumb-item active">添加自定义宏标记</li> + <li class="breadcrumb-item active">自定义宏标记向导</li> </ol> <div class="card shadow-sm"> - <div class="card-header">添加自定义宏标记</div> + <div class="card-header">自定义宏标记向导</div> <div class="card-body"> <span id="list1" style="display:none">[field:textlink/]([field:pubdate function=MyDate('m-d',@me)/])</span> <span id="list2" style="display:none">[field:typelink/] [field:textlink/]</span> diff --git a/src/admin/templets/mytag_tag_guide_ok.htm b/src/admin/templets/mytag_tag_guide_ok.htm index be76fa94..d39c3686 100644 --- a/src/admin/templets/mytag_tag_guide_ok.htm +++ b/src/admin/templets/mytag_tag_guide_ok.htm @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"> - <title>添加自定义宏标记预览</title> + <title>自定义宏标记向导预览</title> <link rel="stylesheet" href="/static/web/css/font-awesome.min.css"> <link rel="stylesheet" href="/static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="/static/web/css/admin.css"> diff --git a/src/admin/templets/vote_getcode.htm b/src/admin/templets/vote_getcode.htm index 7a94a95e..60012bcf 100644 --- a/src/admin/templets/vote_getcode.htm +++ b/src/admin/templets/vote_getcode.htm @@ -25,16 +25,8 @@ <tbody> <tr> <td><textarea name="partcode" id="partcode" class="admin-textarea-xl">{dede:vote id='<?php echo $aid?>'}{/dede:vote}</textarea></td> - <td rowspan="2"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></td> - </tr> - <tr> - <td align="center"><button type="submit"class="btn btn-success btn-sm">提交测试</button></td> - </tr> - <tr> - <td colspan="2"><textarea name="htmlf" id="htmlf" class="admin-textarea-xl"><script src="<?php echo $cfg_basehost.'/data/vote/vote_'.$aid.'.js' ?>"></script></textarea></td> - </tr> - <tr> - <td colspan="2"> + <td><textarea name="htmlf" id="htmlf" class="admin-textarea-xl"><script src="<?php echo $cfg_basehost.'/data/vote/vote_'.$aid.'.js' ?>"></script></textarea></td> + <td> <textarea name="htmlf" id="htmlf" class="admin-textarea-xl"> <?php $vt = new DedeVote($aid); @@ -44,6 +36,12 @@ </textarea> </td> </tr> + <tr> + <td colspan="3" align="center"><button type="submit"class="btn btn-success btn-sm">提交测试</button></td> + </tr> + <tr> + <td colspan="3"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></td> + </tr> </tbody> </table> </div> diff --git a/src/apps/ad_js.php b/src/apps/ad_js.php index 3fe00b72..07a55716 100755 --- a/src/apps/ad_js.php +++ b/src/apps/ad_js.php @@ -29,7 +29,7 @@ if (isset($nocache) || !file_exists($cacheFile) || time() - filemtime($cacheFile $adbody = str_replace('"', '\"', $adbody); $adbody = str_replace("\r", "\\r", $adbody); $adbody = str_replace("\n", "\\n", $adbody); - $adbody = "<!--document.write(\"{$adbody}\");-->"; + $adbody = "document.write(\"{$adbody}\");"; $fp = fopen($cacheFile, 'w'); fwrite($fp, $adbody); fclose($fp); diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 6d6bfbe9..41a788a0 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -474,15 +474,14 @@ body.menu-show .body-right { .atlas-foot input[type=text] { border-radius:0 0 var(--b-radius) var(--b-radius)!important } -.add-tab ul .active { - color:var(--blue) -} -.add-tab li { - float:left; - width:60px; - line-height:30px; +.adtab li { + display:inline-block; + padding:0.5rem; cursor:pointer } +.adtab .active { + color:var(--blue) +} .nw { float:left; width:160px