Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/icon' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tianya committed Apr 17, 2022
2 parents b04ff83 + 572d46f commit 4df3e0a
Show file tree
Hide file tree
Showing 129 changed files with 873 additions and 406 deletions.
16 changes: 8 additions & 8 deletions src/admin/article_coonepage_rule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ function _EditNoteLoad(){ }
<input type='hidden' name='action' value='editsave' />
<table width="430" cellspacing="0" cellpadding="0">
<tr>
<td width="102" height="30">网站名称：</td>
<td width="102" height="26">网站名称：</td>
<td width="302"><input name="title" type="text" id="title" style="width:200px" value="<?php echo $row['title']; ?>" /></td>
<td width="26" align="center"><a href="javascript:CloseEditNode()" class="mr-3"><i class="fa fa-window-close-o" aria-hidden="true"></i></a></td>
<td width="26" align="center"><a href="javascript:CloseEditNode()" class="mr-3"><i class="fa fa-window-close-o"></i></a></td>
</tr>
<tr>
<td height="30">原内容编码：</td>
<td height="26">原内容编码：</td>
<td colspan="2">
<label><input type="radio" name="lang" value="utf-8" <?php echo ($row['lang'] == 'utf-8' ? ' checked="checked" ' : ''); ?> />
UTF-8</label>
Expand All @@ -70,7 +70,7 @@ function _EditNoteLoad(){ }
</td>
</tr>
<tr>
<td height="30">用作文章来源：</td>
<td height="26">用作文章来源：</td>
<td colspan="2">
<label><input type="radio" name="issource" value="0" <?php echo ($row['issource'] == 0 ? ' checked="checked" ' : ''); ?> />
否</label>
Expand All @@ -79,28 +79,28 @@ function _EditNoteLoad(){ }
</td>
</tr>
<tr>
<td height="30">网站网址：</td>
<td height="26">网站网址：</td>
<td colspan="2">
<input name="url" type="text" id="url" value="<?php echo $row['url']; ?>" style="width:200px" />
</td>
</tr>
<tr>
<td height="30"></td>
<td height="26"></td>
<td colspan="2">
使用不带http及任何附加目录的网址<br>
如：news.dedebiz.com
</td>
</tr>
<tr>
<td height="30">采集规则：</td>
<td height="26">采集规则：</td>
<td colspan="2">仅针对文章内容，格式：前面HTML{@body}后面HMTL</td>
</tr>
<tr>
<td height="90"></td>
<td colspan="2"><textarea name="rule" style="width:300px;height:80px"><?php echo $row['rule']; ?></textarea></td>
</tr>
<tr>
<td height="30"></td>
<td height="26"></td>
<td colspan="2"><button class="btn btn-success btn-sm" type="submit" name="Submit" value="">保存规则</button>
<button type="reset" class="btn btn-success btn-sm" name="Submit2">重置</button></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/catalog_do.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ function GetSunLists();
PutCookie('lastCid', $cid, 3600 * 24, "/");
$tu = new TypeUnit();
$tu->dsql = $dsql;
echo " <table width='100%' border='0' cellspacing='0' cellpadding='0'>\r\n";
echo " <table width='100%' cellspacing='0' cellpadding='0'>\r\n";
$tu->LogicListAllSunType($cid, "　");
echo " </table>\r\n";
$tu->Close();
Expand Down
2 changes: 1 addition & 1 deletion src/admin/catalog_edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function action_save()
<input type="hidden" name="moresite" value="<?php echo $myrow['moresite']; ?>">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td width="260" class="bline" height="26" align="center">是否支持投稿：</td>
<td width="160" class="bline" height="26" align="center">是否支持投稿：</td>
<td class="bline">
<label><input type='radio' name='issend' value='0' class='np' <?php if ($myrow['issend'] == "0") echo " checked='1' "; ?>>&nbsp;不支持</label>
<label><input type='radio' name='issend' value='1' class='np' <?php if ($myrow['issend'] == "1") echo " checked='1' "; ?>>&nbsp;支持</label>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/dialog/select_images.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function ReturnImg(reimg) {
</script>
<table width="100%" cellpadding="0" cellspacing="1" align="center" class="table table-borderless">
<tr>
<td colspan="4" height="30">
<td colspan="4" height="26">
<form action="select_images_post.php" method="POST" enctype="multipart/form-data" name="myform">
<?php $noeditor = !empty($noeditor) ? "<input type='hidden' name='noeditor' value='yes'>" : ''; echo $noeditor; ?>
<input type="hidden" name="activepath" value="<?php echo $activepath ?>">
Expand Down
2 changes: 1 addition & 1 deletion src/admin/dialog/select_media.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function ReturnValue(reimg) {
</script>
<table width="100%" align="center" cellspacing="0" cellpadding="2" class="table table-borderless">
<tr>
<td colspan="3" height="30">
<td colspan="3" height="26">
<form action="select_media_post.php" method="POST" enctype="multipart/form-data" name="myform">
<input type="hidden" name="activepath" value="<?php echo $activepath ?>">
<input type="hidden" name="f" value="<?php echo $f ?>">
Expand Down
4 changes: 2 additions & 2 deletions src/admin/dialog/select_soft.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function ReturnValue(reimg) {
</script>
<table width="100%" cellpadding="0" cellspacing="1" align="center" class="table table-borderless">
<tr>
<td colspan="3" height="30">
<td colspan="3" height="26">
<form action="select_soft_post.php" method="POST" enctype="multipart/form-data" name='myform'>
<input type="hidden" name="activepath" value="<?php echo $activepath ?>">
<input type="hidden" name="f" value="<?php echo $f ?>">
Expand Down Expand Up @@ -167,7 +167,7 @@ function ReturnValue(reimg) {
</td>
</tr>
<tr>
<td colspan="3" height="30">点击选择的文件，红色字样的为刚上传的文件</td>
<td colspan="3" height="26">点击选择的文件，红色字样的为刚上传的文件</td>
</tr>
</table>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/dialog/select_templets.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function ReturnValue(reimg) {
</script>
<table width="100%" cellpadding="0" cellspacing="1" align="center" class="table table-borderless">
<tr>
<td colspan="3" height="30">
<td colspan="3" height="26">
<form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
<input type="hidden" name="activepath" value="<?php echo $activepath ?>">
<input type="hidden" name="f" value="<?php echo $f ?>">
Expand Down
2 changes: 1 addition & 1 deletion src/admin/freelist_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
{
global $cfg_phpurl,$addsql;
$start = ($pageno-1) * $pagesize;
$printhead ="<table width='98%' border='0' cellpadding='1' cellspacing='1' align='center' class='table maintable' style='margin-bottom:10px'>
$printhead ="<table width='98%' cellpadding='1' cellspacing='1' align='center' class='table maintable' style='margin-bottom:10px'>
<tr align='center' bgcolor='#FBFCE2'>
<td width='5%' class='tbsname'><a href='javascript:;' onclick=\"ReloadPage('aid')\">ID</a></td>
<td width='20%' class='tbsname'>列表名称</td>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/friendlink_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
function GetPic($pic)
{
if ($pic == '') return '无图标';
else return "<img src='$pic' width='88' height='30' border='0' />";
else return "<img src='$pic' width='88' height='26' />";
}
function GetSta($sta)
{
Expand Down
2 changes: 1 addition & 1 deletion src/admin/inc/inc_menu_func.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function GetMenus($userrank, $topos = 'main')
}
$link = "<div class='items'>
<div class='fllct'>$link</div>
<div class='flrct'><a href='".$ctag2->GetAtt('linkadd')."' target='".$ctag2->GetAtt('target')."'><i class='fa $addico' aria-hidden='true' alt='$addalt' title='$addalt'></i></a></div>
<div class='flrct'><a href='".$ctag2->GetAtt('linkadd')."' target='".$ctag2->GetAtt('target')."'><i class='fa $addico' alt='$addalt' title='$addalt'></i></a></div>
</div>";
} else {
$link .= "";
Expand Down
2 changes: 1 addition & 1 deletion src/admin/index_menu_module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function showHide(objname) {
</script>
<base target="main">
<body>
<table width='100%' height="100%" border='0' cellspacing='0' cellpadding='0'>
<table width='100%' height="100%" cellspacing='0' cellpadding='0'>
<tr>
<td>
<?php
Expand Down
2 changes: 1 addition & 1 deletion src/admin/media_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
function MediaType($tid, $nurl)
{
if ($tid == 1) {
return "图片<a href=\"$nurl\" target=\"_blank\"><i class='fa fa-picture-o' name='picview' border='0' alt='预览'></i></a>";
return "图片<a href=\"$nurl\" target=\"_blank\"><i class='fa fa-picture-o' name='picview' alt='预览'></i></a>";
} else if ($tid == 2) {
return "FLASH";
} else if ($tid == 3) {
Expand Down
8 changes: 4 additions & 4 deletions src/admin/module_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function Setup();
$win->AddHidden("hash", $hash);
$win->AddHidden("action", 'setupstart');
$msg = "<style>.dtb{border-bottom:1px dotted #eee}</style>
<table width='98%' border='0' cellspacing='0' cellpadding='0' class='table'>
<table width='98%' cellspacing='0' cellpadding='0' class='table'>
<tr>
<td width='260' height='26' class='dtb'>模块名称：</td>
<td class='dtb'>{$infos['name']}</td>
Expand Down Expand Up @@ -298,7 +298,7 @@ function DelModule();
$win->AddHidden('hash', $hash);
$win->AddHidden('action', 'delok');
$msg = "<style>.dtb{border-bottom:1px dotted #eee}</style>
<table width='98%' border='0' cellspacing='0' cellpadding='0' class='table'>
<table width='98%' cellspacing='0' cellpadding='0' class='table'>
<tr>
<td width='260' height='26' class='dtb'>模块名称：</td>
<td class='dtb'>{$infos['name']}</td>
Expand Down Expand Up @@ -363,7 +363,7 @@ function UnInstall();
$win->AddHidden("hash", $hash);
$win->AddHidden("action", 'uninstallok');
$msg = "<style>.dtb{border-bottom:1px dotted #eee}</style>
<table width='98%' border='0' cellspacing='0' cellpadding='0' class='table'>
<table width='98%' cellspacing='0' cellpadding='0' class='table'>
<tr>
<td width='260' height='26' class='dtb'>模块名称：</td>
<td class='dtb'>{$infos['name']}</td>
Expand Down Expand Up @@ -504,7 +504,7 @@ function ViewOne();
$wecome_info = "模块管理";
$win->AddTitle("<a href='module_main.php'>模块管理</a> &gt; 模块详情：{$infos['name']}");
$msg = "<style>.dtb{border-bottom:1px dotted #eee}</style>
<table width='98%' border='0' cellspacing='0' cellpadding='0'>
<table width='98%' cellspacing='0' cellpadding='0'>
<tr>
<td width='260' height='26' class='dtb'>模块名称：</td>
<td class='dtb'>{$infos['name']}</td>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/module_upload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
$wecome_info = "<a href='module_main.php'>模块管理</a> &gt; 上传模块";
$win->AddTitle('请选择要上传的文件：');
$win->AddHidden("action", 'upload');
$msg = "<table width='900' border='0' cellspacing='0' cellpadding='0'>
$msg = "<table width='900' cellspacing='0' cellpadding='0'>
<tr>
<td width='260' height='26'>文件格式：</td>
<td height='26'>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/mychannel_edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function __CopyStart()
$win->AddHidden("id", $id);
$win->AddHidden("dopost", 'copysave');
$msg = "
<table width='460' border='0' cellspacing='0' cellpadding='0'>
<table width='460' cellspacing='0' cellpadding='0'>
<tr>
<td width='170' height='26' align='center'>新频道id：</td>
<td width='230'><input name='newid' type='text' id='newid' size='6' value='{$newid}' /></td>
Expand Down
4 changes: 2 additions & 2 deletions src/admin/search_keywords_main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
$start = ($pageno - 1) * $pagesize;
$printhead = "<form name='form3' action=\"search_keywords_main.php\" method=\"post\">
<input name=\"dopost\" type=\"hidden\" value=\"\">
<table width='98%' border='0' cellpadding='1' cellspacing='1' style='margin-bottom:10px' align='center' class='table maintable'>
<table width='98%' cellpadding='1' cellspacing='1' style='margin-bottom:10px' align='center' class='table maintable'>
<tr align='center' bgcolor='#FBFCE2' height='26'>
<td width='5%'>选择</td>
<td width='6%' height='26'><a href='javascript:;' onclick=\"ReloadPage('aid')\">ID</a></td>
Expand Down Expand Up @@ -95,7 +95,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
";
echo $line;
}
echo "<tr align='left' height='30'>
echo "<tr align='left' height='26'>
<td colspan='8' style='padding-left:10px;'>
<a href='javascript:selAll()' class='btn btn-success btn-sm'>反选</a>
<a href='javascript:noselAll()' class='btn btn-success btn-sm'>取消</a>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/sys_admin_user_tj.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
$row = $dsql->GetOne("SELECT COUNT(id) AS dd,SUM(click) AS cc FROM `#@__archives` WHERE senddate>$istarttime AND mid='$uid'; ");
$ddd = $row['dd'] + $ddd;
$ccd = $row['cc'] + $ccd;
$msg = "<table width='100%' border='0' align='center' cellpadding='3' cellspacing='1'>
$msg = "<table width='100%' align='center' cellpadding='3' cellspacing='1'>
<tr align='center' bgcolor='#FBFCE2'>
<td width='18%' height='26'>管理员::统计信息</td>
<td width='18%'>全部(文档|点击)</td>
Expand Down
8 changes: 4 additions & 4 deletions src/admin/sys_repair.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
$wecome_info = "<a href='index_body.php'>系统主页</a> &gt; 系统错误修复工具";
$win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
$msg = "
<table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
<table width='98%' cellspacing='0' cellpadding='0' align='center'>
<tr>
<td height='250' valign='top'>
<br>
Expand Down Expand Up @@ -54,7 +54,7 @@ function 1_test_db() { }
$wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 检测数据结构";
$win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
$msg = "
<table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
<table width='98%' cellspacing='0' cellpadding='0' align='center'>
<tr>
<td height='250' valign='top'>
<span style='color:#28a745'>已完成数据结构完整性检测</span>
Expand Down Expand Up @@ -139,7 +139,7 @@ function 2_test_arctiny() { }
$wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 检测微表正确性";
$win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
$msg = "
<table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
<table width='98%' cellspacing='0' cellpadding='0' align='center'>
<tr>
<td height='250' valign='top'>
{$msg}
Expand Down Expand Up @@ -200,7 +200,7 @@ function 3_re_arctiny() { }
$wecome_info = "<a href='sys_repair.php'>系统错误修复工具</a> &gt; 高级综合检测修复";
$win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
$msg = "
<table width='98%' border='0' cellspacing='0' cellpadding='0' align='center'>
<table width='98%' cellspacing='0' cellpadding='0' align='center'>
<tr>
<td height='250' valign='top'>
完成所有修复操作，移除错误记录 {$errnum} 条
Expand Down
2 changes: 1 addition & 1 deletion src/admin/templets/adtype_main.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<td align="center"><input name="check_new" type="checkbox" id="check_new" value="1" checked='1' class='np'> 新增 </td>
</tr>
<tr>
<td height="30" colspan="5" align="center" bgcolor="#f8f8f8"><input name="imageField" type="submit" class="np coolbg" value="确定"></td>
<td height="26" colspan="5" align="center" bgcolor="#f8f8f8"><input name="imageField" type="submit" class="np coolbg" value="确定"></td>
</tr>
</form>
</table>
Expand Down
6 changes: 3 additions & 3 deletions src/admin/templets/album_add.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<input type="hidden" id="albums" name="albums" value="">
<table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3">
<tr>
<td width="70%" height="30"><i class="fa fa-book"></i> <a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">图集列表</a> &gt; 发布图集</td>
<td width="70%" height="26"><i class="fa fa-book"></i> <a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">图集列表</a> &gt; 发布图集</td>
<td width="30%" align='right'><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
</tr>
</table>
Expand Down Expand Up @@ -199,7 +199,7 @@
echo "</select>";
?>
</span>
<i class='fa fa-search' aria-hidden='true' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid')" title='快捷选择' style='cursor:pointer'></i>
<i class='btn btn-sm fa fa-search' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid')" title='快捷选择' style='cursor:pointer'></i>
<?php
if($cfg_need_typeid2=='Y')
{
Expand All @@ -221,7 +221,7 @@
<td>
<span id='typeid2ct'></span>
<input type='text' name='typeid2' id='typeid2' value='' style='width:160px'>
<i class='fa fa-search' aria-hidden='true' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2')" title='选择副栏目'></i>
<i class='btn btn-sm fa fa-search' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2')" title='选择副栏目'></i>
</td>
</tr>
</table>
Expand Down
6 changes: 3 additions & 3 deletions src/admin/templets/album_edit.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<input type="hidden" id="albums" name="albums" value="">
<table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3">
<tr>
<td width="70%" height="30"><i class="fa fa-book"></i> <a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives">图集列表</a> &gt; 修改图集</td>
<td width="70%" height="26"><i class="fa fa-book"></i> <a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&dopost=listArchives">图集列表</a> &gt; 修改图集</td>
<td width="30%" align='right'><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
</tr>
</table>
Expand Down Expand Up @@ -194,7 +194,7 @@
echo $typeOptions;
echo '</select>';
?>
<i class='fa fa-search' aria-hidden='true' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid','<?php echo $arcRow['typeid']; ?>')" title='快捷选择'></i>
<i class='btn btn-sm fa fa-search' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid','<?php echo $arcRow['typeid']; ?>')" title='快捷选择'></i>
</td>
<td width="90">消费金币：</td>
<td><input name="money" type="text" id="money" value="<?php echo $arcRow['money']?>" style="width:160px"></td>
Expand All @@ -213,7 +213,7 @@
<td>
<span id='typeid2ct'></span>
<input type='text' name='typeid2' id='typeid2' value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:160px'>
<i class='fa fa-search' aria-hidden='true' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2','<?php echo $arcRow['typeid2']; ?>')" title='选择副栏目'></i>
<i class='btn btn-sm fa fa-search' style='cursor:pointer' onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2','<?php echo $arcRow['typeid2']; ?>')" title='选择副栏目'></i>
</td>
</tr>
</table>
Expand Down
Loading

0 comments on commit 4df3e0a

Please sign in to comment.