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
data/config/locales/nl-NL.yml
CHANGED
@@ -94,34 +94,34 @@
|
|
94
94
|
half_a_minute: "een halve minuut"
|
95
95
|
less_than_x_seconds:
|
96
96
|
one: "minder dan een seconde"
|
97
|
-
other: "minder dan {
|
97
|
+
other: "minder dan %{count} seconden"
|
98
98
|
x_seconds:
|
99
99
|
one: "een seconde"
|
100
|
-
other: "{
|
100
|
+
other: "%{count} seconden"
|
101
101
|
less_than_x_minutes:
|
102
102
|
one: "minder dan een minuut"
|
103
|
-
other: "minder dan {
|
103
|
+
other: "minder dan %{count} minuten"
|
104
104
|
x_minutes:
|
105
105
|
one: "een minuut"
|
106
|
-
other: "{
|
106
|
+
other: "%{count} minuten"
|
107
107
|
about_x_hours:
|
108
108
|
one: "ongeveer een uur"
|
109
|
-
other: "ongeveer {
|
109
|
+
other: "ongeveer %{count} uur"
|
110
110
|
x_days:
|
111
111
|
one: "een dag"
|
112
|
-
other: "{
|
112
|
+
other: "%{count} dagen"
|
113
113
|
about_x_months:
|
114
114
|
one: "ongeveer een maand"
|
115
|
-
other: "ongeveer {
|
115
|
+
other: "ongeveer %{count} maanden"
|
116
116
|
x_months:
|
117
117
|
one: "1 maand"
|
118
|
-
other: "{
|
118
|
+
other: "%{count} maanden"
|
119
119
|
about_x_years:
|
120
120
|
one: "ongeveer een jaar"
|
121
|
-
other: "ongeveer {
|
121
|
+
other: "ongeveer %{count} jaar"
|
122
122
|
over_x_years:
|
123
123
|
one: "meer dan een jaar"
|
124
|
-
other: "meer dan {
|
124
|
+
other: "meer dan %{count} jaar"
|
125
125
|
prompts:
|
126
126
|
year: "Jaar"
|
127
127
|
month: "Maand"
|
@@ -135,8 +135,8 @@
|
|
135
135
|
errors:
|
136
136
|
template:
|
137
137
|
header:
|
138
|
-
one: "Door een fout in het invulformulier kon {
|
139
|
-
other: "Door {
|
138
|
+
one: "Door een fout in het invulformulier kon %{model} niet opgeslagen worden."
|
139
|
+
other: "Door %{count} fouten in het invulformulier kon %{model} niet opgeslagen worden."
|
140
140
|
# The variable :count is also available
|
141
141
|
body: "De volgende problemen traden op:"
|
142
142
|
|
@@ -151,16 +151,16 @@
|
|
151
151
|
accepted: "moet geaccepteerd worden"
|
152
152
|
empty: "mag niet leeg zijn"
|
153
153
|
blank: "moet ingevuld worden"
|
154
|
-
too_long: "is te lang (maximaal {
|
155
|
-
too_short: "is te kort (minimaal {
|
156
|
-
wrong_length: "heeft een verkeerde lengte (het moet {
|
154
|
+
too_long: "is te lang (maximaal %{count} tekens)"
|
155
|
+
too_short: "is te kort (minimaal %{count} tekens)"
|
156
|
+
wrong_length: "heeft een verkeerde lengte (het moet %{count} tekens lang zijn)"
|
157
157
|
taken: "is al bezet"
|
158
158
|
not_a_number: "is geen getal"
|
159
|
-
greater_than: "moet groter zijn dan {
|
160
|
-
greater_than_or_equal_to: "moet groter zijn dan of gelijk zijn aan {
|
161
|
-
equal_to: "moet gelijk zijn aan {
|
162
|
-
less_than: "moet minder zijn dan {
|
163
|
-
less_than_or_equal_to: "moet minder zijn dan of gelijk zijn aan {
|
159
|
+
greater_than: "moet groter zijn dan %{count}"
|
160
|
+
greater_than_or_equal_to: "moet groter zijn dan of gelijk zijn aan %{count}"
|
161
|
+
equal_to: "moet gelijk zijn aan %{count}"
|
162
|
+
less_than: "moet minder zijn dan %{count}"
|
163
|
+
less_than_or_equal_to: "moet minder zijn dan of gelijk zijn aan %{count}"
|
164
164
|
odd: "moet oneven zijn"
|
165
165
|
even: "moet even zijn"
|
166
166
|
duplicate: "is reeds in gebruik"
|
@@ -184,7 +184,7 @@
|
|
184
184
|
# For example,
|
185
185
|
# models:
|
186
186
|
# user:
|
187
|
-
# blank: "This is a custom blank message for {
|
187
|
+
# blank: "This is a custom blank message for %{model}: %{attribute}"
|
188
188
|
# attributes:
|
189
189
|
# login:
|
190
190
|
# blank: "This is a custom blank message for User login"
|
@@ -266,7 +266,8 @@
|
|
266
266
|
title: "Titel"
|
267
267
|
links: "Links"
|
268
268
|
skyline/sections/media_section:
|
269
|
-
|
269
|
+
media: "Afbeelding"
|
270
|
+
link: "Link (optioneel)"
|
270
271
|
alignment: "Uitlijning"
|
271
272
|
caption: "Onderschrift"
|
272
273
|
alignments:
|
@@ -321,8 +322,9 @@
|
|
321
322
|
browse: "Bladeren"
|
322
323
|
upload: "Uploaden"
|
323
324
|
ok: "Ok"
|
324
|
-
delete_media_dir: "
|
325
|
+
delete_media_dir: "Map verwijderen"
|
325
326
|
yes_force_edit: "Ja, bewerken forceren"
|
327
|
+
add_files: "+ Add files"
|
326
328
|
|
327
329
|
icons:
|
328
330
|
"true" : "ja"
|
@@ -365,23 +367,23 @@
|
|
365
367
|
users: "Gebruikersbeheer"
|
366
368
|
authentication:
|
367
369
|
logout: "Uitloggen"
|
368
|
-
logged_in_as: "Ingelogd als <strong
|
370
|
+
logged_in_as: "Ingelogd als <strong>%{user}</strong>"
|
369
371
|
new:
|
370
372
|
log_in: "Inloggen"
|
371
373
|
email: "E-mailadres"
|
372
374
|
password: "Wachtwoord"
|
373
375
|
create:
|
374
376
|
flashes:
|
375
|
-
error: "Inloggen mislukt,
|
377
|
+
error: "Inloggen mislukt, controleer uw e-mailadres en wachtwoord en probeer het opnieuw."
|
376
378
|
user:
|
377
379
|
roles:
|
378
380
|
super: "Superbeheerder"
|
379
381
|
index:
|
380
382
|
left_header: "Gebruikers"
|
381
|
-
header: "Er zijn {
|
382
|
-
confirm_destroy: "Weet u zeker dat u gebruiker {
|
383
|
+
header: "Er zijn %{count} gebruikers"
|
384
|
+
confirm_destroy: "Weet u zeker dat u gebruiker %{display_name} wilt verwijderen?"
|
383
385
|
edit:
|
384
|
-
dialog_title: "Bewerken van gebruiker {
|
386
|
+
dialog_title: "Bewerken van gebruiker %{display_name}"
|
385
387
|
current_password_info: "Bij het bewerken van uw eigen gebruiker dient u uw huidige wachtwoord in te voeren."
|
386
388
|
password_info: "Leeglaten indien het wachtwoord niet gewijzigd hoeft te worden."
|
387
389
|
cannot_change_role: "Het is niet mogelijk uw eigen rol te wijzigen."
|
@@ -395,11 +397,11 @@
|
|
395
397
|
create:
|
396
398
|
flashes:
|
397
399
|
success: "Gebruiker successvol aangemaakt."
|
398
|
-
error: "De gegevens van de gebruiker konden niet worden opgeslagen,
|
400
|
+
error: "De gegevens van de gebruiker konden niet worden opgeslagen, controleer uw invoer en probeer het opnieuw."
|
399
401
|
update:
|
400
402
|
flashes:
|
401
403
|
success: "Gegevens van gebruiker successvol gewijzigd."
|
402
|
-
error: "De gegevens van de gebruiker konden niet worden opgeslagen,
|
404
|
+
error: "De gegevens van de gebruiker konden niet worden opgeslagen, controleer uw invoer en probeer het opnieuw."
|
403
405
|
media_dir:
|
404
406
|
directories: "Mappen"
|
405
407
|
new: "Toevoegen"
|
@@ -409,9 +411,9 @@
|
|
409
411
|
update:
|
410
412
|
flashes:
|
411
413
|
success: "Bestand succesvol opgeslagen."
|
412
|
-
failed: "Bestand kon niet worden opgeslagen,
|
414
|
+
failed: "Bestand kon niet worden opgeslagen, controleer uw invoer en probeer het opnieuw."
|
413
415
|
index:
|
414
|
-
files_in: "Bestanden in {
|
416
|
+
files_in: "Bestanden in %{directory}"
|
415
417
|
new:
|
416
418
|
header: "Bestanden uploaden in"
|
417
419
|
no_files: "Nog geen bestanden gekozen"
|
@@ -434,7 +436,7 @@
|
|
434
436
|
variant_current_editor:
|
435
437
|
takeover:
|
436
438
|
dialog_title: "Bewerken overgenomen"
|
437
|
-
message: "{
|
439
|
+
message: "%{user} heeft het bewerken van dit artikel geforceerd overgenomen."
|
438
440
|
action_to_take: "Wat wilt u doen met uw wijzigingen?"
|
439
441
|
ignore_changes: "Mijn wijzigingen verwerpen."
|
440
442
|
save_as_new_variant: "Mijn wijzigingen opslaan in een nieuwe variant."
|
@@ -450,6 +452,8 @@
|
|
450
452
|
variants: "Varianten"
|
451
453
|
security: "Beveiliging"
|
452
454
|
page_fragments: "Fragmenten"
|
455
|
+
index:
|
456
|
+
blank: "Er zijn nog geen %{name} aanwezig."
|
453
457
|
tabs:
|
454
458
|
editor: "editor"
|
455
459
|
preview: "preview"
|
@@ -475,18 +479,18 @@
|
|
475
479
|
identical_published_variant: "Identiek aan publicatie:"
|
476
480
|
last_published: "Laatste publicatie:"
|
477
481
|
published_variant: "Gepubliceerde variant:"
|
478
|
-
number_of_publications: "Dit artikel is <strong
|
482
|
+
number_of_publications: "Dit artikel is <strong>%{count} keer</strong> gepubliceerd."
|
479
483
|
publication_history: "Publicatiegeschiedenis:"
|
480
484
|
publication_history_link: "Bekijk oudere publicaties"
|
481
485
|
confirm_delete_variant: "Weet u zeker dat u deze variant wilt verwijderen?"
|
482
486
|
confirm_delete: "Weet u zeker dat u dit hele artikel inclusief de publicatiegeschiedenis wilt verwijderen?"
|
483
|
-
currently_editing_since: "{
|
484
|
-
currently_editing_by: "Dit artikel wordt momenteel door {
|
487
|
+
currently_editing_since: "%{user} is %{duration} geleden (%{since}) begonnen met bewerken."
|
488
|
+
currently_editing_by: "Dit artikel wordt momenteel door %{user} bewerkt."
|
485
489
|
force_editing: "Wilt u dit artikel alsnog bewerken?"
|
486
490
|
update:
|
487
491
|
flashes:
|
488
492
|
success: "Artikel is succesvol opgeslagen"
|
489
|
-
error: "Artikel kon niet worden opgeslagen omdat een fout is opgetreden,
|
493
|
+
error: "Artikel kon niet worden opgeslagen omdat een fout is opgetreden, controleer uw invoer en probeer het opnieuw."
|
490
494
|
locked: "Artikel is geblokkeerd"
|
491
495
|
unlocked: "Artikel is niet meer geblokkeerd"
|
492
496
|
lock_failed: "Het blokkeren van het artikel is niet gelukt"
|
@@ -500,21 +504,21 @@
|
|
500
504
|
error_page_has_children: "Het artikel kan niet verwijderd worden, omdat het artikel nog artikelen onder zich bevat."
|
501
505
|
create:
|
502
506
|
flashes:
|
503
|
-
error: "Fout bij aanmaken van het nieuwe artikel {
|
507
|
+
error: "Fout bij aanmaken van het nieuwe artikel %{errors}"
|
504
508
|
page:
|
505
509
|
buttons:
|
506
510
|
delete_image: "delete_page"
|
507
511
|
delete_alt: "Verwijder pagina"
|
508
512
|
edit:
|
509
513
|
add_page_in: "Onder pagina"
|
510
|
-
number_of_publications: "Deze pagina is <strong
|
514
|
+
number_of_publications: "Deze pagina is <strong>%{count} keer</strong> gepubliceerd."
|
511
515
|
confirm_delete: "Weet u zeker dat u deze hele pagina inclusief de publicatiegeschiedenis wilt verwijderen?"
|
512
|
-
currently_editing_by: "Deze pagina wordt momenteel door {
|
516
|
+
currently_editing_by: "Deze pagina wordt momenteel door %{user} bewerkt."
|
513
517
|
force_editing: "Wilt u deze pagina alsnog bewerken?"
|
514
518
|
update:
|
515
519
|
flashes:
|
516
520
|
success: "Pagina is succesvol opgeslagen"
|
517
|
-
error: "Pagina kon niet worden opgeslagen omdat een fout is opgetreden,
|
521
|
+
error: "Pagina kon niet worden opgeslagen omdat een fout is opgetreden, controleer uw invoer en probeer het opnieuw."
|
518
522
|
locked: "Pagina is geblokkeerd"
|
519
523
|
unlocked: "Pagina is niet meer geblokkeerd"
|
520
524
|
lock_failed: "Het blokkeren van de pagina is niet gelukt"
|
@@ -528,16 +532,16 @@
|
|
528
532
|
error_page_has_children: "De pagina kan niet verwijderd worden, omdat de pagina nog pagina's onder zich bevat."
|
529
533
|
create:
|
530
534
|
flashes:
|
531
|
-
error: "Fout bij aanmaken van de nieuwe pagina {
|
535
|
+
error: "Fout bij aanmaken van de nieuwe pagina %{errors}"
|
532
536
|
section:
|
533
537
|
form:
|
534
|
-
will_be_destroyed: "{
|
538
|
+
will_be_destroyed: "%{section} wordt verwijderd bij opslaan."
|
535
539
|
delete: "X"
|
536
540
|
no_sectionable: "Help, ik heb geen Sectionable"
|
537
541
|
messages: "berichten"
|
538
542
|
link_section:
|
539
543
|
form:
|
540
|
-
will_be_destroyed: "Link {
|
544
|
+
will_be_destroyed: "Link %{link} wordt verwijderd bij opslaan"
|
541
545
|
delete: "X"
|
542
546
|
redirect_section:
|
543
547
|
form:
|
@@ -594,8 +598,12 @@
|
|
594
598
|
error: "De variant kon niet verwijderd worden."
|
595
599
|
error_variant_published: "De variant kan niet verwijderd worden omdat deze nog gepubliceerd is."
|
596
600
|
settings:
|
597
|
-
title: "{
|
601
|
+
title: "%{class} instellingen"
|
598
602
|
group_title: Instellingen
|
603
|
+
index:
|
604
|
+
blank:
|
605
|
+
title: "Geen instellingen"
|
606
|
+
content: "In deze implementatie zijn geen instellingen gedefiniëeerd."
|
599
607
|
update:
|
600
608
|
flashes:
|
601
609
|
success: De instellingen zijn opgeslagen.
|
@@ -611,15 +619,15 @@
|
|
611
619
|
url: "URL"
|
612
620
|
file:
|
613
621
|
dialog_title: "Kies bestand"
|
614
|
-
links_to: "{
|
622
|
+
links_to: "%{referable_title}"
|
615
623
|
nothing_selected: "Nog geen bestand gekozen"
|
616
624
|
page:
|
617
625
|
dialog_title: "Kies pagina"
|
618
|
-
links_to: "{
|
626
|
+
links_to: "%{referable_title}"
|
619
627
|
nothing_selected: "Nog geen pagina gekozen"
|
620
628
|
link:
|
621
629
|
dialog_title: "Kies link"
|
622
|
-
links_to: "Linkt naar: {
|
630
|
+
links_to: "Linkt naar: %{referable_title}"
|
623
631
|
nothing_selected: "Nog geen link gekozen"
|
624
632
|
title: "Tooltip"
|
625
633
|
target: "Openen in"
|
@@ -628,7 +636,7 @@
|
|
628
636
|
"-" : "Zelfde venster"
|
629
637
|
image:
|
630
638
|
dialog_title: "Kies afbeelding"
|
631
|
-
links_to: "Linkt naar: {
|
639
|
+
links_to: "Linkt naar: %{referable_title}"
|
632
640
|
nothing_selected: "Nog geen afbeelding gekozen"
|
633
641
|
alt: "Alt"
|
634
642
|
dimensions: "Afmetingen (BxH)"
|
@@ -646,49 +654,49 @@
|
|
646
654
|
menu: Contentelementen
|
647
655
|
default_group: Contentelementen
|
648
656
|
breadcrumb_prefix: "Kruimelpad:"
|
649
|
-
add_a_new: Voeg {
|
650
|
-
add_more: Voeg meer {
|
657
|
+
add_a_new: Voeg %{class} toe
|
658
|
+
add_more: Voeg meer %{class} toe
|
651
659
|
pagination:
|
652
|
-
number_of: "Aantal {
|
660
|
+
number_of: "Aantal %{class}:"
|
653
661
|
pages: "Pagina's:"
|
654
662
|
next: "Volgende »"
|
655
663
|
previous: "Vorige »"
|
656
664
|
editors:
|
657
665
|
checkable_list:
|
658
|
-
blank: "Er zijn nog geen {
|
666
|
+
blank: "Er zijn nog geen %{class}."
|
659
667
|
file:
|
660
668
|
no_file_selected: Geen bestand geselecteerd
|
661
669
|
cancel_selection: Bestand selecteren afbreken
|
662
670
|
display:
|
663
671
|
empty: Leeg
|
664
672
|
joinable_list:
|
665
|
-
adding: "{
|
666
|
-
add_to: "toevoegen aan {
|
673
|
+
adding: "%{class} wordt toegevoegd..."
|
674
|
+
add_to: "toevoegen aan %{class}"
|
667
675
|
flashes:
|
668
676
|
invalid_record: Not good - ActiveRecord::RecordInvalid
|
669
|
-
successfully_saved: De/het {
|
670
|
-
validation_error: De/het {
|
671
|
-
successfully_deleted: De/het {
|
672
|
-
fail_deleted: De/het {
|
677
|
+
successfully_saved: De/het %{class} is opgeslagen
|
678
|
+
validation_error: De/het %{class} kon niet worden opgeslagen. Controleer uw invoer hieronder en probeer het opnieuw.
|
679
|
+
successfully_deleted: De/het %{class} is verwijderd
|
680
|
+
fail_deleted: De/het %{class} kon niet worden verwijderd
|
673
681
|
version_conflict: >
|
674
|
-
<strong>Let op!</strong> Deze versie ({
|
675
|
-
gemaakt door <em
|
676
|
-
alvorens deze op te slaan. {
|
682
|
+
<strong>Let op!</strong> Deze versie (%{your_version}) kon niet worden opgeslagen. Een nieuwere versie (%{current_version})
|
683
|
+
gemaakt door <em>%{current_author}</em> is beschikbaar. Vergelijk uw versie met de huidige versie
|
684
|
+
alvorens deze op te slaan. %{show_link}
|
677
685
|
successfully_imported: De import is succesvol verlopen
|
678
686
|
no_import_file_selected: Import is niet succesvol verlopen, er is geen XML bestand geupload
|
679
|
-
import_failed: "Import is niet succesvol verlopen, controleer het invoer XML bestand op: {
|
687
|
+
import_failed: "Import is niet succesvol verlopen, controleer het invoer XML bestand op: %{errors}"
|
680
688
|
index:
|
681
|
-
title: "{
|
689
|
+
title: "%{value} — Content"
|
682
690
|
intro: Aan de linkerkant vindt u alle mogelijke content-types. Kies een van de content-types om deze te bekijken, te bewerken of te verwijderen.
|
683
691
|
list:
|
684
692
|
info: "Gegevens"
|
685
|
-
confirm_deletion: Weet u zeker dat u deze {
|
693
|
+
confirm_deletion: Weet u zeker dat u deze %{class} wilt verwijderen?
|
686
694
|
up_one_level: ".. één niveau omhoog"
|
687
|
-
blank_slate: "Er zijn op het moment nog geen {
|
695
|
+
blank_slate: "Er zijn op het moment nog geen %{class}"
|
688
696
|
export: "Export »"
|
689
697
|
import: "Import »"
|
690
|
-
title: Content lijst — {
|
691
|
-
title_sublisting: Content lijst — {
|
698
|
+
title: Content lijst — %{class}
|
699
|
+
title_sublisting: Content lijst — %{group} voor %{title}
|
692
700
|
filter: Filter
|
693
701
|
filter_none: "-- geen filter --"
|
694
702
|
filter_apply: Filter toepassen
|
@@ -696,9 +704,9 @@
|
|
696
704
|
dialog_title: "Importeren"
|
697
705
|
choose_file: "Kies te importeren bestand (XML)"
|
698
706
|
create:
|
699
|
-
title: Aanmaken van {
|
707
|
+
title: Aanmaken van %{class}
|
700
708
|
edit:
|
701
|
-
title: "Bewerken van {
|
709
|
+
title: "Bewerken van %{class}: %{title}"
|
702
710
|
meta_information: Meta informatie
|
703
711
|
available_tags: "Beschikbare tags:"
|
704
712
|
available_tags_info: "(klik op een tag om deze te selecteren of deselecteren)"
|
@@ -707,16 +715,16 @@
|
|
707
715
|
publish: Publiceren
|
708
716
|
published: Gepubliceerd
|
709
717
|
publish_automatically_at: "Automatisch publiceren op:"
|
710
|
-
add_a_to_b: "{
|
718
|
+
add_a_to_b: "%{a} toevoegen aan %{b}"
|
711
719
|
add_multiple: Meerdere toevoegen (voorkomt sluiten van dit venster)
|
712
|
-
version_conflict: <strong>Attentie</strong> Opslaan overschrijft de wijzigingen gemaakt door {
|
713
|
-
see_changes_by: Klik hier om de wijzigingen van {
|
720
|
+
version_conflict: <strong>Attentie</strong> Opslaan overschrijft de wijzigingen gemaakt door %{current_author}
|
721
|
+
see_changes_by: Klik hier om de wijzigingen van %{current_author} te bekijken.
|
714
722
|
discard_changes: Mijn wijzigingen verwerpen
|
715
723
|
show:
|
716
|
-
title: "Tonen van {
|
724
|
+
title: "Tonen van %{class}: %{title}"
|
717
725
|
currently_viewing: >
|
718
|
-
<strong>Gentoond wordt </strong> versie {
|
719
|
-
door <em
|
726
|
+
<strong>Gentoond wordt </strong> versie %{current_version}
|
727
|
+
door <em>%{current_author}</em>.
|
720
728
|
error:
|
721
729
|
title: Dit content-type bestaat niet.
|
722
730
|
intro:
|
@@ -728,7 +736,39 @@
|
|
728
736
|
cancel: Afbreken,
|
729
737
|
close_window: Venster sluiten
|
730
738
|
loading: Een ogenblik geduld aub...
|
731
|
-
|
739
|
+
media:
|
740
|
+
dirs:
|
741
|
+
update:
|
742
|
+
flashes:
|
743
|
+
success: "Wijzigingen opgeslagen"
|
744
|
+
index:
|
745
|
+
directories: "Mappen"
|
746
|
+
show:
|
747
|
+
files_in: "Bestanden in %{directory}"
|
748
|
+
edit:
|
749
|
+
actions: "Actions"
|
750
|
+
edit: "Edit"
|
751
|
+
files:
|
752
|
+
new:
|
753
|
+
files: "bestanden"
|
754
|
+
no_files: "Geen bestand(en) geselecteerd"
|
755
|
+
file_progress: "Bezig met uploaden bestand <span class=\"current-file\">1</span> van <span class=\"total-files\">2</span>"
|
756
|
+
percentage_progress: "<span class=\"current-percentage\">20%</span> gereed (<span class=\"current-size\">20 kB</span> van in totaal <span class=\"total-size\">100 kB</span>)"
|
757
|
+
all_uploaded_message: "De volgende bestanden zijn geupload:"
|
758
|
+
some_uploaded_message: "Niet alle bestanden konden worden geupload:"
|
759
|
+
cancel: "Annuleren"
|
760
|
+
edit:
|
761
|
+
actions: "Actions"
|
762
|
+
preview: "Preview"
|
763
|
+
download: "Download"
|
764
|
+
size: "Afmeting (bxh)"
|
765
|
+
type: "Type"
|
766
|
+
filesize: "Afmeting (bxh)"
|
767
|
+
available_tags: "Beschikbare tags:"
|
768
|
+
metadata: "Gegevens"
|
769
|
+
destroy: "Verwijderen"
|
770
|
+
confirm_destroy: "Weet u zeker dat u %{name} wilt verwijderen?"
|
771
|
+
|
732
772
|
tinymce:
|
733
773
|
skyline_table: {
|
734
774
|
desc: "Nieuwe tabel invoegen",
|
data/config/routes.rb
CHANGED
@@ -1,50 +1,53 @@
|
|
1
1
|
ActionController::Routing::Routes.draw do |map|
|
2
|
-
|
2
|
+
|
3
3
|
# =================
|
4
4
|
# = Skyline url's =
|
5
5
|
# =================
|
6
|
-
map.namespace :skyline do |skyline|
|
7
|
-
|
6
|
+
map.namespace :skyline, :path_prefix => ("/#{Skyline::Configuration.url_prefix}" || "/skyline") do |skyline|
|
7
|
+
|
8
8
|
skyline.root :controller => "articles", :action => "index", :type => "skyline/page"
|
9
|
-
|
9
|
+
|
10
10
|
skyline.resources :articles, :collection => {:reorder => :put} do |page|
|
11
11
|
page.resources :article_versions
|
12
12
|
page.resources :variants, :member => {:force_edit => :put}
|
13
13
|
page.resources :publications, :member => {:rollback => :post}
|
14
14
|
page.resource :published_publication
|
15
15
|
end
|
16
|
-
|
16
|
+
|
17
17
|
# These are currently just used for polling
|
18
18
|
skyline.resources :variants do |variant|
|
19
19
|
variant.map "current_editor", :controller => "variant_current_editor", :action => "poll"
|
20
20
|
end
|
21
|
-
|
21
|
+
|
22
22
|
skyline.resource :authentication
|
23
23
|
skyline.resources :users
|
24
|
+
skyline.resources :user_preferences
|
24
25
|
|
26
|
+
|
25
27
|
skyline.resources :sections
|
26
28
|
skyline.resources :content_sections
|
27
29
|
skyline.resources :content_items
|
28
30
|
skyline.resources :link_section_links
|
29
31
|
skyline.resources :redirects, :only => [:new]
|
30
|
-
|
32
|
+
|
31
33
|
skyline.resources :locales, :only => [:show]
|
32
|
-
|
33
|
-
skyline.
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
34
|
+
|
35
|
+
skyline.namespace :media do |media|
|
36
|
+
media.resources :dirs do |dirs|
|
37
|
+
# Alert! Routes hard coded in app/views/skyline/media_files/_index.html.erb
|
38
|
+
dirs.resources :files
|
39
|
+
|
40
|
+
dirs.connect 'data/:size/:name.:format',
|
41
|
+
:controller => 'data',
|
42
|
+
:action => 'show',
|
43
|
+
:conditions => { :method => :get }
|
44
|
+
dirs.connect 'data/:name.:format',
|
45
|
+
:controller => 'data',
|
46
|
+
:action => 'show',
|
47
|
+
:conditions => { :method => :get }
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
48
51
|
skyline.namespace :browser do |browser|
|
49
52
|
browser.resources :images
|
50
53
|
browser.resources :links
|
@@ -56,9 +59,9 @@ ActionController::Routing::Routes.draw do |map|
|
|
56
59
|
media_dir.resources :media_files
|
57
60
|
end
|
58
61
|
end
|
59
|
-
end
|
62
|
+
end
|
60
63
|
end
|
61
|
-
|
64
|
+
|
62
65
|
skyline.namespace :content do |content|
|
63
66
|
content.namespace :editors do |editors|
|
64
67
|
editors.connect 'editable_list/:action/:id', :controller => "editable_list"
|
@@ -66,24 +69,25 @@ ActionController::Routing::Routes.draw do |map|
|
|
66
69
|
end
|
67
70
|
end
|
68
71
|
skyline.connect 'content/:action/*types', :controller => "content"
|
69
|
-
|
72
|
+
|
70
73
|
skyline.resources :settings, :except => [:create, :destroy]
|
71
|
-
|
74
|
+
|
72
75
|
end
|
73
|
-
|
76
|
+
|
74
77
|
# ========================
|
75
78
|
# = Implementation url's =
|
76
79
|
# ========================
|
77
80
|
#Media files data route
|
78
|
-
|
81
|
+
|
82
|
+
map.connect 'media/dirs/:media_dir_id/data/:size/:name.:format',
|
79
83
|
:controller => 'skyline/site/media_files_data',
|
80
84
|
:action => 'show',
|
81
85
|
:conditions => { :method => :get }
|
82
|
-
map.connect '
|
86
|
+
map.connect 'media/dirs/:media_dir_id/data/:name.:format',
|
83
87
|
:controller => 'skyline/site/media_files_data',
|
84
88
|
:action => 'show',
|
85
89
|
:conditions => { :method => :get }
|
86
|
-
|
90
|
+
|
87
91
|
# Default pages renderer.
|
88
92
|
# map.connect '*url', :controller => "skyline/site/pages", :action => "show"
|
89
|
-
end
|
93
|
+
end
|