diff --git a/README.md b/README.md index 2a97a53f..38fed3ff 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Sockets:支持接入DedeBIZ商业组件模块 ..../admin 默认后台管理目录[可任意改名] ..../apps 插件扩展程序目录[不可写入,可执行] ..../data 系统缓存或其它可写入数据存放目录[必须可写入,但不可执行,建议关闭对外访问权限] -..../install 安装程序目录,安装完后可删除[安装时必须有可写入权限] +..../install 程序安装目录,安装完后可删除[安装时必须有可写入权限] ..../static 静态资源存放目录[必须可写入,无需执行] ..../system 类库文件目录[建议关闭对外访问权限] ..../theme 系统默认内核模板目录[建议关闭对外访问权限] diff --git a/dedebiz b/dedebiz index e0db3505..d54796bf 100755 --- a/dedebiz +++ b/dedebiz @@ -469,7 +469,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { die("DedeBIZ:command web server not support\n\n"); } - // 写入安装程序锁 + // 写入程序安装锁 file_put_contents($workDir.'/install/install_lock.txt', 'ok'); echo "Start Dev Server For DedeBIZ\n\r"; diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 4ecd574f..7d585901 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -31,9 +31,6 @@ function DedeCopyToClipboard(text) { document.body.removeChild(textarea); } } -function CopySystemInfo(txt) { - DedeCopyToClipboard(txt); -} $(function () { $.get("index_testenv.php", function (data) { if (data !== '') { @@ -46,6 +43,12 @@ $(function () { } }); }); +function copyFn(){ + var val = document.getElementById('text'); + window.getSelection().selectAllChildren(val); + document.execCommand ("Copy"); + //alert("成功复制系统信息"); +} //Dedebiz info var dedebizInfo; function ViewDedeBIZ() { diff --git a/src/admin/module_main.php b/src/admin/module_main.php index fc31abb3..3316111d 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -226,7 +226,7 @@ function SetupRun() --------------*/ else if ($action == 'setupstart') { if (!is_writeable($mdir)) { - ShowMsg("目录 {$mdir} 不支持写入,这将导致安装程序没法正常创建", "-1"); + ShowMsg("目录 {$mdir} 不支持写入,这将导致程序安装没法正常创建", "-1"); exit(); } $dm = new DedeModule($mdir); @@ -248,7 +248,7 @@ else if ($action == 'setupstart') { if (!isset($autodel) || $autodel == 0) $dm->WriteSystemFile($hash, 'uninstall'); $dm->WriteSystemFile($hash, 'readme'); $dm->Clear(); - //用模块的安装程序安装 + //用模块的程序安装安装 if (!isset($autosetup) || $autosetup == 0) { include(DEDEDATA.'/module/'.$filename); exit(); diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index c554f216..b62e60d2 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -77,7 +77,7 @@ echo "</select>"; ?> <br> - (如果在所选栏目找不到指定标识的广告内容,系统会自动搜索父栏目) </td> + (如果在所选栏目找不到指定标识的广告内容,系统会自动搜索父栏目)</td> </tr> <tr> <td height="26" align="center">广告位名称:</td> diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index dea6ddea..74bb5073 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -23,7 +23,7 @@ <table border='0' cellpadding='0' cellspacing='0' class="table table-borderless"> <tr> <td width='90' align='center'>请选择分类:</td> - <td width='124'><select name='clsid' style='width:150' id="clsid"> + <td width='124'><select name='clsid' style='width:150px' id="clsid"> <option value='0'>默认分类</option> <?php echo $option; ?> </select> diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index d49a4190..e9baa64e 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -73,8 +73,7 @@ <form name='form3' action="article_keywords_main.php" method="post"> <input type='hidden' name='dopost' value='saveall' /> {dede:datalist empty='<tr><td colspan="5"><center>暂无内容</center></td></tr>'} - <tr align="center" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" - onMouseOut="javascript:this.bgColor='#FFFFFF';"> + <tr align="center" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';"> <td height="26"> <input name="aids[]" type="checkbox" value="{dede:field.aid/}" class="np" checked='1' /> </td> @@ -92,8 +91,7 @@ </td> <td> <input type='hidden' name='staold_{dede:field.aid/}' value='{dede:field.sta/}' /> - <label><input type='checkbox' name='isnouse_{dede:field.aid/}' class='np' value='1' {dede:field.sta - function="GetSta(@me)" /} /> + <label><input type='checkbox' name='isnouse_{dede:field.aid/}' class='np' value='1' {dede:field.sta function="GetSta(@me)" /} /> 禁用</label> <label><input type='checkbox' name='isdel_{dede:field.aid/}' class='np' value='1' /> diff --git a/src/admin/templets/baidunews.htm b/src/admin/templets/baidunews.htm index 2132d9e1..b4e65699 100644 --- a/src/admin/templets/baidunews.htm +++ b/src/admin/templets/baidunews.htm @@ -14,9 +14,7 @@ </div> <table width="98%" border="0" align="center" cellpadding="4" cellspacing="1" class="table maintable table-bordered"> <tr> - <td bgcolor="#EDF9D5" colspan="2" background='../static/web/img/tbg.gif' style="padding-left:10px"> - 百度新闻地图 - </td> + <td bgcolor="#EDF9D5" colspan="2" background='../static/web/img/tbg.gif' style="padding-left:10px">百度新闻地图</td> </tr> <tr> <td bgcolor="#FFFFFF" colspan="2"> @@ -32,23 +30,17 @@ </tr> <tr> <td bgcolor="#FFFFFF"> 文件名:</td> - <td bgcolor="#FFFFFF"> - <input name="filename" type="text" id="textfield" value="../data/baidunews.xml" size="30" class='alltxt' /> - </td> + <td bgcolor="#FFFFFF"><input name="filename" type="text" id="textfield" value="../data/baidunews.xml" size="30" class='alltxt' /></td> </tr> <tr> - <td colspan="2" align="center" bgcolor="#FFFFFF"> - <button name="button" type="submit" class="btn btn-success" id="button">开始生成</button> - </td> + <td colspan="2" align="center" bgcolor="#FFFFFF"><button name="button" type="submit" class="btn btn-success" id="button">开始生成</button></td> </tr> </form> <tr> <td bgcolor="#f8f8f8" colspan="2"> 状态:</td> </tr> <tr> - <td align="center" bgcolor="#FFFFFF" colspan="2"> - <iframe name="stafrm" frameborder="0" id="stafrm" width="96%" height="350px"> - </td> + <td align="center" bgcolor="#FFFFFF" colspan="2"><iframe name="stafrm" frameborder="0" id="stafrm" width="96%" height="350px"></td> </tr> </table> </body> diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index 56758961..400b817e 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -31,17 +31,14 @@ <input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->tid?>"> <tr align="center" bgcolor="#FFFFFF"> <td height="26" valign="top"> - <input name="pname_<?php echo $k?>" value="<?php echo $row->pname?>" type="text" id="pname_<?php echo $k?>" - class='pubinputs' style="width:90%"> + <input name="pname_<?php echo $k?>" value="<?php echo $row->pname?>" type="text" id="pname_<?php echo $k?>" class='pubinputs' style="width:90%"> </td> <td height="26" valign="top"> - <input name="num_<?php echo $k?>" value="<?php echo $row->num?>" type="text" id="num_<?php echo $k?>" - class='pubinputs' style="width:80%"> + <input name="num_<?php echo $k?>" value="<?php echo $row->num?>" type="text" id="num_<?php echo $k?>" class='pubinputs' style="width:80%"> </td> <td> - <input name="money_<?php echo $k?>" value="<?php echo $row->money?>" type="text" id="money_<?php echo $k?>" - class='pubinputs' style="width:80%"> - (元) + <input name="money_<?php echo $k?>" value="<?php echo $row->money?>" type="text" id="money_<?php echo $k?>" class='pubinputs' style="width:80%"> + (元) </td> <td> <input name="check_<?php echo $k?>" type="checkbox" id="check_<?php echo $k?>" value="1" checked='1' @@ -66,7 +63,7 @@ </td> <td valign="top"> <input name="money_new" type="text" id="money_new" class='pubinputs' style='width:80%' value="30"> - (元) + (元) </td> <td align="center" bgcolor="#FFFFFF"> <input name="check_new" type="checkbox" id="check_new" value="1" checked='1' class='np' /> diff --git a/src/admin/templets/content_batch_up.htm b/src/admin/templets/content_batch_up.htm index 15e8a2a7..13df3682 100644 --- a/src/admin/templets/content_batch_up.htm +++ b/src/admin/templets/content_batch_up.htm @@ -62,14 +62,14 @@ <td height="26" colspan="2" background='../static/web/img/tbg.gif'> <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless"> <tr> - <td width="177" height="18" style="padding-left:10px">文档批量管理</td> + <td width="180" height="18" style="padding-left:10px">文档批量管理</td> <td align="right"></td> </tr> </table> </td> </tr> <tr> - <td width="177" align="center" bgcolor="#FFFFFF">选定栏目:</td> + <td width="180" align="center" bgcolor="#FFFFFF">选定栏目:</td> <td bgcolor="#FFFFFF"> <?php $tl = new TypeLink(0); @@ -112,8 +112,7 @@ </tr> <tr> <td height="26" align="center" bgcolor="#FFFFFF">用户的登录id:</td> - <td height="26" bgcolor="#FFFFFF"><input name="userid" type="text" id="userid" size="20"> - (网址uid=后面跟的id)</td> + <td height="26" bgcolor="#FFFFFF"><input name="userid" type="text" id="userid" size="20">(网址uid=后面跟的id)</td> </tr> <tr> <td height="26" align="center" bgcolor="#FFFFFF">操作:</td> diff --git a/src/admin/templets/diy_add.htm b/src/admin/templets/diy_add.htm index 17c22daf..8d3d4bb4 100644 --- a/src/admin/templets/diy_add.htm +++ b/src/admin/templets/diy_add.htm @@ -61,8 +61,7 @@ <span class="STYLE2" id="help3">自定义表单的中文名称,在后台管理,前台发布等均使用此名字</span> </td> <td bgcolor="#FFFFFF"> - <input name="name" type="text" id="name" style="width:180px" value="自定义表单<?php echo $newdiyid; ?>" - class='pubinputs' /> + <input name="name" type="text" id="name" style="width:180px" value="自定义表单<?php echo $newdiyid; ?>" class='pubinputs' /> *<img src="../static/web/img/help.gif" alt="帮助" border="0" style="cursor:hand" onClick="showHide2('help3')"> </td> </tr> diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 9cfb046c..f26a48cd 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -67,8 +67,7 @@ <td height="26" align="left" bgcolor="#f8f8f8">自定义表单名称:<br> <span class="STYLE2" id="help3">自定义表单的中文名称,在后台管理,前台发布等均使用此名字</span></td> <td bgcolor="#f8f8f8"> - <input name="name" type="text" id="name" value="<?php echo $row['name']?>" style="width:180px" - class='alltxt' /> + <input name="name" type="text" id="name" value="<?php echo $row['name']?>" style="width:180px" class='alltxt' /> *<img src="../static/web/img/help.gif" alt="帮助" border="0" style="cursor:hand" onClick="showHide2('help3')"> </td> </tr> @@ -76,8 +75,7 @@ <td height="26" align="left" bgcolor="#FFFFFF">数据表:<br> <span class="STYLE2" id="help5">自定义表单数据表创建后不可修改表名</span></td> <td bgcolor="#FFFFFF"> - <input name="table" type="text" id="table" style="width:180px" value="<?php echo $row['table']; ?>" - class='alltxt' disabled='1' /> + <input name="table" type="text" id="table" style="width:180px" value="<?php echo $row['table']; ?>" class='alltxt' disabled='1' /> *<img src="../static/web/img/help.gif" alt="帮助" border="0" style="cursor:hand" onClick="showHide2('help5')"> </td> </tr> diff --git a/src/admin/templets/feedback_edit.htm b/src/admin/templets/feedback_edit.htm index 839e85b9..76b95386 100644 --- a/src/admin/templets/feedback_edit.htm +++ b/src/admin/templets/feedback_edit.htm @@ -53,7 +53,7 @@ <td>修改的评论内容HTML代码不会被屏蔽,可用HTML语法编辑</td> </tr> <tr bgcolor="#FFFFFF"> - <td height="62" align="center"> </td> + <td height="62" align="center"></td> <td height="62"> <textarea name="msg" cols="60" rows="5" id="msg"><?php echo cn_substr(Text2Html($row['msg']), 250); ?></textarea></td> </tr> @@ -62,7 +62,7 @@ <td>回复内容的HTML代码会被屏蔽</td> </tr> <tr bgcolor="#FFFFFF"> - <td height="26" align="center"> </td> + <td height="26" align="center"></td> <td height="26"> <textarea name="adminmsg" cols="60" rows="5" id="adminmsg"></textarea></td> </tr> diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index e9de2357..20970bee 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -214,7 +214,7 @@ ?> 文档发布时间: <input name="subday" type="text" id="subday2" value="0" size="6"> - 天以内 (0 表示不限) </td> + 天以内 (0 表示不限)</td> </tr> <tr> <td height="26" align="left">每页记录数: diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index de7ef6a6..7852a908 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -189,7 +189,7 @@ ?> 文档发布时间: <input name="subday" type="text" id="subday" size="6" value="<?php echo $ctag->GetAtt('subday')?>"> - 天以内 (0 表示不限) </td> + 天以内 (0 表示不限)</td> </tr> <tr> <td height="26" align="left">每页记录数: diff --git a/src/admin/templets/friendlink_type.htm b/src/admin/templets/friendlink_type.htm index cfc77889..7d9c2a73 100644 --- a/src/admin/templets/friendlink_type.htm +++ b/src/admin/templets/friendlink_type.htm @@ -12,7 +12,7 @@ <form name="form1" action="friendlink_type.php" method="post"> <input type="hidden" name="dopost" value="save"> <tr> - <td height="19" background="../static/web/img/tbg.gif" colspan="9" style="padding-left:10px"> + <td height="20" background="../static/web/img/tbg.gif" colspan="9" style="padding-left:10px"> <a href="friendlink_main.php">友情链接管理</a> <a href="friendlink_add.php" class="btn btn-success btn-sm">增加链接</a> <a href="friendlink_type.php" class="btn btn-success btn-sm">网站类型管理</a> diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index cabf48a9..f51c7a9a 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -22,6 +22,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ .table{margin-bottom:0} .web-info{padding:10px;background:#f8f8f8;border-radius:.2rem;text-align:center} .web-info p{margin-bottom:10px} +#text{font-size:0} </style> </head> <body> @@ -30,7 +31,7 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ <div id="tips" class="col-md-12"></div> <div class="col-md-12 mt-3 mb-3"> <div class="card"> - <div class="card-header"><a title="查看流量统计图" href="#statChart"><i class="fa fa-line-chart"></i></a> 流量统计表</div> + <div class="card-header"><a href="#statChart" title="查看流量统计图"><i class="fa fa-line-chart"></i> 流量统计表</a></div> <div class="card-body"> <table class="stattable"> <tbody> @@ -69,7 +70,10 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ </div> <div class="col-md-6 mt-3 mb-3 updatenews"> <div class="card"> - <div class="card-header"><a href="javascript:CopySystemInfo(`Dede:<?php echo $cfg_version_detail;?>|操作系统:<?php echo PHP_OS; ?>|Web服务器:<?php echo $_SERVER['SERVER_SOFTWARE']; ?>|PHP版本:<?php echo @phpversion(); ?>|数据库版本:<?php echo $dsql->GetVersion(); ?>`);"><i class="fa fa-gear"></i></a> 系统信息</div> + <div class="card-header"> + <a href="javascript:copyFn()"><i class="fa fa-gear"></i> 系统信息</a> + <span id="text">Dede:<?php echo $cfg_version_detail; ?>|操作系统:<?php echo PHP_OS; ?>|Web服务器:<?php echo $_SERVER['SERVER_SOFTWARE']; ?>|PHP版本:<?php echo @phpversion(); ?>|数据库版本:<?php echo $dsql->GetVersion(); ?></span> + </div> <div class="card-body"> <div id="updateinfos"> <?php echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' style='width:98%;height:70px;padding:.6rem'></iframe>"; ?> @@ -133,41 +137,5 @@ table.stattable td{padding:.6rem;border-bottom:1px solid #dee2e6;text-align:righ </div> </div> </div> - <div class="footer mt-2"> - <div id="loaddiv" style="display:none"> - <p align="center"><img src="../static/web/img/loadinglit.gif">请稍后,正在下载更新文件列表</p> - </div> - <div id="editTab"><span id="editTabBody">请稍候,正在载入</span></div> - <div id="addTab"> - <form name="addform" action="index_body.php"> - <input type="hidden" name="dopost" value="addnew"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td height="30" colspan="3" background="../static/web/img/tbg.gif"> - <div style="float:left;margin-left:10px">增加快捷操作项</div> - <div style="float:right;padding:2px 10px 0 0"> - <a href="javascript:CloseTab('addTab')"><img src="../static/web/img/close.gif"></a> - </div> - </td> - </tr> - <tr> - <td colspan="2" style="height:10px;border-top:1px solid #8DA659"></td> - </tr> - <tr> - <td width="22%" height="26" align="right">链接标题:</td> - <td width="78%"><input name="title" type="text" class="pubinputs" style="margin-bottom:10px;width:260px"></td> - </tr> - <tr> - <td width="22%" height="26" align="right">链接网址:</td> - <td width="78%"><input name="link" type="text" class="pubinputs" style="width:260px"></td> - </tr> - <tr> - <td height="36"></td> - <td><input type="submit" name="Submit" value="保存项目" class="np coolbg"></td> - </tr> - </table> - </form> - </div> - </div> </body> </html> \ No newline at end of file diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index e1c5c9c6..af648ef8 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -47,7 +47,7 @@ <table width="96%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless"> <tr> <td width="20%" height="18" style="padding-left:10px">管理系统日志</td> - <td width="80%" align="right"> </td> + <td width="80%" align="right"></td> </tr> </table> </td> diff --git a/src/admin/templets/makehtml_archives.htm b/src/admin/templets/makehtml_archives.htm index c3a2d4b5..6faeece4 100644 --- a/src/admin/templets/makehtml_archives.htm +++ b/src/admin/templets/makehtml_archives.htm @@ -47,7 +47,7 @@ <tr> <td height="26" valign="top" bgcolor="#FFFFFF">结束ID:</td> <td height="26" valign="top" bgcolor="#FFFFFF"><input name="endid" type="text" id="endid" size="10"> - (空或0表示直到结束ID) </td> + (空或0表示直到结束ID)</td> </tr> <tr> <td height="26" bgcolor="#FFFFFF">每页生成:</td> diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index b9401a7a..c056aec3 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -34,8 +34,8 @@ </td> </tr> <tr> - <td width="177" valign="top" bgcolor="#FFFFFF">选择首页模板:</td> - <td width="791" valign="top" bgcolor="#FFFFFF"> + <td width="180" valign="top" bgcolor="#FFFFFF">选择首页模板:</td> + <td width="800" valign="top" bgcolor="#FFFFFF"> <input name="templet" type="text" id="templet" style="width:300px" value="<?php echo $row['templet']?>"> <button class="btn btn-success btn-sm" type="button" name="set4" value="" onClick="SelectTemplets('form1.templet');">浏览</button> </td> diff --git a/src/admin/templets/makehtml_spec.htm b/src/admin/templets/makehtml_spec.htm index e554f917..33edfb3e 100644 --- a/src/admin/templets/makehtml_spec.htm +++ b/src/admin/templets/makehtml_spec.htm @@ -16,7 +16,7 @@ <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless"> <tr> <td width="30%" height="18" style="padding-left:10px">更新专题</td> - <td width="70%" align="right"> </td> + <td width="70%" align="right"></td> </tr> </table> </td> diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm index 7eb8e748..fd772e49 100644 --- a/src/admin/templets/media_add.htm +++ b/src/admin/templets/media_add.htm @@ -57,7 +57,7 @@ </td> </tr> <tr> - <td height="19" bgcolor="#ffffff"><img src="../static/web/img/help.gif">提示:图片类型仅支持jpg、png、gif、wbmp格式,flash为.swf格式,视音频和附件为限定扩展名的类型(可在系统参数中修改)</td> + <td height="20" bgcolor="#ffffff"><img src="../static/web/img/help.gif">提示:图片类型仅支持jpg、png、gif、wbmp格式,flash为.swf格式,视音频和附件为限定扩展名的类型(可在系统参数中修改)</td> </tr> <tr> <td height="69" align="center" valign="top" bgcolor="#FFFFFF"> diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm index 469c4112..ef74d936 100644 --- a/src/admin/templets/media_edit.htm +++ b/src/admin/templets/media_edit.htm @@ -30,7 +30,7 @@ <table width="99%" align="center" border="0" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background='../static/web/img/tbg.gif'> + <td height="20" background='../static/web/img/tbg.gif'> <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless"> <tr> <td width="2%" align="center" valign="middle"><img src="../static/web/img/item_tt2.gif"></td> @@ -41,7 +41,7 @@ </td> </tr> <tr> - <td height="19" bgcolor="#ffffff"> + <td height="20" bgcolor="#ffffff"> <div class="alert alert-info" role="alert"> <i class="fa fa-info-circle" aria-hidden="true"></i> 提示:图片类型仅支持jpg、png、gif、wbmp格式,flash为.swf格式,视音频和附件为限定扩展名的类型(可在系统参数中修改) </div> diff --git a/src/admin/templets/member_rank.htm b/src/admin/templets/member_rank.htm index 9d905573..8d7052ab 100644 --- a/src/admin/templets/member_rank.htm +++ b/src/admin/templets/member_rank.htm @@ -34,10 +34,8 @@ <tr align="center" bgcolor="#FFFFFF" height="26"> <td><input type="hidden" name="ID_<?php echo $k?>" value="<?php echo $row->id; ?>"><input - name="name_<?php echo $k?>" value="<?php echo $row->membername; ?>" type="text" id="name_<?php echo $k?>" - class='autoinput alltxt' /></td> - <td><input name="rank_<?php echo $k?>" value="<?php echo $row->rank; ?>" type="text" id="rank_<?php echo $k?>" - class='autoinput alltxt' /></td> + name="name_<?php echo $k?>" value="<?php echo $row->membername; ?>" type="text" id="name_<?php echo $k?>" class='autoinput alltxt' /></td> + <td><input name="rank_<?php echo $k?>" value="<?php echo $row->rank; ?>" type="text" id="rank_<?php echo $k?>" class='autoinput alltxt' /></td> <td><input name="money_<?php echo $k?>" value="<?php echo $row->money; ?>" type="text" id="money_<?php echo $k?>" class='autoinput alltxt' /></td> <td><input name="scores_<?php echo $k?>" value="<?php echo $row->scores; ?>" type="text" id="scores_<?php echo $k?>" class='autoinput alltxt' /></td> <td align="center"> diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index c4d5e5bb..9e4ba54a 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -28,7 +28,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href='<?php echo $ENV_GOBACK_URL; ?>'>会员管理</a> > 提升为管理员</td> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href='<?php echo $ENV_GOBACK_URL; ?>'>会员管理</a> > 提升为管理员</td> </tr> <tr> <td height="200" bgcolor="#FFFFFF" align='center'><?php @@ -63,7 +63,7 @@ <tr> <td height="30" align="right">用户密码:</td> <td align="left"><input name="pwd" type="text" id="pwd" size="16" style="width:200px"> - (留空则不修改,只能用'0-9a-zA-Z.@_-!'以内范围的字符) </td> + (留空则不修改,只能用'0-9a-zA-Z.@_-!'以内范围的字符)</td> </tr> <tr> <td height="30" align="right">用户类型:</td> diff --git a/src/admin/templets/member_type.htm b/src/admin/templets/member_type.htm index d1d71760..be5ec90f 100644 --- a/src/admin/templets/member_type.htm +++ b/src/admin/templets/member_type.htm @@ -56,7 +56,7 @@ </td> <td> <input name="money_<?php echo $k?>" value="<?php echo $row->money?>" type="text" id="money_<?php echo $k?>" style="width:80%" class='pubinputs' /> - (元) + (元) </td> <td> <select name='exptime_<?php echo $k?>' id='exptime_<?php echo $k?>' style='width:90%'> @@ -96,7 +96,7 @@ </td> <td valign="top"> <input name="money_new" type="text" id="money_new" style='width:80%' value="100" class='pubinputs' /> - (元) + (元) </td> <td valign="top"> <select name='exptime_new' id='exptime_new' style='width:90%'> diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index feabc8a7..8d447a45 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -31,7 +31,7 @@ function checkSubmit() <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href='<?php echo $ENV_GOBACK_URL; ?>'>会员管理</a> > 查看会员</td> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href='<?php echo $ENV_GOBACK_URL; ?>'>会员管理</a> > 查看会员</td> </tr> <tr> <td height="200" bgcolor="#FFFFFF" align='center'> @@ -143,7 +143,7 @@ function checkSubmit() <tr> <td align="right" class='bline'>会员天数:</td> <td class='bline' style="text-align:left"><input type="text" style="width: 200px;" value="<?php echo $row['exptime']?>" id="exptime" name="exptime"> - (如果您要升级会员,会员天数必须大于0) </td> + (如果您要升级会员,会员天数必须大于0)</td> </tr> <?php if($mhasDay!=0){ $mhasDay=($mhasDay>0)? $mhasDay : '<span style="color:#dc3545">该会员已经到期</span>'; ?> <tr> diff --git a/src/admin/templets/module_edit.htm b/src/admin/templets/module_edit.htm index 359b5cf4..0c614ab6 100644 --- a/src/admin/templets/module_edit.htm +++ b/src/admin/templets/module_edit.htm @@ -132,7 +132,7 @@ td{padding-left:8px} </td> </tr> <tr> - <td align="center" bgcolor="#FFFFFF">安装程序:</td> + <td align="center" bgcolor="#FFFFFF">程序安装:</td> <td bgcolor="#FFFFFF"> <label><input type="checkbox" name="autosetup" id="autosetup" value='1' class="np" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')"<?php if(isset($autosetup) && $autosetup==1) echo " checked='1'"; ?> /> 自动生成(由系统自动处理安装)</label> diff --git a/src/admin/templets/module_help.htm b/src/admin/templets/module_help.htm index da304fd5..619a8df9 100644 --- a/src/admin/templets/module_help.htm +++ b/src/admin/templets/module_help.htm @@ -37,8 +37,7 @@ </div> <table width="96%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"> <tr> - <td width="100%" height="26"> <a href="plus_main.php">模块管理</a> - > DedeBIZ模块开发指南:</td> + <td width="100%" height="26"> <a href="plus_main.php">模块管理</a> > DedeBIZ模块开发指南</td> </tr> <tr> <td bgcolor="#FFFFFF"> @@ -53,7 +52,7 @@ <td><a href="#2">2、如何对我开发的模块进行打包</a></td> </tr> <tr> - <td><a href="#3">3、开发模块安装程序和卸载的注意事项</a></td> + <td><a href="#3">3、开发模块程序安装和卸载的注意事项</a></td> </tr> <tr> <td><a href="#4">4、DedeBIZV6的后台管理程序的开发注意事项</a></td> @@ -61,11 +60,9 @@ </table> </td> </tr> - <tr> <td bgcolor="#FFFFFF">1、Dede模块开发介绍<a name="1" id="1"></a></td> </tr> - <tr> <td height="100" bgcolor="#FFFFFF"></td> </tr> @@ -76,7 +73,7 @@ <td height="100" bgcolor="#FFFFFF"></td> </tr> <tr> - <td bgcolor="#FFFFFF">3、开发模块安装程序和卸载程序的注意事项<a name="3" id="3"></a></td> + <td bgcolor="#FFFFFF">3、开发模块程序安装和卸载程序的注意事项<a name="3" id="3"></a></td> </tr> <tr> <td height="100" bgcolor="#FFFFFF"></td> @@ -84,7 +81,6 @@ <tr> <td bgcolor="#FFFFFF">4、DedeBIZ的后台管理程序的开发注意事项<a name="4" id="4"></a></td> </tr> - <tr> <td height="100" bgcolor="#FFFFFF"></td> </tr> diff --git a/src/admin/templets/module_make.htm b/src/admin/templets/module_make.htm index c1d2c68d..89b7d8f6 100644 --- a/src/admin/templets/module_make.htm +++ b/src/admin/templets/module_make.htm @@ -60,8 +60,7 @@ <tr> <td align="center" bgcolor="#FFFFFF">封装类型:</td> <td bgcolor="#FFFFFF"> - <label><input name="moduletype" type="radio" id="moduletype1" class='np' value='soft' checked='1' /> - 模块</label> + <label><input name="moduletype" type="radio" id="moduletype1" class='np' value='soft' checked='1' /> 模块</label> <label><input name="moduletype" type="radio" id="moduletype2" class='np' value='templets' /> 模板</label> <label><input name="moduletype" type="radio" id="moduletype3" class='np' value='plus' /> 小插件</label> <label><input name="moduletype" type="radio" id="moduletype3" class='np' value='patch' /> 补丁</label> @@ -76,17 +75,14 @@ <tr> <td align="center" bgcolor="#FFFFFF">发布时间:</td> <td bgcolor="#FFFFFF"> - <input name="mtime" type="text" id="mtime" style="width:180px" value="<?php echo GetDateMk(time()); ?>" - class='alltxt' /> </td> + <input name="mtime" type="text" id="mtime" style="width:180px" value="<?php echo GetDateMk(time()); ?>" class='alltxt' /> </td> </tr> <tr> <td align="center" bgcolor="#FFFFFF">是否涉及会员系统:</td> <td bgcolor="#FFFFFF"> - <label><input name="ismember" type="radio" class='np' id="ismember0" value="0" - onclick="ShowHideMb('ismember0','rboxct')" checked="checked"> + <label><input name="ismember" type="radio" class='np' id="ismember0" value="0" onclick="ShowHideMb('ismember0','rboxct')" checked="checked"> 不涉及</label> - <label><input name="ismember" type="radio" id="ismember1" value="1" onclick="ShowHideMb('ismember0','rboxct')" - class='np' /> 涉及</label> + <label><input name="ismember" type="radio" id="ismember1" value="1" onclick="ShowHideMb('ismember0','rboxct')" class='np' /> 涉及</label> <div id='rboxct' style='display:none'> 导航使用名称: <input name="indexname" type="text" id="indexname" style="width:180px" value=""> @@ -109,8 +105,7 @@ <tr> <td align="center" bgcolor="#FFFFFF">使用说明文件:</td> <td bgcolor="#FFFFFF"> - <label><input type="checkbox" name="autoreadme" value='1' id="autoreadme" class="np" - onclick="ShowHideField('autoreadme','autoreadmeinput','autoreadmect')"> + <label><input type="checkbox" name="autoreadme" value='1' id="autoreadme" class="np" onclick="ShowHideField('autoreadme','autoreadmeinput','autoreadmect')"> 直接填写</label> <br> <div style='display:block' id='autoreadmeinput'> @@ -134,10 +129,9 @@ </td> </tr> <tr> - <td align="center" bgcolor="#FFFFFF">安装程序:</td> + <td align="center" bgcolor="#FFFFFF">程序安装:</td> <td bgcolor="#FFFFFF"> - <label><input type="checkbox" name="autosetup" value='1' id="autosetup" class="np" - onclick="ShowHideField('autosetup','autosetupinput','autosetupct')"> + <label><input type="checkbox" name="autosetup" value='1' id="autosetup" class="np" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')"> 自动生成(由系统自动处理安装)</label> <br> <div style='display:block' id='autosetupinput'> @@ -162,15 +156,13 @@ </tr> </table> </div> - </td> </tr> <tr> <td align="center" bgcolor="#FFFFFF">删除程序:</td> <td bgcolor="#FFFFFF"> - <label><input type="checkbox" name="autodel" value='1' id="autodel" class="np" - onclick="ShowHideField('autodel','autodelinput','autodelct')"> - 自动生成(由系统自动处理卸载)</label> + <label><input type="checkbox" name="autodel" value='1' id="autodel" class="np" onclick="ShowHideField('autodel','autodelinput','autodelct')"> + 自动生成(由系统自动处理卸载)</label> <br> <div style='display:block' id='autodelinput'> <input name="uninstall" type="file" id="uninstall" style="width:350px"> @@ -181,7 +173,7 @@ <td width="75%" bgcolor="#F3FDE1"> 卸载时执行的SQL语句: <br> - (SQL允许换行,但必须用 ";换行" 表示一条SQL语句结束) + (SQL允许换行,但必须用 ";换行" 表示一条SQL语句结束) </td> </tr> <tr> diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index a54846e9..4039a112 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -112,7 +112,7 @@ <span class="STYLE2">发布内容时显示的提示文字</span></td> <td bgcolor="#FFFFFF"> <input name="itemname" type="text" id="itemname" value="<?php echo $ctag->GetAtt('itemname')?>" class="pubinputs"> - *(发布内容时显示的项名字) </td> + *(发布内容时显示的项名字)</td> </tr> <tr> <td width="28%" bgcolor="#FFFFFF">字段名称:<br> diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index 98c84235..5b310de1 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -56,7 +56,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> > 增加新标记</td> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> > 增加新标记</td> </tr> <tr> <td height="200" bgcolor="#FFFFFF" valign="top"> diff --git a/src/admin/templets/mytag_edit.htm b/src/admin/templets/mytag_edit.htm index a7740f4b..e53f5e4a 100644 --- a/src/admin/templets/mytag_edit.htm +++ b/src/admin/templets/mytag_edit.htm @@ -8,7 +8,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> > 修改标记</td> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="mytag_main.php">自定义标记管理</a> > 修改标记</td> </tr> <tr> <td height="200" bgcolor="#FFFFFF" valign="top"> diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm index 56ca8aa6..25581c98 100644 --- a/src/admin/templets/mytag_tag_guide.htm +++ b/src/admin/templets/mytag_tag_guide.htm @@ -131,7 +131,7 @@ <label><input name="types[]" type="checkbox" id="type[]" value="spec" class="np"> 专题</label> 关键词: <input name="keyword" type="text" id="keyword"> - (","逗号分开) </td> + (","逗号分开)</td> </tr> <tr> <td height="26">排列顺序: diff --git a/src/admin/templets/shops_operations_cart.htm b/src/admin/templets/shops_operations_cart.htm index 61685441..492ae36f 100644 --- a/src/admin/templets/shops_operations_cart.htm +++ b/src/admin/templets/shops_operations_cart.htm @@ -13,59 +13,59 @@ </tr> {dede:datalist} <tr> - <td width="29%" height="26" align="right" bgcolor="#FFFFFF">订单号:</td> + <td width="29%" height="26" align="right" bgcolor="#FFFFFF">订单号:</td> <td width="71%" bgcolor="#FFFFFF"> {dede:field.oid/}</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">商品名称:</td> + <td height="26" align="right" bgcolor="#FFFFFF">商品名称:</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.title/}</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">单价(元/单位):</td> + <td height="26" align="right" bgcolor="#FFFFFF">单价(元/单位):</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.uprice/}</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">数量:</td> + <td height="26" align="right" bgcolor="#FFFFFF">数量:</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.cartcount/}</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">支付方式:</td> + <td height="26" align="right" bgcolor="#FFFFFF">支付方式:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo GetSta($fields['state'],$oid)?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">配送:</td> + <td height="26" align="right" bgcolor="#FFFFFF">配送:</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.dname/} 费用:{dede:field.dprice/}元</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">购买时间:</td> + <td height="26" align="right" bgcolor="#FFFFFF">购买时间:</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.stime function=GetDateTimeMk(@me)/}</td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">收货人:</td> + <td height="26" align="right" bgcolor="#FFFFFF">收货人:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['consignee']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">地址:</td> + <td height="26" align="right" bgcolor="#FFFFFF">地址:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['address']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">邮编:</td> + <td height="26" align="right" bgcolor="#FFFFFF">邮编:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['zip']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">联系电话:</td> + <td height="26" align="right" bgcolor="#FFFFFF">联系电话:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['tel']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">邮箱:</td> + <td height="26" align="right" bgcolor="#FFFFFF">邮箱:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['email']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">留言:</td> + <td height="26" align="right" bgcolor="#FFFFFF">留言:</td> <td height="26" bgcolor="#FFFFFF"> <?php echo $row['des']?></td> </tr> <tr> - <td height="26" align="right" bgcolor="#FFFFFF">合计(元):</td> + <td height="26" align="right" bgcolor="#FFFFFF">合计(元):</td> <td height="26" bgcolor="#FFFFFF"> {dede:field.priceCount/}元</td> </tr> {/dede:datalist} diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index 1760f79f..693ddc90 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -11,7 +11,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="2" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="26" colspan="5" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="26" colspan="5" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> <td width="24%" style="padding-left:10px">管理员帐号 </td> diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index b38afa28..004210e5 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -33,10 +33,10 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="20" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> - <td width="24%" style="padding-left:10px">新增帐号 </td> + <td width="24%" style="padding-left:10px">新增帐号</td> <td width="76%" align="right"><a href="sys_admin_user.php" class="btn btn-success btn-sm">管理帐号</a></td> </tr> </table> diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index a1827233..f21cfc10 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -10,7 +10,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="20" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> <td width="24%" style="padding-left:10px">修改帐号 </td> diff --git a/src/admin/templets/sys_admin_user_tj.htm b/src/admin/templets/sys_admin_user_tj.htm index bbbebfdc..eb2642f7 100644 --- a/src/admin/templets/sys_admin_user_tj.htm +++ b/src/admin/templets/sys_admin_user_tj.htm @@ -39,7 +39,7 @@ </div> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="26" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="26" background="../static/web/img/tbg.gif"> <a href="sys_admin_user.php" style="padding-left:10px">管理员帐号</a> > 编辑绩效统计 </td> </tr> diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm index d1bac17c..5ab9e13e 100644 --- a/src/admin/templets/sys_cache_up.htm +++ b/src/admin/templets/sys_cache_up.htm @@ -16,7 +16,7 @@ <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless"> <tr> <td width="30%" height="18" style="padding-left:10px">更新系统缓存</td> - <td width="70%" align="right"> </td> + <td width="70%" align="right"></td> </tr> </table> </td> diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm index 5fae7c99..678948d7 100644 --- a/src/admin/templets/sys_data.htm +++ b/src/admin/templets/sys_data.htm @@ -92,7 +92,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="99%" align="center" border="0" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" colspan="8" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="20" colspan="8" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> <td width="24%" style="padding-left:10px">数据库管理</td> diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index b8f299e2..30900060 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -128,7 +128,7 @@ <input type="text" name="validate" class="alltxt" style="width:80px;text-transform: uppercase"> </td> <td> - <img src='../apps/vdimgck.php' style="cursor:pointer;" onClick="this.src='../apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"/> + <img src='../apps/vdimgck.php' style="cursor:pointer" onClick="this.src='../apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"/> </td> </tr> </table> diff --git a/src/admin/templets/sys_data_revert.htm b/src/admin/templets/sys_data_revert.htm index 350bfb06..f43ef3f3 100644 --- a/src/admin/templets/sys_data_revert.htm +++ b/src/admin/templets/sys_data_revert.htm @@ -56,7 +56,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="99%" border="0" cellpadding="3" cellspacing="1" align="center" class="table maintable table-bordered mt-3"> <tr> - <td height="19" colspan="4" background="../static/web/img/tbg.gif" bgcolor="#E7E7E7"> + <td height="20" colspan="4" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> <td width="24%">数据还原</td> diff --git a/src/admin/templets/sys_group_add.htm b/src/admin/templets/sys_group_add.htm index 36d52d90..b5a72022 100644 --- a/src/admin/templets/sys_group_add.htm +++ b/src/admin/templets/sys_group_add.htm @@ -32,7 +32,7 @@ $dsql->Execute(); while($row = $dsql->GetObject()) echo '<span style='color:#e74d58'>'.$row->rank.'</span>、'; ?> - ,级别值必须小于10,超过或等于10所有权限设置将无效(超级管理员),如果10个组不能完全满足您的要求,允许使用小数) </td> + ,级别值必须小于10,超过或等于10所有权限设置将无效(超级管理员),如果10个组不能完全满足您的要求,允许使用小数)</td> </tr> <?php $start = 0; @@ -44,12 +44,12 @@ if($line=="") continue; if(preg_match("#^>>#", $line)) { - if($start>0) echo " </td></tr>\r\n"; + if($start>0) echo "</td></tr>\r\n"; $start++; $lhead = " <tr> - <td height='26' colspan='2' bgcolor='#F9FAF3' style='text-align:left; line-height: 22px;'>{$start}、".str_replace('>>','',$line)."</td></tr> - <tr><td height='26' colspan='2' style='text-align:left; line-height: 22px;'> + <td height='26' colspan='2' bgcolor='#F9FAF3' style='text-align:left;line-height:22px'>{$start}、".str_replace('>>','',$line)."</td></tr> + <tr><td height='26' colspan='2' style='text-align:left;line-height:22px'> "; echo $lhead; } diff --git a/src/admin/templets/sys_info_pay.htm b/src/admin/templets/sys_info_pay.htm index 9f8e4283..ef119153 100644 --- a/src/admin/templets/sys_info_pay.htm +++ b/src/admin/templets/sys_info_pay.htm @@ -99,7 +99,7 @@ foreach($payment_arr as $value){ <div style="padding:6px; line-height:24px;"> <?php foreach($cfg_pay_info['name'] as $k => $val) { ?> <li style="float:left; width:180px;"> -<input name="payment_select[<?php echo $k; ?>]" type="checkbox" value="<?php echo $cfg_pay_info['type'][$k]; ?>" Onclick="if(this.checked == true) ShowReg(<?php echo $k; ?>);" <?php if(in_array($cfg_pay_info['type'][$k],$payment_select)) echo 'checked'; ?>> <span onClick="ShowReg(<?php echo $k; ?>);" style="cursor:pointer;"><?php echo $val; ?></span> +<input name="payment_select[<?php echo $k; ?>]" type="checkbox" value="<?php echo $cfg_pay_info['type'][$k]; ?>" Onclick="if(this.checked == true) ShowReg(<?php echo $k; ?>);" <?php if(in_array($cfg_pay_info['type'][$k],$payment_select)) echo 'checked'; ?>> <span onClick="ShowReg(<?php echo $k; ?>);" style="cursor:pointer"><?php echo $val; ?></span> </li> <?php }?> </div> diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm index 537447a5..1017cd32 100644 --- a/src/admin/templets/sys_sql_query.htm +++ b/src/admin/templets/sys_sql_query.htm @@ -13,7 +13,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif"> + <td height="20" background="../static/web/img/tbg.gif"> <table width="96%" border="0" cellspacing="1" cellpadding="1" class="table table-borderless"> <tr> <td width="24%" style="padding-left:10px">SQL命令运行器</td> diff --git a/src/admin/templets/templets_one.htm b/src/admin/templets/templets_one.htm index 9f36d33a..5635f8a1 100644 --- a/src/admin/templets/templets_one.htm +++ b/src/admin/templets/templets_one.htm @@ -27,8 +27,7 @@ <form action='templets_one.php' name='sss'> <ul> <li>关键词:</li> - <li><input type='text' name='keyword' value="<?php if(!empty($keyword)) $keyword = ''; ?>" - style='width:160px' /></li> + <li><input type='text' name='keyword' value="<?php if(!empty($keyword)) $keyword = ''; ?>" style='width:160px' /></li> <li>标识:</li> <li><?php $likeid = (!isset($likeid) ? '' : $likeid); diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index 3e9d657d..b99c5ea5 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -27,7 +27,7 @@ <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"> <a href="templets_one.php">单独页面管理</a> > 增加新页面 </td> </tr> diff --git a/src/admin/templets/templets_one_edit.htm b/src/admin/templets/templets_one_edit.htm index 699553a4..b0e1a280 100644 --- a/src/admin/templets/templets_one_edit.htm +++ b/src/admin/templets/templets_one_edit.htm @@ -30,7 +30,7 @@ function checkSubmit() <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable table-bordered mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif" style="padding-left:10px"> + <td height="20" background="../static/web/img/tbg.gif" style="padding-left:10px"> <a href="templets_one.php">单独页面管理</a> > 更新页面 </td> </tr> diff --git a/src/admin/templets/vote_getcode.htm b/src/admin/templets/vote_getcode.htm index 6cd4962f..3d8ee54b 100644 --- a/src/admin/templets/vote_getcode.htm +++ b/src/admin/templets/vote_getcode.htm @@ -10,7 +10,7 @@ <body background="../static/web/img/allbg.gif" leftmargin="8" topmargin="8"> <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3"> <tr> - <td height="19" background="../static/web/img/tbg.gif"><a href="vote_main.php">投票管理</a> > 获取代码 + <td height="20" background="../static/web/img/tbg.gif"><a href="vote_main.php">投票管理</a> > 获取代码 </td> </tr> <tr> diff --git a/src/install/index.php b/src/install/index.php index e176551c..70363054 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -266,7 +266,7 @@ else if($step==2) $adminquery = "INSERT INTO `{$dbprefix}member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`) VALUES('1','10','0','{$adminuser}的空间','','person','',''); "; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); - //锁定安装程序 + //锁定程序安装 $fp = fopen(INSLOCKFILE,'w'); fwrite($fp,'ok'); fclose($fp); diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html index 712c7518..e5e2e836 100755 --- a/src/install/templates/step-1.html +++ b/src/install/templates/step-1.html @@ -2,18 +2,18 @@ <html> <head> <meta charset="<?php echo $cfg_soft_lang; ?>"> - <title>DedeCMSV6安装程序</title> + <title>DedeCMSV6程序安装</title> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css"> <script src="../static/web/js/jquery.min.js"></script> <script src="../static/web/js/popper.min.js"></script> <script src="../static/web/js/bootstrap.bundle.min.js"></script> <script src="../static/web/js/style.js"></script> - <style>body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#343a40;background:#f6f6f6}input,select,.btn{font-size:14px!important}@media (min-width:1170px){.container{max-width:950px}}</style> + <style>body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#343a40;background:#f6f6f6}input,select,.btn{font-size:14px!important}@media (min-width:1170px){.container{max-width:960px}}</style> </head> <body> <div class="d-flex flex-column flex-md-row align-items-center mb-3 p-3 px-md-5 bg-white border-bottom shadow-sm"> - <h5 class="my-0 mr-md-auto text-success">安装程序</h5> + <h5 class="my-0 mr-md-auto text-success">程序安装</h5> <nav class="my-md-0 mr-md-3"> <a class="p-2 text-dark" href="https://www.dedebiz.com/git" target="_blank">代码托管</a> <a class="p-2 text-dark" href="https://www.dedebiz.com/help" target="_blank">帮助中心</a> @@ -32,7 +32,7 @@ ?> <div class="card mb-4 shadow-sm"> <div class="card-header bg-success text-white"> - <h5 class="my-0 fw-normal text-center">首次运行安装程序DedeCMSV<?php echo $cfg_version_detail;?></h5> + <h5 class="my-0 fw-normal text-center">首次运行程序安装DedeCMSV<?php echo $cfg_version_detail;?></h5> </div> <div class="card-body"> <form action="index.php" method="post" name="form1"> diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index ea72e86d..4178d6d9 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -1 +1 @@ -.flink,.flink a,.copyright,.copyright a{color:white}.copyright{background-color:#12451F;padding:.5em}form.search{display:flex;width:100%}ul.spec > li > a > img,.article-spec > a > img{width:120px}ul.spec .border-bottom-dashed{border-bottom:dashed 1px #929292}ul.spec > li .title a{color:#212529}ul.spec > li .title h4{display:inline}ul.spec > li .title .label{background-color:#B7E9B4;color:#008E38;padding:0 5px;border-radius:3px}ul.spec > li .description,ul.spec > li .description a{color:#868686;font-size:16px;line-height:24px;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden}ul.items > li .type{background-color:#008E38;color:white;font-size:14px;height:18px;line-height:18px;position:relative;padding:0 5px;top:-3px;margin-right:10px}ul.items > li .pane{background-color:#008E38;width:10px;height:10px;display:inline-block;vertical-align:middle;margin-right:10px;margin-bottom:10px}ul.items > li .caption{line-height:32px}ul.items > li .title,ul.items > li .caption a{display:inline;line-height:18px;color:#212529}ul.items > li .description,ul.items > li .description a,ul.items > li .addinfo{color:#868686;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden;line-height:26px;word-break:break-all}ul.items > li .addinfo{font-size:14px}ul.items .border-bottom-dashed{border-bottom:dashed 1px #929292}ul.items img{max-width:100px}ul.items > li .label{border:1px solid #FF8400;color:#FF8400;height:24px;border-radius:3px;font-size:12px;line-height:24px;margin-left:5px;padding:0 5px}ul.items > li .label:hover{border:1px solid #FF8400;color:white;text-decoration-line:none;background-color:#FF8400;height:24px;border-radius:3px;font-size:12px;line-height:24px;margin-left:5px;padding:0 5px}ul.items > li .source{font-size:14px}.list-group-dede{text-align:center;font-size:16px}.dropdown-dede .dropdown-menu{width:100%;text-align:center}.dropdown-dede .dropdown-menu>.dropdown-item.active{background-color:white;color:#FF8400}.dropdown-dede,.dropdown-dede a{width:100%}.dropdown-dede,.dropdown-item{padding:.25rem 1.5rem;text-align:left;border-bottom:1px dashed #D7D7D7}.dropdown-dede,.dropdown-item:last-child{border-bottom:none}.list-group-dede .list-group-item.active{z-index:2;color:#ff8400;background-color:white}.list-group-dede{border:1px solid #96D6A8;border-radius:10px}.list-group-dede .list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:none;font-weight:600;border-bottom:1px dashed #D7D7D7}.list-group-dede .list-group-item.active{border:none;border-bottom:1px dashed #D7D7D7}.list-group-dede .list-group-item+.list-group-item.active{margin-top:0px}.list-group-dede .list-group-item:last-child{border-bottom:none}.ddcard,.ddcard-normal{border:none}.ddcard-normal{box-shadow:1px 0px 5px 5px #f6f6f6;padding:.25em}.ddcard-normal ul{padding:.5em}.ddcard > .card-header{background-color:white;padding:0;border-bottom:solid 5px #008E38}.ddcard-normal > .card-header{background-color:white;padding:0;border-bottom:none}.ddcard-normal > .card-header .caption{font-size:18px;font-weight:600}.ddcard-normal > .card-header .caption a{color:#008E38}.ddcard-normal > .card-header .caption::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}.ddcard > .card-header .caption{font-size:18px}.ddcard > .card-header .caption span{display:inline-block;background:#008E38;padding:5px 15px;color:white;margin-bottom:-3px}.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a{color:#008E38;font-size:14px;line-height:26px}.ddcard > .list-group{margin-left:20px}.ddcard > .list-group .label,.ddcard-normal > .list-group .label{float:right;font-size:14px;padding:3px;color:#12451F;background-color:#B6E9B4;border-radius:3px;margin-left:5px}.ddcard-normal > .list-group .time{color:#C0C0C0}.ddcard-normal > ul > li,.ddcard-normal > ol > li{border-bottom:dashed 1px #CFCFCF;list-style:none}.ddcard-normal > ul > li.media img{width:75px;height:57px}.ddcard-normal > ul > li.media h4{font-size:16px}.ddcard-normal .more{padding-right:1.5em}.ddcard-normal > .list-group > li i{color:#60B983}.ddcard > ul > li,.ddcard > ol > li,.ddcard-normal > ul > li,.ddcard-normal > ol > li{padding:5px 0;color:#C0C0C0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ddcard > ul > li:nth-child(1),.ddcard > ol > li:nth-child(1),.ddcard-normal > ul > li:nth-child(1),.ddcard-normal > ol > li:nth-child(1){margin-top:10px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ddcard > ul > li a,.ddcard > ol > li a,.ddcard-normal > ul > li a,.ddcard-normal > ol > li a{color:#272727}.ddcard > ol > li::before,.ddcard-normal > ol > li::before{background-color:#FF8400;color:white;padding:3px;margin-left:-10px;margin-right:10px;border-radius:3px}.ddcard > ol > li:nth-child(1)::before,.ddcard-normal > ol > li:nth-child(1)::before{content:"1";background-color:#FF8400;color:white;padding:3px 6px;margin-left:0px;margin-right:10px;border-radius:3px;width:6px}.ddcard > ol > li:nth-child(2)::before,.ddcard-normal > ol > li:nth-child(2)::before{content:"2";background-color:#FFB400;color:white;padding:3px 5px;margin-left:0px;margin-right:10px;border-radius:3px}.ddcard > ol > li:nth-child(3)::before,.ddcard-normal > ol > li:nth-child(3)::before{content:"3";background-color:#FFCC00;color:white;padding:3px 5px;margin-left:0px;margin-right:10px;border-radius:3px}h1.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h2.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h3.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h4.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h5.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h3.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}h4.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}h5.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}.nav.dede .nav-link{color:#858585;border:solid 1px #858585}.nav.dede .nav-link.active{color:white;border:solid 1px #FF8400}.nav.dede .nav-link:hover{color:white;background-color:#FF8400;border:solid 1px #FF8400}.nav.dede .nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}nav.navbar.dede{padding:0}nav.navbar.dede .dropdown-item.active,.dropdown-item:active{color:#ff8400;text-decoration:none;background-color:#fff}nav.navbar.dede .navbar-brand{display:none}nav.navbar.dede .nav-item{width:7em;text-align:center;padding:.5em 0}nav.navbar.dede .nav-item.active{background-color:#ff8400}nav.location{padding:.5em;border:solid 1px #B5B5B5;border-radius:10px;display:flex;flex-direction:row}nav.location .caption{display:inline-block;line-height:20px;font-size:18px;font-weight:600;color:#008E38;width:75px;text-align:center;padding:0 5px 0 5px;position:relative}nav.location .dede{padding-inline-start:0px;margin-bottom:0}nav.location .dede li{float:left;list-style-type:none}nav.location .dede li .nav-link{color:#272727}nav.location .dede li.active .nav-link{color:#ff8400}.dede-title > .dede,.dede-title > .dede-box{display:inline-block}.dede-title > .items{display:inline-block}.position .breadcrumb .breadcrumb-item a{color:#008E38}#btnScrollTop{display:none;position:fixed;bottom:20px;right:20px;z-index:99;font-size:18px;border:none;outline:none;background-color:#EC982C;color:white;cursor:pointer;padding:10px 15px;border-radius:10px}#btnScrollTop:hover{background-color:#E77817}.showhide-info .btn-show,.showhide-info .btn-hide{margin:20px auto}.showhide-info.show .box{height:100%}.showhide-info.show .btn-show{display:none}.showhide-info.show .btn-hide{display:block}.showhide-info.hide .box{height:300px;overflow:hidden}.showhide-info.hide .btn-showhide{position:relative;padding-top:20px;padding-bottom:30px}.showhide-info.hide .gradient{position:absolute;top:-79px;left:0;height:80px;width:100%;background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(255,255,255,0)),to(#fff));background-image:-webkit-linear-gradient(top,rgba(255,255,255,0),#fff);background-image:linear-gradient(-180deg,rgba(255,255,255,0),#fff)}.showhide-info.hide .btn-show{display:block}.showhide-info.hide .btn-hide{display:none}.article-main h2{line-height:1.5em}.article-meta small{color:#868686;margin-left:1em}.article-main .body{word-break:break-all}.article-main .body img,.article-main .body video{max-width:100%!important;height:auto !important;visibility:visible !important}.article-main .body table{width:100% !important}.site-nav{font-size:14px}.site-nav .title b{color:#ff8400}.site-nav .user a{color:#008E38}#body-pic img{max-width:40%!important}.image-item img{height:160px}.list-image img{width:130px;max-width:130px!important}.flink{background-color:#008e38!important}.flink,.flink a,.copyright,.copyright a{color:white}@media only screen and (max-width:1199px){.ddcard > .card-header .caption span{font-size:14px}}@media only screen and (max-width:576px){.logo{text-align:center}nav.navbar.dede .nav-item{width:100%}nav.navbar.dede .navbar-brand{display:block;margin-left:10px}.dropdown-dede,.dropdown-item{text-align:center}.ddcard > .card-header .caption span{font-size:16px}}@media only screen and (max-width:768px){nav.navbar.dede .nav-item{width:100%}nav.navbar.dede .navbar-brand{display:block;margin-left:10px}.dropdown-dede,.dropdown-item{text-align:center}.ddcard > .card-header .caption span{font-size:14px}}.digg .comment-container{width:200px;padding:10px 20px;border:1px solid #f6f6f6;border-radius:20px;margin:0 6px;cursor:pointer}.digg .comment-container:hover{background-color:#FFFCE0}.digg .comment-top{display:flex;flex-direction:row;align-items:center;margin-bottom:10px}.digg .comment-top-text{color:#497cf6;margin-left:10px}.digg .comment-top-text-danger{color:#d21d35;margin-left:10px}.digg .text-like{color:#497cf6}.digg .text-unlike{color:#d21d35}.digg .comment-top p{margin-bottom:unset}.prenext .pagination-previous,.pagination-next{font-size:14px;color:#a6a5a6;padding:6px 14px;border-radius:34px;border:1px solid #f0f0f0;cursor:pointer}.prenext .pagination-previous:hover,.pagination-next:hover{color:#c2e5d0;background-color:#1eac5a}.actbox{float:right;padding:10px}.actbox ul{list-style:none}.actbox ul li{float:left;margin-left:10px} \ No newline at end of file +body{line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51}.flink,.flink a,.copyright,.copyright a{color:white}.copyright{background-color:#12451F;padding:.5em}form.search{display:flex;width:100%}ul.spec > li > a > img,.article-spec > a > img{width:120px}ul.spec .border-bottom-dashed{border-bottom:dashed 1px #929292}ul.spec > li .title a{color:#212529}ul.spec > li .title h4{display:inline}ul.spec > li .title .label{background-color:#B7E9B4;color:#008E38;padding:0 5px;border-radius:3px}ul.spec > li .description,ul.spec > li .description a{color:#868686;font-size:16px;line-height:24px;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden}ul.items > li .type{background-color:#008E38;color:white;font-size:14px;height:18px;line-height:18px;position:relative;padding:0 5px;top:-3px;margin-right:10px}ul.items > li .pane{background-color:#008E38;width:10px;height:10px;display:inline-block;vertical-align:middle;margin-right:10px;margin-bottom:10px}ul.items > li .caption{line-height:32px}ul.items > li .title,ul.items > li .caption a{display:inline;line-height:18px;color:#212529}ul.items > li .description,ul.items > li .description a,ul.items > li .addinfo{color:#868686;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden;line-height:26px;word-break:break-all}ul.items > li .addinfo{font-size:14px}ul.items .border-bottom-dashed{border-bottom:dashed 1px #929292}ul.items img{max-width:100px}ul.items > li .label{border:1px solid #FF8400;color:#FF8400;height:24px;border-radius:3px;font-size:12px;line-height:24px;margin-left:5px;padding:0 5px}ul.items > li .label:hover{border:1px solid #FF8400;color:white;text-decoration-line:none;background-color:#FF8400;height:24px;border-radius:3px;font-size:12px;line-height:24px;margin-left:5px;padding:0 5px}ul.items > li .source{font-size:14px}.list-group-dede{text-align:center;font-size:16px}.dropdown-dede .dropdown-menu{width:100%;text-align:center}.dropdown-dede .dropdown-menu>.dropdown-item.active{background-color:white;color:#FF8400}.dropdown-dede,.dropdown-dede a{width:100%}.dropdown-dede,.dropdown-item{padding:.25rem 1.5rem;text-align:left;border-bottom:1px dashed #D7D7D7}.dropdown-dede,.dropdown-item:last-child{border-bottom:none}.list-group-dede .list-group-item.active{z-index:2;color:#ff8400;background-color:white}.list-group-dede{border:1px solid #96D6A8;border-radius:10px}.list-group-dede .list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:none;font-weight:600;border-bottom:1px dashed #D7D7D7}.list-group-dede .list-group-item.active{border:none;border-bottom:1px dashed #D7D7D7}.list-group-dede .list-group-item+.list-group-item.active{margin-top:0px}.list-group-dede .list-group-item:last-child{border-bottom:none}.ddcard,.ddcard-normal{border:none}.ddcard-normal{box-shadow:1px 0px 5px 5px #f6f6f6;padding:.25em}.ddcard-normal ul{padding:.5em}.ddcard > .card-header{background-color:white;padding:0;border-bottom:solid 5px #008E38}.ddcard-normal > .card-header{background-color:white;padding:0;border-bottom:none}.ddcard-normal > .card-header .caption{font-size:18px;font-weight:600}.ddcard-normal > .card-header .caption a{color:#008E38}.ddcard-normal > .card-header .caption::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}.ddcard > .card-header .caption{font-size:18px}.ddcard > .card-header .caption span{display:inline-block;background:#008E38;padding:5px 15px;color:white;margin-bottom:-3px}.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a{color:#008E38;font-size:14px;line-height:26px}.ddcard > .list-group{margin-left:20px}.ddcard > .list-group .label,.ddcard-normal > .list-group .label{float:right;font-size:14px;padding:3px;color:#12451F;background-color:#B6E9B4;border-radius:3px;margin-left:5px}.ddcard-normal > .list-group .time{color:#C0C0C0}.ddcard-normal > ul > li,.ddcard-normal > ol > li{border-bottom:dashed 1px #CFCFCF;list-style:none}.ddcard-normal > ul > li.media img{width:75px;height:57px}.ddcard-normal > ul > li.media h4{font-size:16px}.ddcard-normal .more{padding-right:1.5em}.ddcard-normal > .list-group > li i{color:#60B983}.ddcard > ul > li,.ddcard > ol > li,.ddcard-normal > ul > li,.ddcard-normal > ol > li{padding:5px 0;color:#C0C0C0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ddcard > ul > li:nth-child(1),.ddcard > ol > li:nth-child(1),.ddcard-normal > ul > li:nth-child(1),.ddcard-normal > ol > li:nth-child(1){margin-top:10px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.ddcard > ul > li a,.ddcard > ol > li a,.ddcard-normal > ul > li a,.ddcard-normal > ol > li a{color:#272727}.ddcard > ol > li::before,.ddcard-normal > ol > li::before{background-color:#FF8400;color:white;padding:3px;margin-left:-10px;margin-right:10px;border-radius:3px}.ddcard > ol > li:nth-child(1)::before,.ddcard-normal > ol > li:nth-child(1)::before{content:"1";background-color:#FF8400;color:white;padding:3px 6px;margin-left:0px;margin-right:10px;border-radius:3px;width:6px}.ddcard > ol > li:nth-child(2)::before,.ddcard-normal > ol > li:nth-child(2)::before{content:"2";background-color:#FFB400;color:white;padding:3px 5px;margin-left:0px;margin-right:10px;border-radius:3px}.ddcard > ol > li:nth-child(3)::before,.ddcard-normal > ol > li:nth-child(3)::before{content:"3";background-color:#FFCC00;color:white;padding:3px 5px;margin-left:0px;margin-right:10px;border-radius:3px}h1.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h2.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h3.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h4.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h5.dede::before{content:" ";background-color:#008E38;padding:4px;margin-right:10px}h3.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}h4.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}h5.dede-box::before{content:" ";background-color:#B7E9B4;padding:4px;margin-bottom:4px;margin-right:10px;display:inline-block}.nav.dede .nav-link{color:#858585;border:solid 1px #858585}.nav.dede .nav-link.active{color:white;border:solid 1px #FF8400}.nav.dede .nav-link:hover{color:white;background-color:#FF8400;border:solid 1px #FF8400}.nav.dede .nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}nav.navbar.dede{padding:0}nav.navbar.dede .dropdown-item.active,.dropdown-item:active{color:#ff8400;text-decoration:none;background-color:#fff}nav.navbar.dede .navbar-brand{display:none}nav.navbar.dede .nav-item{width:7em;text-align:center;padding:.5em 0}nav.navbar.dede .nav-item.active{background-color:#ff8400}nav.location{padding:.5em;border:solid 1px #B5B5B5;border-radius:10px;display:flex;flex-direction:row}nav.location .caption{display:inline-block;line-height:20px;font-size:18px;font-weight:600;color:#008E38;width:75px;text-align:center;padding:0 5px 0 5px;position:relative}nav.location .dede{padding-inline-start:0px;margin-bottom:0}nav.location .dede li{float:left;list-style-type:none}nav.location .dede li .nav-link{color:#272727}nav.location .dede li.active .nav-link{color:#ff8400}.dede-title > .dede,.dede-title > .dede-box{display:inline-block}.dede-title > .items{display:inline-block}.position .breadcrumb .breadcrumb-item a{color:#008E38}#btnScrollTop{display:none;position:fixed;bottom:20px;right:20px;z-index:99;font-size:18px;border:none;outline:none;background-color:#EC982C;color:white;cursor:pointer;padding:10px 15px;border-radius:10px}#btnScrollTop:hover{background-color:#E77817}.showhide-info .btn-show,.showhide-info .btn-hide{margin:20px auto}.showhide-info.show .box{height:100%}.showhide-info.show .btn-show{display:none}.showhide-info.show .btn-hide{display:block}.showhide-info.hide .box{height:300px;overflow:hidden}.showhide-info.hide .btn-showhide{position:relative;padding-top:20px;padding-bottom:30px}.showhide-info.hide .gradient{position:absolute;top:-79px;left:0;height:80px;width:100%;background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(255,255,255,0)),to(#fff));background-image:-webkit-linear-gradient(top,rgba(255,255,255,0),#fff);background-image:linear-gradient(-180deg,rgba(255,255,255,0),#fff)}.showhide-info.hide .btn-show{display:block}.showhide-info.hide .btn-hide{display:none}.article-main h2{line-height:1.5em}.article-meta small{color:#868686;margin-left:1em}.article-main .body{word-break:break-all}.article-main .body img,.article-main .body video{max-width:100%!important;height:auto !important;visibility:visible !important}.article-main .body table{width:100% !important}.site-nav{font-size:14px}.site-nav .title b{color:#ff8400}.site-nav .user a{color:#008E38}#body-pic img{max-width:40%!important}.image-item img{height:160px}.list-image img{width:130px;max-width:130px!important}.flink{background-color:#008e38!important}.flink,.flink a,.copyright,.copyright a{color:white}@media only screen and (max-width:1199px){.ddcard > .card-header .caption span{font-size:14px}}@media only screen and (max-width:576px){.logo{text-align:center}nav.navbar.dede .nav-item{width:100%}nav.navbar.dede .navbar-brand{display:block;margin-left:10px}.dropdown-dede,.dropdown-item{text-align:center}.ddcard > .card-header .caption span{font-size:16px}}@media only screen and (max-width:768px){nav.navbar.dede .nav-item{width:100%}nav.navbar.dede .navbar-brand{display:block;margin-left:10px}.dropdown-dede,.dropdown-item{text-align:center}.ddcard > .card-header .caption span{font-size:14px}}.digg .comment-container{width:200px;padding:10px 20px;border:1px solid #f6f6f6;border-radius:20px;margin:0 6px;cursor:pointer}.digg .comment-container:hover{background-color:#FFFCE0}.digg .comment-top{display:flex;flex-direction:row;align-items:center;margin-bottom:10px}.digg .comment-top-text{color:#497cf6;margin-left:10px}.digg .comment-top-text-danger{color:#d21d35;margin-left:10px}.digg .text-like{color:#497cf6}.digg .text-unlike{color:#d21d35}.digg .comment-top p{margin-bottom:unset}.prenext .pagination-previous,.pagination-next{font-size:14px;color:#a6a5a6;padding:6px 14px;border-radius:34px;border:1px solid #f0f0f0;cursor:pointer}.prenext .pagination-previous:hover,.pagination-next:hover{color:#c2e5d0;background-color:#1eac5a}.actbox{float:right;padding:10px}.actbox ul{list-style:none}.actbox ul li{float:left;margin-left:10px} \ No newline at end of file diff --git a/src/system/dedemodule.class.php b/src/system/dedemodule.class.php index 606ef64a..528c65d0 100755 --- a/src/system/dedemodule.class.php +++ b/src/system/dedemodule.class.php @@ -241,7 +241,7 @@ class DedeModule while (!feof($fp)) { $line = fgets($fp, 1024); if (!$start) { - //2011-6-7 修复模块打包程序中上传安装程序生成为空白文件 + //2011-6-7 修复模块打包程序中上传程序安装生成为空白文件 if (preg_match("#<{$ntype}>#i", $line)) $start = TRUE; } else { if (preg_match("#<\/{$ntype}#i", $line)) break; diff --git a/src/theme/plus/carbuyaction.htm b/src/theme/plus/carbuyaction.htm index 5539269f..9dd3b734 100644 --- a/src/theme/plus/carbuyaction.htm +++ b/src/theme/plus/carbuyaction.htm @@ -155,7 +155,7 @@ <td width="180" class="td1">验证码</td> <td><a name="mate_vdimgck" /> <input name="vdcode" id="vdcode" type="text" class="ipt-txt" size="10" - style="text-transform:uppercase;" /> + style="text-transform:uppercase" /> <a href="#mate_vdimgck"><img id="vdimgck_img" src="../apps/vdimgck.php" hspace="6" align="absmiddle" onClick="vdimgck();" title="看不清换一张" /></a> <a href="#mate_vdimgck" onClick="vdimgck();">看不清换一张</a> </td> </tr> diff --git a/src/theme/templets/advancedsearch.htm b/src/theme/templets/advancedsearch.htm index f5d041a1..613f2df4 100644 --- a/src/theme/templets/advancedsearch.htm +++ b/src/theme/templets/advancedsearch.htm @@ -19,12 +19,10 @@ a:hover{ color:#F30; text-decoration:none; } - .cbox{ width:98%; margin:8px auto 0px;; } - .top{ height:60px; background:url(/templets/images/toplogo.gif) 6px center no-repeat; @@ -63,9 +61,6 @@ input,select,textarea{ .lightkeyword{ font-weight:bold; color:#F00; -} -.slist{ - } .slist dl{ display:block; @@ -77,7 +72,6 @@ input,select,textarea{ line-height:27px; font-size:14px; letter-spacing:1px; - /*font-weight:bold;*/ } .slist dl dd p{ line-height:19px; diff --git a/src/theme/templets/article_article.htm b/src/theme/templets/article_article.htm index 0205e685..d7b29927 100644 --- a/src/theme/templets/article_article.htm +++ b/src/theme/templets/article_article.htm @@ -41,22 +41,17 @@ <small>作者:</small>{dede:field.writer/} <small>点击:</small><span id="_count">...</span>次 </div> - <div class="body py-2"> {dede:field.body/} (责任编辑:{dede:adminname/}) </div> <!-- /.body --> - <nav> <ul class="pagination justify-content-center py-3"> {dede:pagebreak/} </ul> </nav> - <div class="clearfix"></div> - {dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/} - <div class="row"> <div class="col-md-4 prenext pt-2"> <div class="pagination-previous">{dede:prenext get='pre'/}</div> @@ -65,45 +60,29 @@ <div class="col-md-8"> <div class="row actbox"> <ul> - <li><i class="fa fa-star-o" aria-hidden="true"></i> <a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" - target="_blank">收藏</a></li> - <li><i class="fa fa-bug" aria-hidden="true"></i> <a - href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a> + <li><i class="fa fa-star-o" aria-hidden="true"></i> <a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li> + <li><i class="fa fa-bug" aria-hidden="true"></i> <a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a> </li> - <li><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <a - href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" - target="_blank">推荐</a></li> - <li><i class="fa fa-print" aria-hidden="true"></i> <a href="#" - onClick="window.print();">打印</a></li> + <li><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li> + <li><i class="fa fa-print" aria-hidden="true"></i> <a href="#" onClick="window.print();">打印</a></li> </ul> </div><!-- /actbox --> </div> </div> - {dede:include comment='文档评论模块' file='widget_article_feedback.htm' /} - </div> <!-- /.article-main --> - <aside class="col-md-4 article-sidebar"> - {dede:include comment='推荐内容' filename="widget_recommend.htm"/} - {dede:include comment='热点内容' filename="widget_hot.htm"/} - {dede:include comment='QR二维码' filename="widget_qrcode.htm"/} - </aside> <!-- /.article-sidebar --> - </div> </main> <!-- /main --> - {dede:include filename="footer.htm"/} <script> - - //页面加载触发 $(document).ready(function () { //获取文档点击数统计 diff --git a/src/theme/templets/list_infos.htm b/src/theme/templets/list_infos.htm index d059fe15..68a91cbe 100644 --- a/src/theme/templets/list_infos.htm +++ b/src/theme/templets/list_infos.htm @@ -16,7 +16,6 @@ color: #008E38; margin-right: 10px; } - .info-search .info-guide { line-height: 32px; } diff --git a/src/theme/templets/widget_article_digg.htm b/src/theme/templets/widget_article_digg.htm index e334ff06..5dd89970 100644 --- a/src/theme/templets/widget_article_digg.htm +++ b/src/theme/templets/widget_article_digg.htm @@ -19,7 +19,6 @@ </div> </div> </div> <!-- ./digg --> - <script> //获取顶踩数据 function GetDigg(aid,cid) { @@ -34,7 +33,6 @@ } }) } - function PostDigg(ftype, aid) { var saveid = GetCookie('diggid'); if (saveid != null) { @@ -70,7 +68,5 @@ } }); } - GetDigg("{dede:field.id/}", "{dede:field.channel/}"); - </script> \ No newline at end of file diff --git a/src/theme/templets/widget_article_feedback.htm b/src/theme/templets/widget_article_feedback.htm index faa1d8de..d6d8d242 100644 --- a/src/theme/templets/widget_article_feedback.htm +++ b/src/theme/templets/widget_article_feedback.htm @@ -16,8 +16,8 @@ <div class="col-md-6 mb-3 areaValidate" style="display: none;"> <label for="iptValidate">验证码</label> <div class="input-group"> - <input type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="{dede:global.cfg_cmspath/}/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onclick="this.src='{dede:global.cfg_cmspath/}/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="{dede:global.cfg_cmspath/}/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='{dede:global.cfg_cmspath/}/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> </div> @@ -34,7 +34,6 @@ <button class="btn btn-success" type="button" onClick='SendFeedback()'>发表评论</button> </div> </div> - <div class="feedbacks"> {dede:feedback} <div class="media"> @@ -67,21 +66,17 @@ border-radius: 50%; border: solid 1px #DDD; } - .feedbacks .media { border-bottom: solid 1px #DDD; padding-top: 10px; } - .feedbacks .feedback_replies .media { border-top: solid 1px #DDD; border-bottom:none; } - .feedbacks .media-body { padding: 0 1em .5em 1em; } - .feedbacks .media-body small{ color: #999; } @@ -92,7 +87,6 @@ color: #F1813F; font-size: 14px; } - .feedbacks ._feedback_reply .alert { margin-bottom: 0; } @@ -128,7 +122,6 @@ } }); } - //进行回复,回复必须登录 function SendReplyFeedback(fid) { let content = $(`._feedback_reply[for="${fid}"]`).find(".iptReplyContent").val(); @@ -149,7 +142,6 @@ }) $(`._feedback_reply[for="${fid}"]`).find(".btnSend").attr("disabled", "disabled"); } - //回复某个评论 function ReplyFeedback(fid) { let replyPannel = `<div class="form-group mt-2"> @@ -173,7 +165,6 @@ $(`._feedback_reply[for="${fid}"]`).html('<i class="fa fa-spinner fa-spin" aria-hidden="true"></i>'); } - //加载回复评论 function LoadReplyFeedbacks(fid) { $(`.feedback_replies[for="${fid}"]`).html('<i class="fa fa-spinner fa-spin" aria-hidden="true"></i>'); @@ -215,7 +206,6 @@ } }) } - //赞 function GoodFeedback(fid, g) { let good = { diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index 52df7941..dfcf606b 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -77,10 +77,8 @@ <td align="center"><?php echo $fields['click']; ?></td> <td align="center"><?php echo GetDateMk($fields['senddate']); ?></td> <td align="center" class="doPost"> - <a - href="javascript:editArc(<?php echo $fields['aid']?>,<?php echo $fields['channel']?>);">修改</a> - | <a href="javascript:delArc(<?php echo $fields['aid']?>);">删除</a> | <a - href="javascript:viewArc(<?php echo $fields['aid']; ?>);">预览</a> + <a href="javascript:editArc(<?php echo $fields['aid']?>,<?php echo $fields['channel']?>);">修改</a> + | <a href="javascript:delArc(<?php echo $fields['aid']?>);">删除</a> | <a href="javascript:viewArc(<?php echo $fields['aid']; ?>);">预览</a> </td> </tr> {/dede:datalist} diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 4305d432..296dc331 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -58,14 +58,12 @@ 个人会员该项为昵称,企业会员填写公司名称 </small> </div> - <div class="form-group row"> <label for="iptOldpwd" class="col-sm-2 col-form-label">原登录密码</label> <div class="col-sm-10"> <input name="oldpwd" type="password" class="form-control" id="iptOldpwd"> </div> </div> - <div class="form-group row"> <label for="iptUserpwd" class="col-sm-2 col-form-label">新密码</label> <div class="col-sm-10"> @@ -75,7 +73,6 @@ 不修改密码请保留此项为空 </small> </div> - <div class="form-group row"> <label for="iptUserpwdok" class="col-sm-2 col-form-label">确认新密码</label> <div class="col-sm-10"> @@ -85,7 +82,6 @@ 不修改密码请保留此项为空 </small> </div> - <div class="form-group row"> <label class="col-sm-2 col-form-label">原安全问题</label> <div class="col-sm-10"> @@ -98,14 +94,12 @@ 忘记密码时重设密码用 </small> </div> - <div class="form-group row"> <label for="iptSafeanswer" class="col-sm-2 col-form-label">原问题答案</label> <div class="col-sm-10"> <input name="safeanswer" type="text" class="form-control" id="iptSafeanswer"> </div> </div> - <div class="form-group row"> <label class="col-sm-2 col-form-label">新安全问题</label> <div class="col-sm-10"> @@ -117,14 +111,12 @@ 不修改不用填写 </small> </div> - <div class="form-group row"> <label for="iptNewsafeanswer" class="col-sm-2 col-form-label">新问题答案</label> <div class="col-sm-10"> <input name="newsafeanswer" type="text" class="form-control" id="iptNewsafeanswer"> </div> </div> - <div class="form-group row"> <label for="iptEmail" class="col-sm-2 col-form-label">电子邮箱</label> <div class="col-sm-10"> @@ -134,7 +126,6 @@ 每个电子邮邮箱只能注册一个帐号,要修改电子邮箱必须填写正确安全问题的答案 </small> </div> - <div class="form-group row"> <label for="iptEmail" class="col-sm-2 col-form-label">性别</label> <div class="col-sm-10"> @@ -149,15 +140,12 @@ 保密</label> </div> </div> - <div class="form-group row"> <label for="iptValidate" class="col-sm-2 col-form-label">验证码</label> <div class="col-sm-10"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" - style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" - onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> diff --git a/src/user/templets/edit_email.htm b/src/user/templets/edit_email.htm index c42ef4ec..9818d182 100644 --- a/src/user/templets/edit_email.htm +++ b/src/user/templets/edit_email.htm @@ -31,8 +31,8 @@ <a class="nav-link" href="edit_face.php">头像设置</a> </li> <li class="nav-item"> - <a class="nav-link active" href="edit_email.php">验证邮箱</a> - </li> + <a class="nav-link active" href="edit_email.php">验证邮箱</a> + </li> </ul> <form action="edit_email.php" method="post" enctype="multipart/form-data" name="form1" class="mt-3"> <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" /> diff --git a/src/user/templets/header.htm b/src/user/templets/header.htm index 81853e15..24f8c4cc 100644 --- a/src/user/templets/header.htm +++ b/src/user/templets/header.htm @@ -15,7 +15,6 @@ </form> </div> </div> - </div> </header> </div> diff --git a/src/user/templets/index-notlogin.htm b/src/user/templets/index-notlogin.htm index 67a799d2..f7c824f5 100755 --- a/src/user/templets/index-notlogin.htm +++ b/src/user/templets/index-notlogin.htm @@ -27,18 +27,18 @@ </div> <div class="form-group"> <div class="input-group"> - <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd" style="text-transform:uppercase;"> + <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd" style="text-transform:uppercase"> </div> </div> <div class="form-group"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> <button type="submit" class="btn btn-success btnLogin">登 录</button> <a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew" class="btn btn-outline-success btnLogin mt-2">注 册</a> - <a href="<?php echo $cfg_memberurl;?>/resetpassword.php" style="color:#008E38;">忘记密码</a> + <a href="<?php echo $cfg_memberurl;?>/resetpassword.php" style="color:#008E38;">忘记密码</a> </form> </div> </div> diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index 26838a50..661a11bf 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -27,13 +27,13 @@ </div> <div class="form-group"> <div class="input-group"> - <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd" style="text-transform:uppercase;"> + <input placeholder="输入密码" name="pwd" type="password" class="form-control" id="iptPwd" style="text-transform:uppercase"> </div> </div> <div class="form-group"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> <button type="submit" class="btn btn-success btnLogin">登 录</button> diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm index d286eb1e..dd09d6f3 100755 --- a/src/user/templets/reg-new.htm +++ b/src/user/templets/reg-new.htm @@ -26,18 +26,18 @@ </div> <div class="form-group"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onClick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onClick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> <div class="form-group"> <div class="input-group"> - <input placeholder="登录密码" name="userpwd" type="password" class="form-control" id="iptUserpwd" style="text-transform:uppercase;"> + <input placeholder="登录密码" name="userpwd" type="password" class="form-control" id="iptUserpwd" style="text-transform:uppercase"> </div> </div> <div class="form-group"> <div class="input-group"> - <input placeholder="确认密码" name="userpwdok" type="password" class="form-control" id="iptUserpwdok" style="text-transform:uppercase;"> + <input placeholder="确认密码" name="userpwdok" type="password" class="form-control" id="iptUserpwdok" style="text-transform:uppercase"> </div> </div> <div class="form-group form-check"> diff --git a/src/user/templets/resetpassword.htm b/src/user/templets/resetpassword.htm index da1de232..b1dd45ec 100755 --- a/src/user/templets/resetpassword.htm +++ b/src/user/templets/resetpassword.htm @@ -20,12 +20,10 @@ } return false; } - function hideVc() { $('#ver_code').css('visibility','hidden'); } - $(document).ready(function(){ $("#vdcode").focus(function(){ var leftpos = $("#vdcode").position().left; @@ -66,8 +64,8 @@ </div> <div class="form-group"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> <div class="form-group"> diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm index 1696386a..6ea869ba 100755 --- a/src/user/templets/resetpassword3.htm +++ b/src/user/templets/resetpassword3.htm @@ -34,8 +34,8 @@ </div> <div class="form-group"> <div class="input-group"> - <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase;"> - <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer;" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> + <input name="vdcode" placeholder="输入图形验证码" type="text" class="form-control" id="iptValidate" style="text-transform:uppercase"> + <img src="<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='<?php echo $cfg_cmsurl; ?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="点击我更换图片" alt="点击我更换图片" /> </div> </div> <button type="submit" class="btn btn-success btnLogin">确定</button> diff --git a/src/user/templets/shops_action_payment.htm b/src/user/templets/shops_action_payment.htm index a1f92947..9893e37b 100755 --- a/src/user/templets/shops_action_payment.htm +++ b/src/user/templets/shops_action_payment.htm @@ -34,11 +34,11 @@ <td width="180" class="td1">订单编号:</td> <td>{dede:var.carts.orders_id/}</td> </tr> - <tr> + <tr> <td width="180" class="td1">商品总数:</td> <td>{dede:var.carts.cart_count/}件</td> </tr> - <tr> + <tr> <td width="180" class="td1">商品名称:</td> <td>{dede:var.pay_name/}</td> </tr> diff --git a/src/user/templets/shops_orders.htm b/src/user/templets/shops_orders.htm index ac0817c0..eadd7bba 100755 --- a/src/user/templets/shops_orders.htm +++ b/src/user/templets/shops_orders.htm @@ -33,7 +33,6 @@ <a class="nav-link" href="shops_products.php">已购商品</a> </li> </ul> - <div class="postForm mt-3" style="padding-bottom: 0px;"> <form name="form3" action="shops_products.php" method="get"> <div class="input-group" style="margin-top:3px; padding-left: 130px;"> 订单号: @@ -41,7 +40,6 @@ <div class="input-group-append"> <button class="btn btn-success btn-sm" type="submit">搜索</button> </div> - </div> </form> </div>