diff --git a/src/dede/mda_main.php b/src/dede/mda_main.php index 45175f6..ab4e0df 100755 --- a/src/dede/mda_main.php +++ b/src/dede/mda_main.php @@ -375,12 +375,12 @@ echo << 德得广告 - + - + - +
 德得广告 >> 配置德得广告 德得广告 >> 配置德得广告
@@ -388,7 +388,7 @@ echo << - + \r\n"; - $this->myWinItem .= "\r\n"; + $this->myWinItem .= "\r\n"; $this->myWinItem .= "\r\n"; } @@ -191,7 +191,7 @@ class OxWindow */ function GetWindow($wintype="save", $msg="", $isform=true) { - global $cfg_plus_dir; + global $cfg_images_dir; $this->StartWin(); $this->myWin .= $this->myWinItem; if($wintype!="") @@ -203,9 +203,9 @@ class OxWindow diff --git a/src/include/taglib/qrcode.lib.php b/src/include/taglib/qrcode.lib.php index 3f0271b..5a1222f 100755 --- a/src/include/taglib/qrcode.lib.php +++ b/src/include/taglib/qrcode.lib.php @@ -37,9 +37,9 @@ function lib_qrcode(&$ctag,&$refObj) var __dedeqrcode_id={$GLOBALS['qrcode_id']}; var __dedeqrcode_aid={$id}; var __dedeqrcode_type='{$type}'; - var __dedeqrcode_dir='{$GLOBALS['cfg_plus_dir']}'; + var __dedeqrcode_dir='{$GLOBALS['cfg_images_dir']}'; - + EOT; $GLOBALS['qrcode_id']++; return $reval; diff --git a/src/templets/plus/win_templet.htm b/src/templets/plus/win_templet.htm index 1cbe94d..6e2441b 100755 --- a/src/templets/plus/win_templet.htm +++ b/src/templets/plus/win_templet.htm @@ -2,12 +2,12 @@ {dede:wintitle/} - + - +
德得广告德得广告
diff --git a/src/plus/img/106.gif b/src/images/img/106.gif similarity index 100% rename from src/plus/img/106.gif rename to src/images/img/106.gif diff --git a/src/plus/img/addon.gif b/src/images/img/addon.gif similarity index 100% rename from src/plus/img/addon.gif rename to src/images/img/addon.gif diff --git a/src/plus/img/allbg.gif b/src/images/img/allbg.gif similarity index 100% rename from src/plus/img/allbg.gif rename to src/images/img/allbg.gif diff --git a/src/plus/img/base.css b/src/images/img/base.css similarity index 100% rename from src/plus/img/base.css rename to src/images/img/base.css diff --git a/src/plus/img/button_back.gif b/src/images/img/button_back.gif similarity index 100% rename from src/plus/img/button_back.gif rename to src/images/img/button_back.gif diff --git a/src/plus/img/button_ok.gif b/src/images/img/button_ok.gif similarity index 100% rename from src/plus/img/button_ok.gif rename to src/images/img/button_ok.gif diff --git a/src/plus/img/button_reset.gif b/src/images/img/button_reset.gif similarity index 100% rename from src/plus/img/button_reset.gif rename to src/images/img/button_reset.gif diff --git a/src/plus/img/button_save.gif b/src/images/img/button_save.gif similarity index 100% rename from src/plus/img/button_save.gif rename to src/images/img/button_save.gif diff --git a/src/plus/img/button_search.gif b/src/images/img/button_search.gif similarity index 100% rename from src/plus/img/button_search.gif rename to src/images/img/button_search.gif diff --git a/src/plus/img/c-bury.png b/src/images/img/c-bury.png similarity index 100% rename from src/plus/img/c-bury.png rename to src/images/img/c-bury.png diff --git a/src/plus/img/c-digg.png b/src/images/img/c-digg.png similarity index 100% rename from src/plus/img/c-digg.png rename to src/images/img/c-digg.png diff --git a/src/plus/img/channellist.gif b/src/images/img/channellist.gif similarity index 100% rename from src/plus/img/channellist.gif rename to src/images/img/channellist.gif diff --git a/src/plus/img/df_dedetitle.gif b/src/images/img/df_dedetitle.gif similarity index 100% rename from src/plus/img/df_dedetitle.gif rename to src/images/img/df_dedetitle.gif diff --git a/src/plus/img/df_gbg.gif b/src/images/img/df_gbg.gif similarity index 100% rename from src/plus/img/df_gbg.gif rename to src/images/img/df_gbg.gif diff --git a/src/plus/img/dfpic.gif b/src/images/img/dfpic.gif similarity index 100% rename from src/plus/img/dfpic.gif rename to src/images/img/dfpic.gif diff --git a/src/plus/img/face/1.gif b/src/images/img/face/1.gif similarity index 100% rename from src/plus/img/face/1.gif rename to src/images/img/face/1.gif diff --git a/src/plus/img/face/2.gif b/src/images/img/face/2.gif similarity index 100% rename from src/plus/img/face/2.gif rename to src/images/img/face/2.gif diff --git a/src/plus/img/face/3.gif b/src/images/img/face/3.gif similarity index 100% rename from src/plus/img/face/3.gif rename to src/images/img/face/3.gif diff --git a/src/plus/img/face/4.gif b/src/images/img/face/4.gif similarity index 100% rename from src/plus/img/face/4.gif rename to src/images/img/face/4.gif diff --git a/src/plus/img/face/5.gif b/src/images/img/face/5.gif similarity index 100% rename from src/plus/img/face/5.gif rename to src/images/img/face/5.gif diff --git a/src/plus/img/face/6.gif b/src/images/img/face/6.gif similarity index 100% rename from src/plus/img/face/6.gif rename to src/images/img/face/6.gif diff --git a/src/plus/img/face/7.gif b/src/images/img/face/7.gif similarity index 100% rename from src/plus/img/face/7.gif rename to src/images/img/face/7.gif diff --git a/src/plus/img/face/8.gif b/src/images/img/face/8.gif similarity index 100% rename from src/plus/img/face/8.gif rename to src/images/img/face/8.gif diff --git a/src/plus/img/fbico.gif b/src/images/img/fbico.gif similarity index 100% rename from src/plus/img/fbico.gif rename to src/images/img/fbico.gif diff --git a/src/plus/img/feedback.gif b/src/images/img/feedback.gif similarity index 100% rename from src/plus/img/feedback.gif rename to src/images/img/feedback.gif diff --git a/src/plus/img/file.gif b/src/images/img/file.gif similarity index 100% rename from src/plus/img/file.gif rename to src/images/img/file.gif diff --git a/src/plus/img/file_move.gif b/src/images/img/file_move.gif similarity index 100% rename from src/plus/img/file_move.gif rename to src/images/img/file_move.gif diff --git a/src/plus/img/flink-add.gif b/src/images/img/flink-add.gif similarity index 100% rename from src/plus/img/flink-add.gif rename to src/images/img/flink-add.gif diff --git a/src/plus/img/flink.gif b/src/images/img/flink.gif similarity index 100% rename from src/plus/img/flink.gif rename to src/images/img/flink.gif diff --git a/src/plus/img/jpeg.gif b/src/images/img/jpeg.gif similarity index 100% rename from src/plus/img/jpeg.gif rename to src/images/img/jpeg.gif diff --git a/src/plus/img/jpeg.jpg b/src/images/img/jpeg.jpg similarity index 100% rename from src/plus/img/jpeg.jpg rename to src/images/img/jpeg.jpg diff --git a/src/plus/img/l_dd1.gif b/src/images/img/l_dd1.gif similarity index 100% rename from src/plus/img/l_dd1.gif rename to src/images/img/l_dd1.gif diff --git a/src/plus/img/lbg.gif b/src/images/img/lbg.gif similarity index 100% rename from src/plus/img/lbg.gif rename to src/images/img/lbg.gif diff --git a/src/plus/img/login_input_bg.gif b/src/images/img/login_input_bg.gif similarity index 100% rename from src/plus/img/login_input_bg.gif rename to src/images/img/login_input_bg.gif diff --git a/src/plus/img/member.gif b/src/images/img/member.gif similarity index 100% rename from src/plus/img/member.gif rename to src/images/img/member.gif diff --git a/src/plus/img/menuarrow.gif b/src/images/img/menuarrow.gif similarity index 100% rename from src/plus/img/menuarrow.gif rename to src/images/img/menuarrow.gif diff --git a/src/plus/img/menumember.gif b/src/images/img/menumember.gif similarity index 100% rename from src/plus/img/menumember.gif rename to src/images/img/menumember.gif diff --git a/src/plus/img/nspage.css b/src/images/img/nspage.css similarity index 100% rename from src/plus/img/nspage.css rename to src/images/img/nspage.css diff --git a/src/plus/img/nspage_mtitle.gif b/src/images/img/nspage_mtitle.gif similarity index 100% rename from src/plus/img/nspage_mtitle.gif rename to src/images/img/nspage_mtitle.gif diff --git a/src/plus/img/nspage_tophr.gif b/src/images/img/nspage_tophr.gif similarity index 100% rename from src/plus/img/nspage_tophr.gif rename to src/images/img/nspage_tophr.gif diff --git a/src/plus/img/qrcode.js b/src/images/img/qrcode.js similarity index 100% rename from src/plus/img/qrcode.js rename to src/images/img/qrcode.js diff --git a/src/plus/img/recommend.gif b/src/images/img/recommend.gif similarity index 100% rename from src/plus/img/recommend.gif rename to src/images/img/recommend.gif diff --git a/src/plus/img/reg.gif b/src/images/img/reg.gif similarity index 100% rename from src/plus/img/reg.gif rename to src/images/img/reg.gif diff --git a/src/plus/img/sdd.gif b/src/images/img/sdd.gif similarity index 100% rename from src/plus/img/sdd.gif rename to src/images/img/sdd.gif diff --git a/src/plus/img/slide.swf b/src/images/img/slide.swf similarity index 100% rename from src/plus/img/slide.swf rename to src/images/img/slide.swf diff --git a/src/plus/img/softlinks.gif b/src/images/img/softlinks.gif similarity index 100% rename from src/plus/img/softlinks.gif rename to src/images/img/softlinks.gif diff --git a/src/plus/img/sysinfo.gif b/src/images/img/sysinfo.gif similarity index 100% rename from src/plus/img/sysinfo.gif rename to src/images/img/sysinfo.gif diff --git a/src/plus/img/toplogo.gif b/src/images/img/toplogo.gif similarity index 100% rename from src/plus/img/toplogo.gif rename to src/images/img/toplogo.gif diff --git a/src/plus/img/topsearch_submit.gif b/src/images/img/topsearch_submit.gif similarity index 100% rename from src/plus/img/topsearch_submit.gif rename to src/images/img/topsearch_submit.gif diff --git a/src/plus/img/vote.gif b/src/images/img/vote.gif similarity index 100% rename from src/plus/img/vote.gif rename to src/images/img/vote.gif diff --git a/src/plus/img/votebg.gif b/src/images/img/votebg.gif similarity index 100% rename from src/plus/img/votebg.gif rename to src/images/img/votebg.gif diff --git a/src/plus/img/wbg.gif b/src/images/img/wbg.gif similarity index 100% rename from src/plus/img/wbg.gif rename to src/images/img/wbg.gif diff --git a/src/plus/img/writerbg.gif b/src/images/img/writerbg.gif similarity index 100% rename from src/plus/img/writerbg.gif rename to src/images/img/writerbg.gif diff --git a/src/include/ckeditor/plugins/addon/dialogs/addon.js b/src/include/ckeditor/plugins/addon/dialogs/addon.js index 53a6d7f..f4bc82d 100755 --- a/src/include/ckeditor/plugins/addon/dialogs/addon.js +++ b/src/include/ckeditor/plugins/addon/dialogs/addon.js @@ -14,7 +14,7 @@ { var addonUrl = this.getValueOf( 'Link', 'txtUrl' ); var addonTitle = this.getValueOf( 'Link', 'txtTitle'); - var tempvar='\r \r \r \r \r \r \r
'+addonTitle+'
'; + var tempvar='\r \r \r \r \r \r \r
'+addonTitle+'
'; editor.insertHtml(tempvar); }, diff --git a/src/include/common.func.php b/src/include/common.func.php index 73b5027..f2caff0 100755 --- a/src/include/common.func.php +++ b/src/include/common.func.php @@ -313,7 +313,7 @@ function ShowMsg($msg, $gourl, $onlymsg=0, $limittime=0) }\r\n"; $rmsg = $func; $rmsg .= "document.write(\"
"; - $rmsg .= "
DedeCMS 提示信息！
\");\r\n"; + $rmsg .= "
DedeCMS 提示信息！
\");\r\n"; $rmsg .= "document.write(\"

\");\r\n"; $rmsg .= "document.write(\"".str_replace("\"","“",$msg)."\");\r\n"; $rmsg .= "document.write(\""; diff --git a/src/include/common.inc.php b/src/include/common.inc.php index 610e7a7..05f13d7 100755 --- a/src/include/common.inc.php +++ b/src/include/common.inc.php @@ -204,6 +204,9 @@ $cfg_cmsurl = $cfg_mainsite.$cfg_cmspath; $cfg_plus_dir = $cfg_cmspath.'/plus'; $cfg_phpurl = $cfg_mainsite.$cfg_plus_dir; +$cfg_images_dir = $cfg_cmspath.'/images'; +$cfg_imagesurl = $cfg_mainsite.$cfg_images_dir; + $cfg_mobile_dir = $cfg_cmspath.'/m'; $cfg_mobileurl = $cfg_mainsite.$cfg_mobile_dir; diff --git a/src/include/dialog/select_images.php b/src/include/dialog/select_images.php index 627a6ac..07d18dd 100755 --- a/src/include/dialog/select_images.php +++ b/src/include/dialog/select_images.php @@ -61,7 +61,7 @@ if (!empty($noeditor)) 图片浏览器 - + diff --git a/src/include/dialog/select_soft.php b/src/include/dialog/select_soft.php index 339c91a..6f1379f 100755 --- a/src/include/dialog/select_soft.php +++ b/src/include/dialog/select_soft.php @@ -51,7 +51,7 @@ if (!empty($noeditor)) 软件管理器 - + diff --git a/src/include/dialog/select_templets.php b/src/include/dialog/select_templets.php index ffa32bf..cacf97e 100755 --- a/src/include/dialog/select_templets.php +++ b/src/include/dialog/select_templets.php @@ -40,7 +40,7 @@ if(empty($comeback)) 模板管理器 - + diff --git a/src/include/oxwindow.class.php b/src/include/oxwindow.class.php index c108a4e..00c7041 100755 --- a/src/include/oxwindow.class.php +++ b/src/include/oxwindow.class.php @@ -134,7 +134,7 @@ class OxWindow */ function AddTitle($title, $col="2") { - global $cfg_plus_dir; + global $cfg_images_dir; if($col!=""&&$col!="0") { $colspan="colspan='$col'"; @@ -144,7 +144,7 @@ class OxWindow $colspan=""; } $this->myWinItem .= "
$title$title
- - - + + +
-
+  ◇{dede:wecome_info/}