From 975a5db9d7864b2c3938d7c462abf0e8d295ecfc Mon Sep 17 00:00:00 2001 From: wlx Date: Fri, 9 May 2014 06:22:07 +0000 Subject: [PATCH] merge heihedata branch r4469 - r4471. --- .../admin/views/scripts/news/newsadd.phtml | 11 +- .../admin/views/scripts/news/newsedit.phtml | 6 +- .../admin/views/scripts/news/newslist.phtml | 1 + application/models/Theme.php | 7 + .../js/lib/kindeditor/kindeditor-all-min.js | 355 + htdocs/js/lib/kindeditor/kindeditor-all.js | 10220 ++++++++++++++++ htdocs/js/lib/kindeditor/kindeditor-min.js | 182 + htdocs/js/lib/kindeditor/kindeditor.js | 5960 +++++++++ .../kindlang => js/lib/kindeditor/lang}/ar.js | 21 +- .../kindlang => js/lib/kindeditor/lang}/en.js | 21 +- htdocs/js/lib/kindeditor/lang/ko.js | 237 + .../lib/kindeditor/lang}/zh_CN.js | 35 +- .../lib/kindeditor/lang}/zh_TW.js | 22 +- .../lib/kindeditor}/plugins/anchor/anchor.js | 2 +- .../plugins/autoheight/autoheight.js | 54 + .../kindeditor/plugins/baidumap/baidumap.js | 93 + .../kindeditor/plugins/baidumap/index.html | 83 + .../lib/kindeditor/plugins/baidumap/map.html | 43 + .../plugins/clearhtml/clearhtml.js | 0 .../lib/kindeditor}/plugins/code/code.js | 5 + .../lib/kindeditor}/plugins/code/prettify.css | 26 +- .../lib/kindeditor}/plugins/code/prettify.js | 56 +- .../plugins/emoticons/emoticons.js | 4 +- .../plugins/emoticons/images/0.gif | Bin .../plugins/emoticons/images/1.gif | Bin .../plugins/emoticons/images/10.gif | Bin .../plugins/emoticons/images/100.gif | Bin .../plugins/emoticons/images/101.gif | Bin .../plugins/emoticons/images/102.gif | Bin .../plugins/emoticons/images/103.gif | Bin .../plugins/emoticons/images/104.gif | Bin .../plugins/emoticons/images/105.gif | Bin .../plugins/emoticons/images/106.gif | Bin .../plugins/emoticons/images/107.gif | Bin .../plugins/emoticons/images/108.gif | Bin .../plugins/emoticons/images/109.gif | Bin .../plugins/emoticons/images/11.gif | Bin .../plugins/emoticons/images/110.gif | Bin .../plugins/emoticons/images/111.gif | Bin .../plugins/emoticons/images/112.gif | Bin .../plugins/emoticons/images/113.gif | Bin .../plugins/emoticons/images/114.gif | Bin .../plugins/emoticons/images/115.gif | Bin .../plugins/emoticons/images/116.gif | Bin .../plugins/emoticons/images/117.gif | Bin .../plugins/emoticons/images/118.gif | Bin .../plugins/emoticons/images/119.gif | Bin .../plugins/emoticons/images/12.gif | Bin .../plugins/emoticons/images/120.gif | Bin .../plugins/emoticons/images/121.gif | Bin .../plugins/emoticons/images/122.gif | Bin .../plugins/emoticons/images/123.gif | Bin .../plugins/emoticons/images/124.gif | Bin .../plugins/emoticons/images/125.gif | Bin .../plugins/emoticons/images/126.gif | Bin .../plugins/emoticons/images/127.gif | Bin .../plugins/emoticons/images/128.gif | Bin .../plugins/emoticons/images/129.gif | Bin .../plugins/emoticons/images/13.gif | Bin .../plugins/emoticons/images/130.gif | Bin .../plugins/emoticons/images/131.gif | Bin .../plugins/emoticons/images/132.gif | Bin .../plugins/emoticons/images/133.gif | Bin .../plugins/emoticons/images/134.gif | Bin .../plugins/emoticons/images/14.gif | Bin .../plugins/emoticons/images/15.gif | Bin .../plugins/emoticons/images/16.gif | Bin .../plugins/emoticons/images/17.gif | Bin .../plugins/emoticons/images/18.gif | Bin .../plugins/emoticons/images/19.gif | Bin .../plugins/emoticons/images/2.gif | Bin .../plugins/emoticons/images/20.gif | Bin .../plugins/emoticons/images/21.gif | Bin .../plugins/emoticons/images/22.gif | Bin .../plugins/emoticons/images/23.gif | Bin .../plugins/emoticons/images/24.gif | Bin .../plugins/emoticons/images/25.gif | Bin .../plugins/emoticons/images/26.gif | Bin .../plugins/emoticons/images/27.gif | Bin .../plugins/emoticons/images/28.gif | Bin .../plugins/emoticons/images/29.gif | Bin .../plugins/emoticons/images/3.gif | Bin .../plugins/emoticons/images/30.gif | Bin .../plugins/emoticons/images/31.gif | Bin .../plugins/emoticons/images/32.gif | Bin .../plugins/emoticons/images/33.gif | Bin .../plugins/emoticons/images/34.gif | Bin .../plugins/emoticons/images/35.gif | Bin .../plugins/emoticons/images/36.gif | Bin .../plugins/emoticons/images/37.gif | Bin .../plugins/emoticons/images/38.gif | Bin .../plugins/emoticons/images/39.gif | Bin .../plugins/emoticons/images/4.gif | Bin .../plugins/emoticons/images/40.gif | Bin .../plugins/emoticons/images/41.gif | Bin .../plugins/emoticons/images/42.gif | Bin .../plugins/emoticons/images/43.gif | Bin .../plugins/emoticons/images/44.gif | Bin .../plugins/emoticons/images/45.gif | Bin .../plugins/emoticons/images/46.gif | Bin .../plugins/emoticons/images/47.gif | Bin .../plugins/emoticons/images/48.gif | Bin .../plugins/emoticons/images/49.gif | Bin .../plugins/emoticons/images/5.gif | Bin .../plugins/emoticons/images/50.gif | Bin .../plugins/emoticons/images/51.gif | Bin .../plugins/emoticons/images/52.gif | Bin .../plugins/emoticons/images/53.gif | Bin .../plugins/emoticons/images/54.gif | Bin .../plugins/emoticons/images/55.gif | Bin .../plugins/emoticons/images/56.gif | Bin .../plugins/emoticons/images/57.gif | Bin .../plugins/emoticons/images/58.gif | Bin .../plugins/emoticons/images/59.gif | Bin .../plugins/emoticons/images/6.gif | Bin .../plugins/emoticons/images/60.gif | Bin .../plugins/emoticons/images/61.gif | Bin .../plugins/emoticons/images/62.gif | Bin .../plugins/emoticons/images/63.gif | Bin .../plugins/emoticons/images/64.gif | Bin .../plugins/emoticons/images/65.gif | Bin .../plugins/emoticons/images/66.gif | Bin .../plugins/emoticons/images/67.gif | Bin .../plugins/emoticons/images/68.gif | Bin .../plugins/emoticons/images/69.gif | Bin .../plugins/emoticons/images/7.gif | Bin .../plugins/emoticons/images/70.gif | Bin .../plugins/emoticons/images/71.gif | Bin .../plugins/emoticons/images/72.gif | Bin .../plugins/emoticons/images/73.gif | Bin .../plugins/emoticons/images/74.gif | Bin .../plugins/emoticons/images/75.gif | Bin .../plugins/emoticons/images/76.gif | Bin .../plugins/emoticons/images/77.gif | Bin .../plugins/emoticons/images/78.gif | Bin .../plugins/emoticons/images/79.gif | Bin .../plugins/emoticons/images/8.gif | Bin .../plugins/emoticons/images/80.gif | Bin .../plugins/emoticons/images/81.gif | Bin .../plugins/emoticons/images/82.gif | Bin .../plugins/emoticons/images/83.gif | Bin .../plugins/emoticons/images/84.gif | Bin .../plugins/emoticons/images/85.gif | Bin .../plugins/emoticons/images/86.gif | Bin .../plugins/emoticons/images/87.gif | Bin .../plugins/emoticons/images/88.gif | Bin .../plugins/emoticons/images/89.gif | Bin .../plugins/emoticons/images/9.gif | Bin .../plugins/emoticons/images/90.gif | Bin .../plugins/emoticons/images/91.gif | Bin .../plugins/emoticons/images/92.gif | Bin .../plugins/emoticons/images/93.gif | Bin .../plugins/emoticons/images/94.gif | Bin .../plugins/emoticons/images/95.gif | Bin .../plugins/emoticons/images/96.gif | Bin .../plugins/emoticons/images/97.gif | Bin .../plugins/emoticons/images/98.gif | Bin .../plugins/emoticons/images/99.gif | Bin .../plugins/emoticons/images/static.gif | Bin .../plugins/filemanager/filemanager.js | 2 +- .../plugins/filemanager/images/file-16.gif | Bin .../plugins/filemanager/images/file-64.gif | Bin 0 -> 1149 bytes .../plugins/filemanager/images/folder-16.gif | Bin .../plugins/filemanager/images/folder-64.gif | Bin 0 -> 1272 bytes .../plugins/filemanager/images/go-up.gif | Bin .../lib/kindeditor}/plugins/flash/flash.js | 22 +- .../lib/kindeditor}/plugins/image/image.js | 193 +- .../plugins/image/images/align_left.gif | Bin .../plugins/image/images/align_right.gif | Bin .../plugins/image/images/align_top.gif | Bin .../plugins/image/images/refresh.png | Bin 0 -> 800 bytes .../plugins/insertfile/insertfile.js | 73 +- .../plugins/lineheight/lineheight.js | 0 .../lib/kindeditor}/plugins/link/link.js | 10 +- .../lib/kindeditor}/plugins/map/map.html | 0 .../lib/kindeditor}/plugins/map/map.js | 0 .../lib/kindeditor}/plugins/media/media.js | 21 +- .../plugins/multiimage/images/image.png | Bin 0 -> 1862 bytes .../multiimage/images/select-files-en.png | Bin 0 -> 484 bytes .../multiimage/images/select-files-zh_CN.png | Bin 0 -> 481 bytes .../plugins/multiimage/images/swfupload.swf | Bin 0 -> 12787 bytes .../plugins/multiimage/multiimage.js | 1384 +++ .../plugins/pagebreak/pagebreak.js | 11 +- .../plugins/plainpaste/plainpaste.js | 0 .../kindeditor}/plugins/preview/preview.js | 0 .../plugins/quickformat/quickformat.js | 30 +- .../lib/kindeditor}/plugins/table/table.js | 183 +- .../kindeditor}/plugins/template/html/1.html | 26 +- .../kindeditor}/plugins/template/html/2.html | 82 +- .../kindeditor}/plugins/template/html/3.html | 70 +- .../kindeditor}/plugins/template/template.js | 2 +- .../plugins/wordpaste/wordpaste.js | 0 .../lib/kindeditor/themes}/common/anchor.gif | Bin .../lib/kindeditor/themes}/common/blank.gif | Bin .../lib/kindeditor/themes}/common/flash.gif | Bin .../lib/kindeditor/themes}/common/loading.gif | Bin .../lib/kindeditor/themes}/common/media.gif | Bin .../lib/kindeditor/themes}/common/rm.gif | Bin .../kindeditor/themes/default/background.png | Bin 0 -> 788 bytes .../kindeditor/themes}/default/default.css | 218 +- .../lib/kindeditor/themes/default/default.png | Bin 0 -> 8299 bytes htdocs/js/lib/kindeditor/themes/qq/editor.gif | Bin 0 -> 1449 bytes htdocs/js/lib/kindeditor/themes/qq/qq.css | 143 + .../lib/kindeditor/themes}/simple/simple.css | 260 +- htdocs/static/css/kindskin/default/bg.gif | Bin 616 -> 0 bytes .../static/css/kindskin/default/default.gif | Bin 9874 -> 0 bytes .../static/css/kindskin/default/default.png | Bin 8391 -> 0 bytes htdocs/static/js/kindeditor-min.js | 171 - .../js/plugins/filemanager/images/file-64.gif | Bin 1087 -> 0 bytes .../plugins/filemanager/images/folder-64.gif | Bin 1220 -> 0 bytes .../js/plugins/image/images/refresh.gif | Bin 655 -> 0 bytes 211 files changed, 19584 insertions(+), 761 deletions(-) create mode 100644 htdocs/js/lib/kindeditor/kindeditor-all-min.js create mode 100644 htdocs/js/lib/kindeditor/kindeditor-all.js create mode 100644 htdocs/js/lib/kindeditor/kindeditor-min.js create mode 100644 htdocs/js/lib/kindeditor/kindeditor.js rename htdocs/{static/js/kindlang => js/lib/kindeditor/lang}/ar.js (87%) rename htdocs/{static/js/kindlang => js/lib/kindeditor/lang}/en.js (85%) create mode 100644 htdocs/js/lib/kindeditor/lang/ko.js rename htdocs/{static/js/kindlang => js/lib/kindeditor/lang}/zh_CN.js (82%) rename htdocs/{static/js/kindlang => js/lib/kindeditor/lang}/zh_TW.js (85%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/anchor/anchor.js (93%) create mode 100644 htdocs/js/lib/kindeditor/plugins/autoheight/autoheight.js create mode 100644 htdocs/js/lib/kindeditor/plugins/baidumap/baidumap.js create mode 100644 htdocs/js/lib/kindeditor/plugins/baidumap/index.html create mode 100644 htdocs/js/lib/kindeditor/plugins/baidumap/map.html rename htdocs/{static/js => js/lib/kindeditor}/plugins/clearhtml/clearhtml.js (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/code/code.js (91%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/code/prettify.css (98%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/code/prettify.js (99%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/emoticons.js (94%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/0.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/1.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/10.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/100.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/101.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/102.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/103.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/104.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/105.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/106.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/107.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/108.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/109.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/11.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/110.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/111.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/112.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/113.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/114.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/115.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/116.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/117.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/118.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/119.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/12.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/120.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/121.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/122.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/123.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/124.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/125.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/126.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/127.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/128.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/129.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/13.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/130.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/131.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/132.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/133.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/134.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/14.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/15.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/16.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/17.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/18.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/19.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/2.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/20.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/21.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/22.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/23.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/24.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/25.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/26.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/27.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/28.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/29.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/3.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/30.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/31.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/32.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/33.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/34.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/35.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/36.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/37.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/38.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/39.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/4.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/40.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/41.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/42.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/43.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/44.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/45.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/46.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/47.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/48.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/49.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/5.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/50.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/51.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/52.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/53.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/54.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/55.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/56.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/57.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/58.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/59.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/6.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/60.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/61.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/62.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/63.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/64.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/65.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/66.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/67.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/68.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/69.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/7.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/70.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/71.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/72.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/73.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/74.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/75.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/76.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/77.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/78.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/79.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/8.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/80.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/81.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/82.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/83.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/84.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/85.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/86.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/87.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/88.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/89.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/9.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/90.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/91.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/92.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/93.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/94.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/95.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/96.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/97.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/98.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/99.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/emoticons/images/static.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/filemanager/filemanager.js (96%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/filemanager/images/file-16.gif (100%) create mode 100644 htdocs/js/lib/kindeditor/plugins/filemanager/images/file-64.gif rename htdocs/{static/js => js/lib/kindeditor}/plugins/filemanager/images/folder-16.gif (100%) create mode 100644 htdocs/js/lib/kindeditor/plugins/filemanager/images/folder-64.gif rename htdocs/{static/js => js/lib/kindeditor}/plugins/filemanager/images/go-up.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/flash/flash.js (85%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/image/image.js (57%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/image/images/align_left.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/image/images/align_right.gif (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/image/images/align_top.gif (100%) create mode 100644 htdocs/js/lib/kindeditor/plugins/image/images/refresh.png rename htdocs/{static/js => js/lib/kindeditor}/plugins/insertfile/insertfile.js (66%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/lineheight/lineheight.js (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/link/link.js (85%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/map/map.html (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/map/map.js (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/media/media.js (86%) create mode 100644 htdocs/js/lib/kindeditor/plugins/multiimage/images/image.png create mode 100644 htdocs/js/lib/kindeditor/plugins/multiimage/images/select-files-en.png create mode 100644 htdocs/js/lib/kindeditor/plugins/multiimage/images/select-files-zh_CN.png create mode 100644 htdocs/js/lib/kindeditor/plugins/multiimage/images/swfupload.swf create mode 100644 htdocs/js/lib/kindeditor/plugins/multiimage/multiimage.js rename htdocs/{static/js => js/lib/kindeditor}/plugins/pagebreak/pagebreak.js (67%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/plainpaste/plainpaste.js (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/preview/preview.js (100%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/quickformat/quickformat.js (67%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/table/table.js (85%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/template/html/1.html (91%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/template/html/2.html (91%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/template/html/3.html (88%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/template/template.js (94%) rename htdocs/{static/js => js/lib/kindeditor}/plugins/wordpaste/wordpaste.js (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/anchor.gif (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/blank.gif (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/flash.gif (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/loading.gif (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/media.gif (100%) rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/common/rm.gif (100%) create mode 100644 htdocs/js/lib/kindeditor/themes/default/background.png rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/default/default.css (81%) create mode 100644 htdocs/js/lib/kindeditor/themes/default/default.png create mode 100644 htdocs/js/lib/kindeditor/themes/qq/editor.gif create mode 100644 htdocs/js/lib/kindeditor/themes/qq/qq.css rename htdocs/{static/css/kindskin => js/lib/kindeditor/themes}/simple/simple.css (63%) delete mode 100644 htdocs/static/css/kindskin/default/bg.gif delete mode 100644 htdocs/static/css/kindskin/default/default.gif delete mode 100644 htdocs/static/css/kindskin/default/default.png delete mode 100644 htdocs/static/js/kindeditor-min.js delete mode 100644 htdocs/static/js/plugins/filemanager/images/file-64.gif delete mode 100644 htdocs/static/js/plugins/filemanager/images/folder-64.gif delete mode 100644 htdocs/static/js/plugins/image/images/refresh.gif diff --git a/application/admin/views/scripts/news/newsadd.phtml b/application/admin/views/scripts/news/newsadd.phtml index 71d1b130..bbb67e45 100644 --- a/application/admin/views/scripts/news/newsadd.phtml +++ b/application/admin/views/scripts/news/newsadd.phtml @@ -3,9 +3,8 @@ $this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); $this->headScript()->appendFile('/static/js/jquery.tagInput.min.js'); - $this->headScript()->appendFile('/static/js/kindeditor-min.js'); - $this->headScript()->appendFile('/static/js/kindlang/zh_CN.js'); - $this->headLink()->appendStylesheet('/static/css/kindskin/default/default.css'); + $theme = new Theme; + $theme->appendPlus($this,'kindeditor'); $this->headLink()->appendStylesheet('/static/js/uploadify/uploadify.css'); $this->headScript()->appendFile('/static/js/uploadify/swfobject.js'); $this->headScript()->appendFile('/static/js/uploadify/jquery.uploadify.v2.1.4.min.js'); @@ -40,7 +39,6 @@ var tags=[ $(document).ready(function(){ KindEditor.ready(function(K) { editor=K.create('textarea[name="body"]', { - cssPath : '/static/js/plugins/code/prettify.css', uploadJson : '/plugins/upload_json.php', fileManagerJson : '/plugins/file_manager_json.php', allowFileManager : true @@ -125,7 +123,10 @@ $(document).ready(function(){ foreach($this->types as $v) { $head = ""; - if(!empty($v[$this->deepField])) {$head = str_repeat('-',$v[$this->deepField]);} + if(!empty($v[$this->deepField])) + { + $head = str_repeat('-',$v[$this->deepField]); + } echo ''.$head.$v['title'].'
'; $head = ""; } diff --git a/application/admin/views/scripts/news/newsedit.phtml b/application/admin/views/scripts/news/newsedit.phtml index dca4cdc5..4a326d3e 100644 --- a/application/admin/views/scripts/news/newsedit.phtml +++ b/application/admin/views/scripts/news/newsedit.phtml @@ -5,9 +5,8 @@ $this->headScript()->appendFile('/js/jquery-1.7.min.js'); $this->headLink()->appendStylesheet('/css/admin.css'); $this->headScript()->appendFile('/static/js/jquery.tagInput.min.js'); - $this->headScript()->appendFile('/static/js/kindeditor-min.js'); - $this->headScript()->appendFile('/static/js/kindlang/zh_CN.js'); - $this->headLink()->appendStylesheet('/static/css/kindskin/default/default.css'); + $theme = new Theme; + $theme->appendPlus($this,'kindeditor'); $this->headLink()->appendStylesheet('/static/js/uploadify/uploadify.css'); $this->headScript()->appendFile('/static/js/uploadify/swfobject.js'); $this->headScript()->appendFile('/static/js/uploadify/jquery.uploadify.v2.1.4.min.js'); @@ -49,7 +48,6 @@ var tags=[ $(document).ready(function(){ KindEditor.ready(function(K) { editor=K.create('textarea[name="body"]', { - cssPath : '/static/js/plugins/code/prettify.css', uploadJson : '/plugins/upload_json.php', fileManagerJson : '/plugins/file_manager_json.php', allowFileManager : true diff --git a/application/admin/views/scripts/news/newslist.phtml b/application/admin/views/scripts/news/newslist.phtml index 659e57f4..774b2cb7 100644 --- a/application/admin/views/scripts/news/newslist.phtml +++ b/application/admin/views/scripts/news/newslist.phtml @@ -39,6 +39,7 @@ $('#divFooter').css('position','absolute'); { foreach($this->types as $v) { + $haed=""; if(!empty($v[$this->deepField])) {$haed = str_repeat('-',$v[$this->deepField]);} if($this->type == $v['id']) echo '