diff --git a/src/admin/media_main.php b/src/admin/media_main.php index 05a08113..7c3578d1 100644 --- a/src/admin/media_main.php +++ b/src/admin/media_main.php @@ -41,9 +41,9 @@ if ($mediatype > 1) { $addsql .= " AND u.mediatype='$membertype' "; } $sql = "SELECT u.aid,u.title,u.url,u.mediatype,u.filesize,u.mid,u.uptime,a.userid AS adminname,m.userid AS membername -FROM #@__uploads u -LEFT JOIN #@__admin a ON a.id = u.mid -LEFT JOIN #@__member m ON m.mid = u.mid +FROM `#@__uploads` u +LEFT JOIN `#@__admin` a ON a.id = u.mid +LEFT JOIN `#@__member` m ON m.mid = u.mid $addsql ORDER BY u.aid DESC"; $dlist = new DataListCP(); $dlist->pageSize = 20; @@ -56,7 +56,7 @@ $dlist->Display(); function MediaType($tid, $nurl) { if ($tid == 1) { - return "图片预览"; + return "图片"; } else if ($tid == 2) { return "FLASH"; } else if ($tid == 3) { diff --git a/src/admin/sys_passport.php b/src/admin/sys_passport.php deleted file mode 100644 index 203e0651..00000000 --- a/src/admin/sys_passport.php +++ /dev/null @@ -1,28 +0,0 @@ -'; - $fp = fopen($ConfigFile, "w") or die("写入文件 $ConfigFile 失败，请检查权限"); - fwrite($fp, $configstr); - fclose($fp); - echo "\r\n"; -} -include DedeInclude('templets/sys_passport.htm'); diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index 7304aa59..766f771c 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -28,11 +28,11 @@ if($row[$field]=='') continue; if($fielddata[1]=='img') { - $row[$field] = " 浏览原图 删除原图"; + $row[$field] = " 浏览原图 删除原图"; } else if($fielddata[1]=='addon') { - $row[$field] = " 浏览原附件 删除原附件"; + $row[$field] = " 浏览原附件 删除原附件"; } else { if(!in_array($fielddata[1],$allowhtml)){ $row[$field] = dede_htmlspecialchars($row[$field]); diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 2572eb68..d2068165 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -28,10 +28,10 @@ { if($fields[$field]=='') continue; if($fielddata[1]=='img'){ - $fields[$field] = "图片附件"; + $fields[$field] = " 图片附件"; } else if($fielddata[1]=='addon'){ - $fields[$field] = "其它附件"; + $fields[$field] = " 其它附件"; } else { if(!in_array($fielddata[1],$allowhtml)){ $fields[$field] = dede_htmlspecialchars($fields[$field]); diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 9a5c6a8f..5af9dcf7 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -17,7 +17,6 @@ } -
- - 单击关闭预览 - -
-
diff --git a/src/admin/templets/mytag_edit.htm b/src/admin/templets/mytag_edit.htm index 6ce9487f..8e55c832 100644 --- a/src/admin/templets/mytag_edit.htm +++ b/src/admin/templets/mytag_edit.htm @@ -4,15 +4,16 @@ 修改标记 + - +
自定义标记管理 > 修改标记
- +
@@ -65,7 +66,9 @@ - +
+ +
diff --git a/src/admin/templets/sys_passport.htm b/src/admin/templets/sys_passport.htm deleted file mode 100644 index 94687ded..00000000 --- a/src/admin/templets/sys_passport.htm +++ /dev/null @@ -1,71 +0,0 @@ - - - - -通行证设置 - - - - - - - - - - -
通行证设置：
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
参数说明参数值
是否使用通行证： -> -是 -> -否
通行证加密码： - - -
登录通行证网址： -
退出通行证网址：
注册通行证帐号网址： - -
- - - - - -
-
-
-
- - \ No newline at end of file diff --git a/src/admin/tpl.php b/src/admin/tpl.php index 6396613a..f472d5fd 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -227,7 +227,7 @@ else if ($action == 'savetagfile') { 测试标签：(需要使用环境变量的不能在此测试)

- + "; $wintitle = "成功修改/创建文件"; diff --git a/src/static/web/img/button_back.gif b/src/static/web/img/button_back.gif deleted file mode 100644 index 723470a6..00000000 Binary files a/src/static/web/img/button_back.gif and /dev/null differ diff --git a/src/static/web/img/button_ok.gif b/src/static/web/img/button_ok.gif deleted file mode 100644 index 2aeb6752..00000000 Binary files a/src/static/web/img/button_ok.gif and /dev/null differ diff --git a/src/static/web/img/button_reset.gif b/src/static/web/img/button_reset.gif deleted file mode 100644 index 8bd3ef1d..00000000 Binary files a/src/static/web/img/button_reset.gif and /dev/null differ diff --git a/src/static/web/img/channeladd.gif b/src/static/web/img/channeladd.gif deleted file mode 100644 index 3aeea691..00000000 Binary files a/src/static/web/img/channeladd.gif and /dev/null differ diff --git a/src/static/web/img/channellist.gif b/src/static/web/img/channellist.gif deleted file mode 100644 index f5d699cc..00000000 Binary files a/src/static/web/img/channellist.gif and /dev/null differ diff --git a/src/static/web/img/pic_dir.gif b/src/static/web/img/pic_dir.gif deleted file mode 100644 index 1829c3bb..00000000 Binary files a/src/static/web/img/pic_dir.gif and /dev/null differ diff --git a/src/theme/system/part_autochannel.htm b/src/theme/system/part_autochannel.htm index 9fa0fcd7..758405df 100644 --- a/src/theme/system/part_autochannel.htm +++ b/src/theme/system/part_autochannel.htm @@ -1,6 +1,6 @@
  • - + ▪
  • [field:typename/] diff --git a/src/theme/system/part_channelartlist.htm b/src/theme/system/part_channelartlist.htm index 850c3720..cdeac0ff 100644 --- a/src/theme/system/part_channelartlist.htm +++ b/src/theme/system/part_channelartlist.htm @@ -4,7 +4,7 @@ {dede:type} - +
    ▪ [field:typename /]