skylinecms 3.0.8 → 3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +131 -10
- data/README.md +1 -2
- data/Rakefile +3 -3
- data/app/controllers/skyline/application_controller.rb +40 -4
- data/app/controllers/skyline/articles_controller.rb +4 -4
- data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +1 -1
- data/app/controllers/skyline/content_controller.rb +4 -3
- data/app/controllers/skyline/{media_files_data_controller.rb → media/data_controller.rb} +61 -59
- data/app/controllers/skyline/media/dirs_controller.rb +83 -0
- data/app/controllers/skyline/media/files_controller.rb +80 -0
- data/app/controllers/skyline/sections_controller.rb +10 -3
- data/app/controllers/skyline/settings_controller.rb +4 -2
- data/app/controllers/skyline/user_preferences_controller.rb +18 -0
- data/app/controllers/skyline/users_controller.rb +1 -1
- data/app/controllers/skyline/variant_current_editor_controller.rb +2 -0
- data/app/helpers/skyline/application_helper.rb +39 -35
- data/app/helpers/skyline/dialog_helper.rb +11 -10
- data/app/helpers/skyline/editors/boolean.rb +2 -2
- data/app/helpers/skyline/editors/page_browser.rb +2 -0
- data/app/helpers/skyline/editors/wysiwyg.rb +1 -1
- data/app/helpers/skyline/js_layout_helper.rb +19 -0
- data/app/helpers/skyline/media/dirs_helper.rb +2 -0
- data/app/helpers/skyline/media/files_helper.rb +6 -0
- data/app/helpers/skyline/media_files_helper.rb +2 -2
- data/app/helpers/skyline/menu_helper.rb +33 -0
- data/app/helpers/skyline/message_generator.rb +5 -1
- data/app/helpers/skyline/notification_generator.rb +6 -0
- data/app/helpers/skyline/plugin_helper.rb +21 -0
- data/app/helpers/skyline/presenters/presenter.rb +4 -13
- data/app/helpers/skyline/presenters/table.rb +0 -27
- data/app/helpers/skyline/ref_object_helper.rb +2 -2
- data/app/helpers/skyline/tree_helper.rb +74 -5
- data/app/models/skyline/article.rb +18 -6
- data/app/models/skyline/article_version.rb +1 -1
- data/app/models/skyline/image_ref.rb +9 -5
- data/app/models/skyline/inline_ref.rb +3 -2
- data/app/models/skyline/link_section_link.rb +2 -2
- data/app/models/skyline/media_file.rb +33 -10
- data/app/models/skyline/page.rb +10 -9
- data/app/models/skyline/section.rb +1 -1
- data/app/models/skyline/sections/content_collection_section.rb +1 -1
- data/app/models/skyline/sections/content_item_section.rb +1 -1
- data/app/models/skyline/sections/heading_section.rb +1 -1
- data/app/models/skyline/sections/iframe_section.rb +2 -2
- data/app/models/skyline/sections/link_section.rb +1 -1
- data/app/models/skyline/sections/media_section.rb +32 -5
- data/app/models/skyline/sections/page_fragment_section.rb +1 -1
- data/app/models/skyline/sections/raw_section.rb +1 -1
- data/app/models/skyline/sections/redirect_section.rb +4 -4
- data/app/models/skyline/sections/rss_section.rb +7 -2
- data/app/models/skyline/sections/splitter_section.rb +1 -1
- data/app/models/skyline/sections/wysiwyg_section.rb +3 -3
- data/app/models/skyline/site.rb +1 -1
- data/app/models/skyline/user.rb +1 -1
- data/app/models/skyline/user_preference.rb +69 -0
- data/app/models/skyline/variant.rb +1 -1
- data/app/templates/skyline/sections/content_item_section/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/media_section/default/index.html.erb +9 -9
- data/app/views/skyline/articles/_list.html.erb +34 -0
- data/app/views/skyline/articles/edit.html.erb +13 -6
- data/app/views/skyline/articles/index.html.erb +12 -43
- data/app/views/skyline/articles/page/_index.html.erb +13 -11
- data/app/views/skyline/authentications/new.html.erb +2 -2
- data/app/views/skyline/browser/links/_index.html.erb +4 -2
- data/app/views/skyline/browser/tabs/media_library/_index.html.erb +12 -13
- data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +122 -51
- data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +7 -7
- data/app/views/skyline/content/list.rhtml +1 -3
- data/app/views/skyline/content/presenters/_table.html.erb +45 -0
- data/app/views/skyline/layouts/content.html.erb +1 -1
- data/app/views/skyline/layouts/media.html.erb +2 -1
- data/app/views/skyline/layouts/pages.html.erb +10 -0
- data/app/views/skyline/link_section_links/_form.html.erb +0 -1
- data/app/views/skyline/locales/show.js.erb +2 -2
- data/app/views/skyline/media/dirs/_edit.html.erb +42 -0
- data/app/views/skyline/media/dirs/_index.html.erb +14 -0
- data/app/views/skyline/media/dirs/_show.html.erb +34 -0
- data/app/views/skyline/media/dirs/index.html.erb +36 -0
- data/app/views/skyline/media/files/_edit.html.erb +101 -0
- data/app/views/skyline/media/files/_index.html.erb +68 -0
- data/app/views/skyline/media/files/_new.html.erb +45 -0
- data/app/views/skyline/publications/_index.html.erb +2 -2
- data/app/views/skyline/sections/_media_section.html.erb +12 -2
- data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -3
- data/app/views/skyline/settings/index.html +14 -0
- data/app/views/skyline/shared/_head.html.erb +2 -0
- data/app/views/skyline/shared/_header_area.html.erb +7 -5
- data/app/views/skyline/users/index.html.erb +31 -16
- data/config/initializers/dependencies.rb +6 -1
- data/config/initializers/observers.rb +1 -2
- data/config/initializers/rails_defaults.rb +1 -1
- data/config/locales/en-US.yml +110 -68
- data/config/locales/nl-NL.yml +117 -77
- data/config/routes.rb +36 -32
- data/db/fixtures/roles_and_rights.rb +65 -40
- data/db/migrate/20090302102548_add_media_nodes.rb +2 -2
- data/db/migrate/20090309133933_add_description_to_media_nodes.rb +2 -2
- data/db/migrate/20090309134731_add_tags.rb +2 -2
- data/db/migrate/20090309135746_create_media_files_tags.rb +2 -2
- data/db/migrate/20090319091342_create_media_caches.rb +2 -2
- data/db/migrate/20090327083240_create_users.rb +2 -2
- data/db/migrate/20090327084656_create_roles.rb +2 -2
- data/db/migrate/20090327084719_create_rights.rb +2 -2
- data/db/migrate/20090327084739_create_grants.rb +2 -2
- data/db/migrate/20090327090918_create_rights_roles.rb +2 -2
- data/db/migrate/20090408115155_create_ref_objects.rb +2 -2
- data/db/migrate/20090504140044_create_test_sections.rb +2 -2
- data/db/migrate/20090506083107_add_refering_column_name_to_ref_objects.rb +2 -2
- data/db/migrate/20090706124019_add_skyline_media_node_title.rb +1 -1
- data/db/migrate/20090904121447_create_skyline_referable_uris.rb +6 -6
- data/db/migrate/20091221145204_add_skyline_media_section_link.rb +11 -0
- data/db/migrate/20100109145958_add_associated_tags_index.rb +9 -0
- data/db/migrate/20100115111440_create_skyline_user_preferences.rb +14 -0
- data/db/migrate/20100120113953_remove_unused_articles_index.rb +9 -0
- data/db/migrate/20100409073447_change_referable_uri_to_text.rb +9 -0
- data/doc/Bundler.md +33 -28
- data/doc/MIGRATION.md +48 -0
- data/lib/skyline/{content_item.rb → belongs_to_referable.rb} +57 -88
- data/lib/skyline/configuration.rb +14 -15
- data/lib/skyline/content/content.rb +14 -2
- data/lib/skyline/deprecated/version3_0_8.rb +106 -0
- data/lib/skyline/{form_builder_with_errors.rb → form_builder.rb} +5 -5
- data/lib/skyline/{referable.rb → has_many_referables_in.rb} +22 -12
- data/lib/skyline/javascript_generator_methods.rb +1 -1
- data/lib/skyline/plugins_manager.rb +135 -14
- data/lib/skyline/rendering/helpers/renderer_helper.rb +14 -9
- data/lib/skyline/{renderer.rb → rendering/renderer.rb} +3 -4
- data/lib/skyline/{renderable_scope_interface.rb → rendering/scopes/interface.rb} +1 -1
- data/lib/skyline/{wildcard_renderable_scope.rb → rendering/scopes/wildcard.rb} +3 -3
- data/lib/skyline/{section_item.rb → sections/interface.rb} +17 -10
- data/lib/skyline/settings.rb +29 -19
- data/lib/skyline/taggable.rb +3 -3
- data/lib/skyline/version.rb +2 -2
- data/{tasks → lib/tasks}/database.rake +14 -2
- data/{tasks → lib/tasks}/implementation.rake +0 -0
- data/lib/tasks/testing.rake +41 -0
- data/public/skyline/images/backgrounds/panel-dt.gif +0 -0
- data/public/skyline/javascripts/src/application.js +114 -120
- data/public/skyline/javascripts/src/browser.js +22 -4
- data/public/skyline/javascripts/src/library_uploader.js +13 -3
- data/public/skyline/javascripts/src/sections.js +57 -6
- data/public/skyline/javascripts/src/skyline/src/dialog.js +6 -0
- data/public/skyline/javascripts/src/skyline/src/drag.js +6 -0
- data/public/skyline/javascripts/src/skyline/src/events.js +50 -0
- data/public/skyline/javascripts/src/skyline/src/field_replicator.js +12 -11
- data/public/skyline/javascripts/src/skyline/src/layout.js +172 -30
- data/public/skyline/javascripts/src/skyline/src/menu.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/menubutton.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/skyline.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/table.js +398 -0
- data/public/skyline/javascripts/src/skyline/src/tabs.js +2 -2
- data/public/skyline/javascripts/src/skyline/src/tag_selector.js +34 -26
- data/public/skyline/javascripts/src/skyline/src/tree.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/uploader.js +2 -2
- data/public/skyline/javascripts/src/skyline/src/utils.js +3 -0
- data/public/skyline/javascripts/src/skyline/test/_dynamic_right.html +24 -0
- data/public/skyline/javascripts/src/skyline/test/_right_content.html +1 -0
- data/public/skyline/javascripts/src/skyline/test/basic_layout.html +190 -0
- data/public/skyline/javascripts/src/skyline/test/dialog.html +101 -0
- data/public/skyline/javascripts/src/skyline/test/draggablefiles.html +196 -0
- data/public/skyline/javascripts/src/skyline/test/dynamic_layout.html +89 -0
- data/public/skyline/javascripts/src/skyline/test/field_replicator.html +60 -0
- data/public/skyline/javascripts/src/skyline/test/last-closed.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/last-open.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/menubutton.html +81 -0
- data/public/skyline/javascripts/src/skyline/test/middle.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/sortable.html +121 -0
- data/public/skyline/javascripts/src/skyline/test/table.html +521 -0
- data/public/skyline/javascripts/src/skyline/test/tagselector.html +72 -0
- data/public/skyline/javascripts/src/skyline/test/toggle.html +95 -0
- data/public/skyline/javascripts/src/skyline/test/tree.html +310 -0
- data/public/skyline/javascripts/src/skyline/test/tree.png +0 -0
- data/public/skyline/javascripts/src/skyline/test/undohtml.css +27 -0
- data/public/skyline/javascripts/src/skyline/vendor/fancyupload/Swiff.Uploader.js +2 -2
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +1 -354
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +64 -52
- data/public/skyline/javascripts/src/skyline.editor/assets/content.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/src/script_loader.js +156 -75
- data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +14 -4
- data/public/skyline/javascripts/src/skyline.editor/src/theme.js +8 -0
- data/public/skyline/javascripts/src/skyline.editor/test/dialog.html +28 -0
- data/public/skyline/javascripts/src/skyline.editor/test/lorem.html +7 -0
- data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +87 -0
- data/public/skyline/javascripts/src/skyline.editor/test/undohtml.css +27 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +205 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/css/content.css +54 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +111 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +19 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/simple.html +6 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +14 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +8 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +18 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +154 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +52 -44
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +388 -17
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +58 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js +8 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +10 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +18 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +136 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +18 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +564 -124
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +4 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +106 -27
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +4 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +921 -918
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +41 -24
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js +18 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +48 -23
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +24 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +3 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js +10 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/template.htm +2 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +26 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +98 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +3 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +11 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +3 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js +8 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +8 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +1 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +2 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +252 -188
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +7 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +10 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +2 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css +4 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +3 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +5 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +5492 -4341
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +5 -4
- data/public/skyline/javascripts/src/skyline.js +3 -1
- data/public/skyline/javascripts/src/user_preferences.js +49 -0
- data/public/skyline/stylesheets/general.css +149 -47
- data/rails/init.rb +3 -3
- data/test/factories.rb +28 -0
- data/test/integration/media_browser_super_access_test.rb +52 -0
- data/test/integration/media_browser_user_access_test.rb +50 -0
- data/test/integration/user_preferences_test.rb +73 -0
- data/test/mocks/test_content_object.rb +32 -0
- data/test/mocks/test_section.rb +22 -0
- data/test/test_helper.rb +60 -0
- data/test/unit/inline_ref_test.rb +195 -0
- data/test/unit/locales_test.rb +82 -0
- data/test/unit/page_test.rb +204 -0
- data/test/unit/test_content_object_test.rb +69 -0
- data/test/unit/test_section_test.rb +247 -0
- data/test/unit/user_preference_test.rb +123 -0
- data/test/unit/user_test.rb +74 -0
- data/test/user_access_helper.rb +36 -0
- data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +8 -0
- data/vendor/digitpaint/personify/test/parse_runner.rb +25 -0
- data/vendor/digitpaint/personify/test/parser_test.rb +109 -0
- data/vendor/digitpaint/personify/test/test_helper.rb +16 -0
- data/vendor/digitpaint/personify/vendor/treetop/.gitignore +5 -0
- data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +13 -4
- data/vendor/mootools-on-rails/test/mootools_helper_test.rb +138 -0
- data/vendor/mootools-on-rails/test/test_helper.rb +5 -0
- data/vendor/weppos/url_validation.rb +76 -0
- metadata +384 -189
- data/app/controllers/skyline/media_dirs_controller.rb +0 -56
- data/app/controllers/skyline/media_files_controller.rb +0 -87
- data/app/helpers/skyline/presenters/article_list.rb +0 -139
- data/app/observers/skyline/media_file_observer.rb +0 -32
- data/app/views/skyline/media_dirs/_edit.html.erb +0 -25
- data/app/views/skyline/media_dirs/_index.html.erb +0 -14
- data/app/views/skyline/media_dirs/index.html.erb +0 -42
- data/app/views/skyline/media_files/_edit.html.erb +0 -75
- data/app/views/skyline/media_files/_header.html.erb +0 -3
- data/app/views/skyline/media_files/_index.html.erb +0 -51
- data/app/views/skyline/media_files/_new.html.erb +0 -50
- data/db/migrate/20090603104115_prefix_tables_for_skyline.rb +0 -30
- data/lib/skyline/indexer.rb +0 -36
- data/lib/skyline/renderable_scope.rb +0 -27
- data/lib/skyline/rendering/helpers/settings_helper.rb +0 -26
- data/lib/skyline/searchable_item.rb +0 -132
- data/lib/skyline/url_validation.rb +0 -66
- data/public/skyline/images/backgrounds/splitter.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.bat +0 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.xml +0 -364
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full_jquery.html +0 -94
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/AddOnManager.js +0 -95
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/CommandManager.js +0 -54
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ControlManager.js +0 -489
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Developer.js +0 -91
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Editor.js +0 -2295
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorCommands.js +0 -934
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorManager.js +0 -453
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ForceBlocks.js +0 -644
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Popup.js +0 -412
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/UndoManager.js +0 -183
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/WindowManager.js +0 -169
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/adapter.js +0 -240
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/jquery.tinymce.js +0 -179
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/prototype/adapter.js +0 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/BlockQuote.js +0 -135
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/CutCopyPaste.js +0 -24
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/InsertHorizontalRule.js +0 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/RemoveFormat.js +0 -173
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/UndoRedo.js +0 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/DOMUtils.js +0 -1823
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Element.js +0 -199
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/EventUtils.js +0 -349
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Range.js +0 -721
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/ScriptLoader.js +0 -351
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Selection.js +0 -747
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Serializer.js +0 -979
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Sizzle.js +0 -975
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/StringWriter.js +0 -200
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/TridentSelection.js +0 -273
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/XMLWriter.js +0 -155
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/firebug/firebug-lite.js +0 -2518
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/tinymce.js +0 -549
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Button.js +0 -68
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ColorSplitButton.js +0 -212
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Container.js +0 -56
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Control.js +0 -182
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/DropMenu.js +0 -397
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ListBox.js +0 -320
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Menu.js +0 -175
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuButton.js +0 -128
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuItem.js +0 -69
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/NativeListBox.js +0 -198
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Separator.js +0 -34
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/SplitButton.js +0 -99
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Toolbar.js +0 -86
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Cookie.js +0 -126
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Dispatcher.js +0 -101
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSON.js +0 -81
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONP.js +0 -25
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONRequest.js +0 -87
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/URI.js +0 -289
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/XHR.js +0 -80
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/xml/Parser.js +0 -126
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/jquery.tinymce.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js +0 -616
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js +0 -438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_dev.js +0 -128
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery_src.js +0 -12198
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype_src.js +0 -13057
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api.html +0 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_jquery.html +0 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_prototype.html +0 -19
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/basic.html +0 -548
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/crossdomain.html +0 -87
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/css/unit.css +0 -120
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/index.html +0 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/jquery_plugin.html +0 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/api.js +0 -1438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/testrunner.js +0 -791
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/main.html +0 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/media.html +0 -221
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/menu.html +0 -22
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/parts.html +0 -90
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/paste.html +0 -132
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/performance.html +0 -152
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/range.html +0 -522
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/removeformat.html +0 -88
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/selection.html +0 -235
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/config.ini +0 -27
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/footer.html +0 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/header.html +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/index.php +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/instructions.txt +0 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/logo.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/selectors.list +0 -40
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/style.css +0 -181
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/index.php +0 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/slickspeed.js +0 -147
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/template.php +0 -47
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/template.html +0 -2865
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/test.xml +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/ant-contrib.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/js_build_tools.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnClientAdapter.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnant.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnjavahl.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnkit.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/yuicompressor.jar +0 -0
@@ -1,56 +0,0 @@
|
|
1
|
-
class Skyline::MediaDirsController < Skyline::ApplicationController
|
2
|
-
|
3
|
-
layout "skyline/layouts/media"
|
4
|
-
|
5
|
-
self.default_menu_item = :media_library
|
6
|
-
|
7
|
-
authorize :create, :by => "media_dir_create"
|
8
|
-
authorize :edit, :update, :by => "media_dir_update"
|
9
|
-
authorize :destroy, :by => "media_dir_delete"
|
10
|
-
|
11
|
-
def index
|
12
|
-
@media_dirs = Skyline::MediaDir.group_by_parent_id
|
13
|
-
end
|
14
|
-
|
15
|
-
def create
|
16
|
-
parent_id = params[:parent_id] || 0
|
17
|
-
|
18
|
-
@parent = Skyline::MediaDir.find_by_id(parent_id)
|
19
|
-
if @parent
|
20
|
-
@directory = @parent.subdirectories.build()
|
21
|
-
else
|
22
|
-
@directory = Skyline::MediaDir.new()
|
23
|
-
end
|
24
|
-
@directory.save
|
25
|
-
|
26
|
-
render :update do |p|
|
27
|
-
p.replace("dirtree",
|
28
|
-
:partial => "skyline/media_dirs/index",
|
29
|
-
:locals => {:media_dirs => Skyline::MediaDir.group_by_parent_id, :selected_node => @directory})
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
def update
|
34
|
-
media_dir = Skyline::MediaDir.find(params[:id])
|
35
|
-
|
36
|
-
if params[:skyline_media_dir]
|
37
|
-
media_dir.name = params[:skyline_media_dir][:name] if !params[:skyline_media_dir][:name].blank?
|
38
|
-
media_dir.parent_id = (params[:skyline_media_dir][:parent_id] == "0") ? nil : params[:skyline_media_dir][:parent_id]
|
39
|
-
|
40
|
-
media_dir.save
|
41
|
-
end
|
42
|
-
|
43
|
-
render :update do |p|
|
44
|
-
p.replace( "dirtree", :partial => "index", :locals => {:media_dirs => Skyline::MediaDir.group_by_parent_id, :selected_node => media_dir})
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
def destroy
|
49
|
-
media_dir = Skyline::MediaDir.find(params[:id])
|
50
|
-
media_dir.destroy
|
51
|
-
|
52
|
-
render :update do |p|
|
53
|
-
p.replace( "dirtree", :partial => "index", :locals => {:media_dirs => Skyline::MediaDir.group_by_parent_id, :selected_node => media_dir.directory})
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
@@ -1,87 +0,0 @@
|
|
1
|
-
class Skyline::MediaFilesController < Skyline::ApplicationController
|
2
|
-
layout "skyline/layouts/media"
|
3
|
-
# to avoid error 422 on authentication/session management
|
4
|
-
skip_before_filter :verify_authenticity_token, :only => :create
|
5
|
-
|
6
|
-
self.default_menu_item = :media_library
|
7
|
-
|
8
|
-
authorize :create, :by => "media_file_create"
|
9
|
-
authorize :edit, :update, :by => "media_file_update"
|
10
|
-
authorize :destroy, :by => "media_file_delete"
|
11
|
-
|
12
|
-
def index
|
13
|
-
media_dir = Skyline::MediaDir.find(params[:media_dir_id])
|
14
|
-
selected_file = params[:selected_file_id].nil? || params[:selected_file_id] == "0" ? nil : Skyline::MediaFile.find(params[:selected_file_id])
|
15
|
-
|
16
|
-
render :update do |p|
|
17
|
-
if !params[:listonly]
|
18
|
-
p.replace_html("contentHeaderPanel", "<span class=\"content\">#{t(:files_in, :directory => media_dir.name, :scope => [:media_file,:index])}</span>")
|
19
|
-
p.replace_html("uploadPanel", :partial => "new", :locals => {:media_dir => media_dir})
|
20
|
-
p.replace_html("metaHeaderPanel", "<span class=\"content directory\">#{media_dir.name}</span>")
|
21
|
-
p.replace_html("metaBodyPanel", :partial => "skyline/media_dirs/edit", :locals => {:media_dir => media_dir})
|
22
|
-
end
|
23
|
-
|
24
|
-
p.replace_html("filelist", :partial => "index", :locals => {:media_dir => media_dir, :show_meta_data => params[:show_meta_data], :selected_file => selected_file})
|
25
|
-
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
def create
|
30
|
-
@parent = Skyline::MediaDir.find_by_id(params[:media_dir_id])
|
31
|
-
|
32
|
-
@media_file = Skyline::MediaFile.new(:name => params[:Filename], :parent_id => params[:media_dir_id], :data => params[:Filedata])
|
33
|
-
@parent.files << @media_file if @parent
|
34
|
-
|
35
|
-
if @media_file.save
|
36
|
-
render :json => {:result => "success"}
|
37
|
-
else
|
38
|
-
render :json => {:result => "failed"}
|
39
|
-
end
|
40
|
-
|
41
|
-
end
|
42
|
-
|
43
|
-
def edit
|
44
|
-
@tags = Skyline::MediaFile.available_tags
|
45
|
-
media_file = Skyline::MediaFile.find(params[:id])
|
46
|
-
|
47
|
-
render :update do |p|
|
48
|
-
p.replace_html("metaHeaderPanel", :partial => "skyline/media_files/header", :locals => {:media_file => media_file} )
|
49
|
-
p.replace_html("metaBodyPanel", :partial => "skyline/media_files/edit", :locals => {:media_file => media_file} )
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
def update
|
54
|
-
@tags = Skyline::MediaFile.available_tags
|
55
|
-
media_file = Skyline::MediaFile.find(params[:id])
|
56
|
-
original_media_file = media_file.clone
|
57
|
-
media_file.attributes = params[:skyline_media_file]
|
58
|
-
|
59
|
-
@saved = media_file.save
|
60
|
-
|
61
|
-
render :update do |p|
|
62
|
-
if @saved
|
63
|
-
p.notification :success, t(:success, :scope => [:media_file,:update,:flashes])
|
64
|
-
else
|
65
|
-
p.message :failed, t(:failed, :scope => [:media_file,:update,:flashes])
|
66
|
-
end
|
67
|
-
if original_media_file.directory.id == media_file.directory.id
|
68
|
-
# just a normal edit of the media_file
|
69
|
-
p.replace_html("filelist", :partial => "index", :locals => {:media_dir => media_file.directory, :selected_file => media_file})
|
70
|
-
else
|
71
|
-
# file was moved to another directory
|
72
|
-
p.replace_html("filelist", :partial => "index", :locals => {:media_dir => original_media_file.directory})
|
73
|
-
p.replace_html("metaHeaderPanel", "<span class=\"content folder\">#{original_media_file.directory.name}</span>")
|
74
|
-
p.replace_html("metaBodyPanel", :partial => "skyline/media_dirs/edit", :locals => {:media_dir => original_media_file.directory})
|
75
|
-
end
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
|
80
|
-
def destroy
|
81
|
-
media_file = Skyline::MediaFile.find(params[:id])
|
82
|
-
media_file.destroy
|
83
|
-
|
84
|
-
redirect_to :action=>:index, :media_dir_id=> params[:media_dir_id]
|
85
|
-
end
|
86
|
-
|
87
|
-
end
|
@@ -1,139 +0,0 @@
|
|
1
|
-
class Skyline::Presenters::ArticleList < Skyline::Presenters::Presenter
|
2
|
-
|
3
|
-
def output
|
4
|
-
["<div id=\"list-wrapper\"><ul class=\"article-list #{"orderable" if self.fieldset.orderable?}\" id=\"list\">",header,body,"</ul>",footer,"</div>"].join("\n")
|
5
|
-
end
|
6
|
-
|
7
|
-
def body
|
8
|
-
if self.collection.any?
|
9
|
-
self.collection.map{|el| self.row(el) }
|
10
|
-
else
|
11
|
-
"<li class=\"blank-slate\">#{t(:blank_slate, :scope => [:content,:list], :class => self.fieldset.plural_name.downcase)} " +
|
12
|
-
link_to(t(:add_a_new, :scope => [:content], :class => self.fieldset.singular_name.downcase),:action => "create", :types => stack.url_types, :return_to => url_for({})) +
|
13
|
-
"</li>"
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
def footer
|
18
|
-
if fieldset.orderable? && self.collection.any?
|
19
|
-
<<-EOS
|
20
|
-
<script type="text/javascript" charset="utf-8">
|
21
|
-
var s = new Skyline.Sortable("list",{handle: "span.drag", clone: true, revert: true, draggables: "li.element"});
|
22
|
-
s.addEvent("afterDrop", function(){
|
23
|
-
#{
|
24
|
-
remote_function(
|
25
|
-
:url => {:action => "order", :types => stack.url_types},
|
26
|
-
:data => "'order=' + Application.getSequence('#list li.element').join(',')"
|
27
|
-
)
|
28
|
-
}
|
29
|
-
});
|
30
|
-
</script>
|
31
|
-
EOS
|
32
|
-
else
|
33
|
-
""
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
|
38
|
-
# <li class="header">
|
39
|
-
# <div class="draggable">
|
40
|
-
# <ul class="meta">
|
41
|
-
# <li style="width: 50%">Sub-pagina's</li>
|
42
|
-
# <li style="width: 50%">Publicatiedatum</li>
|
43
|
-
# </ul>
|
44
|
-
# </div>
|
45
|
-
# </li>
|
46
|
-
def header
|
47
|
-
out = "<li class=\"header\">"
|
48
|
-
out << "<div class=\"edit\"> </div>"
|
49
|
-
out << "<div class=\"draggable\">"
|
50
|
-
out << "<div class=\"content\"> </div>"
|
51
|
-
out << "<ul class=\"meta\">"
|
52
|
-
self.heading_collection.each do |field|
|
53
|
-
out << "<li style=\"width: #{self.heading_size}\">#{field.singular_label}</li>"
|
54
|
-
end
|
55
|
-
out << "</ul>"
|
56
|
-
out << "</div><div class=\"clear\"> </div>"
|
57
|
-
out << "</li>"
|
58
|
-
if self.options[:navigation] && stack.has_parent?
|
59
|
-
out << "<li class=\"up\">"+link_to(t(:up_one_level, :scope => [:content,:list]), :action => "list", :types => stack.url_types(:up => 1,:collection => true))+"</li>"
|
60
|
-
end
|
61
|
-
out
|
62
|
-
end
|
63
|
-
|
64
|
-
# <li class="even">
|
65
|
-
# <span class="drag" ></span>
|
66
|
-
# <div class="edit">
|
67
|
-
# <a href="#"><img src="/images/buttons/edit.gif?1197741337" alt="Edit"/></a>
|
68
|
-
# <a href="#"><img src="/images/buttons/delete.gif?1197741337" alt="Edit"/></a>
|
69
|
-
# </div>
|
70
|
-
# <div class="draggable">
|
71
|
-
# <div class="content">
|
72
|
-
# <h3>Titel van dit artikel</h3>
|
73
|
-
# <p>Some sub info.....</p>
|
74
|
-
# </div>
|
75
|
-
# <ul class="meta">
|
76
|
-
# <li style="width: 50%">7 items (view)</li>
|
77
|
-
# <li style="width: 50%">Publicatiedatum</li>
|
78
|
-
# </ul>
|
79
|
-
# </div>
|
80
|
-
# </li>
|
81
|
-
def row(record)
|
82
|
-
return if record.new_record? # there can't be any new records in a list!
|
83
|
-
out = ""
|
84
|
-
out << "<span class=\"drag\"> </span>" if fieldset.orderable?
|
85
|
-
out << content_tag("div",edit_button(record) + " " + delete_button(record),:class => "edit")
|
86
|
-
out << "<div class=\"draggable\">"
|
87
|
-
out << content(record)
|
88
|
-
out << meta(record)
|
89
|
-
out << "</div><div class=\"clear\"> </div>"
|
90
|
-
content_tag("li",out,:class => cycle("odd","even") + " element", :id => "element_#{record.id}")
|
91
|
-
end
|
92
|
-
|
93
|
-
def content(record)
|
94
|
-
out = "<div class=\"content\">"
|
95
|
-
title,opts = value(record,title_field)
|
96
|
-
out << "<h3>#{title}</h3>"
|
97
|
-
if subtitle_field
|
98
|
-
subtitle,opts = value(record,subtitle_field)
|
99
|
-
out << "<p>#{subtitle}</p>"
|
100
|
-
end
|
101
|
-
out << "</div>"
|
102
|
-
end
|
103
|
-
|
104
|
-
def meta(record)
|
105
|
-
out = "<ul class=\"meta\">"
|
106
|
-
self.heading_collection.each do |field|
|
107
|
-
v,rest = value(record,field)
|
108
|
-
out << "<li style=\"width: #{self.heading_size}\">#{v.blank? ? " " : v}</li>"
|
109
|
-
end
|
110
|
-
out << "</ul>"
|
111
|
-
end
|
112
|
-
|
113
|
-
def heading_collection(fieldset=self.fieldset,cache=true)
|
114
|
-
return @heading_collection if @heading_collection && cache
|
115
|
-
@heading_collection = super.find_all{|f| ![self.title_field,self.subtitle_field].include?(f) }
|
116
|
-
end
|
117
|
-
|
118
|
-
# We have to use 99% as to fool IE
|
119
|
-
def heading_size
|
120
|
-
@heading_size ||= "#{(99 / self.heading_collection.size.to_f).to_i}%"
|
121
|
-
end
|
122
|
-
|
123
|
-
# @deprecated: the use of title_column
|
124
|
-
def title_field
|
125
|
-
self.fieldset.fields[self.fieldset.settings.title_field || self.fieldset.settings.title_column || first_non_hidden_field]
|
126
|
-
end
|
127
|
-
|
128
|
-
# @deprecated: the use of subtitle_column
|
129
|
-
def subtitle_field
|
130
|
-
self.fieldset.settings.subtitle_field && self.fieldset.fields[self.fieldset.settings.subtitle_field] ||
|
131
|
-
self.fieldset.settings.subtitle_column && self.fieldset.fields[self.fieldset.settings.subtitle_column] ||
|
132
|
-
nil
|
133
|
-
end
|
134
|
-
|
135
|
-
def first_non_hidden_field
|
136
|
-
self.fieldset.field_names.find{|f| self.fieldset.fields.has_key?(f) && !self.fieldset.fields[f].hidden_in(:list) }
|
137
|
-
end
|
138
|
-
|
139
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
class Skyline::MediaFileObserver < ActiveRecord::Observer
|
2
|
-
def after_save(media_file)
|
3
|
-
index(media_file)
|
4
|
-
end
|
5
|
-
|
6
|
-
def index(media_file)
|
7
|
-
return unless %w{pdf word excel powerpoint}.include?(media_file.file_type)
|
8
|
-
indexer = Skyline::Indexer.instance
|
9
|
-
solr_id = "#{media_file.class.name}-#{media_file.id}"
|
10
|
-
|
11
|
-
fields = {"ext.literal.id" => solr_id,
|
12
|
-
"ext.literal.title" => "#{media_file.title}",
|
13
|
-
"ext.literal.url" => "#{media_file.url}",
|
14
|
-
"ext.literal.cat" => "#{media_file.class.name}",
|
15
|
-
"ext.literal.documentdate" => media_file.date.present? ? media_file.date.to_time.utc.iso8601(3) : nil,
|
16
|
-
"ext.literal.tags_multi" => media_file.tags.collect{|t| t.tag},
|
17
|
-
"ext.literal.description_s" => media_file.description,
|
18
|
-
"ext.literal.file_type_s"=>media_file.file_type,
|
19
|
-
"ext.idx.attr" => "true",
|
20
|
-
"ext.def.fl" => "body",
|
21
|
-
"stream.file" => "#{media_file.file_path}"}
|
22
|
-
|
23
|
-
indexer.add_file_index(fields)
|
24
|
-
end
|
25
|
-
|
26
|
-
def after_destroy(media_file)
|
27
|
-
indexer = Skyline::Indexer.instance
|
28
|
-
solr_id = "#{media_file.class.name}-#{media_file.id}"
|
29
|
-
|
30
|
-
indexer.remove_from_index(solr_id)
|
31
|
-
end
|
32
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
<% if local_assigns.has_key?(:media_dir) %>
|
2
|
-
<div class=" ">
|
3
|
-
<% remote_form_for media_dir, :url => url_for(:action=>:update, :controller=>:media_dirs, :id=>media_dir.id), :complete => "Application.Layouts.MediaLibrary.initTree();" do |f|%>
|
4
|
-
<%= f.hidden_field :parent_id %>
|
5
|
-
<div class="content divided">
|
6
|
-
<dl class="line">
|
7
|
-
<dt><%=f.label :name, Skyline::MediaDir.human_attribute_name("name") + ":" %></dt>
|
8
|
-
<dd><%= f.text_field :name, :class => "full" %></dd>
|
9
|
-
</dl>
|
10
|
-
<div class="submit">
|
11
|
-
<%= submit_button :save, :class => "small green" %>
|
12
|
-
</div>
|
13
|
-
</div>
|
14
|
-
<div class="content">
|
15
|
-
<%= link_to_remote button_text(:delete_media_dir),{
|
16
|
-
:url => skyline_media_dir_url(media_dir),
|
17
|
-
:method=> :delete,
|
18
|
-
:confirm => t(:message, :scope => [:media_dir,:destroy]),
|
19
|
-
:href => url_for(:action => "destroy", :id => media_dir.id)},
|
20
|
-
{ :class => "button small red"}
|
21
|
-
%>
|
22
|
-
</div>
|
23
|
-
<% end %>
|
24
|
-
</div>
|
25
|
-
<% end %>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<div id="dirtree" class="tree">
|
2
|
-
<% if local_assigns.has_key?(:media_dirs) %>
|
3
|
-
<%= media_dir_tree(media_dirs,media_dirs[nil],
|
4
|
-
:selected => (local_assigns[:selected_node] || Skyline::MediaDir.root),
|
5
|
-
:id_prefix => "dirItem"
|
6
|
-
) %>
|
7
|
-
<% end %>
|
8
|
-
</div>
|
9
|
-
|
10
|
-
<script type="text/javascript" charset="utf-8">
|
11
|
-
if(Application.Layout.current){
|
12
|
-
Application.Layout.current.initializeDirTree();
|
13
|
-
}
|
14
|
-
</script>
|
@@ -1,42 +0,0 @@
|
|
1
|
-
<dl id="leftPanel" class="panel">
|
2
|
-
<dt>
|
3
|
-
<span class="content">
|
4
|
-
<a href="#" class="button small" id="newDir"><%= button_text :add %></a>
|
5
|
-
<%= t(:directories, :scope => [:media_dir]) %>
|
6
|
-
</span>
|
7
|
-
</dt>
|
8
|
-
<dd class="scrollable">
|
9
|
-
<%= render :partial => '/skyline/media_dirs/index', :locals => {:media_dirs => @media_dirs} %>
|
10
|
-
</dd>
|
11
|
-
</dl>
|
12
|
-
<dl id="contentPanel" class="panel">
|
13
|
-
<dt id="contentHeaderPanel">
|
14
|
-
<span class="content">
|
15
|
-
<% if local_assigns.has_key?(:media_dir) %>
|
16
|
-
<%= t(:files_in, :directory => media_dir.name, :scope => [:media_file,:index]) %>
|
17
|
-
<% else %>
|
18
|
-
|
19
|
-
<% end %>
|
20
|
-
</span>
|
21
|
-
</dt>
|
22
|
-
<dd id="contentBodyPanel">
|
23
|
-
<div id="uploadPanel">
|
24
|
-
</div>
|
25
|
-
<div id="fileListPanel" class="scrollable">
|
26
|
-
<ul id="filelist" class="files">
|
27
|
-
</ul>
|
28
|
-
</div>
|
29
|
-
</dd>
|
30
|
-
</dl>
|
31
|
-
<dl id="metaPanel" class="panel">
|
32
|
-
<dt id="metaHeaderPanel"><span class="content"> </span></dt>
|
33
|
-
<dd id="metaBodyPanel" class="scrollable meta"></dd>
|
34
|
-
</dl>
|
35
|
-
|
36
|
-
|
37
|
-
<script type="text/javascript" charset="utf-8">
|
38
|
-
(function(){
|
39
|
-
var a = new Application.Layout.Media();
|
40
|
-
a.skylineMediaDirsPath = "<%=skyline_media_dirs_path%>";
|
41
|
-
})();
|
42
|
-
</script>
|
@@ -1,75 +0,0 @@
|
|
1
|
-
<% if local_assigns.has_key?(:media_file) %>
|
2
|
-
<div class=" ">
|
3
|
-
<div class="content divided">
|
4
|
-
<dl class="line">
|
5
|
-
<% if media_file.file_type == "image"%>
|
6
|
-
<dt><%=t(:preview, :scope => [:media_file, :edit])%></dt>
|
7
|
-
<dd class="image">
|
8
|
-
<%= image_tag(url_for(
|
9
|
-
:action=>:show,
|
10
|
-
:controller=>:media_files_data,
|
11
|
-
:name=>media_file.name,
|
12
|
-
:size=>'100x100'),
|
13
|
-
:alt => "Image") %>
|
14
|
-
</dd>
|
15
|
-
<%end%>
|
16
|
-
<dd class="caption">
|
17
|
-
<%= link_to t(:download, :scope => [:media_file, :edit]), url_for(:action=>:show, :controller=>:media_files_data, :name=>media_file.name),:target => "_blank" %>
|
18
|
-
</dd>
|
19
|
-
</dl>
|
20
|
-
<dl class="flow">
|
21
|
-
<% if media_file.file_type == "image" && media_file.dimension.present? %>
|
22
|
-
<dt><%=t(:size, :scope => [:media_file, :edit])%>: </dt>
|
23
|
-
<dd><%=media_file.dimension['width'] %>x<%=media_file.dimension['height'] %></dd>
|
24
|
-
<%end%>
|
25
|
-
<dt><%=t(:type, :scope => [:media_file, :edit])%>: </dt>
|
26
|
-
<dd><%=media_file.file_type%></dd>
|
27
|
-
<dt><%=t(:filesize, :scope => [:media_file, :edit])%>: </dt>
|
28
|
-
<dd><%=number_to_human_size(media_file.size)%></dd>
|
29
|
-
</dl>
|
30
|
-
</div>
|
31
|
-
<% remote_form_for media_file,
|
32
|
-
:url => skyline_media_dir_media_file_path,
|
33
|
-
:method => :put,
|
34
|
-
:html => {:method=>:put} do |f|%>
|
35
|
-
<div class="content divided">
|
36
|
-
<dl class="line">
|
37
|
-
<dt><%=f.label :name, Skyline::MediaFile.human_attribute_name("name")%></dt>
|
38
|
-
<dd><%= f.text_field :name, :class => "full" %></dd>
|
39
|
-
|
40
|
-
<dt><%=f.label :title, Skyline::MediaFile.human_attribute_name("title")%></dt>
|
41
|
-
<dd><%= f.text_field :title, :class => "full" %></dd>
|
42
|
-
|
43
|
-
<dt><%=f.label :description, Skyline::MediaFile.human_attribute_name("description")%></dt>
|
44
|
-
<dd><%= f.text_area :description, :cols=>20, :rows=>5%></dd>
|
45
|
-
|
46
|
-
<dt><%=f.label :date, Skyline::MediaFile.human_attribute_name("date")%></dt>
|
47
|
-
<dd><%= f.date_select :date, :use_month_numbers => true, :include_blank => true %></dd>
|
48
|
-
</dl>
|
49
|
-
<dl class="tagselector line">
|
50
|
-
<dt><%=f.label :raw_tags, Skyline::MediaFile.human_attribute_name("file_tags")%></dt>
|
51
|
-
<dd><%=f.text_area :raw_tags, :rows => nil %></dd>
|
52
|
-
<dt class="tags"><%=t(:available_tags, :scope => [:media_file, :edit])%></dt>
|
53
|
-
<dd class="tags">
|
54
|
-
<%= render :partial => "/skyline/tags/available_tags"%>
|
55
|
-
</dd>
|
56
|
-
</dl>
|
57
|
-
<div class="submit">
|
58
|
-
<%=submit_button :save, :class => "small green"%>
|
59
|
-
</div>
|
60
|
-
</div>
|
61
|
-
<div class="content">
|
62
|
-
<%=link_to_remote button_text(:delete), {
|
63
|
-
:url => skyline_media_dir_media_file_url,
|
64
|
-
:method=> :delete,
|
65
|
-
:confirm => 'Weet u zeker dat u dit bestand wilt verwijderen?',
|
66
|
-
:href => url_for(:action => "destroy", :id => media_file.id) },
|
67
|
-
{ :class => "button small red" }
|
68
|
-
%>
|
69
|
-
</div>
|
70
|
-
<% end %>
|
71
|
-
</div>
|
72
|
-
<% end %>
|
73
|
-
<script type="text/javascript" charset="utf-8">
|
74
|
-
new Skyline.TagSelector("skyline_media_file_raw_tags",".taglist li");
|
75
|
-
</script>
|
@@ -1,51 +0,0 @@
|
|
1
|
-
<% if local_assigns.has_key?(:media_dir) && !media_dir.blank? %>
|
2
|
-
<% media_dir.files.each do |f|%>
|
3
|
-
<li id='fileItem_<%=f.parent_id%>_<%=f.id%>' class="<%=f.file_type%> <%='selected' if local_assigns.has_key?(:selected_file) && selected_file == f%>">
|
4
|
-
<div class="file">
|
5
|
-
<%= link_to f.name,edit_skyline_media_dir_media_file_path(media_dir, f), :id => "fileLinkItem_#{f.id}" %>
|
6
|
-
</div>
|
7
|
-
</li>
|
8
|
-
<% end %>
|
9
|
-
<% end %>
|
10
|
-
|
11
|
-
<script type="text/javascript" charset="utf-8">
|
12
|
-
<% if local_assigns.has_key?(:selected_file) && !selected_file.blank? %>
|
13
|
-
new Request({
|
14
|
-
evalScripts: true,
|
15
|
-
url: "<%=edit_skyline_media_dir_media_file_path(media_dir, selected_file)%>"
|
16
|
-
}).get();
|
17
|
-
<% end %>
|
18
|
-
|
19
|
-
/*Initialise draggable file list, add event listener on dropped to send ajax request to update file attributes*/
|
20
|
-
var v = new Application.DraggableFileList("#fileListPanel .files li","#dirtree li");
|
21
|
-
v.addEvent("dropped",function(f,d){
|
22
|
-
var ids = f.get("id").split("_");
|
23
|
-
var url = "/skyline/media_dirs/"+ ids[1] +"/media_files/"+ ids[2];
|
24
|
-
params = "skyline_media_file[parent_id]="+Application.getId(d.get("id"));
|
25
|
-
new Request({
|
26
|
-
evalScripts:true,
|
27
|
-
url: url,
|
28
|
-
data: 'authenticity_token='+encodeURIComponent('<%=form_authenticity_token%>')+'&'+params,
|
29
|
-
method: 'put'
|
30
|
-
}).send();
|
31
|
-
return false;
|
32
|
-
});
|
33
|
-
|
34
|
-
v.addEvent("selected", function(event,d){
|
35
|
-
event.stop();
|
36
|
-
event.preventDefault();
|
37
|
-
|
38
|
-
if(this.selectedEl){ this.selectedEl.removeClass("selected"); }
|
39
|
-
this.selectedEl = d;
|
40
|
-
d.addClass("selected");
|
41
|
-
|
42
|
-
var link = d.getElement("a");
|
43
|
-
|
44
|
-
new Request({
|
45
|
-
url: link.get('href'),
|
46
|
-
method: 'get'
|
47
|
-
}).send();
|
48
|
-
});
|
49
|
-
|
50
|
-
v.selectedEl = $('fileListPanel').getElement('.files li.selected');
|
51
|
-
</script>
|
@@ -1,50 +0,0 @@
|
|
1
|
-
<% if local_assigns.has_key?(:media_dir) && !media_dir.blank? %>
|
2
|
-
<div class="upload innerpanel" id="libraryuploader">
|
3
|
-
<div id="foldername" class="head panelhead">
|
4
|
-
<a class="collapse" href="#"><%=t(:header, :scope => [:media_file,:new]) %> <em><%= media_dir.name %></em></a>
|
5
|
-
</div>
|
6
|
-
<div id="uploadarea" class="panelBody">
|
7
|
-
<form id="libraryuploaderform" class="upload innerpanel closed" action="<%= skyline_media_file_path_with_session_information(media_dir) %>">
|
8
|
-
<div class="upload-files">
|
9
|
-
<div class="body">
|
10
|
-
<div class="messages"></div>
|
11
|
-
<ul class="files" style="height: 100px">
|
12
|
-
<li class="blank"><%=t(:no_files, :scope => [:media_file,:new]) %></li>
|
13
|
-
</ul>
|
14
|
-
<div class="status" id="uploadstatus">
|
15
|
-
<span class="total-files">0</span> <%=t(:files, :scope => [:media_file,:new]) %>
|
16
|
-
<span class="total-size">0 kB</span>
|
17
|
-
</div>
|
18
|
-
<a href="#" class="browse" id="adduploadfiles"><%=t(:add_files, :scope => [:media_file,:new]) %></a>
|
19
|
-
</div>
|
20
|
-
<div id="submit-buttons" class="submit">
|
21
|
-
<a id="cancelselect" href="#" class="cancel"><%=t(:cancel, :scope => [:media_file,:new]) %></a>
|
22
|
-
<%= submit_button :upload, :class => "small green upload", :id=> "uploadbutton" %>
|
23
|
-
|
24
|
-
<%= submit_button :ok, :class => "small green upload", :id=> "finishedbutton" %>
|
25
|
-
</div>
|
26
|
-
</div>
|
27
|
-
<div class="upload-progress hide">
|
28
|
-
<div class="body">
|
29
|
-
<%=t(:file_progress, :scope => [:media_file, :new]) %>
|
30
|
-
<div class="progressbar">
|
31
|
-
<div class="bar" style="width: 20%"> </div>
|
32
|
-
</div>
|
33
|
-
<div class="progress-text">
|
34
|
-
<%=t(:percentage_progress, :scope => [:media_file, :new]) %>
|
35
|
-
</div>
|
36
|
-
</div>
|
37
|
-
<div class="submit">
|
38
|
-
<a href="#" class="cancel"><%=t(:cancel, :scope => [:media_file,:new]) %></a>
|
39
|
-
</div>
|
40
|
-
</div>
|
41
|
-
</form>
|
42
|
-
|
43
|
-
</div>
|
44
|
-
</div>
|
45
|
-
<script type="text/javascript" charset="utf-8">
|
46
|
-
if(Application.Layout.current){
|
47
|
-
Application.Layout.current.initializeUploadPanel("<%= skyline_media_dir_media_files_path(media_dir) %>");
|
48
|
-
}
|
49
|
-
</script>
|
50
|
-
<%end%>
|
@@ -1,30 +0,0 @@
|
|
1
|
-
class PrefixTablesForSkyline < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
rename_table :grants, :skyline_grants
|
4
|
-
rename_table :media_caches, :skyline_media_cache
|
5
|
-
rename_table :media_files_tags, :skyline_media_files_skyline_tags
|
6
|
-
rename_table :media_nodes, :skyline_media_nodes
|
7
|
-
|
8
|
-
rename_table :ref_objects, :skyline_ref_objects
|
9
|
-
rename_table :rights, :skyline_rights
|
10
|
-
rename_table :rights_roles, :skyline_rights_skyline_roles
|
11
|
-
rename_table :roles, :skyline_roles
|
12
|
-
rename_table :tags, :skyline_tags
|
13
|
-
rename_table :users, :skyline_users
|
14
|
-
rename_table :test_sections, :skyline_test_sections
|
15
|
-
end
|
16
|
-
|
17
|
-
def self.down
|
18
|
-
rename_table :skyline_test_sections, :test_sections
|
19
|
-
rename_table :skyline_users, :users
|
20
|
-
rename_table :skyline_tags, :tags
|
21
|
-
rename_table :skyline_roles, :roles
|
22
|
-
rename_table :skyline_rights_skyline_roles, :rights_roles
|
23
|
-
rename_table :skyline_rights, :rights
|
24
|
-
rename_table :skyline_ref_objects, :ref_objects
|
25
|
-
rename_table :skyline_grants, :grants
|
26
|
-
rename_table :skyline_media_cache, :media_caches
|
27
|
-
rename_table :skyline_media_files_skyline_tags, :media_files_tags
|
28
|
-
rename_table :skyline_media_nodes, :media_nodes
|
29
|
-
end
|
30
|
-
end
|
data/lib/skyline/indexer.rb
DELETED
@@ -1,36 +0,0 @@
|
|
1
|
-
# The Indexer currently used to index content wtihin skyline. It's basically
|
2
|
-
# a unified interface for RSolr.
|
3
|
-
#
|
4
|
-
# @private
|
5
|
-
class Skyline::Indexer
|
6
|
-
include Singleton
|
7
|
-
|
8
|
-
# Add/Update solr index
|
9
|
-
def add_index(fields)
|
10
|
-
if Skyline::Configuration.solr_indexing
|
11
|
-
solr = RSolr.connect
|
12
|
-
solr.add(fields)
|
13
|
-
solr.commit
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
# Remove item from solr-index
|
18
|
-
def remove_from_index(solr_id)
|
19
|
-
if Skyline::Configuration.solr_indexing
|
20
|
-
solr = RSolr.connect
|
21
|
-
solr.delete_by_id(solr_id)
|
22
|
-
solr.commit
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
def add_file_index(fields)
|
27
|
-
if Skyline::Configuration.solr_indexing
|
28
|
-
solr = RSolr.connect
|
29
|
-
begin
|
30
|
-
solr.send_request('/update/extract',fields)
|
31
|
-
solr.commit
|
32
|
-
rescue RSolr::RequestError
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|