skylinecms 3.1.0 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (540) hide show
  1. data/.gitignore +5 -0
  2. data/CHANGELOG +51 -1
  3. data/Gemfile +8 -0
  4. data/Rakefile +0 -43
  5. data/app/controllers/skyline/application_controller.rb +30 -26
  6. data/app/controllers/skyline/articles_controller.rb +8 -28
  7. data/app/controllers/skyline/authentications_controller.rb +6 -8
  8. data/app/controllers/skyline/browser/links_controller.rb +12 -8
  9. data/app/controllers/skyline/browser/tabs/linkables_controller.rb +9 -0
  10. data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +0 -12
  11. data/app/controllers/skyline/content/editors/editable_list_controller.rb +0 -4
  12. data/app/controllers/skyline/content/editors/joinable_list_controller.rb +1 -19
  13. data/app/controllers/skyline/content_controller.rb +14 -30
  14. data/app/controllers/skyline/content_items_controller.rb +3 -9
  15. data/app/controllers/skyline/content_sections_controller.rb +3 -10
  16. data/app/controllers/skyline/link_section_links_controller.rb +2 -10
  17. data/app/controllers/skyline/media/data_controller.rb +24 -14
  18. data/app/controllers/skyline/media/dirs_controller.rb +12 -26
  19. data/app/controllers/skyline/media/files_controller.rb +12 -28
  20. data/app/controllers/skyline/publications_controller.rb +0 -12
  21. data/app/controllers/skyline/published_publications_controller.rb +0 -4
  22. data/app/controllers/skyline/sections_controller.rb +4 -18
  23. data/app/controllers/skyline/site/media_files_data_controller.rb +11 -13
  24. data/app/controllers/skyline/site/pages_controller.rb +4 -3
  25. data/app/controllers/skyline/skyline2_controller.rb +1 -1
  26. data/app/controllers/skyline/users_controller.rb +7 -31
  27. data/app/controllers/skyline/variant_current_editor_controller.rb +5 -5
  28. data/app/controllers/skyline/variants_controller.rb +3 -3
  29. data/app/helpers/skyline/application_helper.rb +16 -5
  30. data/app/helpers/skyline/button_helper.rb +12 -18
  31. data/app/helpers/skyline/content_helper.rb +11 -11
  32. data/app/helpers/skyline/dialog_helper.rb +3 -2
  33. data/app/helpers/skyline/editors/checkable_list.rb +4 -2
  34. data/app/helpers/skyline/editors/date_time.rb +1 -1
  35. data/app/helpers/skyline/editors/display.rb +1 -1
  36. data/app/helpers/skyline/editors/editable_list.rb +13 -8
  37. data/app/helpers/skyline/editors/editor.rb +10 -10
  38. data/app/helpers/skyline/editors/list.rb +2 -2
  39. data/app/helpers/skyline/editors/page_browser.rb +1 -0
  40. data/app/helpers/skyline/editors/wysiwyg.rb +2 -3
  41. data/app/helpers/skyline/form_helper.rb +36 -0
  42. data/app/helpers/skyline/media/files_helper.rb +1 -1
  43. data/app/helpers/skyline/message_generator.rb +13 -4
  44. data/app/helpers/skyline/pages_helper.rb +1 -1
  45. data/app/helpers/skyline/plugin_helper.rb +1 -1
  46. data/app/helpers/skyline/presenters/presenter.rb +12 -8
  47. data/app/helpers/skyline/ref_object_helper.rb +9 -7
  48. data/app/helpers/skyline/translation_helper.rb +1 -1
  49. data/app/helpers/skyline/tree_helper.rb +1 -3
  50. data/app/middleware/skyline/flash_session_cookie_middleware.rb +6 -1
  51. data/app/middleware/skyline/plugins_loader_middleware.rb +1 -1
  52. data/app/middleware/skyline/sprockets_middleware.rb +1 -1
  53. data/app/models/skyline/article.rb +94 -26
  54. data/app/models/skyline/article_version.rb +22 -9
  55. data/app/models/skyline/image_ref.rb +1 -1
  56. data/app/models/skyline/inline_ref.rb +78 -62
  57. data/app/models/skyline/link_ref.rb +1 -1
  58. data/app/models/skyline/media_cache.rb +4 -2
  59. data/app/models/skyline/media_file.rb +2 -5
  60. data/app/models/skyline/media_node.rb +2 -2
  61. data/app/models/skyline/object_ref.rb +2 -2
  62. data/app/models/skyline/page.rb +8 -6
  63. data/app/models/skyline/page_fragment.rb +4 -2
  64. data/app/models/skyline/publication.rb +1 -1
  65. data/app/models/skyline/sections/content_collection_section.rb +1 -1
  66. data/app/models/skyline/sections/link_section.rb +1 -1
  67. data/app/models/skyline/user.rb +17 -7
  68. data/app/models/skyline/user_preference.rb +1 -1
  69. data/app/models/skyline/variant.rb +11 -5
  70. data/app/templates/skyline/page/default/index.html.erb +1 -1
  71. data/app/templates/skyline/sections/raw_section/default/index.html.erb +1 -1
  72. data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb +1 -1
  73. data/app/views/skyline/articles/_currently_editing.html.erb +1 -1
  74. data/app/views/skyline/articles/_meta.html.erb +24 -11
  75. data/app/views/skyline/articles/_security.html.erb +2 -2
  76. data/app/views/skyline/articles/_takeover_action.html.erb +1 -1
  77. data/app/views/skyline/articles/edit.html.erb +29 -16
  78. data/app/views/skyline/articles/edit_preview_only.html.erb +2 -2
  79. data/app/views/skyline/articles/index.html.erb +2 -2
  80. data/app/views/skyline/articles/page/_header.html.erb +1 -1
  81. data/app/views/skyline/articles/page/_index.html.erb +9 -3
  82. data/app/views/skyline/articles/page_fragment/_index.html.erb +7 -2
  83. data/app/views/skyline/articles/update.js.erb +20 -0
  84. data/app/views/skyline/authentications/new.html.erb +1 -1
  85. data/app/views/skyline/browser/links/_index.html.erb +2 -0
  86. data/app/views/skyline/browser/tabs/linkables/_index.html.erb +29 -0
  87. data/app/views/skyline/browser/tabs/linkables/_show.html.erb +67 -0
  88. data/app/views/skyline/browser/tabs/linkables/show.js.erb +4 -0
  89. data/app/views/skyline/browser/tabs/media_library/_index.html.erb +2 -2
  90. data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +4 -35
  91. data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +1 -3
  92. data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb +1 -0
  93. data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb +1 -0
  94. data/app/views/skyline/browser/tabs/pages/_index.html.erb +1 -1
  95. data/app/views/skyline/content/_add.rhtml +6 -1
  96. data/app/views/skyline/content/_filter.rhtml +1 -1
  97. data/app/views/skyline/content/_import.html.erb +1 -1
  98. data/app/views/skyline/content/_index.html.erb +2 -2
  99. data/app/views/skyline/content/_meta.html.erb +2 -2
  100. data/app/views/skyline/content/create.rhtml +1 -1
  101. data/app/views/skyline/content/edit.rhtml +1 -1
  102. data/app/views/skyline/content/editors/editable_list/new.js.erb +2 -0
  103. data/app/views/skyline/content/editors/joinable_list/_add.html.erb +17 -10
  104. data/app/views/skyline/content/editors/joinable_list/_list.html.erb +24 -8
  105. data/app/views/skyline/content/editors/joinable_list/cancel.js.erb +1 -0
  106. data/app/views/skyline/content/editors/joinable_list/index.js.erb +1 -0
  107. data/app/views/skyline/content/editors/joinable_list/new.js.erb +5 -0
  108. data/app/views/skyline/content/field.js.erb +2 -0
  109. data/app/views/skyline/content/import.js.erb +4 -0
  110. data/app/views/skyline/content/order.js.erb +6 -0
  111. data/app/views/skyline/content/presenters/_table.html.erb +1 -1
  112. data/app/views/skyline/content_items/_content_item.html.erb +2 -2
  113. data/app/views/skyline/content_items/new.js.erb +6 -0
  114. data/app/views/skyline/content_sections/_tags.html.erb +2 -2
  115. data/app/views/skyline/content_sections/new.js.erb +6 -0
  116. data/app/views/skyline/link_section_links/_form.html.erb +1 -1
  117. data/app/views/skyline/link_section_links/new.js.erb +4 -0
  118. data/app/views/skyline/locales/show.js.erb +3 -3
  119. data/app/views/skyline/media/dirs/_edit.html.erb +9 -7
  120. data/app/views/skyline/media/dirs/edit.js.erb +1 -0
  121. data/app/views/skyline/media/dirs/index.html.erb +16 -6
  122. data/app/views/skyline/media/dirs/index.js.erb +6 -0
  123. data/app/views/skyline/media/dirs/show.js.erb +5 -0
  124. data/app/views/skyline/media/files/_edit.html.erb +13 -11
  125. data/app/views/skyline/media/files/_index.html.erb +2 -2
  126. data/app/views/skyline/media/files/_new.html.erb +2 -2
  127. data/app/views/skyline/media/files/edit.js.erb +4 -0
  128. data/app/views/skyline/media/files/index.js.erb +4 -0
  129. data/app/views/skyline/media/files/update.js.erb +8 -0
  130. data/app/views/skyline/publications/_index.html.erb +2 -2
  131. data/app/views/skyline/publications/index.js.erb +9 -0
  132. data/app/views/skyline/sections/_content_collection_section.html.erb +6 -6
  133. data/app/views/skyline/sections/_content_item_section.html.erb +1 -1
  134. data/app/views/skyline/sections/_form.html.erb +4 -4
  135. data/app/views/skyline/sections/_link_section.html.erb +6 -1
  136. data/app/views/skyline/sections/_splitter_section.html.erb +1 -1
  137. data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -2
  138. data/app/views/skyline/sections/new.js.erb +12 -0
  139. data/app/views/skyline/settings/edit.html.erb +1 -1
  140. data/app/views/skyline/shared/_head.html.erb +3 -0
  141. data/app/views/skyline/shared/_header_area.html.erb +5 -5
  142. data/app/views/skyline/users/_edit.html.erb +1 -1
  143. data/app/views/skyline/users/_form.html.erb +1 -1
  144. data/app/views/skyline/users/_new.html.erb +1 -1
  145. data/app/views/skyline/users/create.js.erb +2 -0
  146. data/app/views/skyline/users/edit.js.erb +1 -0
  147. data/app/views/skyline/users/index.html.erb +21 -6
  148. data/app/views/skyline/users/new.js.erb +1 -0
  149. data/app/views/skyline/users/update.js.erb +2 -0
  150. data/config/initializers/dependencies.rb +1 -17
  151. data/config/initializers/gem_dependencies.rb +10 -0
  152. data/config/initializers/locales.rb +8 -1
  153. data/config/initializers/middlewares.rb +7 -3
  154. data/config/initializers/observers.rb +6 -4
  155. data/config/locales/en-US.yml +44 -34
  156. data/config/locales/nl-NL.yml +45 -33
  157. data/config/routes.rb +65 -74
  158. data/db/migrate/20090508145820_create_skyline_pages.rb +2 -2
  159. data/db/migrate/20090508145852_create_skyline_page_versions.rb +2 -2
  160. data/db/migrate/20090508150149_create_skyline_sections.rb +1 -1
  161. data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb +2 -2
  162. data/db/migrate/20090624154251_create_skyline_link_section_links.rb +1 -1
  163. data/db/migrate/20100120113953_remove_unused_articles_index.rb +1 -1
  164. data/db/migrate/20110816080626_add_skyline_test_article_data.rb +13 -0
  165. data/db/migrate/20111101092405_rename_indexes.rb +24 -0
  166. data/doc/INSTALL.md +54 -27
  167. data/doc/MIGRATION.md +27 -2
  168. data/lib/skyline.rb +2 -1
  169. data/lib/skyline/authentication/user.rb +80 -0
  170. data/lib/skyline/belongs_to_referable.rb +1 -1
  171. data/lib/skyline/cli/init.rb +14 -26
  172. data/lib/skyline/cli/init/templates/config/initializers/skyline_configuration.rb +0 -1
  173. data/lib/skyline/configuration.rb +74 -32
  174. data/lib/skyline/content/content.rb +7 -6
  175. data/lib/skyline/content/field_meta_data.rb +2 -2
  176. data/lib/skyline/content/stack.rb +1 -1
  177. data/lib/skyline/content_item_section_selectable.rb +4 -4
  178. data/lib/skyline/deprecated/version3_0_8.rb +2 -2
  179. data/lib/skyline/engine.rb +37 -0
  180. data/lib/skyline/form_builder.rb +8 -8
  181. data/lib/skyline/linkable.rb +28 -0
  182. data/lib/skyline/plugins/manager.rb +77 -0
  183. data/lib/skyline/plugins/plugin.rb +89 -0
  184. data/lib/skyline/rendering/helpers/renderer_helper.rb +1 -1
  185. data/lib/skyline/rendering/renderer.rb +27 -13
  186. data/lib/skyline/route_constraint.rb +15 -0
  187. data/lib/skyline/settings.rb +9 -7
  188. data/lib/skyline/taggable.rb +2 -2
  189. data/lib/skyline/version.rb +4 -4
  190. data/lib/skylinecms.rb +5 -3
  191. data/lib/tasks/database.rake +2 -2
  192. data/public/skyline/javascripts/src/application.js +5 -4
  193. data/public/skyline/javascripts/src/rails.js +165 -0
  194. data/public/skyline/javascripts/src/sections.js +6 -9
  195. data/public/skyline/javascripts/src/skyline.editor/src/plugins/autoresize/editor_plugin.js +72 -27
  196. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylineimage/dialog.js +13 -12
  197. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylinelink/dialog.js +7 -7
  198. data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +4 -3
  199. data/public/skyline/javascripts/src/skyline.editor/src/theme.js +101 -536
  200. data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +1 -0
  201. data/public/skyline/javascripts/src/skyline.editor/test/single.html +56 -0
  202. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +1410 -1091
  203. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/accessibility.html +101 -0
  204. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +1 -1
  205. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +12 -12
  206. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/lists/media_list.js +5 -1
  207. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/media/sample.flv +0 -0
  208. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +2 -1
  209. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +4 -4
  210. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +3 -2
  211. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +1 -170
  212. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +1 -5
  213. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +30 -29
  214. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js +1 -1
  215. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +1 -1
  216. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +34 -31
  217. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +32 -13
  218. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js +1 -43
  219. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +21 -17
  220. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js +1 -52
  221. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +35 -30
  222. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -1
  223. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +31 -9
  224. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js +1 -0
  225. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +172 -0
  226. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
  227. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +23 -5
  228. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
  229. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +14 -5
  230. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +1 -1
  231. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +1 -1
  232. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
  233. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +34 -21
  234. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm +15 -14
  235. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
  236. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
  237. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
  238. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
  239. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
  240. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
  241. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js +1 -20
  242. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js +1 -0
  243. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js +50 -0
  244. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css +3 -42
  245. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
  246. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +315 -63
  247. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +18 -330
  248. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +199 -438
  249. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js +1 -85
  250. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  251. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -4
  252. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +2 -1
  253. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +1 -1
  254. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +80 -16
  255. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
  256. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
  257. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
  258. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
  259. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
  260. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +1 -1
  261. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js +1 -1
  262. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +2 -0
  263. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -1
  264. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +31 -28
  265. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js +1 -0
  266. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js +781 -0
  267. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css +5 -4
  268. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
  269. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +703 -295
  270. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js +361 -602
  271. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js +1 -103
  272. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +365 -285
  273. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf +0 -0
  274. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
  275. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +4 -3
  276. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js +1 -1
  277. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +7 -2
  278. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js +1 -1
  279. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +1 -4
  280. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  281. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +148 -239
  282. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js +1 -5
  283. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
  284. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +4 -0
  285. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +18 -6
  286. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js +1 -16
  287. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +17 -16
  288. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
  289. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +55 -38
  290. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +3 -9
  291. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +1 -63
  292. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +515 -398
  293. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
  294. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +122 -112
  295. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +16 -14
  296. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  297. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +1364 -1139
  298. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +44 -11
  299. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +18 -18
  300. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +15 -14
  301. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js +1 -74
  302. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +11 -11
  303. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +12 -9
  304. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +54 -53
  305. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js +1 -1
  306. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js +1 -15
  307. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
  308. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +1 -1
  309. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -1
  310. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +36 -20
  311. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +6 -5
  312. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +6 -5
  313. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +6 -5
  314. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +5 -4
  315. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +9 -8
  316. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
  317. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +6 -6
  318. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +11 -10
  319. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +1 -16
  320. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +2 -12
  321. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +3 -5
  322. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +4 -13
  323. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js +1 -32
  324. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +3 -5
  325. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +5 -5
  326. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +39 -40
  327. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +10 -9
  328. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
  329. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +195 -54
  330. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +51 -51
  331. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
  332. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
  333. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  334. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
  335. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
  336. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
  337. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
  338. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
  339. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
  340. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif +0 -0
  341. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
  342. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js +1 -0
  343. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +5 -0
  344. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +26 -6
  345. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js +108 -32
  346. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +12 -6
  347. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -7
  348. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js +6 -12
  349. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +1 -62
  350. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -51
  351. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +27 -28
  352. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm +47 -0
  353. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +14 -1
  354. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
  355. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
  356. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
  357. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -4
  358. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
  359. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
  360. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
  361. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +12 -0
  362. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +1 -0
  363. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
  364. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
  365. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
  366. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +8 -6
  367. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +1 -1
  368. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
  369. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +3 -3
  370. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js +1 -1
  371. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +1 -2
  372. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif +0 -0
  373. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js +1 -11
  374. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
  375. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
  376. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +7838 -5579
  377. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +1 -1
  378. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +14 -4
  379. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +95 -10
  380. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +35 -3
  381. data/public/skyline/javascripts/src/skyline/src/drag.js +10 -7
  382. data/public/skyline/javascripts/src/skyline/src/layout.js +13 -12
  383. data/public/skyline/javascripts/src/skyline/src/menubutton.js +1 -3
  384. data/public/skyline/javascripts/src/skyline/src/sortable.js +7 -5
  385. data/public/skyline/javascripts/src/skyline/src/tree.js +8 -4
  386. data/public/skyline/javascripts/src/skyline/test/sortable.html +73 -12
  387. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +485 -2
  388. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +130 -81
  389. data/public/skyline/stylesheets/general.css +23 -6
  390. data/skylinecms.gemspec +45 -0
  391. data/test/mocks/test_article.rb +11 -0
  392. data/test/mocks/test_section.rb +1 -1
  393. data/test/test_helper.rb +2 -1
  394. data/test/unit/article_test.rb +142 -0
  395. data/test/unit/inline_ref_test.rb +38 -16
  396. data/test/unit/test_content_object_test.rb +2 -1
  397. data/vendor/digitpaint/nested_attributes_positioning.rb +1 -1
  398. metadata +207 -487
  399. data/app/helpers/skyline/media_files_helper.rb +0 -7
  400. data/config/initializers/javascript_generator_methods.rb +0 -4
  401. data/config/initializers/rails_defaults.rb +0 -6
  402. data/doc/Bundler.md +0 -76
  403. data/lib/skyline/plugins_manager.rb +0 -150
  404. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +0 -84
  405. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css +0 -6
  406. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif +0 -0
  407. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
  408. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
  409. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
  410. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css +0 -1
  411. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif +0 -0
  412. data/rails/init.rb +0 -32
  413. data/vendor/digitpaint/personify/README.md +0 -86
  414. data/vendor/digitpaint/personify/lib/parser/personify.rb +0 -838
  415. data/vendor/digitpaint/personify/lib/parser/personify.treetop +0 -126
  416. data/vendor/digitpaint/personify/lib/parser/personify_node_classes.rb +0 -7
  417. data/vendor/digitpaint/personify/lib/template.rb +0 -16
  418. data/vendor/digitpaint/personify/personify.rb +0 -7
  419. data/vendor/digitpaint/personify/script/generate_parser.rb +0 -6
  420. data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +0 -8
  421. data/vendor/digitpaint/personify/test/parse_runner.rb +0 -25
  422. data/vendor/digitpaint/personify/test/parser_test.rb +0 -109
  423. data/vendor/digitpaint/personify/test/test_helper.rb +0 -16
  424. data/vendor/digitpaint/personify/vendor/treetop/.gitignore +0 -5
  425. data/vendor/digitpaint/personify/vendor/treetop/History.txt +0 -9
  426. data/vendor/digitpaint/personify/vendor/treetop/README +0 -164
  427. data/vendor/digitpaint/personify/vendor/treetop/Rakefile +0 -20
  428. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet +0 -20
  429. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet +0 -18
  430. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage +0 -251
  431. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/info.plist +0 -10
  432. data/vendor/digitpaint/personify/vendor/treetop/bin/tt +0 -28
  433. data/vendor/digitpaint/personify/vendor/treetop/doc/contributing_and_planned_features.markdown +0 -103
  434. data/vendor/digitpaint/personify/vendor/treetop/doc/grammar_composition.markdown +0 -65
  435. data/vendor/digitpaint/personify/vendor/treetop/doc/index.markdown +0 -90
  436. data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown +0 -51
  437. data/vendor/digitpaint/personify/vendor/treetop/doc/semantic_interpretation.markdown +0 -189
  438. data/vendor/digitpaint/personify/vendor/treetop/doc/site.rb +0 -110
  439. data/vendor/digitpaint/personify/vendor/treetop/doc/sitegen.rb +0 -60
  440. data/vendor/digitpaint/personify/vendor/treetop/doc/syntactic_recognition.markdown +0 -100
  441. data/vendor/digitpaint/personify/vendor/treetop/doc/using_in_ruby.markdown +0 -21
  442. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.rb +0 -551
  443. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.treetop +0 -97
  444. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb +0 -7
  445. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_test.rb +0 -54
  446. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus +0 -0
  447. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.rb +0 -718
  448. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop +0 -132
  449. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb +0 -5
  450. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb +0 -89
  451. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/test_helper.rb +0 -18
  452. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop.rb +0 -11
  453. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb +0 -45
  454. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler.rb +0 -6
  455. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb +0 -40
  456. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb +0 -17
  457. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.rb +0 -2955
  458. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.treetop +0 -404
  459. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes.rb +0 -19
  460. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb +0 -20
  461. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb +0 -14
  462. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb +0 -22
  463. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb +0 -31
  464. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb +0 -24
  465. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb +0 -28
  466. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb +0 -27
  467. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb +0 -13
  468. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb +0 -19
  469. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb +0 -9
  470. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb +0 -138
  471. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb +0 -55
  472. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb +0 -45
  473. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb +0 -55
  474. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb +0 -68
  475. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb +0 -20
  476. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb +0 -9
  477. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb +0 -9
  478. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/ruby_builder.rb +0 -113
  479. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions.rb +0 -2
  480. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions/string.rb +0 -42
  481. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime.rb +0 -5
  482. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/compiled_parser.rb +0 -95
  483. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb +0 -4
  484. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb +0 -15
  485. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +0 -200
  486. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb +0 -164
  487. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/syntax_node.rb +0 -72
  488. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb +0 -16
  489. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb +0 -17
  490. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/version.rb +0 -9
  491. data/vendor/digitpaint/personify/vendor/treetop/script/generate_metagrammar.rb +0 -14
  492. data/vendor/digitpaint/personify/vendor/treetop/script/svnadd +0 -11
  493. data/vendor/digitpaint/personify/vendor/treetop/script/svnrm +0 -11
  494. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/and_predicate_spec.rb +0 -36
  495. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/anything_symbol_spec.rb +0 -52
  496. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/character_class_spec.rb +0 -188
  497. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/choice_spec.rb +0 -80
  498. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/circular_compilation_spec.rb +0 -28
  499. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb +0 -21
  500. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_compiler_spec.rb +0 -84
  501. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_spec.rb +0 -41
  502. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb +0 -40
  503. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/not_predicate_spec.rb +0 -38
  504. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/one_or_more_spec.rb +0 -35
  505. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/optional_spec.rb +0 -37
  506. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb +0 -19
  507. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parsing_rule_spec.rb +0 -32
  508. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/sequence_spec.rb +0 -115
  509. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_spec.rb +0 -81
  510. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_symbol_spec.rb +0 -37
  511. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.treetop +0 -7
  512. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.tt +0 -7
  513. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar_do.treetop +0 -7
  514. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/zero_or_more_spec.rb +0 -56
  515. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/a.treetop +0 -11
  516. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/b.treetop +0 -11
  517. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/c.treetop +0 -10
  518. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/d.treetop +0 -10
  519. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/grammar_composition_spec.rb +0 -26
  520. data/vendor/digitpaint/personify/vendor/treetop/spec/ruby_extensions/string_spec.rb +0 -32
  521. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/compiled_parser_spec.rb +0 -101
  522. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb +0 -147
  523. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb +0 -349
  524. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb +0 -385
  525. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb +0 -660
  526. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle +0 -6175
  527. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb +0 -58
  528. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb +0 -23
  529. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb +0 -164
  530. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb +0 -84
  531. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/syntax_node_spec.rb +0 -53
  532. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_helper.rb +0 -106
  533. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_suite.rb +0 -4
  534. data/vendor/digitpaint/personify/vendor/treetop/treetop.gemspec +0 -18
  535. data/vendor/mootools-on-rails/README +0 -54
  536. data/vendor/mootools-on-rails/Rakefile +0 -22
  537. data/vendor/mootools-on-rails/lib/mootools_on_rails.rb +0 -30
  538. data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +0 -510
  539. data/vendor/mootools-on-rails/test/mootools_helper_test.rb +0 -138
  540. data/vendor/mootools-on-rails/test/test_helper.rb +0 -5
@@ -90,9 +90,11 @@ Application.Sections = new Class({
90
90
  section.addEvent("click", activate);
91
91
  section.getElements("input, select, textarea").addEvent("focus", activate);
92
92
 
93
- if(section.retrieve("skyline.editor")){
94
- section.retrieve("skyline.editor").addEvent("focus", activate);
95
- }
93
+ setTimeout(function(){
94
+ if(section.retrieve("skyline.editor")){
95
+ section.retrieve("skyline.editor").addEvent("focus", activate);
96
+ }
97
+ },0);
96
98
  },
97
99
 
98
100
  _fakeSection : function(event,element,parent){
@@ -111,11 +113,6 @@ Application.Sections = new Class({
111
113
  clone.adopt(tools.clone(true));
112
114
  }
113
115
 
114
- var op = element.getOffsetParent();
115
- var p = element.getPosition(op);
116
- var s = op.getScroll();
117
- p.x = p.x + s.x;
118
- p.y = p.y + s.y;
119
- return clone.inject(parent).setPosition(p);
116
+ return clone.inject(parent).position(element.getPosition(element.getOffsetParent()));;
120
117
  }
121
118
  });
@@ -23,51 +23,91 @@
23
23
  * @param {string} url Absolute URL to where the plugin is located.
24
24
  */
25
25
  init : function(ed, url) {
26
- var t = this;
26
+ var t = this, oldSize = 0;
27
27
 
28
28
  /**
29
29
  * This method gets executed each time the editor needs to resize.
30
30
  */
31
31
  function resize() {
32
- var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
32
+ var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight, ifr;
33
33
 
34
- // Get height differently depending on the browser used
35
- myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
36
-
37
- // Don't make it smaller than the minimum height
38
- if (myHeight > t.autoresize_min_height)
39
- resizeHeight = myHeight;
40
-
41
- var ifr = DOM.get(ed.id + '_ifr');
42
- var tbl = DOM.get(ed.id + '_tbl');
34
+ ifr = DOM.get(ed.id + '_ifr');
43
35
 
44
- // Calc difference between iframe and container
45
- var dh = tbl.clientHeight - ifr.clientHeight;
46
-
47
- // Resize content element
48
- ed.getWin().scrollTo(0,0);
49
- DOM.setStyle(ifr, 'height', resizeHeight + 'px');
50
-
51
- // Resize the table too
52
- DOM.setStyle(tbl, 'height', resizeHeight + dh);
53
-
54
- ed.skyline_editor_height = resizeHeight;
36
+ if(tinymce.isWebKit){
37
+ DOM.setStyle(ifr, 'height', "0px");
38
+ }
39
+
40
+ var parseMarginValue = function(v){
41
+ if(tinymce.is(v, 'string')){
42
+ if (v.indexOf('px') > -1){
43
+ v = parseInt(v)
44
+ } else{
45
+ v = 0
46
+ }
47
+ }
48
+ return v;
49
+ }
50
+
51
+ // We have to incorporate the margin too.
52
+ var vMargin = parseMarginValue(DOM.getStyle(d.body, "marginTop", true)) + parseMarginValue(DOM.getStyle(d.body, "marginBottom", true))
53
+
54
+ // Get height differently depending on the browser used
55
+ myHeight = tinymce.isIE ? b.scrollHeight : d.body.offsetHeight;
56
+
57
+ // Don't make it smaller than the minimum height
58
+ if (myHeight > t.autoresize_min_height)
59
+ resizeHeight = myHeight;
60
+
61
+ // Resize content element
62
+ if (resizeHeight !== oldSize) {
63
+ ed.getWin().scrollTo(0,0);
64
+ DOM.setStyle(ifr, 'height', (resizeHeight + vMargin) + 'px');
65
+ oldSize = resizeHeight;
66
+ } else {
67
+ if(tinymce.isWebKit){
68
+ DOM.setStyle(ifr, 'height', (oldSize + vMargin) + "px");
69
+ }
70
+ }
71
+
72
+ // if we're throbbing, we'll re-throb to match the new size
73
+ if (t.throbbing) {
74
+ ed.setProgressState(false);
75
+ ed.setProgressState(true);
76
+ }
77
+
78
+ ed.skyline_editor_height = resizeHeight;
55
79
  };
56
80
 
57
81
  t.editor = ed;
58
82
 
59
83
  // Define minimum height
60
84
  t.autoresize_min_height = 10;
61
-
85
+
62
86
  // Things to do when the editor is ready
63
87
  ed.onInit.add(function(ed, l) {
64
88
  // Hide scrollbars
65
- ed.getBody().style.overflowY = "hidden";
89
+ var b = ed.getBody()
90
+ var tbl = tinymce.DOM.get(ed.id + '_tbl');
91
+
92
+ b.style.overflowY = "hidden";
93
+ if(tinymce.isIE){
94
+ b.scroll = "no"
95
+ tinymce.DOM.setStyle(tbl, "zoom", "1");
96
+ }
97
+
98
+ tinymce.DOM.setStyle(tbl, "table-layout", "fixed");
99
+ tinymce.DOM.setStyle(tbl, "height", "auto");
100
+
101
+ // Resize the window onload
102
+ var w = ed.getWin();
103
+ if(w.addEventListener){
104
+ w.addEventListener("load", resize, false)
105
+ }
66
106
  });
67
107
 
68
108
  var delayedResize = function(){
69
109
  var nr = resize();
70
- dab = $(ed.getBody()).getStyle("background-color");
110
+ dab = tinymce.DOM.toHex(tinymce.DOM.getStyle(ed.getBody(), "backgroundColor", true));
71
111
  if(dab != "#fffffe"){
72
112
  setTimeout(delayedResize, 50);
73
113
  }
@@ -80,13 +120,18 @@
80
120
  ed.onKeyUp.add(resize);
81
121
  ed.onPostRender.add(resize);
82
122
 
123
+
124
+
83
125
  ed.onLoadContent.add(function(ed, l) {
84
126
  // resize();
85
127
 
86
128
  // Because the content area resizes when its content CSS loads,
87
- // and we can't easily add a listener to its onload event,
88
- // we'll just trigger a resize after a short loading period
129
+ // and we listen to a change in background color.
89
130
  delayedResize();
131
+ if(tinymce.isIE){
132
+ // IE Caches too much.
133
+ setTimeout(delayedResize, 150);
134
+ }
90
135
  });
91
136
 
92
137
  // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
@@ -1,8 +1,8 @@
1
1
  Skyline.Editor.plugins.SkylineImage.Dialog = new Class({
2
2
  validAttributes : {
3
- "skyline-ref-id": "ref_id",
4
- "skyline-referable-id" : "referable_id",
5
- "skyline-referable-type" : "referable_type",
3
+ "data-skyline-ref-id": "ref_id",
4
+ "data-skyline-referable-id" : "referable_id",
5
+ "data-skyline-referable-type" : "referable_type",
6
6
  "alt" : "alt",
7
7
  "class" : "class",
8
8
  "src" : "url",
@@ -51,23 +51,24 @@ Skyline.Editor.plugins.SkylineImage.Dialog = new Class({
51
51
  ed.dom.setAttribs(el, attr);
52
52
  } else {
53
53
  ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
54
- el = ed.dom.get('__mce_tmp');
55
- ed.dom.setAttribs(el, attr);
56
- ed.dom.setAttrib(el, 'id', '');
54
+ ed.dom.setAttribs('__mce_tmp', attr);
55
+ ed.dom.setAttrib('__mce_tmp', 'id', '');
57
56
  ed.undoManager.add();
58
57
  }
59
-
58
+
59
+
60
60
  // Force a resize so we should not have resize artifacts.
61
- ed.execCommand('mceAutoResize',false);
62
- ed.getWin().focus();
61
+ ed.execCommand('mceAutoResize',false);
62
+ ed.execCommand('mceRepaint');
63
+ ed.focus();
63
64
  },
64
65
 
65
66
  // Get attributes from IMG tag for passing to dialog
66
- _getParameters : function(el){
67
+ _getParameters : function(el){
67
68
  if(!this.edit){ return {"new": true}; }
68
- var attr = {"new": false}, el = $(el);
69
+ var ed = this.editor, attr = {"new": false};
69
70
  $H(this.validAttributes).each(function(v,k){
70
- attr[v] = el.getProperty(k);
71
+ attr[v] = ed.dom.getAttrib(el,k);
71
72
  });
72
73
  return attr
73
74
  },
@@ -1,8 +1,8 @@
1
1
  Skyline.Editor.plugins.SkylineLink.Dialog = new Class({
2
2
  validAttributes : {
3
- "skyline-ref-id": "ref_id",
4
- "skyline-referable-id" : "referable_id",
5
- "skyline-referable-type" : "referable_type",
3
+ "data-skyline-ref-id": "ref_id",
4
+ "data-skyline-referable-id" : "referable_id",
5
+ "data-skyline-referable-type" : "referable_type",
6
6
  "title" : "title",
7
7
  "href" : "url",
8
8
  "target" : "target"
@@ -74,12 +74,12 @@ Skyline.Editor.plugins.SkylineLink.Dialog = new Class({
74
74
  ed.selection.moveToBookmark(i);
75
75
  ed.execCommand("mceEndUndoLevel");
76
76
  },
77
- // Get attributes from Element for passing to dialog
78
- _getParameters : function(el){
77
+ // Get attributes from IMG tag for passing to dialog
78
+ _getParameters : function(el){
79
79
  if(!this.edit){ return {"new": true}; }
80
- var attr = {"new": false}, el = $(el);
80
+ var ed = this.editor, attr = {"new": false};
81
81
  $H(this.validAttributes).each(function(v,k){
82
- attr[v] = el.getProperty(k);
82
+ attr[v] = ed.dom.getAttrib(el,k);
83
83
  });
84
84
  return attr
85
85
  },
@@ -3,7 +3,8 @@ tinyMCEPreInit.suffix = "";
3
3
  tinyMCEPreInit.base = "/javascripts/skyline.editor";
4
4
  tinyMCEPreInit.query = "";
5
5
 
6
- //= require "../vendor/tinymce/jscripts/tiny_mce/tiny_mce"
6
+ //= require "../vendor/tinymce/jscripts/tiny_mce/tiny_mce_src"
7
+ //= require "../vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template"
7
8
  //= require "../vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin"
8
9
 
9
10
  var __FILE__ = Skyline.Utils.getJsLocation("skyline.editor.js");
@@ -27,8 +28,8 @@ Skyline.Editor = new Class({
27
28
  tinyMceDefaults : {
28
29
  language : false,
29
30
  // The default list with added our own sklyine specific attributes.
30
- extended_valid_elements : "img[class|longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align|skyline-ref-id|skyline-referable-id|skyline-referable-type],"
31
- + "a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|skyline-ref-id|skyline-referable-id|skyline-referable-type]",
31
+ extended_valid_elements : "img[id|class|longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align|skyline-ref-id|skyline-referable-id|skyline-referable-type],"
32
+ + "a[id|rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|skyline-ref-id|skyline-referable-id|skyline-referable-type]",
32
33
  theme : "-skyline",
33
34
  plugins : "-autoresize,-skylinewindows,-skylineimage,-skylinelink,-skylinecode,-paste,-skylinecontextmenu, -skylinetable",
34
35
  paste_strip_class_attributes : "all",
@@ -1,76 +1,25 @@
1
- /**
2
- * $Id: editor_template_src.js 1045 2009-03-04 20:03:18Z spocke $
3
- *
4
- * @author Moxiecode
5
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
6
- */
7
-
8
1
  (function(tinymce) {
9
2
  var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;
10
3
 
11
4
  // Tell it to load theme specific language pack(s)
12
5
  tinymce.ThemeManager.requireLangPack('skyline');
13
-
14
- tinymce.create('Skyline.Editor.TinyMceTheme', {
15
- sizes : [8, 10, 12, 14, 18, 24, 36],
16
-
17
- // Control name lookup, format: title, command
18
- controls : {
19
- bold : ['bold_desc', 'Bold'],
20
- italic : ['italic_desc', 'Italic'],
21
- underline : ['underline_desc', 'Underline'],
22
- strikethrough : ['striketrough_desc', 'Strikethrough'],
23
- justifyleft : ['justifyleft_desc', 'JustifyLeft'],
24
- justifycenter : ['justifycenter_desc', 'JustifyCenter'],
25
- justifyright : ['justifyright_desc', 'JustifyRight'],
26
- justifyfull : ['justifyfull_desc', 'JustifyFull'],
27
- bullist : ['bullist_desc', 'InsertUnorderedList'],
28
- numlist : ['numlist_desc', 'InsertOrderedList'],
29
- outdent : ['outdent_desc', 'Outdent'],
30
- indent : ['indent_desc', 'Indent'],
31
- cut : ['cut_desc', 'Cut'],
32
- copy : ['copy_desc', 'Copy'],
33
- paste : ['paste_desc', 'Paste'],
34
- undo : ['undo_desc', 'Undo'],
35
- redo : ['redo_desc', 'Redo'],
36
- link : ['link_desc', 'mceLink'],
37
- unlink : ['unlink_desc', 'unlink'],
38
- image : ['image_desc', 'mceImage'],
39
- cleanup : ['cleanup_desc', 'mceCleanup'],
40
- code : ['code_desc', 'mceCodeEditor'],
41
- hr : ['hr_desc', 'InsertHorizontalRule'],
42
- removeformat : ['removeformat_desc', 'RemoveFormat'],
43
- sub : ['sub_desc', 'subscript'],
44
- sup : ['sup_desc', 'superscript'],
45
- forecolor : ['forecolor_desc', 'ForeColor'],
46
- forecolorpicker : ['forecolor_desc', 'mceForeColor'],
47
- backcolor : ['backcolor_desc', 'HiliteColor'],
48
- backcolorpicker : ['backcolor_desc', 'mceBackColor'],
49
- charmap : ['charmap_desc', 'mceCharMap'],
50
- visualaid : ['visualaid_desc', 'mceToggleVisualAid'],
51
- anchor : ['anchor_desc', 'mceInsertAnchor'],
52
- newdocument : ['newdocument_desc', 'mceNewDocument'],
53
- blockquote : ['blockquote_desc', 'mceBlockQuote']
54
- },
55
-
56
- stateControls : ['bold', 'italic', 'underline', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'sub', 'sup', 'blockquote'],
57
-
58
- getInfo : function() {
59
- return {
60
- longname : 'Skyline theme',
61
- author : 'DigitPaint BV',
62
- authorurl : 'http://tinymce.moxiecode.com',
63
- version : tinymce.majorVersion + "." + tinymce.minorVersion
64
- };
65
- },
66
-
6
+
7
+ tinymce.create('Skyline.Editor.TinyMceTheme:tinymce.themes.AdvancedTheme', {
67
8
  init : function(ed, url) {
68
9
  var t = this, s, v, o;
69
10
 
70
11
  t.editor = ed;
71
12
  t.url = url;
72
13
  t.onResolveName = new tinymce.util.Dispatcher(this);
73
- t.toolbars = [];
14
+ t.toolbars = [];
15
+
16
+ ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();
17
+ ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;
18
+
19
+ // Setting skyline custom layout
20
+ ed.settings.theme_advanced_layout_manager = "customLayout";
21
+ ed.settings.theme_advanced_custom_layout = t._skylineLayout;
22
+ ed.settings.theme_advanced_resizing_min_height = 0;
74
23
 
75
24
  // Default settings
76
25
  t.settings = s = extend({
@@ -83,12 +32,55 @@
83
32
  ],
84
33
  theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
85
34
  theme_advanced_toolbar_align : "center",
35
+ theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
86
36
  theme_advanced_more_colors : 1,
87
37
  theme_advanced_row_height : 23,
88
38
  theme_advanced_resize_horizontal : 1,
89
39
  theme_advanced_resizing_use_cookie : 1,
40
+ theme_advanced_font_sizes : "1,2,3,4,5,6,7",
41
+ theme_advanced_font_selector : "span",
42
+ theme_advanced_show_current_color: 0,
90
43
  readonly : ed.settings.readonly
91
- }, ed.settings);
44
+ }, ed.settings);
45
+
46
+ // Setup default font_size_style_values
47
+ if (!s.font_size_style_values)
48
+ s.font_size_style_values = "8pt,10pt,12pt,14pt,18pt,24pt,36pt";
49
+
50
+ if (tinymce.is(s.theme_advanced_font_sizes, 'string')) {
51
+ s.font_size_style_values = tinymce.explode(s.font_size_style_values);
52
+ s.font_size_classes = tinymce.explode(s.font_size_classes || '');
53
+
54
+ // Parse string value
55
+ o = {};
56
+ ed.settings.theme_advanced_font_sizes = s.theme_advanced_font_sizes;
57
+ each(ed.getParam('theme_advanced_font_sizes', '', 'hash'), function(v, k) {
58
+ var cl;
59
+
60
+ if (k == v && v >= 1 && v <= 7) {
61
+ k = v + ' (' + t.sizes[v - 1] + 'pt)';
62
+ cl = s.font_size_classes[v - 1];
63
+ v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt');
64
+ }
65
+
66
+ if (/^\s*\./.test(v))
67
+ cl = v.replace(/\./g, '');
68
+
69
+ o[k] = cl ? {'class' : cl} : {fontSize : v};
70
+ });
71
+
72
+ s.theme_advanced_font_sizes = o;
73
+ }
74
+
75
+ if ((v = s.theme_advanced_path_location) && v != 'none')
76
+ s.theme_advanced_statusbar_location = s.theme_advanced_path_location;
77
+
78
+ if (s.theme_advanced_statusbar_location == 'none')
79
+ s.theme_advanced_statusbar_location = 0;
80
+
81
+ if (ed.settings.content_css === false){
82
+ ed.contentCSS.push(ed.baseURI.toAbsolute("assets/content.css"));
83
+ }
92
84
 
93
85
  if(!ed.onFocus){
94
86
  ed.onFocus = new tinymce.util.Dispatcher(ed);
@@ -96,22 +88,24 @@
96
88
 
97
89
  // Init editor
98
90
  ed.onInit.add(function() {
99
- ed.onNodeChange.add(t._nodeChanged, t);
100
-
101
- if (ed.settings.content_css === false){
102
- ed.dom.loadCSS(ed.baseURI.toAbsolute("assets/content.css"));
91
+ if (!ed.settings.readonly) {
92
+ ed.onNodeChange.add(t._nodeChanged, t);
93
+ ed.onKeyUp.add(t._updateUndoStatus, t);
94
+ ed.onMouseUp.add(t._updateUndoStatus, t);
95
+ ed.dom.bind(ed.dom.getRoot(), 'dragend', function() {
96
+ t._updateUndoStatus(ed);
97
+ });
103
98
  }
104
99
 
105
100
  var ifr = DOM.get(ed.id + '_ifr');
106
- if(ifr.contentDocument){
107
- ifr = ifr.contentDocument;
101
+ if(ifr.contentWindow){
102
+ ifr = ifr.contentWindow;
108
103
  }
109
104
 
110
105
  Event.add(ifr,"focus",function(){
111
106
  ed.onFocus.dispatch(ed);
112
107
  t._onFocus();
113
- });
114
-
108
+ });
115
109
  });
116
110
 
117
111
  // Add custom classes
@@ -120,11 +114,9 @@
120
114
  ed.controlManager.setControlType("toolbar", Skyline.Editor.Toolbar);
121
115
  });
122
116
 
123
-
124
-
125
117
  ed.onActivate.add(t._onActivate,t);
126
- ed.onDeactivate.add(t._onDeactivate,t);
127
-
118
+ ed.onDeactivate.add(t._onDeactivate,t);
119
+
128
120
  ed.onSetProgressState.add(function(ed, b, ti) {
129
121
  var co, id = ed.id, tb;
130
122
 
@@ -144,138 +136,10 @@
144
136
  }
145
137
  });
146
138
 
147
- },
148
-
149
- createControl : function(n, cf) {
150
- var cd, c;
151
-
152
- if (c = cf.createControl(n)){
153
- return c;
154
- }
155
-
156
- switch (n) {
157
- case "styleselect":
158
- return this._createStyleSelect();
159
-
160
- case "formatselect":
161
- return this._createBlockFormats();
162
-
163
- case "forecolor":
164
- return this._createForeColorMenu();
165
-
166
- case "backcolor":
167
- return this._createBackColorMenu();
168
- }
169
-
170
- if ((cd = this.controls[n])){
171
- return cf.createButton(n, {title : "skyline." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
172
- }
173
- },
174
-
175
- execCommand : function(cmd, ui, val) {
176
- var f = this['_' + cmd];
177
-
178
- if (f) {
179
- f.call(this, ui, val);
180
- return true;
181
- }
182
-
183
- return false;
184
- },
185
-
186
- renderUI : function(o) {
187
- var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
188
-
189
- n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor'});
190
-
191
- if (!DOM.boxModel)
192
- n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
193
-
194
- n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
195
- n = tb = DOM.add(n, 'tbody');
196
-
197
- ic = t._skylineLayout(s, tb, o);
198
-
199
- n = o.targetNode;
200
-
201
- // Add classes to first and last TRs
202
- nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8
203
- DOM.addClass(nl[0], 'mceFirst');
204
- DOM.addClass(nl[nl.length - 1], 'mceLast');
205
-
206
- // Add classes to first and last TDs
207
- each(DOM.select('tr', tb), function(n) {
208
- DOM.addClass(n.firstChild, 'mceFirst');
209
- DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');
210
- });
211
-
212
- DOM.insertAfter(p, n);
213
-
214
- if (!ed.getParam('accessibility_focus'))
215
- Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});
216
-
217
- t.deltaHeight = o.deltaHeight;
218
- o.targetNode = null;
219
-
220
- return {
221
- iframeContainer : ic,
222
- editorContainer : ed.id + '_parent',
223
- sizeContainer : sc,
224
- deltaHeight : o.deltaHeight
225
- };
226
- },
227
-
228
- resizeBy : function(dw, dh) {
229
- var e = DOM.get(this.editor.id + '_tbl');
230
- this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
231
- },
232
-
233
- resizeTo : function(w, h) {
234
- var ed = this.editor, s = ed.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr'), dh;
235
-
236
- // Boundery fix box
237
- w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
238
- h = Math.max(s.theme_advanced_resizing_min_height || 100, h);
239
- w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
240
- h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
241
-
242
- // Calc difference between iframe and container
243
- dh = e.clientHeight - ifr.clientHeight;
244
-
245
- // Resize iframe and container
246
- DOM.setStyle(ifr, 'height', h - dh);
247
- DOM.setStyles(e, {width : w, height : h});
248
- },
139
+ },
249
140
 
250
- destroy : function() {
251
- var id = this.editor.id;
252
-
253
- Event.clear(id + '_resize');
254
- Event.clear(id + '_external_close');
255
- },
256
-
257
- // Internal functions
258
-
259
- _onFocus : function(){
260
- this._onActivate();
261
- },
262
- _onActivate : function(){
263
- var t = this, ed = t.editor;
264
- each(t.toolbars,function(to){
265
- to.setState("hidden",false);
266
- });
267
- },
268
-
269
- _onDeactivate : function(){
270
- var t = this, ed = t.editor;
271
- each(t.toolbars,function(to){
272
- to.setState("hidden",true);
273
- });
274
-
275
- },
276
-
277
141
  _skylineLayout : function(s,tb,o){
278
- var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;
142
+ var ed = this, theme = ed.theme, dc, da, cf = ed.controlManager, n, ic, to, a;
279
143
 
280
144
  n = DOM.add(tb, 'tr');
281
145
  n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
@@ -292,7 +156,7 @@
292
156
  });
293
157
 
294
158
  to = cf.createToolbar("toolbar"+i,{});
295
- t._addControls(v, to);
159
+ theme._addControls(v, to);
296
160
  DOM.setHTML(n, to.renderHTML());
297
161
  var tn = DOM.get(to.id);
298
162
 
@@ -302,343 +166,44 @@
302
166
  DOM.setStyles(n,{"width":"auto"});
303
167
  DOM.setStyles(tn,{"width":rect.w + "px"});
304
168
  to.setState("hidden",true);
305
- t.toolbars.push(to);
169
+ theme.toolbars.push(to);
306
170
  i += 1;
307
171
  })
308
172
 
309
173
  DOM.setStyles(cont,{width: "auto", position: "static", left: "auto"});
310
174
 
311
175
  return ic
312
- },
313
-
314
- _addControls : function(v, tb) {
315
- var t = this, s = t.settings, di, cf = t.editor.controlManager;
316
-
317
- if (s.theme_advanced_disable && !t._disabled) {
318
- di = {};
319
-
320
- each(explode(s.theme_advanced_disable), function(v) {
321
- di[v] = 1;
322
- });
323
-
324
- t._disabled = di;
325
- } else
326
- di = t._disabled;
327
-
328
- each(explode(v), function(n) {
329
- var c;
330
-
331
- if (di && di[n])
332
- return;
333
-
334
- c = t.createControl(n, cf);
335
-
336
- if (c)
337
- tb.add(c);
338
- });
339
- },
340
-
341
- _nodeChanged : function(ed, cm, n, co) {
342
- var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn;
343
-
344
- if (s.readonly)
345
- return;
346
-
347
- tinymce.each(t.stateControls, function(c) {
348
- cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
349
- });
350
-
351
- cm.setActive('visualaid', ed.hasVisual);
352
- cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
353
- cm.setDisabled('redo', !ed.undoManager.hasRedo());
354
- cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
355
-
356
- p = DOM.getParent(n, 'A');
357
- if (c = cm.get('link')) {
358
- if (!p || !p.name) {
359
- c.setDisabled(!p && co);
360
- c.setActive(!!p);
361
- }
362
- }
363
-
364
- if (c = cm.get('unlink')) {
365
- c.setDisabled(!p && co);
366
- c.setActive(!!p && !p.name);
367
- }
368
-
369
- if (c = cm.get('anchor')) {
370
- c.setActive(!!p && p.name);
371
-
372
- if (tinymce.isWebKit) {
373
- p = DOM.getParent(n, 'IMG');
374
- c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
375
- }
376
- }
377
-
378
- p = DOM.getParent(n, 'IMG');
379
- if (c = cm.get('image'))
380
- c.setActive(!!p && n.className.indexOf('mceItem') == -1);
381
-
382
- if (c = cm.get('styleselect')) {
383
- if (n.className) {
384
- t._importClasses();
385
- c.select(n.className);
386
- } else
387
- c.select();
388
- }
389
-
390
- if (c = cm.get('formatselect')) {
391
- p = DOM.getParent(n, DOM.isBlock);
392
-
393
- if (p)
394
- c.select(p.nodeName.toLowerCase());
395
- }
396
-
397
- if (ed.settings.convert_fonts_to_spans) {
398
- ed.dom.getParent(n, function(n) {
399
- if (n.nodeName === 'SPAN') {
400
- if (!cl && n.className)
401
- cl = n.className;
402
-
403
- if (!fz && n.style.fontSize)
404
- fz = n.style.fontSize;
405
-
406
- if (!fn && n.style.fontFamily)
407
- fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
408
- }
409
-
410
- return false;
411
- });
412
-
413
- }
414
-
415
- },
416
-
417
- // Commands gets called by execCommand
418
-
419
- _sel : function(v) {
420
- this.editor.execCommand('mceSelectNodeDepth', false, v);
421
- },
422
-
423
- _mceInsertAnchor : function(ui, v) {
424
- var ed = this.editor;
425
-
426
- ed.windowManager.open({
427
- url : tinymce.baseURL + '/dialogs/anchor.htm',
428
- width : 320 + parseInt(ed.getLang('skyline.anchor_delta_width', 0)),
429
- height : 90 + parseInt(ed.getLang('skyline.anchor_delta_height', 0)),
430
- inline : true
431
- }, {
432
- theme_url : this.url
433
- });
434
- },
435
-
436
- _mceCharMap : function() {
437
- var ed = this.editor;
438
-
439
- ed.windowManager.open({
440
- url : tinymce.baseURL + '/dialogs/charmap.htm',
441
- width : 550 + parseInt(ed.getLang('skyline.charmap_delta_width', 0)),
442
- height : 250 + parseInt(ed.getLang('skyline.charmap_delta_height', 0)),
443
- inline : true
444
- }, {
445
- theme_url : this.url
446
- });
447
- },
448
- _mceColorPicker : function(u, v) {
449
- var ed = this.editor;
450
-
451
- v = v || {};
452
-
453
- ed.windowManager.open({
454
- url : tinymce.baseURL + '/dialogs/color_picker.htm',
455
- width : 375 + parseInt(ed.getLang('skyline.colorpicker_delta_width', 0)),
456
- height : 250 + parseInt(ed.getLang('skyline.colorpicker_delta_height', 0)),
457
- close_previous : false,
458
- inline : true
459
- }, {
460
- input_color : v.color,
461
- func : v.func,
462
- theme_url : this.url
463
- });
464
- },
465
-
466
- _mceCodeEditor : function(ui, val) {
467
- var ed = this.editor;
468
-
469
- ed.windowManager.open({
470
- url : tinymce.baseURL + '/dialogs/source_editor.htm',
471
- width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
472
- height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
473
- inline : true,
474
- resizable : true,
475
- maximizable : true
476
- }, {
477
- theme_url : this.url
478
- });
479
- },
480
-
481
- _mceForeColor : function() {
482
- var t = this;
483
-
484
- this._mceColorPicker(0, {
485
- color: t.fgColor,
486
- func : function(co) {
487
- t.fgColor = co;
488
- t.editor.execCommand('ForeColor', false, co);
489
- }
490
- });
491
- },
492
-
493
- _mceBackColor : function() {
494
- var t = this;
495
-
496
- this._mceColorPicker(0, {
497
- color: t.bgColor,
498
- func : function(co) {
499
- t.bgColor = co;
500
- t.editor.execCommand('HiliteColor', false, co);
501
- }
502
- });
503
- },
504
-
505
- _ufirst : function(s) {
506
- return s.substring(0, 1).toUpperCase() + s.substring(1);
507
- },
508
-
509
- // Extra control structures
510
- _importClasses : function(e) {
511
- var ed = this.editor, c = ed.controlManager.get('styleselect');
512
-
513
- if (c.getLength() == 0) {
514
- each(ed.dom.getClasses(), function(o) {
515
- c.add(o['class'], o['class']);
516
- });
517
- }
518
- },
519
-
520
- _createStyleSelect : function(n) {
521
- var t = this, ed = t.editor, cf = ed.controlManager, c = cf.createListBox('styleselect', {
522
- title : 'skyline.style_select',
523
- onselect : function(v) {
524
- if (c.selectedValue === v) {
525
- ed.execCommand('mceSetStyleInfo', 0, {command : 'removeformat'});
526
- c.select();
527
- return false;
528
- } else
529
- ed.execCommand('mceSetCSSClass', 0, v);
530
- }
531
- });
532
-
533
- if (c) {
534
- each(ed.getParam('theme_advanced_styles', '', 'hash'), function(v, k) {
535
- if (v)
536
- c.add(t.editor.translate(k), v);
537
- });
538
-
539
- c.onPostRender.add(function(ed, n) {
540
- if (!c.NativeListBox) {
541
- Event.add(n.id + '_text', 'focus', t._importClasses, t);
542
- Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
543
- Event.add(n.id + '_open', 'focus', t._importClasses, t);
544
- Event.add(n.id + '_open', 'mousedown', t._importClasses, t);
545
- } else
546
- Event.add(n.id, 'focus', t._importClasses, t);
547
- });
548
- }
549
-
550
- return c;
551
- },
552
-
553
-
554
- _createBlockFormats : function() {
555
- var c, fmts = {
556
- p : 'skyline.paragraph',
557
- address : 'skyline.address',
558
- pre : 'skyline.pre',
559
- h1 : 'skyline.h1',
560
- h2 : 'skyline.h2',
561
- h3 : 'skyline.h3',
562
- h4 : 'skyline.h4',
563
- h5 : 'skyline.h5',
564
- h6 : 'skyline.h6',
565
- div : 'skyline.div',
566
- blockquote : 'skyline.blockquote',
567
- code : 'skyline.code',
568
- dt : 'skyline.dt',
569
- dd : 'skyline.dd',
570
- samp : 'skyline.samp'
571
- }, t = this;
572
-
573
- c = t.editor.controlManager.createListBox('formatselect', {title : 'skyline.block', cmd : 'FormatBlock'});
574
- if (c) {
575
- each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
576
- c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});
577
- });
578
- }
579
-
580
- return c;
581
- },
582
-
583
- _createForeColorMenu : function() {
584
- var c, t = this, s = t.settings, o = {}, v;
585
-
586
- if (s.theme_advanced_more_colors) {
587
- o.more_colors_func = function() {
588
- t._mceColorPicker(0, {
589
- color : c.value,
590
- func : function(co) {
591
- c.setColor(co);
592
- }
593
- });
594
- };
595
- }
596
-
597
- if (v = s.theme_advanced_text_colors)
598
- o.colors = v;
599
-
600
- if (s.theme_advanced_default_foreground_color)
601
- o.default_color = s.theme_advanced_default_foreground_color;
602
-
603
- o.title = 'skyline.forecolor_desc';
604
- o.cmd = 'ForeColor';
605
- o.scope = this;
606
-
607
- c = t.editor.controlManager.createColorSplitButton('forecolor', o);
608
-
609
- return c;
176
+ },
177
+
178
+ _onFocus : function(){
179
+ this._onActivate();
180
+ },
181
+
182
+ _onActivate : function(){
183
+ var t = this, ed = t.editor;
184
+ each(t.toolbars,function(to){
185
+ to.setState("hidden",false);
186
+ });
610
187
  },
611
-
612
- _createBackColorMenu : function() {
613
- var c, t = this, s = t.settings, o = {}, v;
614
-
615
- if (s.theme_advanced_more_colors) {
616
- o.more_colors_func = function() {
617
- t._mceColorPicker(0, {
618
- color : c.value,
619
- func : function(co) {
620
- c.setColor(co);
621
- }
622
- });
623
- };
624
- }
625
-
626
- if (v = s.theme_advanced_background_colors)
627
- o.colors = v;
628
-
629
- if (s.theme_advanced_default_background_color)
630
- o.default_color = s.theme_advanced_default_background_color;
631
-
632
- o.title = 'skyline.backcolor_desc';
633
- o.cmd = 'HiliteColor';
634
- o.scope = this;
635
-
636
- c = t.editor.controlManager.createColorSplitButton('backcolor', o);
637
-
638
- return c;
639
- }
640
188
 
641
- });
642
-
189
+ _onDeactivate : function(){
190
+ var t = this, ed = t.editor;
191
+ each(t.toolbars,function(to){
192
+ to.setState("hidden",true);
193
+ });
194
+
195
+ },
196
+
197
+ getInfo : function() {
198
+ return {
199
+ longname : 'Skyline theme',
200
+ author : 'DigitPaint BV',
201
+ authorurl : 'http://tinymce.moxiecode.com',
202
+ version : tinymce.majorVersion + "." + tinymce.minorVersion
203
+ };
204
+ }
205
+ });
206
+
643
207
  tinymce.ThemeManager.add('skyline', Skyline.Editor.TinyMceTheme);
208
+
644
209
  }(tinymce));