界面样式调整

src/dede/inc/inc_menu.php

@@ -160,8 +160,8 @@ $adminMenu2
 <m:top item='1_10_7_' name='系统帮助' display='none'>
   <m:item name='参考文档' link='http://help.dedecms.com' rank='' target='_blank' />
   <m:item name='意见建议反馈' link='https://github.com/dedetech/issues' rank='' target='_blank' />
+  <m:item name='代码托管' link='https://git.dedebiz.com/' rank='' target='_blank' />
   <m:item name='官方交流论坛' link='http://bbs.dedecms.com' rank='' target='_blank' />
-  <m:item name='Github' link='https://github.com/dedetech/' rank='' target='_blank' />
 </m:top>
 
 -----------------------------------------------

src/dede/mychannel_edit.php

@@ -510,10 +510,11 @@ else if($dopost == 'modifysearch')
     {
         $step = 1;
         $mid = intval($mid);
-        $query = "SELECT mainfields, addonfields, template FROM #@__advancedsearch WHERE mid='$mid'";
+        $query = "SELECT mainfields, addonfields, template FROM `#@__advancedsearch` WHERE mid='$mid'";
         $searchinfo = $dsql->GetOne($query);
         if(!is_array($searchinfo))
         {
+            $searchinfo = array();
             $searchinfo['mainfields'] = $searchinfo['addonfields'] = $searchinfo['template'] = '';
         }
         $searchinfo['mainfields'] = explode(',', $searchinfo['mainfields']);
@@ -531,12 +532,12 @@ else if($dopost == 'modifysearch')
         $c4 = in_array('source', $searchinfo['mainfields']) ? 'checked' : '';
         $c5 = in_array('senddate', $searchinfo['mainfields']) ? 'checked' : '';
 
-        $mainfields = '<label><input type="checkbox" name="mainfields[]" '.$c1.' value="iscommend" class="np" />是否推荐</label>';
-        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c2.' value="typeid" class="np" />栏目</label>';
+        $mainfields = '<label><input type="checkbox" name="mainfields[]" '.$c1.' value="iscommend" class="np" /> 是否推荐</label> ';
+        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c2.' value="typeid" class="np" /> 栏目</label> ';
 
-        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c3.' value="writer" class="np" />作者</label>';
-        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c4.' value="source" class="np" />来源</label>';
-        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c5.' value="senddate" class="np" />发布时间</label>';
+        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c3.' value="writer" class="np" /> 作者</label> ';
+        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c4.' value="source" class="np" /> 来源</label> ';
+        $mainfields .= '<label><input type="checkbox" name="mainfields[]" '.$c5.' value="senddate" class="np" /> 发布时间</label> ';
         /*
         $mainfields .= '<label><input type="checkbox" name="mainfields[]" value="description" />摘要</label>';
         $mainfields .= '<label><input type="checkbox" name="mainfields[]" value="keywords" />关键词</label>';
@@ -555,9 +556,9 @@ else if($dopost == 'modifysearch')
         if($channel['issystem'] < 0)
         {
             $checked = in_array('typeid', $addonfieldsarr) ? 'checked' : '';
-            $addonfields .= '<label><input type="checkbox" name="addonfields[]" '.$checked.' value="typeid" class="np" />栏目</label>';
+            $addonfields .= '<label><input type="checkbox" name="addonfields[]" '.$checked.' value="typeid" class="np" /> 栏目</label> ';
             $checked = in_array('senddate', $addonfieldsarr) ? 'checked' : '';
-            $addonfields .= '<label><input type="checkbox" name="addonfields[]" '.$checked.' value="senddate" class="np" />发布时间</label>';
+            $addonfields .= '<label><input type="checkbox" name="addonfields[]" '.$checked.' value="senddate" class="np" /> 发布时间</label> ';
         }
         if(is_array($dtp->CTags) && !empty($dtp->CTags))
         {
@@ -574,7 +575,7 @@ else if($dopost == 'modifysearch')
                 $label = $ctag->GetAtt('itemname');
                 if(in_array($datatype, $searchtype)){
                     $checked = in_array($value, $addonfieldsarr) ? 'checked' : '';
-                    $addonfields .= "<label><input type=\"checkbox\" name=\"addonfields[]\" $checked value=\"$value\" class='np' />$label</label>";
+                    $addonfields .= "<label><input type=\"checkbox\" name=\"addonfields[]\" $checked value=\"$value\" class='np' /> $label</label> ";
                 }
             }
         }

src/dede/templets/ad_add.htm

@@ -5,7 +5,8 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
   <title>增加广告</title>
-  <!-- <link rel="stylesheet" href="../static/css/bootstrap.min.css"> -->
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <link href="../static/css/daterangepicker.css" rel="stylesheet">
   <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
@@ -83,14 +84,14 @@
 
 <body background="images/allbg.gif" leftmargin='8' topmargin='8'>
   <form action="ad_add.php" method="post" name="form1" onSubmit="return checkSubmit()">
-    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
       <tr>
         <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b><a
               href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 增加广告位置 </td>
       </tr>
       <tr>
         <td height="200" bgcolor="#FFFFFF" valign="top">
-          <table width="100%" border="0" cellspacing="4" cellpadding="4">
+          <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
 
             <input name="normbody[style]" type="hidden" value="code" id="adstyle" />
             <input type="hidden" name="token" value="<?php echo make_hash();?>" />
@@ -168,8 +169,9 @@
             </tr>
             <tr>
               <td height="53" align="center">&nbsp;</td>
-              <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22"
-                  border="0" class="np" /></td>
+              <td colspan="2">
+                <button type="submit" class="btn btn-secondary">确定</button>
+                </td>
             </tr>
 
           </table>

src/dede/templets/ad_edit.htm

@@ -5,7 +5,8 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
   <title>更改广告</title>
-  <!-- <link rel="stylesheet" href="../static/css/bootstrap.min.css"> -->
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <link href="../static/css/daterangepicker.css" rel="stylesheet">
   <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
@@ -46,14 +47,14 @@
 </head>
 
 <body background="images/allbg.gif" leftmargin='8' topmargin='8'>
-  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
     <tr>
       <td height="28" background="images/tbg.gif" style="padding-left:10px;">&nbsp;<b><a
             href="ad_main.php"><u>广告管理</u></a></b> &gt;&gt; 更改广告 </td>
     </tr>
     <tr>
       <td height="200" bgcolor="#FFFFFF" valign="top">
-        <table width="100%" border="0" cellspacing="4" cellpadding="4">
+        <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
           <form action="ad_edit.php" method="post" enctype="multipart/form-data" name="form1">
             <input type='hidden' name='aid' value='<?php echo $aid?>'>
             <input type='hidden' name='dopost' value='saveedit'>
@@ -91,12 +92,13 @@
             </tr>
             <tr>
               <td height="25" align="center">时间限制：</td>
-              <td colspan="2"><input class="np" name="timeset" type="radio" value="0"
+              <td colspan="2">
+                <label><input class="np" name="timeset" type="radio" value="0"
                   <?php if($row['timeset']==0) echo " checked='1' "; ?> />
-                永不过期
-                <input class="np" type="radio" name="timeset" value="1"
+                永不过期</label>
+                <label><input class="np" type="radio" name="timeset" value="1"
                   <?php if($row['timeset']==1) echo " checked='1' "; ?> />
-                在设内时间内有效</td>
+                在设内时间内有效</label></td>
             </tr>
             <tr>
               <td height="25" align="center">投放时间：</td>
@@ -122,8 +124,7 @@
             </tr>
             <tr>
               <td height="53" align="center">&nbsp;</td>
-              <td colspan="2"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22"
-                  border="0"></td>
+              <td colspan="2"><button type="submit" class="btn btn-secondary">确定</button></td>
             </tr>
           </form>
         </table>

src/dede/templets/ad_main.htm

@@ -6,17 +6,18 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
   <title>广告管理</title>
-	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
 
 <body background="images/allbg.gif" leftmargin="8" topmargin='8'>
-  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
+  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6"
+    class="table maintable table-bordered mt-3">
     <tr>
       <td height="28" background="images/tbg.gif" colspan="7" style="padding-left:10px;">
-        <b><a href="ad_main.php">广告管理</a></b>&nbsp;[<a href="ad_add.php"><u>增加一个新广告</u></a>]
-        [<a href="adtype_main.php"><u>广告分类管理</u></a>]</td>
+        <a href="ad_main.php">广告管理</a> &nbsp;<a href="ad_add.php" class="btn btn-secondary btn-sm">增加一个新广告</a>
+        <a href="adtype_main.php" class="btn btn-secondary btn-sm">广告分类管理</a></td>
     </tr>
     <tr>
       <td height="28" colspan="7" style="padding-left:10px;" bgcolor="#FFFFFF">
@@ -36,8 +37,9 @@
                       </select></td>
                     <td width='71'> 关键字： </td>
                     <td width='185'><input type='text' name='keyword' style='width:150' /></td>
-                    <td width="130"><input name="imageField" type="image" src="images/button_search.gif" width="60"
-                        height="22" border="0" class="np" /></td>
+                    <td width="130">
+                        <button type="submit" class="btn btn-secondary">搜索</button>
+                      </td>
                   </tr>
                 </table>
               </td>
@@ -66,9 +68,9 @@
       <td>{dede:field.timeset function='TimeSetValue(@me)'/}</td>
       <td>{dede:field.endtime function='GetDateMk(@me)'/}</td>
       <td>
-        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=gettag'>[代码]</a>
-        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=edit'>[更改]</a>
-        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=delete'>[删除]</a>
+        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=gettag' class="btn btn-secondary btn-sm">代码</a>
+        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=edit' class="btn btn-secondary btn-sm">更改</a>
+        <a href='ad_edit.php?aid={dede:field.aid /}&dopost=delete' class="btn btn-secondary btn-sm">删除</a>
       </td>
     </tr>
     {/dede:datalist}

src/dede/templets/article_keywords_main.htm

@@ -101,12 +101,12 @@
           </td>
           <td>
             <input type='hidden' name='staold_{dede:field.aid/}' value='{dede:field.sta/}' />
-            <input type='checkbox' name='isnouse_{dede:field.aid/}' class='np' value='1' {dede:field.sta
+            <label><input type='checkbox' name='isnouse_{dede:field.aid/}' class='np' value='1' {dede:field.sta
               function="GetSta(@me)" /} />
-            禁用
+            禁用</label>
             &nbsp;
-            <input type='checkbox' name='isdel_{dede:field.aid/}' class='np' value='1' />
-            删除
+            <label><input type='checkbox' name='isdel_{dede:field.aid/}' class='np' value='1' />
+            删除</label>
           </td>
         </tr>
         {/dede:datalist}

src/dede/templets/article_keywords_make.htm

@@ -3,33 +3,37 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>关键字维护</title>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
 <body background="images/allbg.gif" leftmargin="8" topmargin="8">
-<table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" align="center">
+<table width="98%" border="0" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
     <tr> 
-      <td height="20" background='images/tbg.gif'> <table width="98%" border="0" cellpadding="0" cellspacing="0">
+      <td height="20" background='images/tbg.gif'> <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless">
           <tr> 
             <td width="30%" height="18" style="padding-left:10px;"><strong>关键字维护：</strong></td>
-            <td width="70%" align="right"><input name="kw" type="button" id="kw" value="返回关键字管理页" onClick="location='article_keywords_main.php';"></td>
+            <td width="70%" align="right">
+              <button class="btn btn-secondary btn-sm" name="kw" type="button" id="kw" onClick="location='article_keywords_main.php';">返回关键字管理页</button>
+            </td>
           </tr>
         </table></td>
     </tr>
     <tr> 
-      <td height="48" bgcolor="#FFFFFF">　　本向导帮助自动分析您系统内的关键字，并统计关键字的数量，对其进行排序，您可以清理掉错误的关键字或无意义的关键字，以提高文档关连和搜索的准确性，本分析器是直接在内存中对关键字进行分析排序后加入到数据库的，因此本操作比较占用内存，如果您的文档数量很大并且使用的又是虚拟主机，可能无法完成本操作。<br/>
+      <td height="48" bgcolor="#FFFFFF">本向导帮助自动分析您系统内的关键字，并统计关键字的数量，对其进行排序，您可以清理掉错误的关键字或无意义的关键字，以提高文档关连和搜索的准确性，本分析器是直接在内存中对关键字进行分析排序后加入到数据库的，因此本操作比较占用内存，如果您的文档数量很大并且使用的又是虚拟主机，可能无法完成本操作。<br/>
         　　本程序只分析文章频道的关键字数据，其它频道或自定义频道请自行手工指定内容的关系字。<br/>
         　　如果您的文章是采集回来的，请先用“自动获取关键字”的功能对未有关键字的文章进行分词索引，然后再检测关键字。</td>
   </tr>
   <tr> 
     <td height="31" bgcolor="#ffffff" align="center">
-	   [<a href="article_keywords_make.php?dopost=analyse" target="stafrm"><u>检测已有的关键字</u></a>]
+	   <a href="article_keywords_make.php?dopost=analyse" target="stafrm" class="btn btn-secondary btn-sm">检测已有的关键字</a>
 	   &nbsp;
-	   [<a href="article_keywords_make.php?dopost=fetch" target="stafrm"><u>自动获取关键字</u></a>]
+	   <a href="article_keywords_make.php?dopost=fetch" target="stafrm" class="btn btn-secondary btn-sm">自动获取关键字</a>
 	  </td>
   </tr>
   <tr bgcolor="#F9FCEF"> 
     <td height="20">
-    	<table width="100%">
+    	<table width="100%" class="table table-borderless">
         <tr> 
           <td width="74%"><strong>结果：</strong></td>
           <td width="26%" align="right"> <script language='javascript'>

src/dede/templets/article_keywords_select.htm

@@ -40,16 +40,18 @@ function AddNewKw()
 	showHide("addnew");
 }
 </script>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
 <body background="images/allbg.gif" leftmargin="1" topmargin="1">
 <div class="main">
-  <table width="100%" border="0" cellpadding="1" cellspacing="1" bgcolor="#D6D6D6">
+  <table width="100%" align="center" border="0" cellpadding="1" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
    <form name='form1' action="article_keywords_main.php">
    <input type='hidden' name='dopost' value='add' />
     <tr id="addnew" style="display:none">
         <td width="100%" height="24" colspan="2" align="center" bgcolor="#009900">
-          <table border="0" cellspacing="0" cellpadding="0">
+          <table border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
               <td width="60" align="center">关键字：</td>
               <td width="140"><input name="keyword" type="text" id="keyword" style="width:130px" /></td>
@@ -66,12 +68,12 @@ function AddNewKw()
 	<form name='form2'>
       <tr>
         <td width="100%" height="26" colspan="2" background="images/tbg.gif">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-borderless">
             <tr>
               <td width="31%"><strong>选择关键字</strong></td>
               <td width="69%" align="right">
-                <input type="button" name="kwa" value="新增关键字" onClick="AddNewKw()">
-                <input type="button" name="kwm" value="关键字管理" onClick="location='article_keywords_main.php';">
+                <button class="btn btn-secondary btn-sm" type="button" name="kwa" onClick="AddNewKw()">新增关键字</button>
+                <button class="btn btn-secondary btn-sm" type="button" name="kwm" onClick="location='article_keywords_main.php';">关键字管理</button>
                 </td>
             </tr>
           </table></td>
@@ -85,11 +87,11 @@ function AddNewKw()
       </tr>
       <tr>
         <td height="24" bgcolor="#E4FAC7" style="line-height:180%">
-        <table border="0" cellspacing="0" cellpadding="0">
+        <table border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
               <td width="120">已选的关键字：</td>
               <td width="320"><input name="keywords" type="text" id="keywords" style="width:300" value="<?php echo $keywords?>"></td>
-              <td width="93"><input type="button" name="Submit" value="选用" onClick="ReturnValue()"></td>
+              <td width="93"><button type="button" class="btn btn-secondary btn-sm" name="Submit" onClick="ReturnValue()"> 选用 </button></td>
             </tr>
           </table>
         </td>

src/dede/templets/catalog_menu.htm

@@ -189,7 +189,7 @@ body
    <td width="77%" background='images/mtbg1.gif'  style='border-right: 1px solid #74c63f;'>站点目录树</td>
  </tr>
  <tr> 
-  <td colspan='2' id='items1' align='left' style="background:#ffffff url(images/mmenubg2.gif) no-repeat;padding-left:8px;"> 
+  <td colspan='2' id='items1' align='left'> 
 <?php 
 $tu = new TypeUnit($userChannel);
 $tu->ListAllType($userChannel,$opendir);

src/dede/templets/catalog_menu2.htm

@@ -18,7 +18,7 @@ function LoadSuns(ctid,tid)
 }
 function showHide(objname)
 {
-   if($DE(objname).style.display=="none") $DE(objname).style.display = "block";
+   if($DE(objname).style.display=="none") $DE(objname).style.display = "revert";
 	 else $DE(objname).style.display="none";
 	 return false;
 }
@@ -190,7 +190,7 @@ body
     <td width="80%" background='images/mtbg1.gif'  style='border-right: 1px solid #74c63f;'>站点目录树</td>
   </tr>
   <tr> 
-    <td colspan='2' id='items1' align='center' style="background:#ffffff url(images/mmenubg2.gif) no-repeat;padding-left:8px;"> 
+    <td colspan='2' id='items1' align='center'> 
 <?php 
 $tu = new TypeUnit($userChannel);
 $tu->ListAllType($userChannel,$opendir);

src/dede/templets/erradd.htm

@@ -89,9 +89,9 @@
 			{/dede:datalist}
 			<tr align="left" bgcolor="#ffffff" height="28">
 				<td colspan="8">
-					<a href="javascript:selAll()" class="coolbg">全选</a>
-					<a href="javascript:noSelAll()" class="coolbg">取消</a>
-					<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
+					<a href="javascript:selAll()" class="btn btn-secondary btn-sm">全选</a>
+					<a href="javascript:noSelAll()" class="btn btn-secondary btn-sm">取消</a>
+					<a href="javascript:delArc(0)" class="btn btn-secondary btn-sm">&nbsp;删除&nbsp;</a>
 				</td>
 			</tr>
 			<tr align="center" bgcolor="#F9FCEF" height="28">

src/dede/templets/file_manage_main.htm

@@ -81,7 +81,6 @@ while(($file = $dh->read()) !== false)
    <td>　</td>
    <td>
    <a href=file_manage_view.php?filename=".urlencode($file)."&activepath=".urlencode($activepath)."&fmdo=rename class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href=file_manage_view.php?filename=".urlencode($file)."&activepath=".urlencode($activepath)."&type=dir&fmdo=del class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
    </td>
    </td>
@@ -97,9 +96,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'><i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'><i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -114,9 +111,7 @@ while(($file = $dh->read()) !== false)
    <td align='center' class='linerow'>$filetime</td>
    <td >
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -131,9 +126,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -148,9 +141,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -165,9 +156,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td >
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -182,9 +171,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -199,9 +186,7 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -216,9 +201,7 @@ while(($file = $dh->read()) !== false)
    <td align='center' class='linerow'>$filetime</td>
    <td>
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'>  <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -234,11 +217,8 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='$edurl' class='btn btn-secondary btn-sm'> <i class='fa fa-pencil-square-o' aria-hidden='true'></i> 编辑</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'>  <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -254,11 +234,8 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='$edurl' class='btn btn-secondary btn-sm'> <i class='fa fa-pencil-square-o' aria-hidden='true'></i> 编辑</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -274,11 +251,8 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='$edurl' class='btn btn-secondary btn-sm'> <i class='fa fa-pencil-square-o' aria-hidden='true'></i> 编辑</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -294,11 +268,8 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='$edurl' class='btn btn-secondary btn-sm'> <i class='fa fa-pencil-square-o' aria-hidden='true'></i> 编辑</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'><i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'>  <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -314,11 +285,8 @@ while(($file = $dh->read()) !== false)
    <td align='center'>$filetime</td>
    <td>
    <a href='$edurl' class='btn btn-secondary btn-sm'> <i class='fa fa-pencil-square-o' aria-hidden='true'></i> 编辑</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'>  <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-   &nbsp;
    <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
    </td>
    </tr>";
@@ -332,9 +300,7 @@ while(($file = $dh->read()) !== false)
     <td align='center'>$filetime</td>
     <td>
     <a href='file_manage_view.php?fmdo=rename&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-address-card-o' aria-hidden='true'></i> 改名</a>
-    &nbsp;
     <a href='file_manage_view.php?fmdo=del&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'>  <i class='fa fa-trash' aria-hidden='true'></i> 删除</a>
-    &nbsp;
     <a href='file_manage_view.php?fmdo=move&filename=".urlencode($file)."&activepath=".urlencode($activepath)."' class='btn btn-secondary btn-sm'> <i class='fa fa-share-square' aria-hidden='true'></i> 移动</a>
     </td>
     </tr>";
@@ -354,13 +320,9 @@ foreach ($files as $file)
     <tr>
       <td colspan="4" height='26' bgcolor='#F9FCEF'>
         <a href='file_manage_main.php' class="btn btn-secondary btn-sm">根目录</a>
-        &nbsp;
         <a href='file_manage_view.php?fmdo=newfile&activepath=<?php echo urlencode($activepath)?>' class="btn btn-secondary btn-sm">新建文件</a>
-        &nbsp;
         <a href='file_manage_view.php?fmdo=newdir&activepath=<?php echo urlencode($activepath)?>' class="btn btn-secondary btn-sm">新建目录</a>
-        &nbsp;
         <a href='file_manage_view.php?fmdo=upload&activepath=<?php echo urlencode($activepath)?>' class="btn btn-secondary btn-sm">文件上传</a>
-        &nbsp;
         <a href='file_manage_control.php?fmdo=space&activepath=<?php echo urlencode($activepath)?>' class="btn btn-secondary btn-sm">空间检查</a>
         &nbsp;&nbsp;</td>
     </tr>

src/dede/templets/friendlink_add.htm

@@ -3,28 +3,33 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>友情链接管理</title>
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<script language="javascript" src="js/main.js"></script>
 <script language='javascript'>
 function CheckSubmit()
 {
 	if(document.form1.url.value=="http://"||document.form1.url.value=="")
 	{
    		document.form1.url.focus();
-   		alert("网址不能为空！");
+   		ShowMsg("网址不能为空！");
    		return false;
 	}
 	if(document.form1.webname.value=="")
 	{
    		document.form1.webname.focus();
-   		alert("网站名称不能为空！");
+   		ShowMsg("网站名称不能为空！");
    		return false;
 	}
 	return true;
 }
 </script>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
   <tr>
     <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b><a href="friendlink_main.php"><u>友情链接管理</u></a></b>&gt;&gt;增加链接</td>
 </tr>
@@ -32,7 +37,7 @@ function CheckSubmit()
     <td height="200" bgcolor="#FFFFFF" valign="top">
 	<form action="friendlink_add.php" method="post" enctype="multipart/form-data" name="form1" onSubmit="return CheckSubmit();";>
 	<input type="hidden" name="dopost" value="add" />
-	<table width="80%"  border="0" cellspacing="1" cellpadding="3">
+	<table width="80%"  border="0" cellspacing="1" cellpadding="3" class="table table-borderless">
 	  <tr>
         <td width="19%" height="25">网址：</td>
         <td width="81%">
@@ -62,7 +67,7 @@ function CheckSubmit()
       <tr>
         <td height="25">上传Logo：</td>
         <td>
-        	<input name="logoimg" type="file" id="logoimg" size="30" class='pubinputs' />
+        	<input name="logoimg" type="file" id="logoimg" size="30" />
         </td>
       </tr>
       <tr>
@@ -93,15 +98,15 @@ function CheckSubmit()
       <tr>
         <td height="25">链接位置：</td>
         <td>
-        <input type='radio' name='ischeck' value="1" checked='1' /> 内页
-        <input type='radio' name='ischeck' value="2"/> 首页
+        <label><input type='radio' name='ischeck' value="1" checked='1' /> 内页</label>
+        <label><input type='radio' name='ischeck' value="2"/> 首页 </label>
         </td>
       </tr>
       <tr>
         <td height="51">&nbsp;</td>
         <td>
-        	<input type="submit" name="Submit" value=" 提 交 " class="coolbg np" />　 　
-          <input type="reset" name="Submit" value=" 重 置 " class="coolbg np" />
+        	<button type="submit" name="Submit" class="btn btn-secondary"> 提 交 </button>
+          <button type="reset" name="Submit" class="btn btn-secondary"> 重 置 </button>
          </td>
       </tr>
     </table>

src/dede/templets/friendlink_edit.htm

@@ -1,71 +1,85 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>友情链接更改</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>友情链接更改</title>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
-  <tr>
-    <td height="28" background="images/tbg.gif" style="padding-left:10px;">
-    	<b><a href="friendlink_main.php"><u>友情链接管理</u></a></b> &gt;&gt; 链接更改</td>
-</tr>
-<tr>
-    <td height="200" bgcolor="#FFFFFF" valign="top">
-	<form action="friendlink_edit.php" method="post" enctype="multipart/form-data" name="form1">
-	<input type="hidden" name="id" value="<?php echo $myLink['id']?>">
-	<input type="hidden" name="dopost" value="saveedit">
-	<table width="80%"  border="0" cellspacing="1" cellpadding="3">
-	  <tr>
-        <td width="19%" height="25">网址：</td>
-        <td width="81%">
-        <input name="url" type="text" id="url" value="<?php echo $myLink['url']?>" size="30" class='pubinputs' />
-        </td>
-      </tr>
-      <tr>
-        <td width="19%" height="25">排列位置：</td>
-        <td width="81%">
-        <input name="sortrank" type="text" id="sortrank" value="<?php echo $myLink['sortrank']?>" size="10"  class='pubinputs' style="width:60px" />
-        (由小到大排列)
-        </td>
-      </tr>
-      <tr>
-        <td height="25">网站名称：</td>
-        <td><input name="webname" type="text" id="webname" size="30" value="<?php echo $myLink['webname']?>" class='pubinputs' /></td>
-      </tr>
-      <tr>
-        <td height="25">网站Logo：</td>
-        <td>
-        	<input name="logo" type="text" id="logo" size="40" value="<?php echo $myLink['logo']?>" class='pubinputs'/>
-          (88*31 gif或jpg)
-         </td>
-      </tr>
-      <tr>
-        <td height="25">上传Logo：</td>
-        <td><input name="logoimg" type="file" id="logoimg" size="30" class='pubinputs' /></td>
-      </tr>
-      <tr>
-        <td height="25">网站简况：</td>
-        <td><textarea name="msg" cols="50" rows="4" id="msg"><?php echo dede_htmlspecialchars($myLink['msg'])?></textarea></td>
-      </tr>
-      <tr>
-        <td height="25">站长Email：</td>
-        <td><input name="email" type="text" id="email" size="30" value="<?php echo $myLink['email']?>" class='pubinputs' /></td>
-      </tr>
-      <tr>
-        <td height="25">链接位置：</td>
-        <td>
-        	<input type='radio' name='ischeck' value="0" <?php if($myLink['ischeck']==0) echo " checked='1' "?>/> 未审核
-        	<input type='radio' name='ischeck' value="1" <?php if($myLink['ischeck']==1) echo " checked='1' "?>/> 内页
-        	<input type='radio' name='ischeck' value="2" <?php if($myLink['ischeck']==2) echo " checked='1' "?>/> 首页
-        </td>
-      </tr>
-      <tr>
-        <td height="25">网站类型：</td>
-        <td>
-        <select name="typeid" id="typeid">
-        <?php
+  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table table-bordered maintable mt-3">
+    <tr>
+      <td height="28" background="images/tbg.gif" style="padding-left:10px;">
+        <b><a href="friendlink_main.php"><u>友情链接管理</u></a></b> &gt;&gt; 链接更改</td>
+    </tr>
+    <tr>
+      <td height="200" bgcolor="#FFFFFF" valign="top">
+        <form action="friendlink_edit.php" method="post" enctype="multipart/form-data" name="form1">
+          <input type="hidden" name="id" value="<?php echo $myLink['id']?>">
+          <input type="hidden" name="dopost" value="saveedit">
+          <table width="80%" border="0" cellspacing="1" cellpadding="3" class="table table-borderless">
+            <tr>
+              <td width="19%" height="25">网址：</td>
+              <td width="81%">
+                <input name="url" type="text" id="url" value="<?php echo $myLink['url']?>" size="30"
+                  class='pubinputs' />
+              </td>
+            </tr>
+            <tr>
+              <td width="19%" height="25">排列位置：</td>
+              <td width="81%">
+                <input name="sortrank" type="text" id="sortrank" value="<?php echo $myLink['sortrank']?>" size="10"
+                  class='pubinputs' style="width:60px" />
+                (由小到大排列)
+              </td>
+            </tr>
+            <tr>
+              <td height="25">网站名称：</td>
+              <td><input name="webname" type="text" id="webname" size="30" value="<?php echo $myLink['webname']?>"
+                  class='pubinputs' /></td>
+            </tr>
+            <tr>
+              <td height="25">网站Logo：</td>
+              <td>
+                <input name="logo" type="text" id="logo" size="40" value="<?php echo $myLink['logo']?>"
+                />
+                (88*31 gif或jpg)
+              </td>
+            </tr>
+            <tr>
+              <td height="25">上传Logo：</td>
+              <td><input name="logoimg" type="file" id="logoimg" size="30" /></td>
+            </tr>
+            <tr>
+              <td height="25">网站简况：</td>
+              <td><textarea name="msg" cols="50" rows="4"
+                  id="msg"><?php echo dede_htmlspecialchars($myLink['msg'])?></textarea></td>
+            </tr>
+            <tr>
+              <td height="25">站长Email：</td>
+              <td><input name="email" type="text" id="email" size="30" value="<?php echo $myLink['email']?>"
+                  class='pubinputs' /></td>
+            </tr>
+            <tr>
+              <td height="25">链接位置：</td>
+              <td>
+                <label><input type='radio' name='ischeck' value="0" <?php if($myLink['ischeck']==0) echo " checked='1' "?> />
+                未审核</label>
+                <label><input type='radio' name='ischeck' value="1" <?php if($myLink['ischeck']==1) echo " checked='1' "?> />
+                内页</label>
+                <label><input type='radio' name='ischeck' value="2" <?php if($myLink['ischeck']==2) echo " checked='1' "?> />
+                首页</label>
+              </td>
+            </tr>
+            <tr>
+              <td height="25">网站类型：</td>
+              <td>
+                <select name="typeid" id="typeid">
+                  <?php
         echo "	<option value='".$myLink['typeid']."'>".$myLink['typename']."</option>\r\n";
         $dsql->SetQuery("select * from #@__flinktype where id<>'".$myLink['typeid']."'");
         $dsql->Execute();
@@ -73,20 +87,22 @@
         	echo "	<option value='".$row->id."'>".$row->typename."</option>\r\n";
         }
         ?>
-        </select>
-        </td>
-      </tr>
-      <tr>
-        <td height="51">&nbsp;</td>
-        <td>
-        	<input type="submit" name="Submit" value=" 提 交 " class="np coolbg" />　 　
-          <input type="reset" name="Submit" value=" 返 回 " onClick="location.href='<?php echo $ENV_GOBACK_URL?>';" class="np coolbg" />
-         </td>
-      </tr>
-    </table>
-	</form>
- </td>
-</tr>
-</table>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td height="51">&nbsp;</td>
+              <td>
+                <button type="submit" name="Submit" class="btn btn-secondary"> 提 交 </button> 　
+                <button type="reset" name="Submit" onClick="location.href='<?php echo $ENV_GOBACK_URL?>';"
+                  class="btn btn-secondary"> 返 回 </button>
+              </td>
+            </tr>
+          </table>
+        </form>
+      </td>
+    </tr>
+  </table>
 </body>
+
 </html>

src/dede/templets/friendlink_main.htm

@@ -9,6 +9,9 @@
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type='text/css'>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
+  <script language="javascript" src="js/main.js"></script>
   <script language='javascript'>
     function Sel(stype) {
       for (var i = 0; i < document.getElementsByName('aids').length; i++) {
@@ -25,7 +28,7 @@
         }
       }
       if (str == '') {
-        alert('你没选择任何内容！');
+        ShowMsg('你没选择任何内容！');
         return false;
       }
       else {
@@ -44,9 +47,9 @@
           <b>友情链接管理</b>
         </div>
         <div style="float:right;padding-right:6px;">
-          [<a href="friendlink_add.php"><u>增加链接</u></a>]
-          [<a href="friendlink_type.php"><u>网站类型管理</u></a>]
-          [<a href='{dede:global name=' cfg_phpurl' /}/flink.php' target='_blank'><u>友情链接预览</u></a>]
+          <a href="friendlink_add.php" class="btn btn-secondary btn-sm">增加链接</a>
+          <a href="friendlink_type.php" class="btn btn-secondary btn-sm">网站类型管理</a>
+          <a href='{dede:global name=' cfg_phpurl' /}/flink.php' target='_blank' class="btn btn-secondary btn-sm">友情链接预览</a>
         </div>
       </td>
     </tr>
@@ -70,8 +73,7 @@
                 </select>
               </td>
               <td>
-                <input name="imageField" class="np" type="image" src="images/button_search.gif" width="60" height="22"
-                  border="0" />
+                <button type="submit" class="btn btn-secondary">搜索</button>
               </td>
             </tr>
           </table>
@@ -102,8 +104,8 @@
         <td>{dede:field.ischeck function="GetSta(@me)"/}</td>
         <td>{dede:field.sortrank/}</td>
         <td>
-          <a href='friendlink_edit.php?id={dede:field.id/}&dopost=getedit'>[更改]</a>
-          <a href='friendlink_edit.php?id={dede:field.id/}&dopost=delete'>[删除]</a>
+          <a href='friendlink_edit.php?id={dede:field.id/}&dopost=getedit' class="btn btn-secondary btn-sm">更改</a>
+          <a href='friendlink_edit.php?id={dede:field.id/}&dopost=delete' class="btn btn-secondary btn-sm">删除</a>
         </td>
       </tr>
       {/dede:datalist}
@@ -111,9 +113,9 @@
     <tr bgcolor="#ffffff" height="28">
       <td colspan="8">
         　
-        <a href='#' onclick='Sel("all")' class='np coolbg'>[全选]</a>
-        <a href='#' onclick='Sel("none")' class='np coolbg'>[取消]</a>
-        <a href='#' onclick='checkSubmit()' class='np coolbg'>批量删除</a>
+        <a href='#' onclick='Sel("all")' class="btn btn-secondary btn-sm">全选</a>
+        <a href='#' onclick='Sel("none")' class="btn btn-secondary btn-sm">取消</a>
+        <a href='#' onclick='checkSubmit()' class="btn btn-secondary btn-sm">批量删除</a>
 
       </td>
     </tr>

src/dede/templets/index2.htm

@@ -81,9 +81,6 @@
         <li><a href="../member" target="_blank">会员中心</a></li>
         <li><a href="exit.php" target="_top">注销</a></li>
       </ul>
-      <div class="quick"> <a href="#" class="ac_qucikmenu" id="ac_qucikmenu">快捷方式</a> <a href="#" class="ac_qucikadd" id="ac_qucikadd">
-        <!--ADD-->
-        </a> </div>
     </div>
   </div>
   <div class="topnav">
@@ -118,7 +115,7 @@
         <form action="action_search.php" target="main" method="post">
           <input name="keyword" type="text" value="功能搜索" onfocus="if(this.value=='功能搜索'){this.value='';}"  onblur="if(this.value==''){this.value='功能搜索';}" class="allsearch" style="width:150px;"/>
           <input name="" type="submit" value="搜索" class="np"/>
-          <a href='http://bbs.dedecms.com' target='_blank'>官方论坛</a> <a href='https://github.com/dedetech' target='_blank'>Github</a>
+          <a href='https://git.dedebiz.com' target='_blank'>代码托管</a> <a href='http://bbs.dedecms.com' target='_blank'>官方论坛</a> 
         </form>
       </div>
     </div>

src/dede/templets/index_menu2.htm

@@ -79,12 +79,12 @@ echo "<script language='javascript'>var curopenItem = '$openitem';</script>\r\n"
 		}
 
 		.flrct {
-			padding-top: 3px;
+			padding-top: 5px;
 			float: left;
 		}
 
 		.sitemu li {
-			padding: 0px 0px 0px 18px;
+			padding: 2px 0px 2px 18px;
 			line-height: 22px;
 			background: url(images/arr4.gif) no-repeat 5px 9px;
 		}

src/dede/templets/mychannel_modifysearch.htm

@@ -7,6 +7,8 @@
   <title>修改频道</title>
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script language="javascript" src="js/main.js"></script>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
   <style type="text/css">
     .STYLE1 {
@@ -26,11 +28,11 @@
 </head>
 
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-  <div class="bodytitle">
+  <div class="bodytitle mt-3">
     <div class="bodytitleleft"></div>
     <div class="bodytitletxt" style="padding-left:10px;">自定义搜索管理</div>
   </div>
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable table-bordered mt-3"
     style="background:#CFCFCF;">
     <form name="form1" action="mychannel_edit.php" method="post" target="stafrm">
       <input type='hidden' name='mid' value='<?php echo $mid?>'>
@@ -43,7 +45,7 @@
           <div style="width:100px; float:right"><a
               href="mychannel_edit.php?dopost=del&mid=<?php echo $mid;?>">删除自定义搜索</a></div>
           <b><a href="mychannel_main.php"><u>内容模型管理</u></a> &gt; 自定义搜索管理：</b>
-          (自定义搜索再方便搜索的同时在一定程度上降低了效率，请根据需求定义搜索)
+          (自定义搜索在方便搜索的同时在一定程度上降低了效率，请根据需求定义搜索)
         </td>
       </tr>
       <tr>
@@ -87,15 +89,14 @@
       </tr>
       <tr bgcolor="#ffffff">
         <td height="28" colspan="2">
-          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
               <td width="26%" height="45">&nbsp;</td>
               <td width="15%">
-                <input type="submit" name="button" id="button" value="确定" class='np coolbg' />
+                <button type="submit" class="btn btn-secondary btn-sm">确定</button>
               </td>
               <td width="59%">
-                <input name="bt" type="button" id="button2" onclick="location='mychannel_main.php';" value="返回"
-                  class='np coolbg' />
+                <button type="button" onclick="location='mychannel_main.php';" class="btn btn-secondary btn-sm">返回</button>
               </td>
             </tr>
           </table>
@@ -104,7 +105,7 @@
     </form>
     <tr bgcolor="bgcolor=" #F9FCEF">
       <td height="20" colspan="2" bgcolor="#F9FCEF">
-        <table width="100%">
+        <table width="100%" class="table table-borderless">
           <tr>
             <td width="74%"><strong>&nbsp;&nbsp;</strong>进行状态： </td>
             <td width="26%" align="right">

src/dede/templets/mytag_add.htm

@@ -10,12 +10,14 @@
   <link href='css/base.css' rel='stylesheet' type='text/css'>
   <link href="../static/css/daterangepicker.css" rel="stylesheet">
   <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script type="text/javascript" src="../static/js/moment.min.js"></script>
   <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
+  <script language="javascript" src="js/main.js"></script>
   <script language="javascript">
     function checkSubmit() {
       if (document.form1.tagname.value == "") {
-        alert("标记名称不能为空！");
+        ShowMsg("标记名称不能为空！");
         document.form1.tagname.focus();
         return false;
       }
@@ -94,10 +96,12 @@
             </tr>
             <tr>
               <td height="25" align="center">时间限制：</td>
-              <td colspan="2"><input name="timeset" type="radio" value="0" checked='1' />
-                永不过期
-                <input type="radio" name="timeset" value="1" />
-                在设内时间内有效</td>
+              <td colspan="2">
+                <label><input name="timeset" type="radio" value="0" checked='1' />
+                永不过期</label>
+                <label><input type="radio" name="timeset" value="1" />
+                在设内时间内有效</label>
+              </td>
             </tr>
             <tr>
               <td height="25" align="center">开始时间：</td>

src/dede/templets/mytag_tag_guide.htm

@@ -142,12 +142,12 @@
               </tr>
               <tr>
                 <td height="28"> 高级筛选：
-                  <input name="types[]" type="checkbox" id="type[]" value="image" class="np" />
-                  带缩略图
-                  <input name="types[]" type="checkbox" id="type[]" value="commend" class="np" />
-                  推荐
-                  <input name="types[]" type="checkbox" id="type[]" value="spec" class="np" />
-                  专题　关键字：
+                  <label><input name="types[]" type="checkbox" id="type[]" value="image" class="np" />
+                  带缩略图</label>
+                  <label><input name="types[]" type="checkbox" id="type[]" value="commend" class="np" />
+                  推荐</label>
+                  <label><input name="types[]" type="checkbox" id="type[]" value="spec" class="np" />
+                  专题</label>　关键字：
                   <input name="keyword" type="text" id="keyword" />
                   （&quot;,&quot;逗号分开） </td>
               </tr>
@@ -164,10 +164,10 @@
                     <option value="rand">随机获取</option>
                   </select>
                   　
-                  <input name="order" type="radio" class="np" value="desc" checked='1' />
-                  由高到低
-                  <input type="radio" name="order" class="np" value="asc" />
-                  由低到高</td>
+                  <label><input name="order" type="radio" class="np" value="desc" checked='1' />
+                  由高到低</label>
+                  <label><input type="radio" name="order" class="np" value="asc" />
+                  由低到高</label></td>
               </tr>
               <tr>
                 <td height="28">文档发布时间：

src/dede/templets/public_guide.htm

@@ -3,7 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>内容发布向导</title>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css" />
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<script language="javascript" src="js/main.js"></script>
 <style>
 .np { border:0px }
 </style>
@@ -24,7 +29,7 @@
 	function SetDefault()
 	{
 		if(selCheckbox==''){
-			alert("你没有选中需要设置为默认的栏目！");
+			ShowMsg("你没有选中需要设置为默认的栏目！");
 		}else{
 			var selobj = document.getElementById(selCheckbox);
 			location="public_guide.php?action=setdefault&cid="+selobj.value;
@@ -36,12 +41,12 @@
 </script>
 </head>
 <body leftmargin="8" topmargin="8" background='images/allbg.gif'>
-<table width="98%" height="31" border="0" align="center" cellpadding="1" cellspacing="1" class="tbtitle" style="border:1px solid #CFCFCF;margin-top:6px;border-bottom:none;">
+<table width="98%" height="31" border="0" align="center" cellpadding="1" cellspacing="1" class="table maintable table-bordered mt-3" style="border:1px solid #CFCFCF;margin-top:6px;border-bottom:none;">
   <tr>
     <td class="tbtitletxt" background='images/tbg.gif'><strong>&nbsp;内容发布向导：</strong></td>
   </tr>
 </table>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" style="border:1px solid #CFCFCF;">
+<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" style="border:1px solid #CFCFCF;" class="table maintable table-borderless mt-3">
   <tr align="center">
     <td height="120" align="left" valign="top" bgcolor="#FFFFFF" style="padding:6px;padding-bottom:20px">
 	<table width="100%" border="0" cellspacing="0" cellpadding="6">
@@ -50,8 +55,8 @@
           1、必须先建立与频道内容模型关连的栏目才能发布内容（<a href="catalog_main.php"><u>栏目管理</u></a>）；<br />
           2、如果您设置了某频道为默认发布表单，以后将不再显示此向导，而是直接显示您所选的频道的发布表单，如果想要发布其它频道的内容，可以从左边的目录树中选择，如果以后您想要修改默认发布表单，请点击目录树上方的“发布向导”图标；</td>
       </tr>
-    </table>
-	<table width="100%" border="0" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf" >
+  </table>
+	<table width="100%" border="0" cellpadding="3" cellspacing="1" bgcolor="#cfcfcf"  class="table table-bordered">
     <tr height="22" align="center" bgcolor="#FBFCE2">
         <td width="8%" ><strong>选择</strong></td>
 		<td width="8%"><strong>频道ID</strong></td>
@@ -78,14 +83,12 @@
         <td><?php echo $row['addtable']; ?></td>
         <td><?php echo $catnum; ?></td>
         <td>
-        <a href="catalog_main.php">管理栏目</a>
+        <a href="catalog_main.php" class="btn btn-secondary btn-sm">管理栏目</a>
         <?php
         if($catnum>0){
         ?>
-        	 | 
-        <a href="<?php echo $row['mancon']; ?>">管理内容</a>
-        	 | 
-        <a href="catalog_do.php?channelid=<?php echo $row['id'];?>&cid=0&dopost=addArchives">发布内容</a>
+        <a href="<?php echo $row['mancon']; ?>" class="btn btn-secondary btn-sm">管理内容</a>
+        <a href="catalog_do.php?channelid=<?php echo $row['id'];?>&cid=0&dopost=addArchives" class="btn btn-secondary btn-sm">发布内容</a>
        <?php }else{ ?>
        		 | 
         <font color='#cccccc'>管理内容</font>
@@ -99,14 +102,11 @@
     ?>
     </table>
 	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr>
-        <td>&nbsp;</td>
-      </tr>
       <tr>
         <td>
-        	<input name="b1" type="button" id="b1" value="把所选的频道表单设为默认表单" onClick="SetDefault()" class="coolbg" />
+        	<button name="b1" type="button" id="b1" onClick="SetDefault()" class="btn btn-secondary btn-sm">把所选的频道表单设为默认表单</button>
         	&nbsp;&nbsp;
-        	<input name="b2" type="button" id="b2" value="取消默认表单" onClick="ResetDefault()" class="coolbg" />
+        	<button name="b2" type="button" id="b2" onClick="ResetDefault()" class="btn btn-secondary btn-sm">取消默认表单</button>
         </td>
       </tr>
     </table></td>

src/dede/templets/templets_tagsource.htm

@@ -60,7 +60,7 @@
     <tr height="26" bgcolor='#FFFFFF' onMouseMove="javascript:this.bgColor='#FCFDEE';"
       onMouseOut="javascript:this.bgColor='#FFFFFF';">
       <td>
-        <img src='images/htm.gif' border='0' align='absmiddle' /><?php echo $filename; ?>
+        <img src='images/htm.gif' border='0' align='absmiddle' /> <?php echo $filename; ?>
       </td>
       <td>
         <?php echo $fileinfo; ?>
@@ -69,7 +69,7 @@
         <?php echo $filetime; ?>
       </td>
       <td align='center'>
-        <a href='tpl.php?action=edittag&filename=<?php echo $filename; ?>'><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 编辑</a>
+        <a href='tpl.php?action=edittag&filename=<?php echo $filename; ?>' class="btn btn-secondary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 编辑</a>
       </td>
     </tr>
     <?php } ?>

src/dede/templets/tpl_edit_tag.htm

@@ -3,8 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>标签源码碎片管理</title>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="css/base.css">
 <link rel="stylesheet" type="text/css" href="css/codemirror.css">
+<script language="javascript" src="../static/js/jquery.js"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<script language="javascript" src="js/main.js"></script>
 <style type="text/css">
 .selbt {
 	width:80px;
@@ -21,12 +26,12 @@
 	position:absolute;
 }
 </style>
-<script  language="javascript">
+<script language="javascript">
 function Post()
 {
 	if (document.form1.filename.value=="")
 	{
-		alert("文件名不能为空。");
+		ShowMsg("文件名不能为空。");
 		document.form1.filename.focus();
 		return false;
 	}
@@ -41,7 +46,7 @@ function Post()
 <script type="text/javascript" src="js/mode/htmlmixed/htmlmixed.js"></script>
 </head>
 <body bgcolor="#F2F4F3" leftmargin="8" topmargin="8">
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#ECFAD3" style="margin-bottom:8px;">
+<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#ECFAD3" style="margin-bottom:8px;" class="mt-3">
   <tr> 
     <td height="28" style="border:1px dotted #BFD67C" background="images/wbg.gif" >&nbsp;&nbsp;◇<a href='templets_tagsource.php'><b>标签源码碎片管理</b></a> &gt;&gt; <b><?php echo $title; ?></b>
 	  </td>
@@ -51,7 +56,7 @@ function Post()
 <input type="hidden" name="actiondo" value="<?php echo $action; ?>" />
 <input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
 <input type="hidden" name="action" value="savetagfile" />
-	<table width='98%'  border='0' cellpadding='3' cellspacing='1' bgcolor='#cfcfcf' align="center">
+	<table width='98%'  border='0' cellpadding='3' cellspacing='1' bgcolor='#cfcfcf' align="center" class="table maintable table-bordered mt-3">
 		<tr bgcolor='#EEF4EA'>
 			<td colspan='2' background='images/wbg.gif' height='26' style="padding-left:10px;">
 					<font color='#666600'><b><?php echo $title; ?></b>(修改源码如果出现语法错误，可能导致标签无法使用，请修改前先作好数据备份)</font>
@@ -60,7 +65,7 @@ function Post()
 		<tr bgcolor='#FFFFFF'>
   		<td>文件名称</td>
   		<td>
-  			<input name=filename size=40 value="<?php echo $filename; ?>" class="alltxt"/>
+  			<input name=filename size=40 value="<?php echo $filename; ?>"/>
     		（不允许用 “..” 形式的路径）
   		</td>
 		</tr>
@@ -79,11 +84,11 @@ function Post()
     </tr>
     <tr>
       <td height="42" colspan='2'  bgcolor="#F9FCEF">
-          <input type="submit" value="  保 存  " name='B1' class="coolbg np" />
+          <button type="submit" name='B1' class="btn btn-secondary">  保 存  </button>
           &nbsp;
-          <input type="reset" value="取消修改" name='B2' class="coolbg np" />
+          <button type="reset" name='B2' class="btn btn-secondary">取消修改</button>
           &nbsp;
-          <input type="button" value="不理返回" name='B4' class="coolbg np" onClick="javascript:history.go(-1);" />
+          <button type="button" name='B4' class="btn btn-secondary" onClick="javascript:history.go(-1);">不理返回</button>
       </td>
     </tr>
 </table>