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,8 +1,11 @@
|
|
1
1
|
/**
|
2
|
-
*
|
2
|
+
* editor_template_src.js
|
3
3
|
*
|
4
|
-
*
|
5
|
-
*
|
4
|
+
* Copyright 2009, Moxiecode Systems AB
|
5
|
+
* Released under LGPL License.
|
6
|
+
*
|
7
|
+
* License: http://tinymce.moxiecode.com/license
|
8
|
+
* Contributing: http://tinymce.moxiecode.com/contributing
|
6
9
|
*/
|
7
10
|
|
8
11
|
(function(tinymce) {
|
@@ -97,11 +100,8 @@
|
|
97
100
|
|
98
101
|
if (k == v && v >= 1 && v <= 7) {
|
99
102
|
k = v + ' (' + t.sizes[v - 1] + 'pt)';
|
100
|
-
|
101
|
-
|
102
|
-
cl = s.font_size_classes[v - 1];
|
103
|
-
v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt');
|
104
|
-
}
|
103
|
+
cl = s.font_size_classes[v - 1];
|
104
|
+
v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt');
|
105
105
|
}
|
106
106
|
|
107
107
|
if (/^\s*\./.test(v))
|
@@ -121,10 +121,11 @@
|
|
121
121
|
|
122
122
|
// Init editor
|
123
123
|
ed.onInit.add(function() {
|
124
|
-
ed.
|
124
|
+
if (!ed.settings.readonly)
|
125
|
+
ed.onNodeChange.add(t._nodeChanged, t);
|
125
126
|
|
126
127
|
if (ed.settings.content_css !== false)
|
127
|
-
ed.dom.loadCSS(ed.baseURI.toAbsolute("
|
128
|
+
ed.dom.loadCSS(ed.baseURI.toAbsolute(url + "/skins/" + ed.settings.skin + "/content.css"));
|
128
129
|
});
|
129
130
|
|
130
131
|
ed.onSetProgressState.add(function(ed, b, ti) {
|
@@ -194,36 +195,93 @@
|
|
194
195
|
},
|
195
196
|
|
196
197
|
_importClasses : function(e) {
|
197
|
-
var ed = this.editor,
|
198
|
+
var ed = this.editor, ctrl = ed.controlManager.get('styleselect');
|
199
|
+
|
200
|
+
if (ctrl.getLength() == 0) {
|
201
|
+
each(ed.dom.getClasses(), function(o, idx) {
|
202
|
+
var name = 'style_' + idx;
|
198
203
|
|
199
|
-
|
200
|
-
|
201
|
-
|
204
|
+
ed.formatter.register(name, {
|
205
|
+
inline : 'span',
|
206
|
+
attributes : {'class' : o['class']},
|
207
|
+
selector : '*'
|
208
|
+
});
|
209
|
+
|
210
|
+
ctrl.add(o['class'], name);
|
202
211
|
});
|
203
212
|
}
|
204
213
|
},
|
205
214
|
|
206
215
|
_createStyleSelect : function(n) {
|
207
|
-
var t = this, ed = t.editor,
|
216
|
+
var t = this, ed = t.editor, ctrlMan = ed.controlManager, ctrl;
|
217
|
+
|
218
|
+
// Setup style select box
|
219
|
+
ctrl = ctrlMan.createListBox('styleselect', {
|
208
220
|
title : 'advanced.style_select',
|
209
|
-
onselect : function(
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
}
|
215
|
-
|
221
|
+
onselect : function(name) {
|
222
|
+
var matches, formatNames = [];
|
223
|
+
|
224
|
+
each(ctrl.items, function(item) {
|
225
|
+
formatNames.push(item.value);
|
226
|
+
});
|
227
|
+
|
228
|
+
ed.focus();
|
229
|
+
ed.undoManager.add();
|
230
|
+
|
231
|
+
// Toggle off the current format
|
232
|
+
matches = ed.formatter.matchAll(formatNames);
|
233
|
+
if (!name || matches[0] == name)
|
234
|
+
ed.formatter.remove(matches[0]);
|
235
|
+
else
|
236
|
+
ed.formatter.apply(name);
|
237
|
+
|
238
|
+
ed.undoManager.add();
|
239
|
+
ed.nodeChanged();
|
240
|
+
|
241
|
+
return false; // No auto select
|
216
242
|
}
|
217
243
|
});
|
218
244
|
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
c.add(t.editor.translate(k), v);
|
223
|
-
});
|
245
|
+
// Handle specified format
|
246
|
+
ed.onInit.add(function() {
|
247
|
+
var counter = 0, formats = ed.getParam('style_formats');
|
224
248
|
|
225
|
-
|
226
|
-
|
249
|
+
if (formats) {
|
250
|
+
each(formats, function(fmt) {
|
251
|
+
var name, keys = 0;
|
252
|
+
|
253
|
+
each(fmt, function() {keys++;});
|
254
|
+
|
255
|
+
if (keys > 1) {
|
256
|
+
name = fmt.name = fmt.name || 'style_' + (counter++);
|
257
|
+
ed.formatter.register(name, fmt);
|
258
|
+
ctrl.add(fmt.title, name);
|
259
|
+
} else
|
260
|
+
ctrl.add(fmt.title);
|
261
|
+
});
|
262
|
+
} else {
|
263
|
+
each(ed.getParam('theme_advanced_styles', '', 'hash'), function(val, key) {
|
264
|
+
var name;
|
265
|
+
|
266
|
+
if (val) {
|
267
|
+
name = 'style_' + (counter++);
|
268
|
+
|
269
|
+
ed.formatter.register(name, {
|
270
|
+
inline : 'span',
|
271
|
+
classes : val,
|
272
|
+
selector : '*'
|
273
|
+
});
|
274
|
+
|
275
|
+
ctrl.add(t.editor.translate(key), name);
|
276
|
+
}
|
277
|
+
});
|
278
|
+
}
|
279
|
+
});
|
280
|
+
|
281
|
+
// Auto import classes if the ctrl box is empty
|
282
|
+
if (ctrl.getLength() == 0) {
|
283
|
+
ctrl.onPostRender.add(function(ed, n) {
|
284
|
+
if (!ctrl.NativeListBox) {
|
227
285
|
Event.add(n.id + '_text', 'focus', t._importClasses, t);
|
228
286
|
Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
|
229
287
|
Event.add(n.id + '_open', 'focus', t._importClasses, t);
|
@@ -233,13 +291,33 @@
|
|
233
291
|
});
|
234
292
|
}
|
235
293
|
|
236
|
-
return
|
294
|
+
return ctrl;
|
237
295
|
},
|
238
296
|
|
239
297
|
_createFontSelect : function() {
|
240
298
|
var c, t = this, ed = t.editor;
|
241
299
|
|
242
|
-
c = ed.controlManager.createListBox('fontselect', {
|
300
|
+
c = ed.controlManager.createListBox('fontselect', {
|
301
|
+
title : 'advanced.fontdefault',
|
302
|
+
onselect : function(v) {
|
303
|
+
var cur = c.items[c.selectedIndex];
|
304
|
+
|
305
|
+
if (!v && cur) {
|
306
|
+
ed.execCommand('FontName', false, cur.value);
|
307
|
+
return;
|
308
|
+
}
|
309
|
+
|
310
|
+
ed.execCommand('FontName', false, v);
|
311
|
+
|
312
|
+
// Fake selection, execCommand will fire a nodeChange and update the selection
|
313
|
+
c.select(function(sv) {
|
314
|
+
return v == sv;
|
315
|
+
});
|
316
|
+
|
317
|
+
return false; // No auto select
|
318
|
+
}
|
319
|
+
});
|
320
|
+
|
243
321
|
if (c) {
|
244
322
|
each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {
|
245
323
|
c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});
|
@@ -253,16 +331,37 @@
|
|
253
331
|
var t = this, ed = t.editor, c, i = 0, cl = [];
|
254
332
|
|
255
333
|
c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
334
|
+
var cur = c.items[c.selectedIndex];
|
335
|
+
|
336
|
+
if (!v && cur) {
|
337
|
+
cur = cur.value;
|
338
|
+
|
339
|
+
if (cur['class']) {
|
340
|
+
ed.formatter.toggle('fontsize_class', {value : cur['class']});
|
341
|
+
ed.undoManager.add();
|
342
|
+
ed.nodeChanged();
|
343
|
+
} else {
|
344
|
+
ed.execCommand('FontSize', false, cur.fontSize);
|
345
|
+
}
|
263
346
|
|
264
|
-
|
347
|
+
return;
|
265
348
|
}
|
349
|
+
|
350
|
+
if (v['class']) {
|
351
|
+
ed.focus();
|
352
|
+
ed.undoManager.add();
|
353
|
+
ed.formatter.toggle('fontsize_class', {value : v['class']});
|
354
|
+
ed.undoManager.add();
|
355
|
+
ed.nodeChanged();
|
356
|
+
} else
|
357
|
+
ed.execCommand('FontSize', false, v.fontSize);
|
358
|
+
|
359
|
+
// Fake selection, execCommand will fire a nodeChange and update the selection
|
360
|
+
c.select(function(sv) {
|
361
|
+
return v == sv;
|
362
|
+
});
|
363
|
+
|
364
|
+
return false; // No auto select
|
266
365
|
}});
|
267
366
|
|
268
367
|
if (c) {
|
@@ -473,7 +572,7 @@
|
|
473
572
|
},
|
474
573
|
|
475
574
|
resizeTo : function(w, h) {
|
476
|
-
var ed = this.editor, s =
|
575
|
+
var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');
|
477
576
|
|
478
577
|
// Boundery fix box
|
479
578
|
w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
|
@@ -481,12 +580,18 @@
|
|
481
580
|
w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
|
482
581
|
h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
|
483
582
|
|
484
|
-
// Calc difference between iframe and container
|
485
|
-
dh = e.clientHeight - ifr.clientHeight;
|
486
|
-
|
487
583
|
// Resize iframe and container
|
488
|
-
DOM.setStyle(
|
489
|
-
DOM.
|
584
|
+
DOM.setStyle(e, 'height', '');
|
585
|
+
DOM.setStyle(ifr, 'height', h);
|
586
|
+
|
587
|
+
if (s.theme_advanced_resize_horizontal) {
|
588
|
+
DOM.setStyle(e, 'width', '');
|
589
|
+
DOM.setStyle(ifr, 'width', w);
|
590
|
+
|
591
|
+
// Make sure that the size is never smaller than the over all ui
|
592
|
+
if (w < e.clientWidth)
|
593
|
+
DOM.setStyle(ifr, 'width', e.clientWidth);
|
594
|
+
}
|
490
595
|
},
|
491
596
|
|
492
597
|
destroy : function() {
|
@@ -700,99 +805,53 @@
|
|
700
805
|
if (!o)
|
701
806
|
return;
|
702
807
|
|
703
|
-
|
704
|
-
c.style.width = Math.max(10, o.cw) + 'px';
|
705
|
-
|
706
|
-
c.style.height = Math.max(10, o.ch) + 'px';
|
707
|
-
DOM.get(ed.id + '_ifr').style.height = Math.max(10, parseInt(o.ch) + t.deltaHeight) + 'px';
|
808
|
+
t.resizeTo(o.cw, o.ch);
|
708
809
|
});
|
709
810
|
}
|
710
811
|
|
711
812
|
ed.onPostRender.add(function() {
|
712
813
|
Event.add(ed.id + '_resize', 'mousedown', function(e) {
|
713
|
-
var
|
714
|
-
|
715
|
-
|
716
|
-
c = DOM.get(ed.id + '_tbl');
|
717
|
-
w = c.clientWidth;
|
718
|
-
h = c.clientHeight;
|
719
|
-
|
720
|
-
miw = s.theme_advanced_resizing_min_width || 100;
|
721
|
-
mih = s.theme_advanced_resizing_min_height || 100;
|
722
|
-
maw = s.theme_advanced_resizing_max_width || 0xFFFF;
|
723
|
-
mah = s.theme_advanced_resizing_max_height || 0xFFFF;
|
724
|
-
|
725
|
-
// Setup placeholder
|
726
|
-
p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'});
|
727
|
-
DOM.setStyles(p, {width : w, height : h});
|
728
|
-
|
729
|
-
// Replace with placeholder
|
730
|
-
DOM.hide(c);
|
731
|
-
DOM.show(p);
|
732
|
-
|
733
|
-
// Create internal resize obj
|
734
|
-
r = {
|
735
|
-
x : e.screenX,
|
736
|
-
y : e.screenY,
|
737
|
-
w : w,
|
738
|
-
h : h,
|
739
|
-
dx : null,
|
740
|
-
dy : null
|
741
|
-
};
|
814
|
+
var mouseMoveHandler1, mouseMoveHandler2,
|
815
|
+
mouseUpHandler1, mouseUpHandler2,
|
816
|
+
startX, startY, startWidth, startHeight, width, height, ifrElm;
|
742
817
|
|
743
|
-
|
744
|
-
|
745
|
-
|
746
|
-
|
747
|
-
// Calc delta values
|
748
|
-
r.dx = e.screenX - r.x;
|
749
|
-
r.dy = e.screenY - r.y;
|
750
|
-
|
751
|
-
// Boundery fix box
|
752
|
-
w = Math.max(miw, r.w + r.dx);
|
753
|
-
h = Math.max(mih, r.h + r.dy);
|
754
|
-
w = Math.min(maw, w);
|
755
|
-
h = Math.min(mah, h);
|
756
|
-
|
757
|
-
// Resize placeholder
|
758
|
-
if (s.theme_advanced_resize_horizontal)
|
759
|
-
p.style.width = w + 'px';
|
760
|
-
|
761
|
-
p.style.height = h + 'px';
|
762
|
-
|
763
|
-
return Event.cancel(e);
|
764
|
-
});
|
818
|
+
function resizeOnMove(e) {
|
819
|
+
width = startWidth + (e.screenX - startX);
|
820
|
+
height = startHeight + (e.screenY - startY);
|
765
821
|
|
766
|
-
|
767
|
-
|
822
|
+
t.resizeTo(width, height);
|
823
|
+
};
|
768
824
|
|
825
|
+
function endResize(e) {
|
769
826
|
// Stop listening
|
770
|
-
Event.remove(DOM.doc, 'mousemove',
|
771
|
-
Event.remove(
|
772
|
-
|
773
|
-
|
774
|
-
DOM.remove(p);
|
775
|
-
|
776
|
-
if (r.dx === null)
|
777
|
-
return;
|
778
|
-
|
779
|
-
ifr = DOM.get(ed.id + '_ifr');
|
780
|
-
|
781
|
-
if (s.theme_advanced_resize_horizontal)
|
782
|
-
c.style.width = Math.max(10, r.w + r.dx) + 'px';
|
783
|
-
|
784
|
-
c.style.height = Math.max(10, r.h + r.dy) + 'px';
|
785
|
-
ifr.style.height = Math.max(10, ifr.clientHeight + r.dy) + 'px';
|
827
|
+
Event.remove(DOM.doc, 'mousemove', mouseMoveHandler1);
|
828
|
+
Event.remove(ed.getDoc(), 'mousemove', mouseMoveHandler2);
|
829
|
+
Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);
|
830
|
+
Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);
|
786
831
|
|
832
|
+
// Store away the size
|
787
833
|
if (s.theme_advanced_resizing_use_cookie) {
|
788
834
|
Cookie.setHash("TinyMCE_" + ed.id + "_size", {
|
789
|
-
cw :
|
790
|
-
ch :
|
835
|
+
cw : width,
|
836
|
+
ch : height
|
791
837
|
});
|
792
838
|
}
|
793
|
-
}
|
839
|
+
};
|
840
|
+
|
841
|
+
e.preventDefault();
|
842
|
+
|
843
|
+
// Get the current rect size
|
844
|
+
startX = e.screenX;
|
845
|
+
startY = e.screenY;
|
846
|
+
ifrElm = DOM.get(t.editor.id + '_ifr');
|
847
|
+
startWidth = width = ifrElm.clientWidth;
|
848
|
+
startHeight = height = ifrElm.clientHeight;
|
794
849
|
|
795
|
-
|
850
|
+
// Register envent handlers
|
851
|
+
mouseMoveHandler1 = Event.add(DOM.doc, 'mousemove', resizeOnMove);
|
852
|
+
mouseMoveHandler2 = Event.add(ed.getDoc(), 'mousemove', resizeOnMove);
|
853
|
+
mouseUpHandler1 = Event.add(DOM.doc, 'mouseup', endResize);
|
854
|
+
mouseUpHandler2 = Event.add(ed.getDoc(), 'mouseup', endResize);
|
796
855
|
});
|
797
856
|
});
|
798
857
|
}
|
@@ -801,22 +860,34 @@
|
|
801
860
|
n = tb = null;
|
802
861
|
},
|
803
862
|
|
804
|
-
_nodeChanged : function(ed, cm, n, co) {
|
805
|
-
var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn;
|
806
|
-
|
807
|
-
if (s.readonly)
|
808
|
-
return;
|
863
|
+
_nodeChanged : function(ed, cm, n, co, ob) {
|
864
|
+
var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, formatNames, matches;
|
809
865
|
|
810
866
|
tinymce.each(t.stateControls, function(c) {
|
811
867
|
cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
|
812
868
|
});
|
813
869
|
|
870
|
+
function getParent(name) {
|
871
|
+
var i, parents = ob.parents, func = name;
|
872
|
+
|
873
|
+
if (typeof(name) == 'string') {
|
874
|
+
func = function(node) {
|
875
|
+
return node.nodeName == name;
|
876
|
+
};
|
877
|
+
}
|
878
|
+
|
879
|
+
for (i = 0; i < parents.length; i++) {
|
880
|
+
if (func(parents[i]))
|
881
|
+
return parents[i];
|
882
|
+
}
|
883
|
+
};
|
884
|
+
|
814
885
|
cm.setActive('visualaid', ed.hasVisual);
|
815
886
|
cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
|
816
887
|
cm.setDisabled('redo', !ed.undoManager.hasRedo());
|
817
888
|
cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
|
818
889
|
|
819
|
-
p =
|
890
|
+
p = getParent('A');
|
820
891
|
if (c = cm.get('link')) {
|
821
892
|
if (!p || !p.name) {
|
822
893
|
c.setDisabled(!p && co);
|
@@ -831,82 +902,78 @@
|
|
831
902
|
|
832
903
|
if (c = cm.get('anchor')) {
|
833
904
|
c.setActive(!!p && p.name);
|
834
|
-
|
835
|
-
if (tinymce.isWebKit) {
|
836
|
-
p = DOM.getParent(n, 'IMG');
|
837
|
-
c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
|
838
|
-
}
|
839
905
|
}
|
840
906
|
|
841
|
-
p =
|
907
|
+
p = getParent('IMG');
|
842
908
|
if (c = cm.get('image'))
|
843
909
|
c.setActive(!!p && n.className.indexOf('mceItem') == -1);
|
844
910
|
|
845
911
|
if (c = cm.get('styleselect')) {
|
846
|
-
|
847
|
-
|
848
|
-
|
849
|
-
|
850
|
-
|
912
|
+
t._importClasses();
|
913
|
+
|
914
|
+
formatNames = [];
|
915
|
+
each(c.items, function(item) {
|
916
|
+
formatNames.push(item.value);
|
917
|
+
});
|
918
|
+
|
919
|
+
matches = ed.formatter.matchAll(formatNames);
|
920
|
+
c.select(matches[0]);
|
851
921
|
}
|
852
922
|
|
853
923
|
if (c = cm.get('formatselect')) {
|
854
|
-
p =
|
924
|
+
p = getParent(DOM.isBlock);
|
855
925
|
|
856
926
|
if (p)
|
857
927
|
c.select(p.nodeName.toLowerCase());
|
858
928
|
}
|
859
929
|
|
860
|
-
|
861
|
-
|
862
|
-
|
863
|
-
|
864
|
-
|
930
|
+
// Find out current fontSize, fontFamily and fontClass
|
931
|
+
getParent(function(n) {
|
932
|
+
if (n.nodeName === 'SPAN') {
|
933
|
+
if (!cl && n.className)
|
934
|
+
cl = n.className;
|
865
935
|
|
866
|
-
|
867
|
-
|
936
|
+
if (!fz && n.style.fontSize)
|
937
|
+
fz = n.style.fontSize;
|
868
938
|
|
869
|
-
|
870
|
-
|
871
|
-
|
939
|
+
if (!fn && n.style.fontFamily)
|
940
|
+
fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
|
941
|
+
}
|
872
942
|
|
873
|
-
|
943
|
+
return false;
|
944
|
+
});
|
945
|
+
|
946
|
+
if (c = cm.get('fontselect')) {
|
947
|
+
c.select(function(v) {
|
948
|
+
return v.replace(/^([^,]+).*/, '$1').toLowerCase() == fn;
|
874
949
|
});
|
950
|
+
}
|
875
951
|
|
876
|
-
|
877
|
-
|
878
|
-
|
879
|
-
|
880
|
-
|
952
|
+
// Select font size
|
953
|
+
if (c = cm.get('fontsizeselect')) {
|
954
|
+
// Use computed style
|
955
|
+
if (s.theme_advanced_runtime_fontsize && !fz && !cl)
|
956
|
+
fz = ed.dom.getStyle(n, 'fontSize', true);
|
881
957
|
|
882
|
-
|
883
|
-
|
884
|
-
|
885
|
-
return true;
|
958
|
+
c.select(function(v) {
|
959
|
+
if (v.fontSize && v.fontSize === fz)
|
960
|
+
return true;
|
886
961
|
|
887
|
-
|
888
|
-
|
889
|
-
|
890
|
-
}
|
891
|
-
} else {
|
892
|
-
if (c = cm.get('fontselect'))
|
893
|
-
c.select(ed.queryCommandValue('FontName'));
|
894
|
-
|
895
|
-
if (c = cm.get('fontsizeselect')) {
|
896
|
-
v = ed.queryCommandValue('FontSize');
|
897
|
-
c.select(function(iv) {
|
898
|
-
return iv.fontSize == v;
|
899
|
-
});
|
900
|
-
}
|
962
|
+
if (v['class'] && v['class'] === cl)
|
963
|
+
return true;
|
964
|
+
});
|
901
965
|
}
|
902
966
|
|
903
967
|
if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
|
904
968
|
p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
|
905
969
|
DOM.setHTML(p, '');
|
906
970
|
|
907
|
-
|
971
|
+
getParent(function(n) {
|
908
972
|
var na = n.nodeName.toLowerCase(), u, pi, ti = '';
|
909
973
|
|
974
|
+
/*if (n.getAttribute('_mce_bogus'))
|
975
|
+
return;
|
976
|
+
*/
|
910
977
|
// Ignore non element and hidden elements
|
911
978
|
if (n.nodeType != 1 || n.nodeName === 'BR' || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
|
912
979
|
return;
|
@@ -950,9 +1017,6 @@
|
|
950
1017
|
break;
|
951
1018
|
|
952
1019
|
case 'font':
|
953
|
-
if (s.convert_fonts_to_spans)
|
954
|
-
na = 'span';
|
955
|
-
|
956
1020
|
if (v = DOM.getAttrib(n, 'face'))
|
957
1021
|
ti += 'font: ' + v + ' ';
|
958
1022
|
|
@@ -975,9 +1039,9 @@
|
|
975
1039
|
ti += 'id: ' + v + ' ';
|
976
1040
|
|
977
1041
|
if (v = n.className) {
|
978
|
-
v = v.replace(
|
1042
|
+
v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '')
|
979
1043
|
|
980
|
-
if (v
|
1044
|
+
if (v) {
|
981
1045
|
ti += 'class: ' + v + ' ';
|
982
1046
|
|
983
1047
|
if (DOM.isBlock(n) || na == 'img' || na == 'span')
|
@@ -1013,7 +1077,7 @@
|
|
1013
1077
|
var ed = this.editor;
|
1014
1078
|
|
1015
1079
|
ed.windowManager.open({
|
1016
|
-
url :
|
1080
|
+
url : this.url + '/anchor.htm',
|
1017
1081
|
width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
|
1018
1082
|
height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
|
1019
1083
|
inline : true
|
@@ -1026,7 +1090,7 @@
|
|
1026
1090
|
var ed = this.editor;
|
1027
1091
|
|
1028
1092
|
ed.windowManager.open({
|
1029
|
-
url :
|
1093
|
+
url : this.url + '/charmap.htm',
|
1030
1094
|
width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
|
1031
1095
|
height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
|
1032
1096
|
inline : true
|
@@ -1039,7 +1103,7 @@
|
|
1039
1103
|
var ed = this.editor;
|
1040
1104
|
|
1041
1105
|
ed.windowManager.open({
|
1042
|
-
url :
|
1106
|
+
url : this.url + '/about.htm',
|
1043
1107
|
width : 480,
|
1044
1108
|
height : 380,
|
1045
1109
|
inline : true
|
@@ -1054,7 +1118,7 @@
|
|
1054
1118
|
v = v || {};
|
1055
1119
|
|
1056
1120
|
ed.windowManager.open({
|
1057
|
-
url :
|
1121
|
+
url : this.url + '/color_picker.htm',
|
1058
1122
|
width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
|
1059
1123
|
height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
|
1060
1124
|
close_previous : false,
|
@@ -1070,7 +1134,7 @@
|
|
1070
1134
|
var ed = this.editor;
|
1071
1135
|
|
1072
1136
|
ed.windowManager.open({
|
1073
|
-
url :
|
1137
|
+
url : this.url + '/source_editor.htm',
|
1074
1138
|
width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
|
1075
1139
|
height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
|
1076
1140
|
inline : true,
|
@@ -1089,7 +1153,7 @@
|
|
1089
1153
|
return;
|
1090
1154
|
|
1091
1155
|
ed.windowManager.open({
|
1092
|
-
url :
|
1156
|
+
url : this.url + '/image.htm',
|
1093
1157
|
width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
|
1094
1158
|
height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
|
1095
1159
|
inline : true
|
@@ -1102,7 +1166,7 @@
|
|
1102
1166
|
var ed = this.editor;
|
1103
1167
|
|
1104
1168
|
ed.windowManager.open({
|
1105
|
-
url :
|
1169
|
+
url : this.url + '/link.htm',
|
1106
1170
|
width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
|
1107
1171
|
height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
|
1108
1172
|
inline : true
|
@@ -72,13 +72,8 @@
|
|
72
72
|
</div>
|
73
73
|
|
74
74
|
<div class="mceActionPanel">
|
75
|
-
<
|
76
|
-
|
77
|
-
</div>
|
78
|
-
|
79
|
-
<div style="float: right">
|
80
|
-
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
|
81
|
-
</div>
|
75
|
+
<input type="submit" id="insert" name="insert" value="{#insert}" />
|
76
|
+
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
|
82
77
|
</div>
|
83
78
|
</form>
|
84
79
|
</body>
|