Bladeren bron

调整细节

tags/6.2.7
叙述、别离 1 jaar geleden
bovenliggende
commit
d3ca513ddf
21 gewijzigde bestanden met toevoegingen van 50 en 40 verwijderingen
  1. +1
    -1
      src/admin/templets/album_add.htm
  2. +1
    -1
      src/admin/templets/album_edit.htm
  3. +2
    -1
      src/admin/templets/archives_add.htm
  4. +1
    -1
      src/admin/templets/archives_edit.htm
  5. +1
    -1
      src/admin/templets/archives_sg_add.htm
  6. +1
    -1
      src/admin/templets/archives_sg_edit.htm
  7. +5
    -5
      src/admin/templets/article_add.htm
  8. +1
    -1
      src/admin/templets/article_edit.htm
  9. +7
    -4
      src/admin/templets/catalog_add.htm
  10. +5
    -2
      src/admin/templets/catalog_edit.htm
  11. +2
    -2
      src/admin/templets/diy_list.htm
  12. +4
    -4
      src/admin/templets/media_add.htm
  13. +3
    -3
      src/admin/templets/media_edit.htm
  14. +2
    -2
      src/admin/templets/soft_add.htm
  15. +1
    -1
      src/admin/templets/soft_edit.htm
  16. +1
    -1
      src/admin/templets/spec_add.htm
  17. +1
    -1
      src/admin/templets/spec_edit.htm
  18. +2
    -2
      src/admin/templets/sys_info_mark.htm
  19. +4
    -1
      src/static/web/css/admin.css
  20. +4
    -4
      src/static/web/css/style.css
  21. +1
    -1
      src/system/common.inc.php

+ 1
- 1
src/admin/templets/album_add.htm Bestand weergeven

@@ -111,7 +111,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-sm btn-success delete">清空</button>


+ 1
- 1
src/admin/templets/album_edit.htm Bestand weergeven

@@ -109,7 +109,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 2
- 1
src/admin/templets/archives_add.htm Bestand weergeven

@@ -102,7 +102,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success delete">清空</button>
@@ -214,6 +214,7 @@
<td>
<label><input type="checkbox" name="remote" id="remote" value="1" <?php if ($cfg_rm_remote=='Y') echo 'checked="1"';?>> 下载远程图片和资源</label>
<label><input type="checkbox" name="dellink" id="dellink" value="1" <?php if ($cfg_arc_dellink=='Y') echo 'checked="1"';?>> 删除非站内链接</label>
<a href="javascript:OpenMyWin('article_allowurl_edit.php');">[设置]</a>
<label><input type="checkbox" name="autolitpic" id="autolitpic" value="1" <?php if ($cfg_arc_autopic=='Y') echo 'checked="1"';?>> 提取第一个图片为缩略图</label>
<label><input type="checkbox" name="needwatermark" value="1" <?php if ($photo_markup=='1') echo 'checked="1"';?>> 图片是否加水印</label>
</td>


+ 1
- 1
src/admin/templets/archives_edit.htm Bestand weergeven

@@ -101,7 +101,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input name="picname" type="text" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button id="btnClearAll" type="button" class="btn btn-success btn-sm">清空</button>


+ 1
- 1
src/admin/templets/archives_sg_add.htm Bestand weergeven

@@ -75,7 +75,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 1
- 1
src/admin/templets/archives_sg_edit.htm Bestand weergeven

@@ -76,7 +76,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md" value="<?php echo $addRow['litpic']?>">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 5
- 5
src/admin/templets/article_add.htm Bestand weergeven

@@ -103,7 +103,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -207,7 +207,7 @@
<td>
<label><input type="checkbox" name="remote" id="remote" value="1" <?php if ($cfg_rm_remote=='Y') echo 'checked="1"';?>> 下载远程图片和资源</label>
<label><input type="checkbox" name="dellink" id="dellink" value="1" <?php if ($cfg_arc_dellink=='Y') echo 'checked="1"';?>> 删除非站内链接</label>
<a href="javascript:OpenMyWin('article_allowurl_edit.php')" class="btn btn-success btn-sm">设置</a>
<a href="javascript:OpenMyWin('article_allowurl_edit.php');">[设置]</a>
<label><input type="checkbox" name="autolitpic" id="autolitpic" value="1" <?php if ($cfg_arc_autopic=='Y') echo 'checked="1"';?>> 提取第一个图片为缩略图</label>
<label><input type="checkbox" name="needwatermark" value="1" <?php if ($photo_markup=='1') echo "checked";?>> 图片是否加水印</label>
</td>
@@ -221,9 +221,9 @@
<tr>
<td width="90">分页方式:</td>
<td>
<label><input type="radio" name="sptype" value="hand" <?php if ($cfg_arcautosp=='N') echo "checked='1'"?>> 手动</label>
<label><input type="radio" name="sptype" value="auto" <?php if ($cfg_arcautosp=='Y') echo "checked='1'"?>> 自动</label>
大小:<input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" class="admin-input-xs"> K(分页符为:#p#分页标题#e#)
<label class="l-height-28"><input type="radio" name="sptype" value="hand" <?php if ($cfg_arcautosp=='N') echo "checked='1'"?>> 手动</label>
<label class="l-height-28"><input type="radio" name="sptype" value="auto" <?php if ($cfg_arcautosp=='Y') echo "checked='1'"?>> 自动</label>
<label>大小:<input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" class="admin-input-xs"> K(分页符为:#p#分页标题#e#)</label>
</td>
</tr>
</table>


+ 1
- 1
src/admin/templets/article_edit.htm Bestand weergeven

@@ -108,7 +108,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input name="picname" type="text" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button id="btnClearAll" type="button" class="btn btn-success btn-sm">清空</button>


+ 7
- 4
src/admin/templets/catalog_add.htm Bestand weergeven

@@ -339,19 +339,22 @@
<tr>
<td>关键词:</td>
<td><textarea name="keywords" id="keywords" class="admin-textarea-sm"></textarea>(标签“{dede:field.keywords/}”调用)</td>
<td>栏目描述:</td>
<td>描述:</td>
<td><textarea name="description" id="description" class="admin-textarea-sm"></textarea>(标签“{dede:field.description/}”调用)</td>
</tr>
<tr>
<td>是否支持跨站调用:</td>
<td>
<input type="text" name="apikey" id="apikey" class="admin-input-md" placeholder="请输入跨站调用秘钥">
<span class="btn btn-success btn-sm mr-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-refresh"></i></span>
<label><input type="radio" name="apienabled" value="1"> 支持</label>
<label><input type="radio" name="apienabled" value="0" checked> 不支持</label>
<span class="btn btn-success btn-sm mr-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-repeat"></i></span>
<label class="l-height-28"><input type="radio" name="apienabled" value="1"> 支持</label>
<label class="l-height-28"><input type="radio" name="apienabled" value="0" checked> 不支持</label>
</td>
<td colspan="2"></td>
</tr>
<tr>
<td colspan="4">栏目文档(标签“{dede:field.content/}”调用)</td>
</tr>
<tr>
<td colspan="4"><?php GetEditor("content","","400","Default","print","false");?></td>
</tr>


+ 5
- 2
src/admin/templets/catalog_edit.htm Bestand weergeven

@@ -312,19 +312,22 @@
<tr>
<td>关键词:</td>
<td><textarea name="keywords" cid="keywords" class="admin-textarea-sm"><?php echo $myrow['keywords']?></textarea>(标签“{dede:field.keywords/}”调用)</td>
<td>栏目描述:</td>
<td>描述:</td>
<td><textarea name="description" id="description" class="admin-textarea-sm"><?php echo $myrow['description']?></textarea>(标签“{dede:field.description/}”调用)</td>
</tr>
<tr>
<td>是否支持跨站调用:</td>
<td>
<input value="<?php echo $myrow['apikey']?>" type="text" name="apikey" id="apikey" class="admin-input-md" placeholder="请输入跨站调用秘钥">
<span class="btn btn-success btn-sm mr-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-refresh"></i></span>
<span class="btn btn-success btn-sm mr-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-repeat"></i></span>
<label><input type="radio" name="apienabled" value="1" <?php if ($myrow['apienabled']=="1") echo "checked='1'";?>> 支持</label>
<label><input type="radio" name="apienabled" value="0" <?php if ($myrow['apienabled']=="0") echo "checked='1'";?>> 不支持</label>
</td>
<td colspan="2"></td>
</tr>
<tr>
<td colspan="4">栏目文档(标签“{dede:field.content/}”调用)</td>
</tr>
<tr>
<td colspan="4"><?php GetEditor("content",$myrow['content'],"400","Default","print","false");?></td>
</tr>


+ 2
- 2
src/admin/templets/diy_list.htm Bestand weergeven

@@ -58,8 +58,8 @@
<td colspan="3">
<input type="button" name="select" onclick="selAll()" class="btn btn-success btn-sm" value="全选">
<input type="button" name="select" onclick="noSelAll()" class="btn btn-success btn-sm mr-2" value="取消">
<label><input type="radio" name="action" value="check"> 审核</label>
<label class="mr-2 ml-2"><input type="radio" name="action" value="delete"> 删除</label>
<label class="l-height-28 mr-2"><input type="radio" name="action" value="check"> 审核</label>
<label class="l-height-28 mr-2"><input type="radio" name="action" value="delete"> 删除</label>
<button type="submit" name="submit" class="btn btn-success btn-sm">提交</button>
<a href="../apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" target="_blank" class="btn btn-success btn-sm">预览</a>
</td>


+ 4
- 4
src/admin/templets/media_add.htm Bestand weergeven

@@ -63,15 +63,15 @@
<tr>
<td>附加参数:</td>
<td>
宽:<input type="text" name="mediawidth" id="mediawidth" class="admin-input-sm">(像素)
高:<input type="text" name="mediaheight" id="mediaheight" class="admin-input-sm">(像素)
播放时间:<input type="text" name="playtime" id="mediawidth3" class="admin-input-sm">(分钟)
<label>宽:<input type="text" name="mediawidth" id="mediawidth" class="admin-input-sm">(像素)</label>
<label><label>高:<input type="text" name="mediaheight" id="mediaheight" class="admin-input-sm">(像素)</label>
<label>播放时间:<input type="text" name="playtime" id="mediawidth3" class="admin-input-sm">(分钟)</label>
</td>
</tr>
<tr>
<td>上传文件:</td>
<td>
数量:<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm">
<label>数量:<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm"></label>
<button type="button" name="Submit" class="btn btn-success btn-sm" onclick="MakeUpload()">添加</button>
<button type="button" name="Submit" class="btn btn-success btn-sm" onclick="ResetUpload()">恢复</button>
</td>


+ 3
- 3
src/admin/templets/media_edit.htm Bestand weergeven

@@ -50,9 +50,9 @@
<tr>
<td>附加参数:</td>
<td>
宽:<input type="text" name="mediawidth" id="mediawidth" value="<?php echo $myrow['width']?>" class="admin-input-sm">(像素)
高:<input type="text" name="mediaheight" id="mediaheight" value="<?php echo $myrow['height']?>" class="admin-input-sm">(像素)
播放时间:<input type="text" name="playtime" id="playtime" value="<?php echo $myrow['playtime']?>" class="admin-input-sm">(分钟)
<label>宽:<input type="text" name="mediawidth" id="mediawidth" value="<?php echo $myrow['width']?>" class="admin-input-sm">(像素)</label>
<label>高:<input type="text" name="mediaheight" id="mediaheight" value="<?php echo $myrow['height']?>" class="admin-input-sm">(像素)</label>
<label>播放时间:<input type="text" name="playtime" id="playtime" value="<?php echo $myrow['playtime']?>" class="admin-input-sm">(分钟)</label>
</td>
</tr>
<tr>


+ 2
- 2
src/admin/templets/soft_add.htm Bestand weergeven

@@ -116,7 +116,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>
@@ -397,7 +397,7 @@
<td>
<label><input type="checkbox" name="remote" id="remote" value="1" <?php if ($cfg_rm_remote=='Y') echo ' checked';?>> 下载远程图片和资源</label>
<label><input type="checkbox" name="dellink" id="dellink" value="1" <?php if ($cfg_arc_dellink=='Y') echo ' checked';?>> 删除非站内链接</label>
<a href="javascript:OpenMyWin('article_allowurl_edit.php');" class="btn btn-success btn-sm">设置</a>
<a href="javascript:OpenMyWin('article_allowurl_edit.php');">[设置]</a>
<label><input type="checkbox" name="autolitpic" id="autolitpic" value="1" <?php if ($cfg_arc_autopic=='Y') echo ' checked';?>> 提取第一个图片为缩略图</label>
</td>
</tr>


+ 1
- 1
src/admin/templets/soft_edit.htm Bestand weergeven

@@ -115,7 +115,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 1
- 1
src/admin/templets/spec_add.htm Bestand weergeven

@@ -110,7 +110,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote"> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit2" onclick="SelectImage('form1.picname','small');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 1
- 1
src/admin/templets/spec_edit.htm Bestand weergeven

@@ -116,7 +116,7 @@
<td width="90">缩略图:</td>
<td width="620">
<input type="text" name="picname" id="picname" value="<?php echo $arcRow['litpic']?>" class="admin-input-md">
<label><input type="checkbox" name="ddisremote" value='1'> 远程</label>
<label><input type="checkbox" name="ddisremote" value="1" id="ddisremote" class="l-height-28"> 远程</label>
<span class="btn btn-success btn-sm fileinput-button">上传图片<input type="file" name="files[]" id="iptAddImages"></span>
<button type="button" name="Submit" onclick="SelectImage('form1.picname','');" class="btn btn-success btn-sm">选择图片</button>
<button type="button" id="btnClearAll" class="btn btn-success btn-sm">清空</button>


+ 2
- 2
src/admin/templets/sys_info_mark.htm Bestand weergeven

@@ -41,8 +41,8 @@
<tr>
<td>水印图片大小控制:</td>
<td>
<span>宽:<input name="get_photo_wwidth" type=text id="get_photo_wwidth" value="<?php echo $photo_wwidth?>" class="admin-input-sm"></span>
<span>高:<input name="get_photo_wheight" type=text id="get_photo_wheight" value="<?php echo $photo_wheight?>" class="admin-input-sm"></span>
<label>宽:<input name="get_photo_wwidth" type=text id="get_photo_wwidth" value="<?php echo $photo_wwidth?>" class="admin-input-sm"></label>
<label>高:<input name="get_photo_wheight" type=text id="get_photo_wheight" value="<?php echo $photo_wheight?>" class="admin-input-sm"></label>
<span>(设置为0为不限)</span>
</td>
</tr>


+ 4
- 1
src/static/web/css/admin.css Bestand weergeven

@@ -538,13 +538,16 @@ body.hidemenu .body-right {
color:inherit;
cursor:pointer
}
.l-height-28 {
line-height:28px
}
.btn-xs {
padding:2px;
line-height:12px;
font-size:12px
}
.btn+.btn,.btn-text+.btn-text {
margin-left:1rem
margin-left:10px
}
.admin-win {
background:#f5f5f5;


+ 4
- 4
src/static/web/css/style.css Bestand weergeven

@@ -311,9 +311,6 @@ input[type=file] {
.flink,.flink a,.copyright,.copyright a {
color:#fff
}
.l-height-30 {
line-height:30px
}
.biz-mb {
margin-bottom:-2rem
}
@@ -364,13 +361,16 @@ input[type=file] {
display:inline-block;
height:36px
}
.l-height-30 {
line-height:30px
}
.fa {
font-size:14px;
color:inherit;
cursor:pointer
}
.btn+.btn,.btn-text+.btn-text {
margin-left:1rem
margin-left:10px
}
.form-control,.btn,.fa {
font-size:14px!important


+ 1
- 1
src/system/common.inc.php Bestand weergeven

@@ -7,7 +7,7 @@
* @link https://www.dedebiz.com
*/
//系统默认运行模式为安全模式,模板管理、标签管理、数据库管理、模块管理等功能已暂停,如果您需要这些功能,DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用
define('DEDEBIZ_SAFE_MODE', TRUE);
define('DEDEBIZ_SAFE_MODE', FALSE);
//生产环境使用`production`,如果采用`dev`模式,会有一些php的报错信息提示,用于开发调试
if (!defined('DEDE_ENVIRONMENT')) {
define('DEDE_ENVIRONMENT', 'production');


Laden…
Annuleren
Opslaan