typo 5.0.3.98.1 → 5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (453) hide show
  1. data/CHANGES-5.1 +54 -0
  2. data/app/apis/meta_weblog_service.rb +7 -6
  3. data/app/controllers/accounts_controller.rb +2 -1
  4. data/app/controllers/admin/content_controller.rb +45 -3
  5. data/app/controllers/admin/pages_controller.rb +1 -1
  6. data/app/controllers/admin/textfilters_controller.rb +4 -4
  7. data/app/controllers/admin/users_controller.rb +14 -2
  8. data/app/controllers/application.rb +4 -1
  9. data/app/controllers/articles_controller.rb +1 -3
  10. data/app/controllers/backend_controller.rb +2 -0
  11. data/app/controllers/comments_controller.rb +6 -0
  12. data/app/helpers/admin/base_helper.rb +24 -26
  13. data/app/helpers/admin/feedback_helper.rb +0 -20
  14. data/app/helpers/application_helper.rb +1 -0
  15. data/app/models/article.rb +2 -0
  16. data/app/models/blog.rb +1 -0
  17. data/app/models/blog_sweeper.rb +8 -9
  18. data/app/models/page_cache.rb +1 -0
  19. data/app/models/tag.rb +2 -2
  20. data/app/models/user.rb +5 -1
  21. data/app/views/admin/blacklist/destroy.html.erb +1 -1
  22. data/app/views/admin/categories/destroy.html.erb +1 -1
  23. data/app/views/admin/comments/destroy.html.erb +1 -1
  24. data/app/views/admin/content/_articles.html.erb +4 -4
  25. data/app/views/admin/content/_attachment.html.erb +6 -7
  26. data/app/views/admin/content/_drafts.html.erb +6 -0
  27. data/app/views/admin/content/_form.html.erb +47 -34
  28. data/app/views/admin/content/destroy.html.erb +1 -1
  29. data/app/views/admin/content/edit.html.erb +1 -1
  30. data/app/views/admin/content/index.html.erb +1 -6
  31. data/app/views/admin/content/new.html.erb +1 -1
  32. data/app/views/admin/pages/_form.html.erb +4 -3
  33. data/app/views/admin/pages/_pages.html.erb +3 -3
  34. data/app/views/admin/pages/destroy.html.erb +1 -1
  35. data/app/views/admin/resources/destroy.html.erb +1 -1
  36. data/app/views/admin/settings/index.html.erb +10 -0
  37. data/app/views/admin/shared/_edit.html.erb +1 -6
  38. data/app/views/admin/textfilters/destroy.html.erb +3 -0
  39. data/app/views/admin/textfilters/edit.html.erb +3 -1
  40. data/app/views/admin/textfilters/index.html.erb +1 -1
  41. data/app/views/admin/textfilters/new.html.erb +3 -1
  42. data/app/views/admin/trackbacks/show.html.erb +1 -1
  43. data/app/views/admin/users/destroy.html.erb +1 -1
  44. data/app/views/admin/users/edit.html.erb +1 -5
  45. data/app/views/admin/users/index.html.erb +1 -1
  46. data/app/views/articles/_comment_failed.html.erb +3 -0
  47. data/config/initializers/access_rules.rb +3 -3
  48. data/db/migrate/070_add_users_to_non_admins.rb +17 -0
  49. data/installer/rails_installer_defaults.yml +1 -1
  50. data/lib/tasks/release.rake +3 -3
  51. data/lib/typo_version.rb +1 -1
  52. data/public/images/admin/cancel.png +0 -0
  53. data/public/images/admin/checked.png +0 -0
  54. data/public/images/admin/delete.png +0 -0
  55. data/public/images/admin/edit.png +0 -0
  56. data/public/images/admin/show.png +0 -0
  57. data/public/javascripts/controls.js +2 -0
  58. data/public/javascripts/dragdrop.js +2 -0
  59. data/public/javascripts/effects.js +6 -4
  60. data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +13 -8
  61. data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +2 -2
  62. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +2 -2
  63. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +2 -2
  64. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +189 -79
  65. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +4 -3
  66. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +16 -15
  67. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +30 -9
  68. data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +108 -90
  69. data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +22 -3
  70. data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +76 -38
  71. data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +7 -2
  72. data/public/javascripts/fckeditor/editor/_source/classes/fckhtmliterator.js +142 -0
  73. data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +2 -2
  74. data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +1 -1
  75. data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +2 -2
  76. data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +3 -3
  77. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +8 -5
  78. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +3 -3
  79. data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +6 -5
  80. data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +85 -38
  81. data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +2 -2
  82. data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +7 -8
  83. data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +180 -17
  84. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +2 -2
  85. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +2 -2
  86. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +1 -1
  87. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +9 -4
  88. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +5 -1
  89. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +3 -3
  90. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +1 -1
  91. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +1 -1
  92. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +15 -4
  93. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +5 -2
  94. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +13 -13
  95. data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +17 -13
  96. data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +2 -2
  97. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +28 -13
  98. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +2 -2
  99. data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +75 -19
  100. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +64 -8
  101. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +3 -1
  102. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +2 -2
  103. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +5 -3
  104. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +6 -6
  105. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +4 -4
  106. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +3 -1
  107. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +3 -1
  108. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +2 -2
  109. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +2 -2
  110. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +7 -9
  111. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +4 -2
  112. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +4 -2
  113. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +3 -3
  114. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +4 -4
  115. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +28 -10
  116. data/public/javascripts/fckeditor/editor/_source/fckconstants.js +1 -1
  117. data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +21 -13
  118. data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +5 -5
  119. data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +4 -4
  120. data/public/javascripts/fckeditor/editor/_source/internals/fck.js +148 -38
  121. data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +4 -4
  122. data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +45 -47
  123. data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +50 -17
  124. data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +4 -2
  125. data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +2 -2
  126. data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +28 -28
  127. data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +12 -13
  128. data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +2 -2
  129. data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +211 -15
  130. data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +63 -39
  131. data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +177 -37
  132. data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +2 -1
  133. data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +2 -2
  134. data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +5 -2
  135. data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +2 -2
  136. data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +5 -2
  137. data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +3 -3
  138. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +36 -27
  139. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +91 -17
  140. data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +22 -13
  141. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +15 -15
  142. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +2 -2
  143. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +2 -2
  144. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +1 -1
  145. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +32 -6
  146. data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +181 -22
  147. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +19 -7
  148. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +8 -2
  149. data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +8 -5
  150. data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +2 -2
  151. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +116 -61
  152. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +6 -10
  153. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +51 -56
  154. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +1 -1
  155. data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +3 -2
  156. data/public/javascripts/fckeditor/editor/css/fck_internal.css +19 -2
  157. data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +8 -1
  158. data/public/javascripts/fckeditor/editor/css/images/fck_plugin.gif +0 -0
  159. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +8 -1
  160. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +199 -26
  161. data/public/javascripts/fckeditor/editor/dialog/fck_about.html +20 -14
  162. data/public/javascripts/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif +0 -0
  163. data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +15 -10
  164. data/public/javascripts/fckeditor/editor/dialog/fck_button.html +9 -14
  165. data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +8 -13
  166. data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +4 -3
  167. data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +6 -6
  168. data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +1 -1
  169. data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +9 -3
  170. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +18 -11
  171. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +7 -3
  172. data/public/javascripts/fckeditor/editor/dialog/fck_form.html +7 -4
  173. data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +12 -15
  174. data/public/javascripts/fckeditor/editor/dialog/fck_image.html +9 -3
  175. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +24 -12
  176. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +24 -18
  177. data/public/javascripts/fckeditor/editor/dialog/fck_link.html +1 -1
  178. data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +41 -20
  179. data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +8 -4
  180. data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +53 -54
  181. data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +8 -13
  182. data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +157 -79
  183. data/public/javascripts/fckeditor/editor/dialog/fck_select.html +14 -11
  184. data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +2 -2
  185. data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +9 -4
  186. data/public/javascripts/fckeditor/editor/dialog/fck_source.html +5 -2
  187. data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +9 -6
  188. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +2 -1
  189. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +3 -1
  190. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +5 -2
  191. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +2 -1
  192. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +0 -1
  193. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +1 -1
  194. data/public/javascripts/fckeditor/editor/dialog/fck_table.html +10 -5
  195. data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +8 -6
  196. data/public/javascripts/fckeditor/editor/dialog/fck_template.html +1 -1
  197. data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +10 -11
  198. data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +10 -14
  199. data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +0 -2
  200. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +2 -2
  201. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +3 -3
  202. data/public/javascripts/fckeditor/editor/fckdebug.html +1 -1
  203. data/public/javascripts/fckeditor/editor/fckdialog.html +660 -213
  204. data/public/javascripts/fckeditor/editor/fckeditor.html +66 -16
  205. data/public/javascripts/fckeditor/editor/fckeditor.original.html +70 -16
  206. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +2 -2
  207. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +37 -2
  208. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +33 -1
  209. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +1 -1
  210. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +2 -1
  211. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +3 -2
  212. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +1 -1
  213. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +2 -1
  214. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +34 -2
  215. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +3 -3
  216. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +5 -3
  217. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +5 -3
  218. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +1 -1
  219. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +50 -4
  220. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +2 -3
  221. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +14 -4
  222. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +2 -3
  223. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +23 -4
  224. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +1 -1
  225. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +43 -32
  226. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +16 -16
  227. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +26 -9
  228. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +2 -2
  229. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +40 -9
  230. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +20 -21
  231. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +2 -2
  232. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +13 -13
  233. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +3 -3
  234. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +4 -5
  235. data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +34 -1
  236. data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +47 -4
  237. data/public/javascripts/fckeditor/editor/js/fckadobeair.js +176 -0
  238. data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +77 -77
  239. data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +74 -74
  240. data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +55 -54
  241. data/public/javascripts/fckeditor/editor/lang/af.js +1 -2
  242. data/public/javascripts/fckeditor/editor/lang/ar.js +16 -17
  243. data/public/javascripts/fckeditor/editor/lang/bg.js +1 -2
  244. data/public/javascripts/fckeditor/editor/lang/bn.js +1 -2
  245. data/public/javascripts/fckeditor/editor/lang/bs.js +1 -2
  246. data/public/javascripts/fckeditor/editor/lang/ca.js +27 -28
  247. data/public/javascripts/fckeditor/editor/lang/cs.js +18 -19
  248. data/public/javascripts/fckeditor/editor/lang/da.js +1 -2
  249. data/public/javascripts/fckeditor/editor/lang/de.js +1 -2
  250. data/public/javascripts/fckeditor/editor/lang/el.js +1 -2
  251. data/public/javascripts/fckeditor/editor/lang/en-au.js +1 -2
  252. data/public/javascripts/fckeditor/editor/lang/en-ca.js +1 -2
  253. data/public/javascripts/fckeditor/editor/lang/en-uk.js +1 -2
  254. data/public/javascripts/fckeditor/editor/lang/en.js +1 -2
  255. data/public/javascripts/fckeditor/editor/lang/eo.js +1 -2
  256. data/public/javascripts/fckeditor/editor/lang/es.js +34 -35
  257. data/public/javascripts/fckeditor/editor/lang/et.js +32 -33
  258. data/public/javascripts/fckeditor/editor/lang/eu.js +32 -33
  259. data/public/javascripts/fckeditor/editor/lang/fa.js +1 -2
  260. data/public/javascripts/fckeditor/editor/lang/fi.js +15 -16
  261. data/public/javascripts/fckeditor/editor/lang/fo.js +1 -2
  262. data/public/javascripts/fckeditor/editor/lang/fr-ca.js +515 -0
  263. data/public/javascripts/fckeditor/editor/lang/fr.js +5 -6
  264. data/public/javascripts/fckeditor/editor/lang/gl.js +1 -2
  265. data/public/javascripts/fckeditor/editor/lang/he.js +15 -16
  266. data/public/javascripts/fckeditor/editor/lang/hi.js +1 -2
  267. data/public/javascripts/fckeditor/editor/lang/hr.js +1 -2
  268. data/public/javascripts/fckeditor/editor/lang/hu.js +1 -2
  269. data/public/javascripts/fckeditor/editor/lang/it.js +1 -2
  270. data/public/javascripts/fckeditor/editor/lang/ja.js +1 -2
  271. data/public/javascripts/fckeditor/editor/lang/km.js +1 -2
  272. data/public/javascripts/fckeditor/editor/lang/ko.js +25 -26
  273. data/public/javascripts/fckeditor/editor/lang/lt.js +1 -2
  274. data/public/javascripts/fckeditor/editor/lang/lv.js +1 -2
  275. data/public/javascripts/fckeditor/editor/lang/mn.js +199 -200
  276. data/public/javascripts/fckeditor/editor/lang/ms.js +1 -2
  277. data/public/javascripts/fckeditor/editor/lang/nb.js +1 -2
  278. data/public/javascripts/fckeditor/editor/lang/nl.js +1 -2
  279. data/public/javascripts/fckeditor/editor/lang/no.js +1 -2
  280. data/public/javascripts/fckeditor/editor/lang/pl.js +51 -52
  281. data/public/javascripts/fckeditor/editor/lang/pt-br.js +16 -17
  282. data/public/javascripts/fckeditor/editor/lang/pt.js +1 -2
  283. data/public/javascripts/fckeditor/editor/lang/ro.js +1 -2
  284. data/public/javascripts/fckeditor/editor/lang/ru.js +31 -32
  285. data/public/javascripts/fckeditor/editor/lang/sk.js +1 -2
  286. data/public/javascripts/fckeditor/editor/lang/sl.js +39 -40
  287. data/public/javascripts/fckeditor/editor/lang/sr-latn.js +1 -2
  288. data/public/javascripts/fckeditor/editor/lang/sr.js +1 -2
  289. data/public/javascripts/fckeditor/editor/lang/sv.js +1 -2
  290. data/public/javascripts/fckeditor/editor/lang/th.js +1 -2
  291. data/public/javascripts/fckeditor/editor/lang/tr.js +1 -2
  292. data/public/javascripts/fckeditor/editor/lang/uk.js +1 -2
  293. data/public/javascripts/fckeditor/editor/lang/vi.js +1 -2
  294. data/public/javascripts/fckeditor/editor/lang/zh-cn.js +2 -3
  295. data/public/javascripts/fckeditor/editor/lang/zh.js +1 -2
  296. data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +9 -2
  297. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +1 -1
  298. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +1 -1
  299. data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +2 -2
  300. data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +35 -11
  301. data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +10 -5
  302. data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +3 -3
  303. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +2 -2
  304. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +2 -2
  305. data/public/javascripts/fckeditor/editor/{filemanager/connectors/cfm/upload.cfm → plugins/placeholder/lang/es.js} +9 -13
  306. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +1 -1
  307. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +1 -1
  308. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +2 -2
  309. data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +1 -1
  310. data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +1 -1
  311. data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +1 -1
  312. data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +271 -8
  313. data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +2 -2
  314. data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +270 -8
  315. data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +2 -2
  316. data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +270 -11
  317. data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +2 -2
  318. data/public/javascripts/fckeditor/fckconfig.js +58 -55
  319. data/public/javascripts/fckeditor/fckeditor.js +99 -8
  320. data/public/javascripts/fckeditor/fckeditor.py +2 -4
  321. data/public/javascripts/fckeditor/fckpackager.xml +12 -12
  322. data/public/javascripts/fckeditor/fckstyles.xml +2 -5
  323. data/public/javascripts/fckeditor/fcktemplates.xml +1 -1
  324. data/public/javascripts/fckeditor/license.txt +1 -2
  325. data/public/javascripts/prototype.js +46 -101
  326. data/public/javascripts/scriptaculous.js +28 -17
  327. data/public/stylesheets/administration.css +5 -1
  328. data/themes/dirtylicious/about.markdown +3 -0
  329. data/themes/dirtylicious/images/body.jpg +0 -0
  330. data/themes/dirtylicious/images/container.jpg +0 -0
  331. data/themes/dirtylicious/images/gravatar.gif +0 -0
  332. data/themes/dirtylicious/images/header.jpg +0 -0
  333. data/themes/dirtylicious/images/li.gif +0 -0
  334. data/themes/dirtylicious/images/main.gif +0 -0
  335. data/themes/dirtylicious/images/nav.gif +0 -0
  336. data/themes/dirtylicious/images/quote.gif +0 -0
  337. data/themes/dirtylicious/images/spinner.gif +0 -0
  338. data/themes/dirtylicious/layouts/default.html.erb +60 -0
  339. data/themes/dirtylicious/preview.png +0 -0
  340. data/themes/dirtylicious/stylesheets/application.css +327 -0
  341. data/themes/dirtylicious/views/articles/_article.html.erb +33 -0
  342. data/themes/dirtylicious/views/articles/_comment.html.erb +14 -0
  343. data/themes/dirtylicious/views/articles/_comment_form.html.erb +37 -0
  344. data/themes/dirtylicious/views/articles/_comment_list.html.erb +7 -0
  345. data/themes/dirtylicious/views/articles/_trackback.html.erb +9 -0
  346. data/themes/dirtylicious/views/articles/comment_preview.html.erb +10 -0
  347. data/themes/dirtylicious/views/articles/index.html.erb +5 -0
  348. data/themes/dirtylicious/views/articles/read.html.erb +42 -0
  349. data/themes/dirtylicious/views/shared/_search.html.erb +16 -0
  350. data/themes/standard_issue/about.markdown +5 -0
  351. data/themes/standard_issue/images/img01.gif +0 -0
  352. data/themes/standard_issue/images/img02.gif +0 -0
  353. data/themes/standard_issue/images/img03.gif +0 -0
  354. data/themes/standard_issue/images/img04.jpg +0 -0
  355. data/themes/standard_issue/images/img05.gif +0 -0
  356. data/themes/standard_issue/images/img06.gif +0 -0
  357. data/themes/standard_issue/images/img07.gif +0 -0
  358. data/themes/standard_issue/images/img08.gif +0 -0
  359. data/themes/standard_issue/images/img09.gif +0 -0
  360. data/themes/standard_issue/images/img10.gif +0 -0
  361. data/themes/standard_issue/images/spacer.gif +0 -0
  362. data/themes/standard_issue/images/spinner.gif +0 -0
  363. data/themes/standard_issue/layouts/default.html.erb +59 -0
  364. data/themes/standard_issue/preview.png +0 -0
  365. data/themes/standard_issue/stylesheets/application.css +461 -0
  366. data/themes/standard_issue/views/articles/_article.html.erb +37 -0
  367. data/themes/standard_issue/views/articles/_comment.html.erb +12 -0
  368. data/themes/standard_issue/views/articles/_comment_form.html.erb +48 -0
  369. data/themes/standard_issue/views/articles/_comment_list.html.erb +7 -0
  370. data/themes/standard_issue/views/articles/_trackback.html.erb +9 -0
  371. data/themes/standard_issue/views/articles/comment_preview.html.erb +10 -0
  372. data/themes/standard_issue/views/articles/index.html.erb +5 -0
  373. data/themes/standard_issue/views/articles/read.html.erb +42 -0
  374. data/themes/standard_issue/views/shared/_search.html.erb +17 -0
  375. data/themes/standard_issue/views/theme/static_view_test.html.erb +1 -0
  376. data/themes/typographic/images/accept.gif +0 -0
  377. data/themes/typographic/images/accept50.gif +0 -0
  378. data/themes/typographic/images/bg_white.gif +0 -0
  379. data/themes/typographic/images/bg_wrapper.gif +0 -0
  380. data/themes/typographic/images/bullet_bottom.gif +0 -0
  381. data/themes/typographic/images/bullet_right.gif +0 -0
  382. data/themes/typographic/images/email_open.gif +0 -0
  383. data/themes/typographic/images/email_open50.gif +0 -0
  384. data/themes/typographic/images/meta.gif +0 -0
  385. data/themes/typographic/images/page_edit.gif +0 -0
  386. data/themes/typographic/images/page_edit50.gif +0 -0
  387. data/themes/typographic/images/spinner.gif +0 -0
  388. data/themes/typographic/images/tag.gif +0 -0
  389. data/themes/typographic/images/user.gif +0 -0
  390. data/themes/typographic/images/user50.gif +0 -0
  391. data/themes/typographic/images/world_link.gif +0 -0
  392. data/themes/typographic/images/world_link50.gif +0 -0
  393. data/themes/typographic/layouts/default.html.erb +5 -2
  394. data/themes/typographic/stylesheets/ie6.css +86 -0
  395. data/themes/typographic/views/articles/_article.html.erb +2 -2
  396. data/vendor/plugins/fckeditor/README +0 -7
  397. data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +1 -3
  398. data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +2 -2
  399. data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +1 -1
  400. data/vendor/plugins/fckeditor/test/fckeditor_test.rb +8 -0
  401. metadata +98 -66
  402. data/CHANGES-5.0.4 +0 -33
  403. data/SIDEBARS +0 -39
  404. data/app/views/admin/content/_quick_post.html.erb +0 -20
  405. data/db/schema.rb +0 -224
  406. data/public/.DS_Store +0 -0
  407. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +0 -62
  408. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +0 -353
  409. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +0 -198
  410. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +0 -128
  411. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +0 -88
  412. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +0 -222
  413. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +0 -61
  414. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +0 -55
  415. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +0 -273
  416. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +0 -315
  417. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +0 -296
  418. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +0 -68
  419. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +0 -225
  420. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +0 -89
  421. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +0 -288
  422. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +0 -68
  423. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +0 -132
  424. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +0 -183
  425. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +0 -31
  426. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +0 -1325
  427. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +0 -65
  428. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +0 -257
  429. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +0 -157
  430. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +0 -93
  431. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +0 -245
  432. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +0 -140
  433. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +0 -87
  434. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +0 -272
  435. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +0 -17
  436. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +0 -59
  437. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +0 -185
  438. data/public/javascripts/fckeditor/fckeditor.afp +0 -161
  439. data/public/javascripts/fckeditor/fckeditor.asp +0 -235
  440. data/public/javascripts/fckeditor/fckeditor.cfc +0 -273
  441. data/public/javascripts/fckeditor/fckeditor.cfm +0 -210
  442. data/public/javascripts/fckeditor/fckeditor.lasso +0 -112
  443. data/test/mocks/themes/typographic/.DS_Store +0 -0
  444. data/themes/typographic/.DS_Store +0 -0
  445. data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS +0 -26
  446. data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE +0 -21
  447. data/vendor/plugins/audioscrobbler_sidebar/README +0 -27
  448. data/vendor/plugins/audioscrobbler_sidebar/Rakefile +0 -22
  449. data/vendor/plugins/audioscrobbler_sidebar/init.rb +0 -5
  450. data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb +0 -54
  451. data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb +0 -13
  452. data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +0 -8
  453. data/vendor/plugins/audioscrobbler_sidebar/views/content.rhtml +0 -10
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
3
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
3
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
4
4
  *
5
5
  * == BEGIN LICENSE ==
6
6
  *
@@ -418,7 +418,7 @@ body
418
418
  background-repeat: no-repeat;
419
419
  }
420
420
 
421
- .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
421
+ .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
422
422
  {
423
423
  opacity: 0.30; /* Safari, Opera and Mozilla */
424
424
  filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
3
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
3
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
4
4
  *
5
5
  * == BEGIN LICENSE ==
6
6
  *
@@ -43,13 +43,16 @@ FCKConfig.Debug = false ;
43
43
  FCKConfig.AllowQueryStringDebug = true ;
44
44
 
45
45
  FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
46
+ FCKConfig.SkinEditorCSS = '' ; // FCKConfig.SkinPath + "|<minified css>" ;
47
+ FCKConfig.SkinDialogCSS = '' ; // FCKConfig.SkinPath + "|<minified css>" ;
48
+
46
49
  FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
47
50
 
48
51
  FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
49
52
 
50
53
  // FCKConfig.Plugins.Add( 'autogrow' ) ;
51
54
  // FCKConfig.Plugins.Add( 'dragresizetable' );
52
- FCKConfig.AutoGrowMax = 400 ;
55
+ // FCKConfig.AutoGrowMax = 400 ;
53
56
 
54
57
  // FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%>
55
58
  // FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code
@@ -73,7 +76,6 @@ FCKConfig.FormatSource = true ;
73
76
  FCKConfig.FormatOutput = true ;
74
77
  FCKConfig.FormatIndentator = ' ' ;
75
78
 
76
- FCKConfig.GeckoUseSPAN = false ;
77
79
  FCKConfig.StartupFocus = false ;
78
80
  FCKConfig.ForcePasteAsPlainText = false ;
79
81
  FCKConfig.AutoDetectPasteFromWord = true ; // IE only.
@@ -95,20 +97,13 @@ FCKConfig.TemplateReplaceCheckbox = true ;
95
97
  FCKConfig.ToolbarLocation = 'In' ;
96
98
 
97
99
  FCKConfig.ToolbarSets["Default"] = [
98
- ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
99
- ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
100
- ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
101
- ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
102
- '/',
103
- ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
104
- ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
105
- ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
106
- ['Link','Unlink','Anchor'],
107
- ['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'],
108
- '/',
109
- ['Style','FontFormat','FontName','FontSize'],
110
- ['TextColor','BGColor'],
111
- ['FitWindow','ShowBlocks','-','About'] // No comma for the last row.
100
+ ['FontFormat','Bold', 'Italic', 'StrikeThrough'],
101
+ ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
102
+ ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
103
+ ['Link','Unlink'],
104
+ ['Image','Flash', 'Smiley'],
105
+ ['FitWindow','SpellCheck'],
106
+ ['RemoveFormat', '-', 'Source']
112
107
  ] ;
113
108
 
114
109
  FCKConfig.ToolbarSets["Basic"] = [
@@ -123,6 +118,7 @@ FCKConfig.Keystrokes = [
123
118
  [ CTRL + 67 /*C*/, true ],
124
119
  [ CTRL + 70 /*F*/, true ],
125
120
  [ CTRL + 83 /*S*/, true ],
121
+ [ CTRL + 84 /*T*/, true ],
126
122
  [ CTRL + 88 /*X*/, true ],
127
123
  [ CTRL + 86 /*V*/, 'Paste' ],
128
124
  [ SHIFT + 45 /*INS*/, 'Paste' ],
@@ -136,8 +132,7 @@ FCKConfig.Keystrokes = [
136
132
  [ CTRL + 73 /*I*/, 'Italic' ],
137
133
  [ CTRL + 85 /*U*/, 'Underline' ],
138
134
  [ CTRL + SHIFT + 83 /*S*/, 'Save' ],
139
- [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
140
- [ CTRL + 9 /*TAB*/, 'Source' ]
135
+ [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ]
141
136
  ] ;
142
137
 
143
138
  FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
@@ -146,8 +141,8 @@ FCKConfig.BrowserContextMenuOnCtrl = false ;
146
141
  FCKConfig.EnableMoreFontColors = true ;
147
142
  FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
148
143
 
149
- FCKConfig.FontFormats = 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ;
150
- FCKConfig.FontNames = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
144
+ FCKConfig.FontFormats = 'p;h1;h2;h3;h4;h5;pre;address;div' ;
145
+ FCKConfig.FontNames = 'Arial;Courier New;Tahoma;Times New Roman;Verdana' ;
151
146
  FCKConfig.FontSizes = 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
152
147
 
153
148
  FCKConfig.StylesXmlPath = FCKConfig.EditorPath + 'fckstyles.xml' ;
@@ -171,7 +166,7 @@ FCKConfig.ImageDlgHideAdvanced = false ;
171
166
 
172
167
  FCKConfig.FlashDlgHideAdvanced = false ;
173
168
 
174
- FCKConfig.ProtectedTags = '' ;
169
+ FCKConfig.ProtectedTags = 'typo' ;
175
170
 
176
171
  // This will be applied to the body element of the editor
177
172
  FCKConfig.BodyId = '' ;
@@ -190,22 +185,25 @@ FCKConfig.CleanWordKeepsStructure = false ;
190
185
  // Only inline elements are valid.
191
186
  FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ;
192
187
 
193
- FCKConfig.CustomStyles =
188
+ // Attributes that will be removed
189
+ FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ;
190
+
191
+ FCKConfig.CustomStyles =
194
192
  {
195
193
  'Red Title' : { Element : 'h3', Styles : { 'color' : 'Red' } }
196
194
  };
197
195
 
198
196
  // Do not add, rename or remove styles here. Only apply definition changes.
199
- FCKConfig.CoreStyles =
197
+ FCKConfig.CoreStyles =
200
198
  {
201
199
  // Basic Inline Styles.
202
- 'Bold' : { Element : 'b', Overrides : 'strong' },
203
- 'Italic' : { Element : 'i', Overrides : 'em' },
200
+ 'Bold' : { Element : 'strong', Overrides : 'b' },
201
+ 'Italic' : { Element : 'em', Overrides : 'i' },
204
202
  'Underline' : { Element : 'u' },
205
203
  'StrikeThrough' : { Element : 'strike' },
206
204
  'Subscript' : { Element : 'sub' },
207
205
  'Superscript' : { Element : 'sup' },
208
-
206
+
209
207
  // Basic Block Styles (Font Format Combo).
210
208
  'p' : { Element : 'p' },
211
209
  'div' : { Element : 'div' },
@@ -217,30 +215,32 @@ FCKConfig.CoreStyles =
217
215
  'h4' : { Element : 'h4' },
218
216
  'h5' : { Element : 'h5' },
219
217
  'h6' : { Element : 'h6' },
220
-
218
+
221
219
  // Other formatting features.
222
- 'FontFace' :
223
- {
224
- Element : 'span',
225
- Styles : { 'font-family' : '#("Font")' },
220
+ 'FontFace' :
221
+ {
222
+ Element : 'span',
223
+ Styles : { 'font-family' : '#("Font")' },
226
224
  Overrides : [ { Element : 'font', Attributes : { 'face' : null } } ]
227
225
  },
228
-
226
+
229
227
  'Size' :
230
- {
231
- Element : 'span',
232
- Styles : { 'font-size' : '#("Size","fontSize")' },
228
+ {
229
+ Element : 'span',
230
+ Styles : { 'font-size' : '#("Size","fontSize")' },
233
231
  Overrides : [ { Element : 'font', Attributes : { 'size' : null } } ]
234
232
  },
235
-
233
+
236
234
  'Color' :
237
- {
238
- Element : 'span',
239
- Styles : { 'color' : '#("Color","color")' },
235
+ {
236
+ Element : 'span',
237
+ Styles : { 'color' : '#("Color","color")' },
240
238
  Overrides : [ { Element : 'font', Attributes : { 'color' : null } } ]
241
239
  },
242
-
243
- 'BackColor' : { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } }
240
+
241
+ 'BackColor' : { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } },
242
+
243
+ 'SelectionHighlight' : { Element : 'span', Styles : { 'background-color' : 'navy', 'color' : 'white' } }
244
244
  };
245
245
 
246
246
  // The distance of an indentation step.
@@ -261,46 +261,49 @@ FCKConfig.JustifyClasses = [] ;
261
261
  // inline when creating the editor instance. In that cases you must set the
262
262
  // values of LinkBrowserURL, ImageBrowserURL and so on.
263
263
  // Custom implementations should just ignore it.
264
- var _FileBrowserLanguage = 'php' ; // asp | aspx | cfm | lasso | perl | php | py
265
- var _QuickUploadLanguage = 'php' ; // asp | aspx | cfm | lasso | perl | php | py
264
+ var _FileBrowserLanguage = 'perl' ; // asp | aspx | cfm | lasso | perl | php | py
265
+ var _QuickUploadLanguage = 'perl' ; // asp | aspx | cfm | lasso | perl | php | py
266
266
 
267
- // Don't care about the following line. It just calculates the correct connector
267
+ // Don't care about the following two lines. It just calculates the correct connector
268
268
  // extension to use for the default File Browser (Perl uses "cgi").
269
269
  var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowserLanguage ;
270
+ var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
270
271
 
271
272
  FCKConfig.LinkBrowser = true ;
272
- FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
273
+ FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
273
274
  FCKConfig.LinkBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70%
274
275
  FCKConfig.LinkBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70%
275
276
 
276
277
  FCKConfig.ImageBrowser = true ;
277
- FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
278
+ FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
278
279
  FCKConfig.ImageBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; // 70% ;
279
280
  FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
280
281
 
281
282
  FCKConfig.FlashBrowser = true ;
282
- FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
283
+ FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
283
284
  FCKConfig.FlashBrowserWindowWidth = FCKConfig.ScreenWidth * 0.7 ; //70% ;
284
285
  FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;
285
286
 
286
287
  FCKConfig.LinkUpload = true ;
287
- FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
288
- FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all
289
- FCKConfig.LinkUploadDeniedExtensions = ".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis|sh|shtml|shtm|phtm)$" ; // empty for no one
288
+ FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension ;
289
+ FCKConfig.LinkUploadAllowedExtensions = ".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$" ; // empty for all
290
+ FCKConfig.LinkUploadDeniedExtensions = "" ; // empty for no one
290
291
 
291
292
  FCKConfig.ImageUpload = true ;
292
- FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
293
+ FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Image' ;
293
294
  FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png|bmp)$" ; // empty for all
294
295
  FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one
295
296
 
296
297
  FCKConfig.FlashUpload = true ;
297
- FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
298
- FCKConfig.FlashUploadAllowedExtensions = ".(swf|fla)$" ; // empty for all
298
+ FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Flash' ;
299
+ FCKConfig.FlashUploadAllowedExtensions = ".(swf|flv)$" ; // empty for all
299
300
  FCKConfig.FlashUploadDeniedExtensions = "" ; // empty for no one
300
301
 
301
302
  FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ;
302
303
  FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ;
303
304
  FCKConfig.SmileyColumns = 8 ;
304
305
  FCKConfig.SmileyWindowWidth = 320 ;
305
- FCKConfig.SmileyWindowHeight = 240 ;
306
+ FCKConfig.SmileyWindowHeight = 210 ;
306
307
 
308
+ FCKConfig.BackgroundBlockerColor = '#ffffff' ;
309
+ FCKConfig.BackgroundBlockerOpacity = 0.50 ;
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
3
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
3
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
4
4
  *
5
5
  * == BEGIN LICENSE ==
6
6
  *
@@ -34,7 +34,7 @@ var FCKeditor = function( instanceName, width, height, toolbarSet, value )
34
34
  this.Height = height || '200' ;
35
35
  this.ToolbarSet = toolbarSet || 'Default' ;
36
36
  this.Value = value || '' ;
37
- this.BasePath = '/fckeditor/' ;
37
+ this.BasePath = FCKeditor.BasePath ;
38
38
  this.CheckBrowser = true ;
39
39
  this.DisplayErrors = true ;
40
40
 
@@ -44,8 +44,23 @@ var FCKeditor = function( instanceName, width, height, toolbarSet, value )
44
44
  this.OnError = null ; // function( source, errorNumber, errorDescription )
45
45
  }
46
46
 
47
- FCKeditor.prototype.Version = '2.5 Beta' ;
48
- FCKeditor.prototype.VersionBuild = '16848' ;
47
+ /**
48
+ * This is the default BasePath used by all editor instances.
49
+ */
50
+ FCKeditor.BasePath = '/fckeditor/' ;
51
+
52
+ /**
53
+ * The minimum height used when replacing textareas.
54
+ */
55
+ FCKeditor.MinHeight = 200 ;
56
+
57
+ /**
58
+ * The minimum width used when replacing textareas.
59
+ */
60
+ FCKeditor.MinWidth = 750 ;
61
+
62
+ FCKeditor.prototype.Version = '2.6' ;
63
+ FCKeditor.prototype.VersionBuild = '18638' ;
49
64
 
50
65
  FCKeditor.prototype.Create = function()
51
66
  {
@@ -61,7 +76,7 @@ FCKeditor.prototype.CreateHtml = function()
61
76
  return '' ;
62
77
  }
63
78
 
64
- var sHtml = '<div>' ;
79
+ var sHtml = '' ;
65
80
 
66
81
  if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
67
82
  {
@@ -76,8 +91,6 @@ FCKeditor.prototype.CreateHtml = function()
76
91
  sHtml += '<textarea name="' + this.InstanceName + '" rows="4" cols="40" style="width:' + sWidth + ';height:' + sHeight + '">' + this._HTMLEncode( this.Value ) + '<\/textarea>' ;
77
92
  }
78
93
 
79
- sHtml += '</div>' ;
80
-
81
94
  return sHtml ;
82
95
  }
83
96
 
@@ -185,6 +198,78 @@ FCKeditor.prototype._HTMLEncode = function( text )
185
198
  return text ;
186
199
  }
187
200
 
201
+ ;(function()
202
+ {
203
+ var textareaToEditor = function( textarea )
204
+ {
205
+ var editor = new FCKeditor( textarea.name ) ;
206
+
207
+ editor.Width = Math.max( textarea.offsetWidth, FCKeditor.MinWidth ) ;
208
+ editor.Height = Math.max( textarea.offsetHeight, FCKeditor.MinHeight ) ;
209
+
210
+ return editor ;
211
+ }
212
+
213
+ /**
214
+ * Replace all <textarea> elements available in the document with FCKeditor
215
+ * instances.
216
+ *
217
+ * // Replace all <textarea> elements in the page.
218
+ * FCKeditor.ReplaceAllTextareas() ;
219
+ *
220
+ * // Replace all <textarea class="myClassName"> elements in the page.
221
+ * FCKeditor.ReplaceAllTextareas( 'myClassName' ) ;
222
+ *
223
+ * // Selectively replace <textarea> elements, based on custom assertions.
224
+ * FCKeditor.ReplaceAllTextareas( function( textarea, editor )
225
+ * {
226
+ * // Custom code to evaluate the replace, returning false if it
227
+ * // must not be done.
228
+ * // It also passes the "editor" parameter, so the developer can
229
+ * // customize the instance.
230
+ * } ) ;
231
+ */
232
+ FCKeditor.ReplaceAllTextareas = function()
233
+ {
234
+ var textareas = document.getElementsByTagName( 'textarea' ) ;
235
+
236
+ for ( var i = 0 ; i < textareas.length ; i++ )
237
+ {
238
+ var editor = null ;
239
+ var textarea = textareas[i] ;
240
+ var name = textarea.name ;
241
+
242
+ // The "name" attribute must exist.
243
+ if ( !name || name.length == 0 )
244
+ continue ;
245
+
246
+ if ( typeof arguments[0] == 'string' )
247
+ {
248
+ // The textarea class name could be passed as the function
249
+ // parameter.
250
+
251
+ var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ) ;
252
+
253
+ if ( !classRegex.test( textarea.className ) )
254
+ continue ;
255
+ }
256
+ else if ( typeof arguments[0] == 'function' )
257
+ {
258
+ // An assertion function could be passed as the function parameter.
259
+ // It must explicitly return "false" to ignore a specific <textarea>.
260
+ editor = textareaToEditor( textarea ) ;
261
+ if ( arguments[0]( textarea, editor ) === false )
262
+ continue ;
263
+ }
264
+
265
+ if ( !editor )
266
+ editor = textareaToEditor( textarea ) ;
267
+
268
+ editor.ReplaceTextarea() ;
269
+ }
270
+ }
271
+ })() ;
272
+
188
273
  function FCKeditor_IsCompatibleBrowser()
189
274
  {
190
275
  var sAgent = navigator.userAgent.toLowerCase() ;
@@ -202,7 +287,13 @@ function FCKeditor_IsCompatibleBrowser()
202
287
 
203
288
  // Opera 9.50+
204
289
  if ( window.opera && window.opera.version && parseFloat( window.opera.version() ) >= 9.5 )
205
- return true ;
290
+ return true ;
291
+
292
+ // Adobe AIR
293
+ // Checked before Safari because AIR have the WebKit rich text editor
294
+ // features from Safari 3.0.4, but the version reported is 420.
295
+ if ( sAgent.indexOf( ' adobeair/' ) != -1 )
296
+ return ( sAgent.match( / adobeair\/(\d+)/ )[1] >= 1 ) ; // Build must be at least v1
206
297
 
207
298
  // Safari 3+
208
299
  if ( sAgent.indexOf( ' applewebkit/' ) != -1 )
@@ -1,6 +1,6 @@
1
1
  """
2
2
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
3
- Copyright (C) 2003-2007 Frederico Caldeira Knabben
3
+ Copyright (C) 2003-2008 Frederico Caldeira Knabben
4
4
 
5
5
  == BEGIN LICENSE ==
6
6
 
@@ -57,7 +57,7 @@ class FCKeditor(object):
57
57
 
58
58
  def CreateHtml(self):
59
59
  HtmlValue = escape(self.Value)
60
- Html = "<div>"
60
+ Html = ""
61
61
 
62
62
  if (self.IsCompatible()):
63
63
  File = "fckeditor.html"
@@ -105,7 +105,6 @@ class FCKeditor(object):
105
105
  HeightCSS,
106
106
  HtmlValue
107
107
  )
108
- Html += "</div>"
109
108
  return Html
110
109
 
111
110
  def IsCompatible(self):
@@ -159,4 +158,3 @@ class FCKeditor(object):
159
158
  else:
160
159
  sParams += "%s=%s" % (k, v)
161
160
  return sParams
162
-
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="utf-8" ?>
2
2
  <!--
3
3
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
4
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
5
5
  *
6
6
  * == BEGIN LICENSE ==
7
7
  *
@@ -27,24 +27,24 @@
27
27
  <Package>
28
28
  <Header><![CDATA[/*
29
29
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
30
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
31
- *
30
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
31
+ *
32
32
  * == BEGIN LICENSE ==
33
- *
33
+ *
34
34
  * Licensed under the terms of any of the following licenses at your
35
35
  * choice:
36
- *
36
+ *
37
37
  * - GNU General Public License Version 2 or later (the "GPL")
38
38
  * http://www.gnu.org/licenses/gpl.html
39
- *
39
+ *
40
40
  * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
41
41
  * http://www.gnu.org/licenses/lgpl.html
42
- *
42
+ *
43
43
  * - Mozilla Public License Version 1.1 or later (the "MPL")
44
44
  * http://www.mozilla.org/MPL/MPL-1.1.html
45
- *
45
+ *
46
46
  * == END LICENSE ==
47
- *
47
+ *
48
48
  * This file has been compressed for better performance. The original source
49
49
  * can be found at "editor/_source".
50
50
  */
@@ -98,7 +98,7 @@
98
98
  <File path="editor/dtd/fck_xhtml10transitional.js" />
99
99
  <File path="editor/_source/classes/fckstyle.js" />
100
100
  <File path="editor/_source/internals/fckstyles.js" />
101
-
101
+
102
102
  <File path="editor/_source/internals/fcklisthandler.js" />
103
103
  <File path="editor/_source/classes/fckelementpath.js" />
104
104
  <File path="editor/_source/classes/fckdomrange.js" />
@@ -151,13 +151,13 @@
151
151
  <File path="editor/_source/classes/fcktoolbarbreak_ie.js" />
152
152
  <File path="editor/_source/internals/fcktoolbarset.js" />
153
153
  <File path="editor/_source/internals/fckdialog.js" />
154
- <File path="editor/_source/internals/fckdialog_ie.js" />
155
154
 
156
155
  <File path="editor/_source/classes/fckmenuitem.js" />
157
156
  <File path="editor/_source/classes/fckmenublock.js" />
158
157
  <File path="editor/_source/classes/fckmenublockpanel.js" />
159
158
  <File path="editor/_source/classes/fckcontextmenu.js" />
160
159
  <File path="editor/_source/internals/fck_contextmenu.js" />
160
+ <File path="editor/_source/classes/fckhtmliterator.js" />
161
161
 
162
162
  <File path="editor/_source/classes/fckplugin.js" />
163
163
  <File path="editor/_source/internals/fckplugins.js" />
@@ -247,13 +247,13 @@
247
247
  <File path="editor/_source/classes/fcktoolbarbreak_gecko.js" />
248
248
  <File path="editor/_source/internals/fcktoolbarset.js" />
249
249
  <File path="editor/_source/internals/fckdialog.js" />
250
- <File path="editor/_source/internals/fckdialog_gecko.js" />
251
250
 
252
251
  <File path="editor/_source/classes/fckmenuitem.js" />
253
252
  <File path="editor/_source/classes/fckmenublock.js" />
254
253
  <File path="editor/_source/classes/fckmenublockpanel.js" />
255
254
  <File path="editor/_source/classes/fckcontextmenu.js" />
256
255
  <File path="editor/_source/internals/fck_contextmenu.js" />
256
+ <File path="editor/_source/classes/fckhtmliterator.js" />
257
257
 
258
258
  <File path="editor/_source/classes/fckplugin.js" />
259
259
  <File path="editor/_source/internals/fckplugins.js" />