skylinecms 3.0.8 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (467) hide show
  1. data/CHANGELOG +131 -10
  2. data/README.md +1 -2
  3. data/Rakefile +3 -3
  4. data/app/controllers/skyline/application_controller.rb +40 -4
  5. data/app/controllers/skyline/articles_controller.rb +4 -4
  6. data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +1 -1
  7. data/app/controllers/skyline/content_controller.rb +4 -3
  8. data/app/controllers/skyline/{media_files_data_controller.rb → media/data_controller.rb} +61 -59
  9. data/app/controllers/skyline/media/dirs_controller.rb +83 -0
  10. data/app/controllers/skyline/media/files_controller.rb +80 -0
  11. data/app/controllers/skyline/sections_controller.rb +10 -3
  12. data/app/controllers/skyline/settings_controller.rb +4 -2
  13. data/app/controllers/skyline/user_preferences_controller.rb +18 -0
  14. data/app/controllers/skyline/users_controller.rb +1 -1
  15. data/app/controllers/skyline/variant_current_editor_controller.rb +2 -0
  16. data/app/helpers/skyline/application_helper.rb +39 -35
  17. data/app/helpers/skyline/dialog_helper.rb +11 -10
  18. data/app/helpers/skyline/editors/boolean.rb +2 -2
  19. data/app/helpers/skyline/editors/page_browser.rb +2 -0
  20. data/app/helpers/skyline/editors/wysiwyg.rb +1 -1
  21. data/app/helpers/skyline/js_layout_helper.rb +19 -0
  22. data/app/helpers/skyline/media/dirs_helper.rb +2 -0
  23. data/app/helpers/skyline/media/files_helper.rb +6 -0
  24. data/app/helpers/skyline/media_files_helper.rb +2 -2
  25. data/app/helpers/skyline/menu_helper.rb +33 -0
  26. data/app/helpers/skyline/message_generator.rb +5 -1
  27. data/app/helpers/skyline/notification_generator.rb +6 -0
  28. data/app/helpers/skyline/plugin_helper.rb +21 -0
  29. data/app/helpers/skyline/presenters/presenter.rb +4 -13
  30. data/app/helpers/skyline/presenters/table.rb +0 -27
  31. data/app/helpers/skyline/ref_object_helper.rb +2 -2
  32. data/app/helpers/skyline/tree_helper.rb +74 -5
  33. data/app/models/skyline/article.rb +18 -6
  34. data/app/models/skyline/article_version.rb +1 -1
  35. data/app/models/skyline/image_ref.rb +9 -5
  36. data/app/models/skyline/inline_ref.rb +3 -2
  37. data/app/models/skyline/link_section_link.rb +2 -2
  38. data/app/models/skyline/media_file.rb +33 -10
  39. data/app/models/skyline/page.rb +10 -9
  40. data/app/models/skyline/section.rb +1 -1
  41. data/app/models/skyline/sections/content_collection_section.rb +1 -1
  42. data/app/models/skyline/sections/content_item_section.rb +1 -1
  43. data/app/models/skyline/sections/heading_section.rb +1 -1
  44. data/app/models/skyline/sections/iframe_section.rb +2 -2
  45. data/app/models/skyline/sections/link_section.rb +1 -1
  46. data/app/models/skyline/sections/media_section.rb +32 -5
  47. data/app/models/skyline/sections/page_fragment_section.rb +1 -1
  48. data/app/models/skyline/sections/raw_section.rb +1 -1
  49. data/app/models/skyline/sections/redirect_section.rb +4 -4
  50. data/app/models/skyline/sections/rss_section.rb +7 -2
  51. data/app/models/skyline/sections/splitter_section.rb +1 -1
  52. data/app/models/skyline/sections/wysiwyg_section.rb +3 -3
  53. data/app/models/skyline/site.rb +1 -1
  54. data/app/models/skyline/user.rb +1 -1
  55. data/app/models/skyline/user_preference.rb +69 -0
  56. data/app/models/skyline/variant.rb +1 -1
  57. data/app/templates/skyline/sections/content_item_section/default/index.html.erb +1 -1
  58. data/app/templates/skyline/sections/media_section/default/index.html.erb +9 -9
  59. data/app/views/skyline/articles/_list.html.erb +34 -0
  60. data/app/views/skyline/articles/edit.html.erb +13 -6
  61. data/app/views/skyline/articles/index.html.erb +12 -43
  62. data/app/views/skyline/articles/page/_index.html.erb +13 -11
  63. data/app/views/skyline/authentications/new.html.erb +2 -2
  64. data/app/views/skyline/browser/links/_index.html.erb +4 -2
  65. data/app/views/skyline/browser/tabs/media_library/_index.html.erb +12 -13
  66. data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +122 -51
  67. data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +7 -7
  68. data/app/views/skyline/content/list.rhtml +1 -3
  69. data/app/views/skyline/content/presenters/_table.html.erb +45 -0
  70. data/app/views/skyline/layouts/content.html.erb +1 -1
  71. data/app/views/skyline/layouts/media.html.erb +2 -1
  72. data/app/views/skyline/layouts/pages.html.erb +10 -0
  73. data/app/views/skyline/link_section_links/_form.html.erb +0 -1
  74. data/app/views/skyline/locales/show.js.erb +2 -2
  75. data/app/views/skyline/media/dirs/_edit.html.erb +42 -0
  76. data/app/views/skyline/media/dirs/_index.html.erb +14 -0
  77. data/app/views/skyline/media/dirs/_show.html.erb +34 -0
  78. data/app/views/skyline/media/dirs/index.html.erb +36 -0
  79. data/app/views/skyline/media/files/_edit.html.erb +101 -0
  80. data/app/views/skyline/media/files/_index.html.erb +68 -0
  81. data/app/views/skyline/media/files/_new.html.erb +45 -0
  82. data/app/views/skyline/publications/_index.html.erb +2 -2
  83. data/app/views/skyline/sections/_media_section.html.erb +12 -2
  84. data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -3
  85. data/app/views/skyline/settings/index.html +14 -0
  86. data/app/views/skyline/shared/_head.html.erb +2 -0
  87. data/app/views/skyline/shared/_header_area.html.erb +7 -5
  88. data/app/views/skyline/users/index.html.erb +31 -16
  89. data/config/initializers/dependencies.rb +6 -1
  90. data/config/initializers/observers.rb +1 -2
  91. data/config/initializers/rails_defaults.rb +1 -1
  92. data/config/locales/en-US.yml +110 -68
  93. data/config/locales/nl-NL.yml +117 -77
  94. data/config/routes.rb +36 -32
  95. data/db/fixtures/roles_and_rights.rb +65 -40
  96. data/db/migrate/20090302102548_add_media_nodes.rb +2 -2
  97. data/db/migrate/20090309133933_add_description_to_media_nodes.rb +2 -2
  98. data/db/migrate/20090309134731_add_tags.rb +2 -2
  99. data/db/migrate/20090309135746_create_media_files_tags.rb +2 -2
  100. data/db/migrate/20090319091342_create_media_caches.rb +2 -2
  101. data/db/migrate/20090327083240_create_users.rb +2 -2
  102. data/db/migrate/20090327084656_create_roles.rb +2 -2
  103. data/db/migrate/20090327084719_create_rights.rb +2 -2
  104. data/db/migrate/20090327084739_create_grants.rb +2 -2
  105. data/db/migrate/20090327090918_create_rights_roles.rb +2 -2
  106. data/db/migrate/20090408115155_create_ref_objects.rb +2 -2
  107. data/db/migrate/20090504140044_create_test_sections.rb +2 -2
  108. data/db/migrate/20090506083107_add_refering_column_name_to_ref_objects.rb +2 -2
  109. data/db/migrate/20090706124019_add_skyline_media_node_title.rb +1 -1
  110. data/db/migrate/20090904121447_create_skyline_referable_uris.rb +6 -6
  111. data/db/migrate/20091221145204_add_skyline_media_section_link.rb +11 -0
  112. data/db/migrate/20100109145958_add_associated_tags_index.rb +9 -0
  113. data/db/migrate/20100115111440_create_skyline_user_preferences.rb +14 -0
  114. data/db/migrate/20100120113953_remove_unused_articles_index.rb +9 -0
  115. data/db/migrate/20100409073447_change_referable_uri_to_text.rb +9 -0
  116. data/doc/Bundler.md +33 -28
  117. data/doc/MIGRATION.md +48 -0
  118. data/lib/skyline/{content_item.rb → belongs_to_referable.rb} +57 -88
  119. data/lib/skyline/configuration.rb +14 -15
  120. data/lib/skyline/content/content.rb +14 -2
  121. data/lib/skyline/deprecated/version3_0_8.rb +106 -0
  122. data/lib/skyline/{form_builder_with_errors.rb → form_builder.rb} +5 -5
  123. data/lib/skyline/{referable.rb → has_many_referables_in.rb} +22 -12
  124. data/lib/skyline/javascript_generator_methods.rb +1 -1
  125. data/lib/skyline/plugins_manager.rb +135 -14
  126. data/lib/skyline/rendering/helpers/renderer_helper.rb +14 -9
  127. data/lib/skyline/{renderer.rb → rendering/renderer.rb} +3 -4
  128. data/lib/skyline/{renderable_scope_interface.rb → rendering/scopes/interface.rb} +1 -1
  129. data/lib/skyline/{wildcard_renderable_scope.rb → rendering/scopes/wildcard.rb} +3 -3
  130. data/lib/skyline/{section_item.rb → sections/interface.rb} +17 -10
  131. data/lib/skyline/settings.rb +29 -19
  132. data/lib/skyline/taggable.rb +3 -3
  133. data/lib/skyline/version.rb +2 -2
  134. data/{tasks → lib/tasks}/database.rake +14 -2
  135. data/{tasks → lib/tasks}/implementation.rake +0 -0
  136. data/lib/tasks/testing.rake +41 -0
  137. data/public/skyline/images/backgrounds/panel-dt.gif +0 -0
  138. data/public/skyline/javascripts/src/application.js +114 -120
  139. data/public/skyline/javascripts/src/browser.js +22 -4
  140. data/public/skyline/javascripts/src/library_uploader.js +13 -3
  141. data/public/skyline/javascripts/src/sections.js +57 -6
  142. data/public/skyline/javascripts/src/skyline/src/dialog.js +6 -0
  143. data/public/skyline/javascripts/src/skyline/src/drag.js +6 -0
  144. data/public/skyline/javascripts/src/skyline/src/events.js +50 -0
  145. data/public/skyline/javascripts/src/skyline/src/field_replicator.js +12 -11
  146. data/public/skyline/javascripts/src/skyline/src/layout.js +172 -30
  147. data/public/skyline/javascripts/src/skyline/src/menu.js +3 -0
  148. data/public/skyline/javascripts/src/skyline/src/menubutton.js +3 -0
  149. data/public/skyline/javascripts/src/skyline/src/skyline.js +3 -0
  150. data/public/skyline/javascripts/src/skyline/src/table.js +398 -0
  151. data/public/skyline/javascripts/src/skyline/src/tabs.js +2 -2
  152. data/public/skyline/javascripts/src/skyline/src/tag_selector.js +34 -26
  153. data/public/skyline/javascripts/src/skyline/src/tree.js +3 -0
  154. data/public/skyline/javascripts/src/skyline/src/uploader.js +2 -2
  155. data/public/skyline/javascripts/src/skyline/src/utils.js +3 -0
  156. data/public/skyline/javascripts/src/skyline/test/_dynamic_right.html +24 -0
  157. data/public/skyline/javascripts/src/skyline/test/_right_content.html +1 -0
  158. data/public/skyline/javascripts/src/skyline/test/basic_layout.html +190 -0
  159. data/public/skyline/javascripts/src/skyline/test/dialog.html +101 -0
  160. data/public/skyline/javascripts/src/skyline/test/draggablefiles.html +196 -0
  161. data/public/skyline/javascripts/src/skyline/test/dynamic_layout.html +89 -0
  162. data/public/skyline/javascripts/src/skyline/test/field_replicator.html +60 -0
  163. data/public/skyline/javascripts/src/skyline/test/last-closed.gif +0 -0
  164. data/public/skyline/javascripts/src/skyline/test/last-open.gif +0 -0
  165. data/public/skyline/javascripts/src/skyline/test/menubutton.html +81 -0
  166. data/public/skyline/javascripts/src/skyline/test/middle.gif +0 -0
  167. data/public/skyline/javascripts/src/skyline/test/sortable.html +121 -0
  168. data/public/skyline/javascripts/src/skyline/test/table.html +521 -0
  169. data/public/skyline/javascripts/src/skyline/test/tagselector.html +72 -0
  170. data/public/skyline/javascripts/src/skyline/test/toggle.html +95 -0
  171. data/public/skyline/javascripts/src/skyline/test/tree.html +310 -0
  172. data/public/skyline/javascripts/src/skyline/test/tree.png +0 -0
  173. data/public/skyline/javascripts/src/skyline/test/undohtml.css +27 -0
  174. data/public/skyline/javascripts/src/skyline/vendor/fancyupload/Swiff.Uploader.js +2 -2
  175. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +1 -354
  176. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +64 -52
  177. data/public/skyline/javascripts/src/skyline.editor/assets/content.css +1 -1
  178. data/public/skyline/javascripts/src/skyline.editor/src/script_loader.js +156 -75
  179. data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +14 -4
  180. data/public/skyline/javascripts/src/skyline.editor/src/theme.js +8 -0
  181. data/public/skyline/javascripts/src/skyline.editor/test/dialog.html +28 -0
  182. data/public/skyline/javascripts/src/skyline.editor/test/lorem.html +7 -0
  183. data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +87 -0
  184. data/public/skyline/javascripts/src/skyline.editor/test/undohtml.css +27 -0
  185. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +205 -0
  186. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/css/content.css +54 -0
  187. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +111 -0
  188. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +19 -3
  189. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +1 -0
  190. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/simple.html +6 -2
  191. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +14 -10
  192. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +7 -3
  193. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +8 -4
  194. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +18 -2
  195. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js +6 -3
  196. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +2 -7
  197. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +6 -3
  198. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +2 -7
  199. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +1 -1
  200. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js +6 -3
  201. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +1 -1
  202. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +2 -7
  203. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -0
  204. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +154 -0
  205. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
  206. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +52 -44
  207. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
  208. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +388 -17
  209. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js +4 -0
  210. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +6 -3
  211. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
  212. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +58 -6
  213. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js +6 -3
  214. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js +1 -1
  215. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js +8 -5
  216. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm +2 -7
  217. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js +6 -3
  218. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
  219. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +10 -3
  220. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +2 -7
  221. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +18 -8
  222. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  223. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -6
  224. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +0 -1
  225. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js +6 -3
  226. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +6 -3
  227. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js +6 -3
  228. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +6 -3
  229. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -0
  230. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +136 -0
  231. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
  232. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +18 -9
  233. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +2 -7
  234. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
  235. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +7 -4
  236. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +6 -3
  237. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +6 -3
  238. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  239. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +564 -124
  240. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm +2 -8
  241. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm +2 -8
  242. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js +6 -3
  243. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js +6 -3
  244. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js +6 -3
  245. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
  246. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +7 -4
  247. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +4 -0
  248. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +4 -9
  249. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
  250. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +106 -27
  251. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js +6 -3
  252. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +4 -11
  253. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
  254. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +7 -4
  255. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +2 -7
  256. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  257. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +921 -918
  258. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +41 -24
  259. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js +18 -20
  260. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +48 -23
  261. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +24 -15
  262. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +3 -8
  263. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +2 -7
  264. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +2 -7
  265. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js +1 -1
  266. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js +10 -7
  267. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/template.htm +2 -9
  268. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
  269. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +26 -16
  270. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -0
  271. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +98 -0
  272. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +3 -10
  273. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +3 -10
  274. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +2 -7
  275. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +3 -10
  276. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +3 -11
  277. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
  278. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +11 -15
  279. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +3 -11
  280. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js +8 -5
  281. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js +7 -4
  282. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +7 -4
  283. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js +7 -4
  284. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +7 -4
  285. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +8 -8
  286. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +7 -4
  287. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +1 -3
  288. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +2 -7
  289. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +0 -1
  290. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +2 -4
  291. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
  292. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +252 -188
  293. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +2 -7
  294. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  295. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +7 -7
  296. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +10 -0
  297. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +2 -2
  298. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -4
  299. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +2 -7
  300. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +7 -3
  301. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css +4 -3
  302. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -6
  303. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +7 -3
  304. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +3 -2
  305. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +4 -4
  306. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +2 -8
  307. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +5 -5
  308. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
  309. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
  310. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +5492 -4341
  311. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +5 -4
  312. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +6 -5
  313. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +5 -4
  314. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +5 -4
  315. data/public/skyline/javascripts/src/skyline.js +3 -1
  316. data/public/skyline/javascripts/src/user_preferences.js +49 -0
  317. data/public/skyline/stylesheets/general.css +149 -47
  318. data/rails/init.rb +3 -3
  319. data/test/factories.rb +28 -0
  320. data/test/integration/media_browser_super_access_test.rb +52 -0
  321. data/test/integration/media_browser_user_access_test.rb +50 -0
  322. data/test/integration/user_preferences_test.rb +73 -0
  323. data/test/mocks/test_content_object.rb +32 -0
  324. data/test/mocks/test_section.rb +22 -0
  325. data/test/test_helper.rb +60 -0
  326. data/test/unit/inline_ref_test.rb +195 -0
  327. data/test/unit/locales_test.rb +82 -0
  328. data/test/unit/page_test.rb +204 -0
  329. data/test/unit/test_content_object_test.rb +69 -0
  330. data/test/unit/test_section_test.rb +247 -0
  331. data/test/unit/user_preference_test.rb +123 -0
  332. data/test/unit/user_test.rb +74 -0
  333. data/test/user_access_helper.rb +36 -0
  334. data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +8 -0
  335. data/vendor/digitpaint/personify/test/parse_runner.rb +25 -0
  336. data/vendor/digitpaint/personify/test/parser_test.rb +109 -0
  337. data/vendor/digitpaint/personify/test/test_helper.rb +16 -0
  338. data/vendor/digitpaint/personify/vendor/treetop/.gitignore +5 -0
  339. data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +13 -4
  340. data/vendor/mootools-on-rails/test/mootools_helper_test.rb +138 -0
  341. data/vendor/mootools-on-rails/test/test_helper.rb +5 -0
  342. data/vendor/weppos/url_validation.rb +76 -0
  343. metadata +384 -189
  344. data/app/controllers/skyline/media_dirs_controller.rb +0 -56
  345. data/app/controllers/skyline/media_files_controller.rb +0 -87
  346. data/app/helpers/skyline/presenters/article_list.rb +0 -139
  347. data/app/observers/skyline/media_file_observer.rb +0 -32
  348. data/app/views/skyline/media_dirs/_edit.html.erb +0 -25
  349. data/app/views/skyline/media_dirs/_index.html.erb +0 -14
  350. data/app/views/skyline/media_dirs/index.html.erb +0 -42
  351. data/app/views/skyline/media_files/_edit.html.erb +0 -75
  352. data/app/views/skyline/media_files/_header.html.erb +0 -3
  353. data/app/views/skyline/media_files/_index.html.erb +0 -51
  354. data/app/views/skyline/media_files/_new.html.erb +0 -50
  355. data/db/migrate/20090603104115_prefix_tables_for_skyline.rb +0 -30
  356. data/lib/skyline/indexer.rb +0 -36
  357. data/lib/skyline/renderable_scope.rb +0 -27
  358. data/lib/skyline/rendering/helpers/settings_helper.rb +0 -26
  359. data/lib/skyline/searchable_item.rb +0 -132
  360. data/lib/skyline/url_validation.rb +0 -66
  361. data/public/skyline/images/backgrounds/splitter.gif +0 -0
  362. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.bat +0 -2
  363. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.xml +0 -364
  364. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full_jquery.html +0 -94
  365. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/AddOnManager.js +0 -95
  366. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/CommandManager.js +0 -54
  367. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ControlManager.js +0 -489
  368. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Developer.js +0 -91
  369. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Editor.js +0 -2295
  370. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorCommands.js +0 -934
  371. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorManager.js +0 -453
  372. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ForceBlocks.js +0 -644
  373. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Popup.js +0 -412
  374. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/UndoManager.js +0 -183
  375. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/WindowManager.js +0 -169
  376. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/adapter.js +0 -240
  377. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/jquery.tinymce.js +0 -179
  378. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/prototype/adapter.js +0 -38
  379. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/BlockQuote.js +0 -135
  380. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/CutCopyPaste.js +0 -24
  381. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/InsertHorizontalRule.js +0 -15
  382. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/RemoveFormat.js +0 -173
  383. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/UndoRedo.js +0 -38
  384. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/DOMUtils.js +0 -1823
  385. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Element.js +0 -199
  386. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/EventUtils.js +0 -349
  387. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Range.js +0 -721
  388. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/ScriptLoader.js +0 -351
  389. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Selection.js +0 -747
  390. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Serializer.js +0 -979
  391. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Sizzle.js +0 -975
  392. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/StringWriter.js +0 -200
  393. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/TridentSelection.js +0 -273
  394. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/XMLWriter.js +0 -155
  395. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/firebug/firebug-lite.js +0 -2518
  396. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/tinymce.js +0 -549
  397. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Button.js +0 -68
  398. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ColorSplitButton.js +0 -212
  399. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Container.js +0 -56
  400. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Control.js +0 -182
  401. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/DropMenu.js +0 -397
  402. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ListBox.js +0 -320
  403. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Menu.js +0 -175
  404. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuButton.js +0 -128
  405. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuItem.js +0 -69
  406. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/NativeListBox.js +0 -198
  407. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Separator.js +0 -34
  408. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/SplitButton.js +0 -99
  409. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Toolbar.js +0 -86
  410. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Cookie.js +0 -126
  411. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Dispatcher.js +0 -101
  412. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSON.js +0 -81
  413. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONP.js +0 -25
  414. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONRequest.js +0 -87
  415. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/URI.js +0 -289
  416. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/XHR.js +0 -80
  417. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/xml/Parser.js +0 -126
  418. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/jquery.tinymce.js +0 -1
  419. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js +0 -1
  420. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js +0 -616
  421. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm +0 -1
  422. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js +0 -1
  423. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js +0 -438
  424. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_dev.js +0 -128
  425. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery.js +0 -1
  426. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery_src.js +0 -12198
  427. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype.js +0 -1
  428. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype_src.js +0 -13057
  429. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api.html +0 -18
  430. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_jquery.html +0 -18
  431. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_prototype.html +0 -19
  432. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/basic.html +0 -548
  433. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/crossdomain.html +0 -87
  434. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/css/unit.css +0 -120
  435. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/index.html +0 -10
  436. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/jquery_plugin.html +0 -112
  437. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/api.js +0 -1438
  438. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/testrunner.js +0 -791
  439. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/main.html +0 -8
  440. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/media.html +0 -221
  441. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/menu.html +0 -22
  442. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/parts.html +0 -90
  443. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/paste.html +0 -132
  444. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/performance.html +0 -152
  445. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/range.html +0 -522
  446. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/removeformat.html +0 -88
  447. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/selection.html +0 -235
  448. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/config.ini +0 -27
  449. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/footer.html +0 -3
  450. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/header.html +0 -6
  451. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/index.php +0 -1
  452. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/instructions.txt +0 -4
  453. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/logo.png +0 -0
  454. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/selectors.list +0 -40
  455. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/style.css +0 -181
  456. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/index.php +0 -112
  457. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/slickspeed.js +0 -147
  458. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/template.php +0 -47
  459. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/template.html +0 -2865
  460. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/test.xml +0 -6
  461. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/ant-contrib.jar +0 -0
  462. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/js_build_tools.jar +0 -0
  463. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnClientAdapter.jar +0 -0
  464. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnant.jar +0 -0
  465. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnjavahl.jar +0 -0
  466. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnkit.jar +0 -0
  467. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/yuicompressor.jar +0 -0
@@ -4,7 +4,7 @@
4
4
  <%= controller.class_from_type.human_name(:count => 2) %>
5
5
  </span>
6
6
  </dt>
7
-
7
+
8
8
  <dd id="contentBodyPanel">
9
9
  <div id="contentInfoPanel">
10
10
  <div class="innerpanel">
@@ -12,48 +12,17 @@
12
12
  </div>
13
13
  </div>
14
14
  </div>
15
-
16
- <div id="contentEditPanel" class="panel scrollable">
17
- <div class="content">
18
-
19
- <% if @articles.any? %>
20
- <ul id="list" class="article-list">
21
- <li class="header">
22
- <div class="edit">&nbsp;</div>
23
- <div class="draggable">
24
- <div class="content">
25
- &nbsp;
26
- </div>
27
- </div>
28
- <div class="clear">
29
- &nbsp;
30
- </div>
31
- </li>
32
-
33
- <% @articles.each do |article| %>
34
- <li class="<%= cycle("odd","even") %> element">
35
- <div class="edit">
36
- <%= link_to button_text(:edit), edit_skyline_article_path(article), :class => "button small" %>
37
- </div>
38
- <div class="draggable">
39
- <div class="content">
40
- <h3>
41
- <%= article.title.blank? ? "&nbsp;" : article.title %>
42
- </h3>
43
- </div>
44
- </div>
45
- <div class="clear">
46
- &nbsp;
47
- </div>
48
- </li>
49
- <% end %>
50
- </ul>
51
-
52
- <% else %>
53
- <em>Nog geen <%= controller.class_from_type.human_name(:count => 2) %> aanwezig.</em>
15
+
16
+ <div id="contentEditPanel" class="panel scrollable content">
17
+ <% if @articles.any? %>
18
+ <% begin %>
19
+ <%= render :partial => "skyline/articles/#{controller.class_from_type.name.demodulize.underscore}/list" %>
20
+ <% rescue ActionView::MissingTemplate %>
21
+ <%= render :partial => "list" %>
54
22
  <% end %>
55
-
56
- </div>
23
+ <% else %>
24
+ <em><%= t(:blank, :scope => [:article, :index], :name => controller.class_from_type.human_name(:count => 2).downcase) %></em>
25
+ <% end %>
57
26
  </div>
58
27
  </dd>
59
28
  </dl>
@@ -67,4 +36,4 @@
67
36
  </div>
68
37
  </div>
69
38
  </dd>
70
- </dl>
39
+ </dl>
@@ -13,16 +13,18 @@
13
13
  <%= Skyline::Page.human_name(:count => 2) %>
14
14
  </span>
15
15
  </dt>
16
- <dd id="leftPageContentPanel" class="scrollable">
17
- <div id="pagetree" class="pages tree">
18
- <% nodes = Skyline::Page.group_by_parent_id %>
19
- <%= page_tree(nodes, nodes[nil], :selected => @article) %>
20
- <% if @article.andand.kind_of?(Skyline::Page) %>
21
- <script type="text/javascript" charset="utf-8">
22
- window.addEvent("domready",function(){
23
- var myFx = new Fx.Scroll("leftPageContentPanel",{duration: 0}).toElement('article_<%= @article.id %>');
24
- });
25
- </script>
26
- <% end %>
16
+ <dd id="leftPageContentPanel">
17
+ <div class="content scrollable">
18
+ <div id="pagetree" class="pages tree">
19
+ <% nodes = Skyline::Page.group_by_parent_id %>
20
+ <%= page_tree(nodes, nodes[nil], :selected => @article) %>
21
+ <% if @article.andand.kind_of?(Skyline::Page) %>
22
+ <script type="text/javascript" charset="utf-8">
23
+ window.addEvent("domready",function(){
24
+ var myFx = new Fx.Scroll("leftPageContentPanel",{duration: 0}).toElement('article_<%= @article.id %>');
25
+ });
26
+ </script>
27
+ <% end %>
28
+ </div>
27
29
  </div>
28
30
  </dd>
@@ -16,8 +16,8 @@
16
16
  <% form_tag skyline_authentication_path do %>
17
17
  <dl class="login panel">
18
18
  <dt><span class="content"><%= t(:log_in, :scope => [:authentication,:new]) %></span></dt>
19
- <dd id="messageArea"></dd>
20
- <dd>
19
+ <dd class="full" id="messageArea"></dd>
20
+ <dd class="full">
21
21
  <div class="content">
22
22
  <table class="fields">
23
23
  <tbody>
@@ -3,14 +3,16 @@
3
3
  <div class="tabs">
4
4
  <div class="chrome">
5
5
  <ul class="toptabs">
6
- <% ["Skyline::Page","Skyline::MediaFile","Skyline::ReferableUri"].each do |tab| %>
6
+ <% tabs = ["Skyline::MediaFile","Skyline::ReferableUri"] %>
7
+ <% tabs.unshift "Skyline::Page" if Skyline::Configuration.enable_pages %>
8
+ <% tabs.each do |tab| %>
7
9
  <li class="<%= "active" if @active_tab == tab %>"><a href="#"><%= t(tab, :scope => [:browser,:tabs]) %></a></li>
8
10
  <% end %>
9
11
  </ul>
10
12
  </div>
11
13
  </div>
12
14
  </div>
13
- <%= render :partial => "skyline/browser/tabs/pages/index" %>
15
+ <%= render :partial => "skyline/browser/tabs/pages/index" if Skyline::Configuration.enable_pages %>
14
16
  <%= render :partial => "skyline/browser/tabs/media_library/index" %>
15
17
  <%= render :partial => "skyline/browser/tabs/external_link/index" %>
16
18
  <% if params[:common] %>
@@ -1,24 +1,24 @@
1
1
  <div id="browserMediaLibrary" class="mediaLibraryTabPanel window">
2
- <div class="leftPanel scrollable">
3
- <div id="browserMediaTree" class="tree">
4
- <%= media_dir_tree(@media_dirs, @media_dirs[nil],
5
- :id_prefix => "browser_dir_node",
6
- :node_url => Proc.new{|node| skyline_browser_tabs_media_library_media_dir_media_files_path(node) },
7
- :selected => @media_dir)%>
2
+ <div class="leftPanel">
3
+ <div class="content scrollable">
4
+ <div id="browserMediaTree" class="tree">
5
+ <%= media_dir_tree(@media_dirs, @media_dirs[nil],
6
+ :id_prefix => "browser_dir_node",
7
+ :node_url => Proc.new{|node| skyline_browser_tabs_media_library_media_dir_media_files_path(node) },
8
+ :selected => @media_dir)%>
9
+ </div>
8
10
  </div>
9
11
  </div>
10
- <div class="contentPanel scrollable">
11
- <!-- <div id="browserUploadPanel">
12
- </div> -->
12
+ <div id="browserContentPanel" class="contentPanel ">
13
13
  <%= render :partial => "skyline/browser/tabs/media_library/media_files/index" %>
14
14
  </div>
15
- <div class="previewPanel scrollable">
15
+ <div id="browserPreviewPanel" class="previewPanel scrollable">
16
16
  <%= render :partial => "skyline/browser/tabs/media_library/media_files/show" %>
17
17
  </div>
18
18
  </div>
19
19
  <script type="text/javascript" charset="utf-8">
20
20
 
21
- var f = function(){
21
+ (function(){
22
22
  var mtp = new Skyline.HorizontalLayout("browserMediaLibrary", { height: 200, hidden: true});
23
23
  var lp = mtp.addPanel(mtp.element.getElement(".leftPanel"),{width: 200});
24
24
  mtp.addSplitter();
@@ -46,6 +46,5 @@
46
46
  }).get();
47
47
  return false;
48
48
  });
49
- };
50
- f();
49
+ })();
51
50
  </script>
@@ -1,63 +1,134 @@
1
- <ul id="browserFilelist" class="files">
2
1
 
3
2
  <input value="<%= @media_file.andand.file_type %>" name="browser[file_type]" id="browser_media_file_type" type="hidden"/>
4
3
  <input value="<%= @media_file.andand.id %>" name="browser[referable_id]" id="browser_media_referable_id" type="hidden"/>
5
4
  <input value="<%= @media_file.andand.class.andand.name %>" name="browser[referable_type]" id="browser_media_referable_type" type="hidden"/>
6
5
  <input value="<%= @media_file.andand.title %>" name="browser[referable_title]" id="browser_media_referable_title" type="hidden"/>
7
6
 
8
- <% browser_url = @media_dir && @media_file && url_for(:action => :show, :controller => '/skyline/media_files_data', :media_dir_id => @media_dir, :name => @media_file.name) %>
7
+ <% browser_url = @media_dir && @media_file && url_for(:action => :show, :controller => '/skyline/media/data', :name => @media_file.name, :dir_id => @media_dir) %>
9
8
  <input value="<%= browser_url %>" name="browser[url]" id="skylineReferableLocation" type="hidden">
10
9
 
11
- <% if @media_dir %>
12
- <% @media_dir.files.each do |f|%>
13
- <li class="<%= f.file_type %> <%= "selected" if f == @media_file %>">
14
- <div class="file">
15
- <% dimen = f.dimension %>
16
- <%= link_to(f.name, skyline_browser_tabs_media_library_media_dir_media_file_path(@media_dir, f),
17
- :"data-file_type" => f.file_type,
18
- :"data-referable_id" => f.id,
19
- :"data-referable_type" => f.class.name,
20
- :"data-referable_title" => f.title,
21
- :"data-url" => url_for(:action => :show, :controller => '/skyline/media_files_data', :media_dir_id => @media_dir, :name => f.name),
22
- :"data-image_width" => dimen.andand["width"],
23
- :"data-image_height" => dimen.andand["height"]) %>
24
- </div>
25
- </li>
26
- <% end %>
27
- <% end %>
28
- </ul>
10
+ <table class="listing files" id="browserFilelist">
11
+ <thead>
12
+ <tr>
13
+ <th><%= Skyline::MediaFile.human_attribute_name("name") %></th>
14
+ <th><%= Skyline::MediaFile.human_attribute_name("type") %></th>
15
+ <th><%= Skyline::MediaFile.human_attribute_name("size") %></th>
16
+ </tr>
17
+ </thead>
18
+ <tbody>
19
+ <% if @media_dir %>
20
+ <% selected_row = nil %>
21
+ <% @media_dir.files.each do |file| %>
22
+ <% dimen = file.dimension %>
23
+ <% selected_row = "file_#{file.id}" if file == @media_file %>
24
+ <tr class="<%= cycle("odd","even") %> <%= "selected" if file == @media_file %>" id="file_<%= file.id %>"
25
+ data-url="<%= url_for(:action => :show, :controller => '/skyline/media/data', :name => file.name, :dir_id => @media_dir) %>"
26
+ data-file_type = "<%= file.file_type %>"
27
+ data-referable_id = "<%= file.id %>"
28
+ data-referable_type = "<%= file.class.name %>"
29
+ data-referable_title = "<%= file.title %>"
30
+ data-image_width = "<%= dimen.andand["width"] %>"
31
+ data-image_height = "<%= dimen.andand["height"] %>">
32
+ <th>
33
+ <div class="file <%= file.file_type %>">
34
+ <%= link_to file.name, skyline_browser_tabs_media_library_media_dir_media_file_path(@media_dir, file), :id => "filelink_#{file.id}" %>
35
+ </div>
36
+
37
+ </th>
38
+ <td>
39
+ <%= file.file_type %>
40
+ </td>
41
+ <td>
42
+ <%= number_to_human_size file.size %>
43
+ </td>
44
+ </tr>
45
+ <% end %>
46
+ <% end %>
47
+ </tbody>
48
+ </table>
49
+
29
50
  <script type="text/javascript" charset="utf-8">
30
- var f = function(ul){
31
- ul.addEvent("click", function(ev){
32
- ev.stop();
33
- ev.preventDefault();
51
+ (function(){
52
+ // var ul = $('browserFilelist');
53
+ // ul.addEvent("click", function(ev){
54
+ // ev.stop();
55
+ // ev.preventDefault();
56
+ //
57
+ // var t = $(ev.target);
58
+ // var li = (t.get("tag") == "li" ? t : t.getParents("li")[0]);
59
+ // if(li){
60
+ // var a = li.getElement("a");
61
+ // ul.getElements('li.selected').removeClass('selected');
62
+ // li.addClass('selected');
63
+ //
64
+ // $('browser_media_file_type').set("value", a.get("data-file_type"));
65
+ // $('browser_media_referable_id').set("value", a.get("data-referable_id"));
66
+ // $('browser_media_referable_type').set("value", a.get("data-referable_type"));
67
+ // $('browser_media_referable_title').set("value", a.get("data-referable_title"));
68
+ // $('skylineReferableLocation').set("value", a.get("data-url"));
69
+ //
70
+ // if($('browserImageWidth')){
71
+ // $('browserImageWidth').set("value", a.get("data-image_width"));
72
+ // };
73
+ // if($('browserImageHeight')){
74
+ // $('browserImageHeight').set("value", a.get("data-image_height"));
75
+ // };
76
+ //
77
+ // new Request({
78
+ // url: a.get("href"),
79
+ // method: "get"
80
+ // }).send();
81
+ // }
82
+ // })
83
+
84
+ var f = $('browserFilelist');
85
+ var t = new Skyline.Table(f, {draggable: false});
86
+ <% if selected_row %>
87
+ t.selectedRow = $('<%= selected_row %>')
88
+ <% end %>
89
+
90
+ t.addEvent("selectRow",function(row,event){
91
+ event.stop();
92
+ row.addClass("selected");
93
+ $('browser_media_file_type').set("value", row.get("data-file_type"));
94
+ $('browser_media_referable_id').set("value", row.get("data-referable_id"));
95
+ $('browser_media_referable_type').set("value", row.get("data-referable_type"));
96
+ $('browser_media_referable_title').set("value", row.get("data-referable_title"));
97
+ $('skylineReferableLocation').set("value", row.get("data-url"));
34
98
 
35
- var t = $(ev.target);
36
- var li = (t.get("tag") == "li" ? t : t.getParents("li")[0]);
37
- if(li){
38
- var a = li.getElement("a");
39
- ul.getElements('li.selected').removeClass('selected');
40
- li.addClass('selected');
41
-
42
- $('browser_media_file_type').set("value", a.get("data-file_type"));
43
- $('browser_media_referable_id').set("value", a.get("data-referable_id"));
44
- $('browser_media_referable_type').set("value", a.get("data-referable_type"));
45
- $('browser_media_referable_title').set("value", a.get("data-referable_title"));
46
- $('skylineReferableLocation').set("value", a.get("data-url"));
47
-
48
- if($('browserImageWidth')){
49
- $('browserImageWidth').set("value", a.get("data-image_width"));
50
- };
51
- if($('browserImageHeight')){
52
- $('browserImageHeight').set("value", a.get("data-image_height"));
53
- };
99
+ if($('browserImageWidth')){
100
+ $('browserImageWidth').set("value", row.get("data-image_width"));
101
+ };
102
+ if($('browserImageHeight')){
103
+ $('browserImageHeight').set("value", row.get("data-image_height"));
104
+ };
105
+
106
+ var l = row.getElement("a");
107
+ (new Request()).get(l.getProperty("href"));
108
+ });
109
+
110
+ t.addEvent("deselectRow",function(row){
111
+ row.removeClass("selected");
112
+ });
113
+
114
+ var bc = $('browserContentPanel');
115
+
116
+ var l = bc.retrieve("skyline.layout");
117
+
118
+ if(l){
119
+ // Cleanup old events
120
+ l.removeEvents("resize");
121
+ }
54
122
 
55
- new Request({
56
- url: a.get("href"),
57
- method: "get"
58
- }).send();
59
- }
60
- })
61
- };
62
- f($('browserFilelist'));
123
+ // Make sure the contentPanel resizes our table!
124
+ bc.addComponentEvent("skyline.layout","resize",function(panel,w,h){
125
+ $('browserFilelist').retrieve("skyline.table").resize(w, "100%");
126
+ });
127
+
128
+ if(l){
129
+ $('browserFilelist').retrieve("skyline.table").resize(l.width - l.offsets.width, "100%");
130
+ }
131
+
132
+
133
+ })();
63
134
  </script>
@@ -2,12 +2,12 @@
2
2
  <% if @media_file %>
3
3
  <% if @media_file.file_type == "image" %>
4
4
  <dl class="advanced">
5
- <dt><%=t(:preview, :scope => [:media_file, :edit])%></dt>
5
+ <dt><%=t(:preview, :scope => [:media, :files, :edit])%></dt>
6
6
  <dd>
7
7
  <%= image_tag(url_for(
8
8
  :action => "show",
9
- :controller => "/skyline/media_files_data",
10
- :media_dir_id => @media_dir,
9
+ :controller => "/skyline/media/data",
10
+ :dir_id => @media_dir,
11
11
  :name => @media_file.name,
12
12
  :size => '100x100'),
13
13
  :alt => "Image") %>
@@ -16,17 +16,17 @@
16
16
  <%end%>
17
17
 
18
18
  <dl class="advanced">
19
- <dt><%= t(:meta_data, :scope => [:media_file,:edit]) %></dt>
19
+ <dt><%= t(:metadata, :scope => [:media, :files,:edit]) %></dt>
20
20
  <dd>
21
21
  <dl class="details">
22
22
  <% if @media_file.file_type == "image" && @media_file.dimension.present? %>
23
- <dt><%=t(:size, :scope => [:media_file, :edit])%>: </dt>
23
+ <dt><%=t(:size, :scope => [:media, :files, :edit])%>: </dt>
24
24
  <dd><%=@media_file.dimension['width'] %>x<%=@media_file.dimension['height'] %></dd>
25
25
  <%end%>
26
- <dt><%=t(:type, :scope => [:media_file, :edit])%>: </dt>
26
+ <dt><%=t(:type, :scope => [:media, :files, :edit])%>: </dt>
27
27
  <dd><%=@media_file.file_type %></dd>
28
28
 
29
- <dt><%=t(:filesize, :scope => [:media_file, :edit])%>: </dt>
29
+ <dt><%=t(:filesize, :scope => [:media, :files, :edit])%>: </dt>
30
30
  <dd><%= number_to_human_size @media_file.size %></dd>
31
31
 
32
32
  <dt><%= Skyline::MediaFile.human_attribute_name("name") %></dt>
@@ -6,9 +6,7 @@
6
6
  <% end %>
7
7
  <% end %>
8
8
 
9
- <div class="content">
10
- <%= presenter_for(@elements,stack.klass) %>
11
- </div>
9
+ <%= Skyline::Presenters::Table.new(@elements,stack.klass,self).output %>
12
10
 
13
11
  <% content_for :meta do %>
14
12
  <%= render :partial => "add", :locals => {:klass => stack.klass, :record => stack.current, :return_to => url_for({})} %>
@@ -0,0 +1,45 @@
1
+ <% id = "#{presenter.fieldset.name}Listing" %>
2
+ <table class="listing" id="<%= id %>">
3
+ <thead>
4
+ <tr>
5
+ <% presenter.heading_collection.each do |field| %>
6
+ <th><%= field.singular_label.capitalize %></th>
7
+ <% end %>
8
+ <th></th>
9
+ </tr>
10
+ </thead>
11
+ <tbody>
12
+ <% presenter.collection.each do |record| %>
13
+ <% next if record.new_record? %>
14
+ <tr class="<%= cycle("odd","even") %>" id="record-<%= record.id %>">
15
+ <% presenter.heading_collection.each do |field| %>
16
+ <% content,options = presenter.value(record,field) %>
17
+ <%= content_tag("td",content,options) %>
18
+ <% end %>
19
+ <td class="right">
20
+ <%= presenter.edit_button(record) %>
21
+ <%= presenter.delete_button(record) %>
22
+ </td>
23
+ </tr>
24
+ <% end %>
25
+ </tbody>
26
+ </table>
27
+
28
+ <script type="text/javascript" charset="utf-8">
29
+ (function(){
30
+ var f = $("<%= id %>")
31
+ var t = new Skyline.Table(f, {<%= "sortable : true, draggable : true" if presenter.fieldset.orderable? %>});
32
+
33
+ <% if presenter.fieldset.orderable? %>
34
+ t.addEvent("reorder", function(row, adjecentRow, position){
35
+ (new Request({ url : "<%= url_for :action => "order", :types => stack.url_types %>"})).post({order : Application.getSequence("#<%= id %> tbody tr").join(",")} );
36
+ });
37
+ <% end %>
38
+
39
+
40
+ // Make sure the contentPanel resizes our table!
41
+ f.getParent().addComponentEvent("skyline.layout","resize",function(panel,w,h){
42
+ $('<%= presenter.fieldset.name %>Listing').retrieve("skyline.table").resize(w, "100%");
43
+ });
44
+ })();
45
+ </script>
@@ -18,7 +18,7 @@
18
18
  <dl id="contentPanel" class="panel">
19
19
  <dt id="contentHeaderPanel">
20
20
  <span class="content">
21
- <%= yield :header %> ??
21
+ <%= yield :header %>
22
22
  </span>
23
23
  </dt>
24
24
  <dd id="contentBodyPanel">
@@ -15,8 +15,9 @@
15
15
  <%= yield %>
16
16
  </div>
17
17
  </div>
18
+ <%= render_js_layout %>
18
19
  <%= render_messages %>
19
- <%= render_notifications %>
20
+ <%= render_notifications %>
20
21
  </body>
21
22
  </html>
22
23
 
@@ -52,6 +52,16 @@
52
52
  }).send();
53
53
  return false;
54
54
  });
55
+
56
+ tree.addEvent("expand", function(event,target){
57
+ var node = target;
58
+ Application.UserPreferences.set('pages.tree.nodes.open.'+Application.getId(node.id), true);return false;
59
+ });
60
+
61
+ tree.addEvent("collapse", function(event,target){
62
+ var node = target;
63
+ Application.UserPreferences.remove('pages.tree.nodes.open.'+Application.getId(node.id));return false;
64
+ });
55
65
  });
56
66
  </script>
57
67
 
@@ -15,7 +15,6 @@
15
15
  <div class="link">
16
16
  <%= l.text_field :title, :class => "link_title full" %>
17
17
  <%= link_browser(l, :linked, {:object => linked_object, :container => "link_section_#{link_guid}"}) %>
18
- <%= l.fieldset_errors :linked %>
19
18
  </div>
20
19
 
21
20
  <ul class="tools">
@@ -9,6 +9,6 @@
9
9
 
10
10
  I18n = {};
11
11
  I18n.LibraryUploader = {
12
- allUploadedMessage : "<%=t(:all_uploaded_message, :scope => [:media_file, :new]) %>",
13
- someUploadedMessage : "<%=t(:some_uploaded_message, :scope => [:media_file, :new]) %>"
12
+ allUploadedMessage : "<%=t(:all_uploaded_message, :scope => [:media, :files, :new]) %>",
13
+ someUploadedMessage : "<%=t(:some_uploaded_message, :scope => [:media, :files, :new]) %>"
14
14
  };
@@ -0,0 +1,42 @@
1
+ <% remote_form_for @dir, :url => skyline_media_dir_path(@dir), :method => :put do |f|%>
2
+ <%= f.hidden_field :parent_id %>
3
+ <dl class="panel">
4
+ <dt>
5
+ <span class="content">
6
+ <%= t :edit, :scope => [:media, :dirs, :edit] %>
7
+ </span>
8
+ </dt>
9
+ <dd>
10
+ <dl class="line">
11
+ <dt><%=f.label :name, Skyline::MediaDir.human_attribute_name("name") + ":" %></dt>
12
+ <dd><%= f.text_field :name, :class => "full" %></dd>
13
+ </dl>
14
+ </dd>
15
+ <dd class="last submit">
16
+ <%= submit_button :save, :class => "small green" %>
17
+ </dd>
18
+ </dl>
19
+
20
+ <dl class="panel">
21
+ <dt>
22
+ <span class="content">
23
+ <%= t :actions, :scope => [:media, :dirs, :edit] %>
24
+ </span>
25
+ </dt>
26
+ <dd class="last">
27
+ <div class="button">
28
+ <% if @dir.parent_id.blank? %>
29
+ <%= link_to_function button_text(:delete_media_dir), "", :class => "button small disabled" %>
30
+ <% else %>
31
+ <%= link_to_remote button_text(:delete_media_dir),{
32
+ :url => skyline_media_dir_url(@dir),
33
+ :method => :delete,
34
+ :confirm => t(:message, :scope => [:media_dir,:destroy]),
35
+ :href => url_for(:action => "destroy", :id => @dir.id)},
36
+ { :class => "button small red"}
37
+ %>
38
+ <% end %>
39
+ </div>
40
+ </dd>
41
+ </dl>
42
+ <% end %>
@@ -0,0 +1,14 @@
1
+ <div id="dirtree" class="tree">
2
+ <% if @dirs %>
3
+ <%= media_dir_tree(@dirs,@dirs[nil],
4
+ :selected => @dir,
5
+ :id_prefix => "dirItem",
6
+ :node_url => lambda{ |node| skyline_media_dir_path(node) },
7
+ :class => "dir"
8
+ ) %>
9
+ <% end %>
10
+ </div>
11
+
12
+ <script type="text/javascript" charset="utf-8">
13
+ Application.Layout.Media.initializeTree("dirtree", "<%= skyline_media_dirs_path %>");
14
+ </script>
@@ -0,0 +1,34 @@
1
+ <dt id="contentHeaderPanel" class="panel">
2
+ <span class="content">
3
+ <%= link_to button_text(:upload), "#", :id => "toggleUploadPanel", :class => "button small right" %>
4
+ <%= t(:files_in, :directory => @dir.name, :scope => [:media, :dirs, :show]) %>
5
+ </span>
6
+ </dt>
7
+ <dd id="contentBodyPanel">
8
+ <div id="contentInfoPanel" data-panel-hidden="true">
9
+ <%= render :partial => "skyline/media/files/new" %>
10
+ </div>
11
+ <div id="contentEditPanel">
12
+ <%= render :partial => "skyline/media/files/index" %>
13
+ </div>
14
+ </dd>
15
+ <script type="text/javascript" charset="utf-8">
16
+ (function(){
17
+ var panel = $('contentPanel').retrieve("skyline.layout");
18
+ if(panel){ panel.restore(); panel.setup(); }
19
+
20
+ var tree = $('dirtree').retrieve("skyline.tree");
21
+ if(tree && tree.selectedNode && tree.selectedNode.getParent().get("id") != "dirItem_<%= @dir.id %>"){
22
+ tree.selectNode(null, $('dirItem_<%= @dir.id %>').getChildren("a")[0]);
23
+ }
24
+
25
+ $("toggleUploadPanel").addEvent("click",function(){
26
+ var l = $('contentInfoPanel').retrieve('skyline.layout');
27
+ if(l.hidden){
28
+ l.show();
29
+ } else {
30
+ l.hide();
31
+ }
32
+ }.bind(this));
33
+ })();
34
+ </script>