Merge branch 'develop' of https://www.zhelixie.com/DedeBIZ/DedeCMSV6 into develop

src/admin/dialog/select_images.php

@@ -136,7 +136,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="imgstick" value="<?php echo $imgstick ?>">
                     <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>">
                     <input type="hidden" name="job" value="upload">
-                    上传：<input type="file" name="imgfile" style="width:260px;border:none">
+                    上传：<input type="file" name="imgfile" style="width:50%;border:none">
                     <label><input type="checkbox" name="needwatermark" value="1" class="np" <?php if ($photo_markup == '1') echo "checked"; ?> /> 水印 </label>
                     <label><input type="checkbox" name="resize" value="1" class="np"> 缩小 </label>
                     宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" style="width:46px">

src/admin/dialog/select_media.php

@@ -79,7 +79,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="f" value="<?php echo $f ?>">
                     <input type="hidden" name="job" value="upload">
                     <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>">
-                    上传：<input type="file" name="uploadfile" style="width:360px;border:none">
+                    上传：<input type="file" name="uploadfile" style="width:50%;border:none">
                     <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
                 </form>
             </td>

src/admin/dialog/select_soft.php

@@ -83,7 +83,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                     <input type="hidden" name="f" value="<?php echo $f ?>">
                     <input type="hidden" name="job" value="upload">
-                    上传：<input type="file" name="uploadfile" size="24" style="border:none">
+                    上传：<input type="file" name="uploadfile" size="24" style="width:50%;border:none">
                     改名：<input type="text" name="newname" style="width:160px">
                     <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
                 </form>

src/admin/dialog/select_templets.php

@@ -64,7 +64,7 @@ a{text-decoration:none!important}
                     <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                     <input type="hidden" name="f" value="<?php echo $f ?>">
                     <input type="hidden" name="job" value="upload">
-                    上传：<input type="file" name="uploadfile" style="width:260px;border:none">
+                    上传：<input type="file" name="uploadfile" style="width:50%;border:none">
                     改名：<input type="text" name="filename" style="width:160px">
                     <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
                 </form>

src/admin/templets/ad_add.htm

@@ -152,7 +152,7 @@
             </tr>
             <tr>
               <td height="80" align="center">过期显示内容：</td>
-              <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100"></textarea></td>
+              <td><textarea name="expbody" rows="10" id="expbody" style="width:80%;height:100px"></textarea></td>
               <td></td>
             </tr>
             <tr>

src/admin/templets/diy_add.htm

@@ -70,8 +70,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 $cfg_dbprefix; ?>diyform<?php echo $newdiyid; ?>" class='pubinputs' />
+          <input name="table" type="text" id="table" style="width:180px" value="<?php echo $cfg_dbprefix; ?>diyform<?php echo $newdiyid; ?>" class='pubinputs' />
           *<img src="../static/web/img/help.gif" alt="帮助" border="0" style="cursor:hand" onClick="showHide2('help5')">
         </td>
       </tr>
@@ -81,18 +80,15 @@
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">列表模板：</td>
-        <td bgcolor="#FFFFFF"><input name="listtemplate" type="text" id="listtemplate" style="width:180px"
-            value="list_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
+        <td bgcolor="#FFFFFF"><input name="listtemplate" type="text" id="listtemplate" style="width:180px" value="list_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">内容模板：</td>
-        <td bgcolor="#FFFFFF"><input name="viewtemplate" type="text" id="viewtemplate" style="width:180px"
-            value="view_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
+        <td bgcolor="#FFFFFF"><input name="viewtemplate" type="text" id="viewtemplate" style="width:180px" value="view_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">发布模板：</td>
-        <td bgcolor="#FFFFFF"><input name="posttemplate" type="text" id="posttemplate" style="width:180px"
-            value="post_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
+        <td bgcolor="#FFFFFF"><input name="posttemplate" type="text" id="posttemplate" style="width:180px" value="post_diyform<?php echo $newdiyid; ?>.htm" class='pubinputs' /></td>
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">前台列表和内容页公开：</td>

src/admin/templets/diy_edit.htm

@@ -154,22 +154,19 @@ foreach($dtp->CTags as $ctag)
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">列表模板：</td>
         <td bgcolor="#FFFFFF">
-          <input name="listtemplate" type="text" id="listtemplate" style="width:180px"
-            value="<?php echo $row['listtemplate']; ?>" class='alltxt' />
+          <input name="listtemplate" type="text" id="listtemplate" style="width:180px" value="<?php echo $row['listtemplate']; ?>" class='alltxt' />
         </td>
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">内容模板：</td>
         <td bgcolor="#FFFFFF">
-          <input name="viewtemplate" type="text" id="viewtemplate" style="width:180px"
-            value="<?php echo $row['viewtemplate']; ?>" class='alltxt' />
+          <input name="viewtemplate" type="text" id="viewtemplate" style="width:180px" value="<?php echo $row['viewtemplate']; ?>" class='alltxt' />
         </td>
       </tr>
       <tr>
         <td height="26" align="left" bgcolor="#FFFFFF">发布模板：</td>
         <td bgcolor="#FFFFFF">
-          <input name="posttemplate" type="text" id="posttemplate" style="width:180px"
-            value="<?php echo $row['posttemplate']; ?>" class='alltxt' />
+          <input name="posttemplate" type="text" id="posttemplate" style="width:180px" value="<?php echo $row['posttemplate']; ?>" class='alltxt' />
         </td>
       </tr>
       <tr>

src/admin/templets/freelist_add.htm

@@ -169,7 +169,7 @@
               <tr>
                 <td height="26" align="left"> 限定栏目：
                   <?php
-                 echo "<select name='typeid' style='width:100'>\r\n";
+                 echo "<select name='typeid' style='width:100px'>\r\n";
                  echo "<option value='0'>不限栏目</option>\r\n";
                 $dsql->SetQuery("Select ID,typename, channeltype From #@__arctype");
                 $dsql->Execute();
@@ -187,7 +187,7 @@
               <tr>
                 <td height="26" align="left"> 限定频道：
                   <?php
-       echo "<select name='channel' style='width:100'>\r\n";
+       echo "<select name='channel' style='width:100px'>\r\n";
        echo "<option value='0' selected>不限</option>\r\n";
        $dsql->SetQuery("Select ID,typename From #@__channeltype where ID>0");
 	   $dsql->Execute();
@@ -202,7 +202,7 @@
               <tr>
                 <td height="26" align="left">附加属性：
                   <?php
-       echo "<select name='att' style='width:100'>\r\n";
+       echo "<select name='att' style='width:100px'>\r\n";
        echo "<option value='0' selected>不限</option>\r\n";
        $dsql->SetQuery("Select * From #@__arcatt");
 	   $dsql->Execute();

src/admin/templets/freelist_edit.htm

@@ -134,7 +134,7 @@
                   限定栏目：
                   <?php
                $typeid = $ctag->GetAtt('typeid');
-               echo "<select name='typeid' style='width:100'>\r\n";
+               echo "<select name='typeid' style='width:100px'>\r\n";
                echo "<option value='0'>不限栏目</option>\r\n";
                $dsql->SetQuery("Select id,typename, channeltype From #@__arctype");
                $dsql->Execute();
@@ -154,7 +154,7 @@
                 <td height="26" align="left"> 限定频道：
                   <?php
                 $channel  = $ctag->GetAtt('channel');
-                echo "<select name='channel' style='width:100'><option value='0'>不限</option>\r\n";
+                echo "<select name='channel' style='width:100px'><option value='0'>不限</option>\r\n";
                 $dsql->SetQuery("Select id,typename From #@__channeltype where id>0");
                 $dsql->Execute();
                 while($nrow = $dsql->GetObject())
@@ -170,7 +170,7 @@
                 <td height="26" align="left">附加属性：
                   <?php
                 $att  = $ctag->GetAtt('att');
-                echo "<select name='att' style='width:100'>\r\n";
+                echo "<select name='att' style='width:100px'>\r\n";
                 echo "<option value='0'>不限</option>\r\n";
                 $dsql->SetQuery("Select * From #@__arcatt");
                 $dsql->Execute();

src/admin/templets/makehtml_archives.htm

@@ -32,7 +32,7 @@
        if(empty($cid)) $cid="0";
        $tl = new TypeLink($cid);
        $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0);
-       echo "<select name='typeid' style='width:300'>\r\n";
+       echo "<select name='typeid' style='width:300px'>\r\n";
        if($cid=="0") echo "<option value='0' selected>更新所有文档</option>\r\n";
        echo $typeOptions;
        echo "</select>";

src/admin/templets/makehtml_homepage.htm

@@ -36,7 +36,7 @@
       <tr>
         <td width="177" valign="top" bgcolor="#FFFFFF">选择首页模板：</td>
         <td width="791" valign="top" bgcolor="#FFFFFF">
-          <input name="templet" type="text" id="templet" style="width:300" value="<?php echo $row['templet']?>">
+          <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>
       </tr>

src/admin/templets/makehtml_js.htm

@@ -35,7 +35,7 @@
        if(empty($cid)) $cid="0";
        $tl = new TypeLink($cid);
        $typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0,1);
-       echo "<select name='typeid' style='width:300'>\r\n";
+       echo "<select name='typeid' style='width:300px'>\r\n";
        if($cid=="0") echo "<option value='0' selected>所有栏目</option>\r\n";
        echo $typeOptions;
        echo "</select>";
@@ -52,8 +52,7 @@
       </tr>
       <tr>
         <td height="26" valign="top" bgcolor="#FFFFFF">模板文件：</td>
-        <td height="26" valign="top" bgcolor="#FFFFFF"><input name="templet" type="text" id="templet" style="width:300"
-            value="plus/js.htm">
+        <td height="26" valign="top" bgcolor="#FFFFFF"><input name="templet" type="text" id="templet" style="width:300px" value="plus/js.htm">
           <button type="button" class="btn btn-success btn-sm" name="set4" onClick="SelectTemplets('form1.templet');">浏览</button>
         </td>
       </tr>

src/admin/templets/makehtml_taglist.htm

@@ -49,7 +49,7 @@
         </td>
       </tr>
       <tr>
-        <td width="300" valign="top" bgcolor="#FFFFFF">选择标签：</td>
+        <td width="300" valign="top" bgcolor="#FFFFFF">输入标签：</td>
         <td width="377" valign="top" bgcolor="#FFFFFF">
           <select id='tagid' name='tagid' style='width:300px'>
         </td>

src/admin/templets/member_scores.htm

@@ -52,14 +52,11 @@
           <input name="Ids-<?php echo $v['id']?>" type="checkbox" id="Ids-<?php echo $v['id']?>" value="1" class='np' />
         </td>
         <td align="left" style="padding:5px;">
-          <input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>"
-            value="<?php echo $v['integral']?>" size="10"></td>
+          <input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" size="10"></td>
         <td align="left" style="padding:5px;">
-          <input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>"
-            value="<?php echo $v['icon']?>" size="3"></td>
+          <input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" size="3"></td>
         <td align="left" style="padding:5px;">
-          <input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>"
-            value="<?php echo $v['titles']?>" size="20"></td>
+          <input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" size="20"></td>
         <td align="left" style="padding:5px;">
           <select name="isdefault-<?php echo $v['id']?>" id="isdefault-<?php echo $v['id']?>">
             <option value="1" <?php if($v['isdefault']) echo " selected='selected'"; ?>>是</option>

src/admin/templets/mychannel_edit.htm

@@ -205,18 +205,15 @@
       </tr>
       <tr>
         <td bgcolor="#FFFFFF">前台会员发布程序</td>
-        <td bgcolor="#FFFFFF"><input name="useraddcon" type="text" id="useraddcon"
-            value="<?php echo $row['useraddcon']; ?>" class="pubinputs"></td>
+        <td bgcolor="#FFFFFF"><input name="useraddcon" type="text" id="useraddcon" value="<?php echo $row['useraddcon']; ?>" class="pubinputs"></td>
       </tr>
       <tr>
         <td bgcolor="#FFFFFF">前台会员修改程序</td>
-        <td bgcolor="#FFFFFF"><input name="usereditcon" type="text" id="usereditcon"
-            value="<?php echo $row['usereditcon']; ?>" class="pubinputs"></td>
+        <td bgcolor="#FFFFFF"><input name="usereditcon" type="text" id="usereditcon" value="<?php echo $row['usereditcon']; ?>" class="pubinputs"></td>
       </tr>
       <tr>
         <td bgcolor="#FFFFFF">前台会员管理程序</td>
-        <td bgcolor="#FFFFFF"><input name="usermancon" type="text" id="usermancon"
-            value="<?php echo $row['usermancon']; ?>" class="pubinputs"></td>
+        <td bgcolor="#FFFFFF"><input name="usermancon" type="text" id="usermancon" value="<?php echo $row['usermancon']; ?>" class="pubinputs"></td>
       </tr>
       <tr>
         <td bgcolor="#FFFFFF">列表附加字段<br>

src/admin/templets/mynews_edit.htm

@@ -42,7 +42,7 @@ function checkSubmit()
           </tr>
           <tr> 
             <td width="10%" height="30" align="right">标题：</td>
-            <td align="left"> <input name="title" type="text" id="title" value="<?php echo $myNews['title']?>" size="30" style="width:300"> 
+            <td align="left"> <input name="title" type="text" id="title" value="<?php echo $myNews['title']?>" size="30" style="width:300px"> 
             </td>
           </tr>
           <tr>

src/admin/templets/mytag_add.htm

@@ -79,7 +79,7 @@
                 <?php
            	$tl = new TypeLink(0);
            	$typeOptions = $tl->GetOptionArray(0,0,0);
-            echo "<select name='typeid' style='width:300'>\r\n";
+            echo "<select name='typeid' style='width:300px'>\r\n";
             echo "<option value='0' selected>显示在没有继承本标记的所有栏目</option>\r\n";
             echo $typeOptions;
             echo "</select>";
@@ -114,14 +114,14 @@
             <tr>
               <td height="80" align="center">正常显示内容：</td>
               <td width="76%">
-                <textarea name="normbody" id="normbody" style="width:80%;height:100"></textarea>
+                <textarea name="normbody" id="normbody" style="width:80%;height:100px"></textarea>
               </td>
               <td width="9%"></td>
             </tr>
             <tr>
               <td height="80" align="center">过期显示内容：</td>
               <td>
-                <textarea name="expbody" id="expbody" style="width:80%;height:100"></textarea>
+                <textarea name="expbody" id="expbody" style="width:80%;height:100px"></textarea>
               </td>
               <td></td>
             </tr>

src/admin/templets/mytag_edit.htm

@@ -23,7 +23,7 @@
 			<?php
            	$tl = new TypeLink(0);
            	$typeOptions = $tl->GetOptionArray($row['typeid'],0,0);
-            echo "<select name='typeid' style='width:300'>\r\n";
+            echo "<select name='typeid' style='width:300px'>\r\n";
             echo "<option value='0' selected>显示在没有继承本标记的所有栏目</option>\r\n";
             echo $typeOptions;
             echo "</select>";
@@ -52,14 +52,14 @@
           <tr> 
             <td height="80" align="center">正常显示内容：</td>
             <td width="76%">
-			<textarea name="normbody" id="normbody" style="width:80%;height:100"><?php echo $row['normbody']?></textarea> 
+			<textarea name="normbody" id="normbody" style="width:80%;height:100px"><?php echo $row['normbody']?></textarea> 
             </td>
             <td width="9%"></td>
           </tr>
           <tr> 
             <td height="80" align="center">过期显示内容：</td>
             <td>
-			<textarea name="expbody" id="expbody" style="width:80%;height:100"><?php echo $row['expbody']?></textarea> 
+			<textarea name="expbody" id="expbody" style="width:80%;height:100px"><?php echo $row['expbody']?></textarea> 
             </td>
             <td></td>
           </tr>

src/admin/templets/spec_add.htm

@@ -357,7 +357,7 @@ table{border-collapse:separate}
             <tr>
               <td>节点容器模板：</td>
               <td colspan="2">
-                <input name="notetemplet<?php echo $i?>" type="text" id="notetemplet<?php echo $i?>" value="system/channel_spec_note.htm" style="width:300">
+                <input name="notetemplet<?php echo $i?>" type="text" id="notetemplet<?php echo $i?>" value="system/channel_spec_note.htm" style="width:300px">
                 <button type="button" name="selno<?php echo $i?>" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.notetemplet<?php echo $i?>');">浏览</button>
               </td>
             </tr>

src/admin/templets/spec_edit.htm

@@ -338,7 +338,7 @@ table{border-collapse:separate}
               <td colspan="2">
                 <table width="600" border="0" cellspacing="0" cellpadding="0">
                   <tr>
-                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300" value="<?php echo $notename?>"></td>
+                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300px" value="<?php echo $notename?>"></td>
                     <td width="90" align="center">节点标识：</td>
                     <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>" style="width:100px" value="<?php echo $noteid?>"></td>
                   </tr>
@@ -394,7 +394,7 @@ table{border-collapse:separate}
               <td colspan="2">
                 <table width="600" border="0" cellspacing="0" cellpadding="0">
                   <tr>
-                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300"></td>
+                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300px"></td>
                     <td width="90" align="center">节点标识：</td>
                     <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>" style="width:100px"></td>
                   </tr>

src/admin/templets/sys_info_mark.htm

@@ -13,8 +13,7 @@
       <input type="hidden" name="action" value="save">
       <input type="hidden" name="get_photo_markimg" value="<?php echo $photo_markimg?>">
       <tr>
-        <td height="26" colspan="2" bgcolor="#FFFFFF" background="../static/web/img/tbg.gif" style="padding-left:10px">
-          系统配置变量 - 图片水印设置 </td>
+        <td height="26" colspan="2" bgcolor="#FFFFFF" background="../static/web/img/tbg.gif" style="padding-left:10px">系统配置变量 - 图片水印设置 </td>
       </tr>
       <tr bgcolor="#FFFFFF">
         <td width="41%" height="26">上传的图片是否使用图片水印功能：<br> </td>
@@ -49,7 +48,6 @@
               <?php if($photo_marktype == 1) echo 'checked'?>> png </label>
           &nbsp;<label><input type="radio" name="get_photo_marktype" value="2"
               <?php if($photo_marktype == 2) echo 'checked'?>> 文字 </label>
-
         </td>
       </tr>
       <tr bgcolor="#FFFFFF">
@@ -60,7 +58,6 @@
           <input name="get_photo_wheight" type=text id="get_photo_wheight" value="<?php echo $photo_wheight?>" size="5">
         </td>
       </tr>
-
       <tr bgcolor="#FFFFFF">
         <td height="26">水印图片文件名（如果不存在，则使用文字水印）：</td>
         <td><img src="../data/mark/<?php echo $photo_markimg; ?>" alt="dede"></td>
@@ -68,7 +65,7 @@
       <tr bgcolor="#FFFFFF">
         <td height="26">上传新图片：</td>
         <td>
-          <input name="newimg" type="file" id="newimg" style="width:300">
+          <input name="newimg" type="file" id="newimg" style="width:300px">
           <br>
           <?php echo "支持的图片格式：gif png"; ?> </td>
       </tr>
@@ -94,8 +91,7 @@
       </tr>
       <tr bgcolor="#FFFFFF">
         <td height="26">设置 GIF 类型水印图片与原始图片的融合度,水印透明度（0—100，值越小越透明）：</td>
-        <td><input name="get_photo_diaphaneity" type=text id="get_photo_diaphaneity"
-            value="<?php echo $photo_diaphaneity?>"></td>
+        <td><input name="get_photo_diaphaneity" type=text id="get_photo_diaphaneity" value="<?php echo $photo_diaphaneity?>"></td>
       </tr>
       <tr bgcolor="#FFFFFF">
         <td height="26">水印位置：</td>
@@ -149,7 +145,6 @@
           </table>
         </td>
       </tr>
-
       <tr bgcolor="#f8f8f8">
         <td height="36" colspan="2">
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
@@ -157,8 +152,8 @@
               <td width="7%"></td>
               <td width="93%" align="center">
                 <button type="submit" class="btn btn-success">确定</button>
-                　&nbsp;
-                <button type="reset" class="btn btn-success">重置</button> </td>
+                <button type="reset" class="btn btn-success">重置</button>
+              </td>
             </tr>
           </table>
         </td>