alchemy_cms 2.1.beta1 → 2.1.beta5
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +2 -1
- data/.rspec +2 -2
- data/.travis.yml +2 -1
- data/Gemfile +8 -9
- data/README.md +10 -10
- data/Rakefile +0 -1
- data/alchemy_cms.gemspec +7 -9
- data/app/assets/images/alchemy/icons.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js +8 -2
- data/app/assets/javascripts/alchemy/{alchemy.dragndrop.js → alchemy.dragndrop.js.erb} +3 -3
- data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.growler.js +3 -3
- data/app/assets/javascripts/alchemy/alchemy.js +10 -15
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js +6 -2
- data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.preview.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.routes.js.erb +38 -0
- data/app/assets/javascripts/alchemy/alchemy.swf_upload.js +360 -0
- data/app/assets/javascripts/alchemy/alchemy.windows.js +32 -17
- data/app/assets/javascripts/alchemy/preview.js +1 -0
- data/{vendor → app}/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +0 -0
- data/{vendor → app}/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/de.js +0 -0
- data/{vendor → app}/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/en.js +0 -0
- data/{vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.erb → app/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss} +15 -33
- data/app/assets/stylesheets/alchemy/_defaults.scss +4 -16
- data/app/assets/stylesheets/alchemy/alchemy.css +2 -2
- data/app/assets/stylesheets/alchemy/base.css.scss +161 -205
- data/app/assets/stylesheets/alchemy/elements.css.scss +15 -8
- data/app/assets/stylesheets/alchemy/{jquery-ui.alchemy.css → jquery-ui.alchemy.css.scss} +41 -45
- data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +14 -10
- data/app/assets/stylesheets/alchemy/{tinymce_content.css → tinymce_content.css.scss} +7 -6
- data/app/assets/stylesheets/alchemy/{tinymce_dialog.css → tinymce_dialog.css.scss} +7 -7
- data/app/controllers/alchemy/admin/attachments_controller.rb +131 -0
- data/app/controllers/alchemy/admin/base_controller.rb +118 -0
- data/app/controllers/alchemy/admin/clipboard_controller.rb +46 -0
- data/app/controllers/alchemy/admin/contents_controller.rb +55 -0
- data/app/controllers/alchemy/admin/dashboard_controller.rb +15 -0
- data/app/controllers/alchemy/admin/elements_controller.rb +123 -0
- data/app/controllers/alchemy/admin/essence_audios_controller.rb +12 -0
- data/app/controllers/alchemy/admin/essence_files_controller.rb +27 -0
- data/app/controllers/alchemy/admin/essence_flashes_controller.rb +12 -0
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +91 -0
- data/app/controllers/alchemy/admin/essence_videos_controller.rb +12 -0
- data/app/controllers/alchemy/admin/languages_controller.rb +7 -0
- data/app/controllers/alchemy/admin/layoutpages_controller.rb +13 -0
- data/app/controllers/alchemy/admin/pages_controller.rb +253 -0
- data/app/controllers/alchemy/admin/pictures_controller.rb +139 -0
- data/app/controllers/alchemy/admin/resources_controller.rb +132 -0
- data/app/controllers/alchemy/admin/trash_controller.rb +24 -0
- data/app/controllers/alchemy/admin/users_controller.rb +81 -0
- data/app/controllers/alchemy/attachments_controller.rb +30 -0
- data/app/controllers/alchemy/base_controller.rb +137 -0
- data/app/controllers/alchemy/elements_controller.rb +18 -0
- data/app/controllers/alchemy/messages_controller.rb +115 -0
- data/app/controllers/alchemy/pages_controller.rb +169 -0
- data/app/controllers/alchemy/pictures_controller.rb +62 -0
- data/app/controllers/alchemy/user_sessions_controller.rb +80 -0
- data/app/helpers/alchemy/admin/attachments_helper.rb +11 -0
- data/app/helpers/alchemy/admin/base_helper.rb +423 -0
- data/app/helpers/alchemy/admin/contents_helper.rb +75 -0
- data/app/helpers/alchemy/admin/elements_helper.rb +118 -0
- data/app/helpers/alchemy/admin/essences_helper.rb +78 -0
- data/app/helpers/alchemy/admin/pages_helper.rb +46 -0
- data/app/helpers/alchemy/admin/pictures_helper.rb +30 -0
- data/app/helpers/alchemy/base_helper.rb +65 -0
- data/app/helpers/alchemy/elements_helper.rb +173 -0
- data/app/helpers/alchemy/essences_helper.rb +101 -0
- data/app/helpers/alchemy/pages_helper.rb +550 -0
- data/app/mailers/alchemy/messages.rb +17 -0
- data/app/mailers/alchemy/notifications.rb +25 -0
- data/app/models/alchemy.rb +7 -0
- data/app/models/alchemy/attachment.rb +82 -0
- data/app/models/alchemy/cell.rb +61 -0
- data/app/models/alchemy/content.rb +163 -0
- data/app/models/alchemy/element.rb +479 -0
- data/app/models/alchemy/essence_audio.rb +19 -0
- data/app/models/alchemy/essence_date.rb +22 -0
- data/app/models/alchemy/essence_file.rb +19 -0
- data/app/models/alchemy/essence_flash.rb +17 -0
- data/app/models/alchemy/essence_html.rb +21 -0
- data/app/models/alchemy/essence_picture.rb +29 -0
- data/app/models/alchemy/essence_richtext.rb +63 -0
- data/app/models/alchemy/essence_text.rb +40 -0
- data/app/models/alchemy/essence_video.rb +19 -0
- data/app/models/alchemy/folded_page.rb +5 -0
- data/app/models/alchemy/language.rb +90 -0
- data/app/models/alchemy/message.rb +71 -0
- data/app/models/alchemy/page.rb +548 -0
- data/app/models/alchemy/picture.rb +100 -0
- data/app/models/alchemy/user.rb +72 -0
- data/app/models/alchemy/user_session.rb +12 -0
- data/app/sweepers/alchemy/content_sweeper.rb +22 -0
- data/app/sweepers/alchemy/pages_sweeper.rb +49 -0
- data/app/sweepers/alchemy/pictures_sweeper.rb +23 -0
- data/app/views/{admin → alchemy/admin}/attachments/_archive_overlay.html.erb +6 -6
- data/app/views/{admin → alchemy/admin}/attachments/_attachment.html.erb +14 -14
- data/app/views/{admin → alchemy/admin}/attachments/_file_to_assign.html.erb +0 -0
- data/app/views/alchemy/admin/attachments/_files_list.html.erb +25 -0
- data/app/views/{admin → alchemy/admin}/attachments/create.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/attachments/destroy.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/attachments/edit.html.erb +2 -2
- data/app/views/alchemy/admin/attachments/index.html.erb +18 -0
- data/app/views/{admin → alchemy/admin}/attachments/new.html.erb +3 -3
- data/app/views/{admin → alchemy/admin}/clipboard/clear.js.erb +1 -1
- data/app/views/alchemy/admin/clipboard/index.html.erb +19 -0
- data/app/views/alchemy/admin/clipboard/insert.js.erb +14 -0
- data/app/views/alchemy/admin/clipboard/remove.js.erb +10 -0
- data/app/views/{admin → alchemy/admin}/contents/_missing.html.erb +4 -4
- data/app/views/{admin → alchemy/admin}/contents/create.js.erb +10 -10
- data/app/views/{admin → alchemy/admin}/contents/destroy.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/contents/new.html.erb +1 -1
- data/app/views/{admin → alchemy/admin}/contents/order.js.erb +0 -0
- data/app/views/alchemy/admin/dashboard/index.html.erb +96 -0
- data/app/views/{admin → alchemy/admin}/elements/_add_content.html.erb +2 -2
- data/app/views/{admin → alchemy/admin}/elements/_element.html.erb +3 -3
- data/app/views/{admin → alchemy/admin}/elements/_element_foot.html.erb +8 -8
- data/app/views/{admin → alchemy/admin}/elements/_element_head.html.erb +4 -4
- data/app/views/{admin → alchemy/admin}/elements/_elements_select.html.erb +2 -2
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +30 -0
- data/app/views/{admin → alchemy/admin}/elements/_picture_editor.html.erb +3 -3
- data/app/views/{admin → alchemy/admin}/elements/create.js.erb +2 -2
- data/app/views/{admin → alchemy/admin}/elements/destroy.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/elements/fold.js.erb +2 -2
- data/app/views/{admin → alchemy/admin}/elements/index.html.erb +1 -10
- data/app/views/{admin → alchemy/admin}/elements/list.js.erb +2 -2
- data/app/views/alchemy/admin/elements/new.html.erb +41 -0
- data/app/views/{admin → alchemy/admin}/elements/order.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/elements/trash.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/elements/update.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/essence_files/assign.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/essence_files/edit.html.erb +23 -23
- data/app/views/{admin → alchemy/admin}/essence_pictures/assign.js.erb +2 -2
- data/app/views/{admin → alchemy/admin}/essence_pictures/crop.html.erb +15 -6
- data/app/views/{admin → alchemy/admin}/essence_pictures/destroy.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/essence_pictures/edit.html.erb +11 -11
- data/app/views/{admin → alchemy/admin}/essence_pictures/save_link.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/essence_pictures/update.js.erb +2 -2
- data/app/views/alchemy/admin/languages/_language.html.erb +36 -0
- data/app/views/{admin → alchemy/admin}/layoutpages/_layoutpage.html.erb +18 -18
- data/app/views/alchemy/admin/layoutpages/index.html.erb +65 -0
- data/app/views/{admin → alchemy/admin}/pages/_contactform_links.html.erb +6 -6
- data/app/views/alchemy/admin/pages/_create_language_form.html.erb +38 -0
- data/app/views/{admin → alchemy/admin}/pages/_external_link.html.erb +9 -9
- data/app/views/{admin → alchemy/admin}/pages/_file_link.html.erb +13 -13
- data/app/views/{admin → alchemy/admin}/pages/_internal_link.html.erb +8 -8
- data/app/views/{admin → alchemy/admin}/pages/_new_page_form.html.erb +6 -6
- data/app/views/{admin → alchemy/admin}/pages/_page.html.erb +25 -25
- data/app/views/{admin → alchemy/admin}/pages/_page_for_links.html.erb +6 -6
- data/app/views/{admin → alchemy/admin}/pages/_page_infos.html.erb +3 -3
- data/app/views/{admin → alchemy/admin}/pages/_page_status.html.erb +4 -4
- data/app/views/{admin → alchemy/admin}/pages/_sitemap.html.erb +21 -21
- data/app/views/alchemy/admin/pages/configure.html.erb +71 -0
- data/app/views/{admin → alchemy/admin}/pages/configure_external.html.erb +9 -9
- data/app/views/{admin → alchemy/admin}/pages/destroy.js.erb +2 -2
- data/app/views/alchemy/admin/pages/edit.html.erb +181 -0
- data/app/views/alchemy/admin/pages/flush.js.erb +2 -0
- data/app/views/{admin → alchemy/admin}/pages/fold.js.erb +0 -0
- data/app/views/alchemy/admin/pages/index.html.erb +104 -0
- data/app/views/{admin → alchemy/admin}/pages/link.html.erb +4 -4
- data/app/views/alchemy/admin/pages/locked.html.erb +3 -0
- data/app/views/{admin → alchemy/admin}/pages/new.html.erb +8 -8
- data/app/views/{admin → alchemy/admin}/pages/show.html.erb +0 -0
- data/app/views/{admin → alchemy/admin}/pages/sort.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/pages/unlock.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/pages/update.js.erb +5 -5
- data/app/views/{admin → alchemy/admin}/partials/_flash.html.erb +0 -0
- data/app/views/{admin → alchemy/admin}/partials/_flash_notices.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +14 -0
- data/app/views/alchemy/admin/partials/_pagination_links.html.erb +5 -0
- data/app/views/{admin → alchemy/admin}/partials/_remote_pagination_links.html.erb +2 -2
- data/app/views/{admin → alchemy/admin}/partials/_remote_search_form.html.erb +2 -2
- data/app/views/{admin → alchemy/admin}/partials/_search_form.html.erb +6 -7
- data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb +8 -0
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +129 -0
- data/app/views/{admin → alchemy/admin}/pictures/_archive_overlay.html.erb +3 -3
- data/app/views/{admin → alchemy/admin}/pictures/_filter_and_size_bar.html.erb +15 -15
- data/app/views/{admin → alchemy/admin}/pictures/_picture.html.erb +7 -7
- data/app/views/{admin → alchemy/admin}/pictures/_picture_to_assign.html.erb +2 -2
- data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +14 -0
- data/app/views/{admin → alchemy/admin}/pictures/archive_overlay.js.erb +0 -0
- data/app/views/{admin → alchemy/admin}/pictures/create.js.erb +3 -3
- data/app/views/{admin → alchemy/admin}/pictures/flush.js.erb +0 -0
- data/app/views/alchemy/admin/pictures/index.html.erb +83 -0
- data/app/views/{admin → alchemy/admin}/pictures/new.html.erb +3 -3
- data/app/views/alchemy/admin/pictures/show_in_window.html.erb +1 -0
- data/app/views/{admin → alchemy/admin}/pictures/update.js.erb +0 -0
- data/app/views/alchemy/admin/resources/_form.html.erb +20 -0
- data/app/views/alchemy/admin/resources/_resource.html.erb +35 -0
- data/app/views/alchemy/admin/resources/_table.html.erb +23 -0
- data/app/views/alchemy/admin/resources/destroy.js.erb +1 -0
- data/app/views/{admin/languages → alchemy/admin/resources}/edit.html.erb +0 -0
- data/app/views/alchemy/admin/resources/index.html.erb +19 -0
- data/app/views/{admin/languages → alchemy/admin/resources}/new.html.erb +0 -0
- data/app/views/{admin → alchemy/admin}/trash/clear.js.erb +1 -1
- data/app/views/{admin → alchemy/admin}/trash/index.html.erb +4 -4
- data/app/views/alchemy/admin/users/_table.html.erb +54 -0
- data/app/views/{admin → alchemy/admin}/users/_user.html.erb +14 -12
- data/app/views/{admin → alchemy/admin}/users/edit.html.erb +0 -0
- data/app/views/alchemy/admin/users/index.html.erb +41 -0
- data/app/views/{admin → alchemy/admin}/users/new.html.erb +1 -1
- data/app/views/{attachments → alchemy/attachments}/show.html.erb +0 -0
- data/app/views/alchemy/base/500.html.erb +5 -0
- data/app/views/alchemy/base/error_notice.js.erb +2 -0
- data/app/views/alchemy/base/permission_denied.js.erb +2 -0
- data/app/views/alchemy/{redirect.js.erb → base/redirect.js.erb} +0 -0
- data/app/views/alchemy/{remote_errors.js.erb → base/remote_errors.js.erb} +0 -0
- data/app/views/alchemy/{update.js.erb → base/update.js.erb} +0 -0
- data/app/views/{elements → alchemy/elements}/_article_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_article_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_bild_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_bild_text_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_bild_text_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_bild_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_claim_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_claim_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_contactform_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_contactform_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_editor_not_found.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_footnote_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_footnote_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_header_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_header_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_headline_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_headline_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_image_mosaic_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_image_mosaic_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_intro_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_intro_image_text_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_intro_image_text_view.html.erb +1 -1
- data/app/views/{elements → alchemy/elements}/_intro_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_news_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_news_view.html.erb +0 -0
- data/app/views/alchemy/elements/_searchresult_editor.html.erb +1 -0
- data/app/views/alchemy/elements/_searchresult_view.html.erb +4 -0
- data/app/views/alchemy/elements/_sitemap_editor.html.erb +3 -0
- data/app/views/{elements → alchemy/elements}/_sitemap_view.html.erb +2 -2
- data/app/views/{elements → alchemy/elements}/_sitename_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_sitename_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_subheadline_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_subheadline_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_text_editor.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_text_view.html.erb +0 -0
- data/app/views/{elements → alchemy/elements}/_view_not_found.html.erb +0 -0
- data/app/views/alchemy/elements/show.html.erb +6 -0
- data/app/views/{elements → alchemy/elements}/show.js.erb +1 -1
- data/app/views/alchemy/essences/_essence_audio_editor.html.erb +1 -0
- data/app/views/{essences → alchemy/essences}/_essence_audio_view.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_date_editor.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_date_view.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_file_editor.html.erb +9 -9
- data/app/views/{essences → alchemy/essences}/_essence_file_view.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_flash_editor.html.erb +1 -0
- data/app/views/{essences → alchemy/essences}/_essence_flash_view.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_html_editor.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_html_view.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_picture_editor.html.erb +8 -8
- data/app/views/{essences → alchemy/essences}/_essence_picture_tools.html.erb +11 -11
- data/app/views/{essences → alchemy/essences}/_essence_picture_view.html.erb +2 -4
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +11 -0
- data/app/views/{essences → alchemy/essences}/_essence_richtext_view.html.erb +0 -0
- data/app/views/{essences → alchemy/essences}/_essence_text_editor.html.erb +6 -6
- data/app/views/{essences → alchemy/essences}/_essence_text_view.html.erb +0 -0
- data/app/views/alchemy/essences/_essence_video_editor.html.erb +1 -0
- data/app/views/{essences → alchemy/essences}/_essence_video_view.html.erb +1 -1
- data/app/views/{messages → alchemy/messages}/contact_form_mail.html.erb +0 -0
- data/app/views/{messages → alchemy/messages}/contact_form_mail.text.erb +0 -0
- data/app/views/{messages → alchemy/messages}/new.html.erb +0 -0
- data/app/views/{navigation → alchemy/navigation}/_image_link.html.erb +0 -0
- data/app/views/{navigation → alchemy/navigation}/_link.html.erb +1 -1
- data/app/views/{navigation → alchemy/navigation}/_renderer.html.erb +0 -0
- data/app/views/alchemy/notifications/admin_user_created.text.erb +13 -0
- data/app/views/alchemy/notifications/registered_user_created.text.erb +10 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_contact.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_external.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_intro.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_layout_footer.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_layout_header.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_news.html.erb +0 -0
- data/app/views/{_newsletter_layout.html.erb → alchemy/page_layouts/_newsletter_layout.html.erb} +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_search.html.erb +0 -0
- data/app/views/{page_layouts → alchemy/page_layouts}/_standard.html.erb +0 -0
- data/app/views/{pages → alchemy/pages}/show.html.erb +0 -0
- data/app/views/{pages → alchemy/pages}/show.rss.builder +0 -0
- data/app/views/{pages → alchemy/pages}/sitemap.xml.erb +0 -0
- data/app/views/{pictures → alchemy/pictures}/show.gif.flexi +0 -0
- data/app/views/{pictures → alchemy/pictures}/show.jpg.flexi +0 -0
- data/app/views/{pictures → alchemy/pictures}/show.png.flexi +0 -0
- data/app/views/{pictures → alchemy/pictures}/thumbnail.png.flexi +0 -0
- data/app/views/{pictures → alchemy/pictures}/zoom.png.flexi +0 -0
- data/app/views/alchemy/search/_result.html.erb +9 -0
- data/app/views/alchemy/user_sessions/leave.html.erb +11 -0
- data/app/views/alchemy/user_sessions/login.html.erb +47 -0
- data/app/views/alchemy/user_sessions/logout.html.erb +3 -0
- data/app/views/alchemy/user_sessions/signup.html.erb +14 -0
- data/app/views/layouts/{alchemy.html.erb → alchemy/admin.html.erb} +23 -17
- data/app/views/layouts/alchemy/login.html.erb +37 -0
- data/app/views/layouts/alchemy/pages.html.erb +29 -0
- data/app/views/layouts/{sitemap.xml.erb → alchemy/sitemap.xml.erb} +0 -0
- data/config/alchemy/config.yml +2 -80
- data/config/alchemy/modules.yml +70 -0
- data/config/alchemy/page_layouts.yml +2 -0
- data/config/authorization_rules.rb +32 -39
- data/config/locales/alchemy.de.yml +789 -0
- data/config/locales/alchemy.en.yml +587 -0
- data/config/routes.rb +144 -142
- data/db/migrate/20111116125112_namespace_models.rb +23 -0
- data/lib/alchemy/auth_engine.rb +7 -0
- data/lib/alchemy/capistrano.rb +4 -1
- data/lib/alchemy/engine.rb +39 -25
- data/lib/alchemy/essence.rb +5 -1
- data/lib/alchemy/i18n.rb +47 -0
- data/lib/alchemy/modules.rb +38 -0
- data/lib/alchemy/page_layout.rb +98 -56
- data/lib/alchemy/seeder.rb +60 -110
- data/lib/alchemy/tinymce.rb +2 -2
- data/lib/alchemy/version.rb +3 -3
- data/lib/alchemy_cms.rb +23 -23
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +1 -1
- data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +1 -1
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +2 -2
- data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -1
- data/lib/rails/generators/alchemy/plugin/plugin_generator.rb +0 -1
- data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +1 -1
- data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +34 -34
- data/lib/tasks/install.rake +2 -9
- data/lib/tasks/upgrade.rake +69 -208
- data/spec/controllers/admin/clipboard_controller_spec.rb +33 -35
- data/spec/controllers/admin/contents_controller_spec.rb +5 -5
- data/spec/controllers/admin/elements_controller_spec.rb +22 -0
- data/spec/controllers/admin/trash_controller_spec.rb +5 -5
- data/spec/controllers/base_controller_spec.rb +67 -0
- data/spec/controllers/pages_controller_spec.rb +6 -6
- data/spec/dummy/config/application.rb +1 -8
- data/spec/dummy/config/routes.rb +2 -57
- data/spec/dummy/db/schema.rb +27 -27
- data/spec/factories.rb +8 -8
- data/spec/helpers/{alchemy_helper_spec.rb → admin/base_helper_spec.rb} +8 -1
- data/spec/helpers/admin/contents_helper_spec.rb +25 -0
- data/spec/helpers/admin/elements_helper_spec.rb +31 -3
- data/spec/helpers/admin/essences_helper_spec.rb +27 -0
- data/spec/helpers/elements_helper_spec.rb +99 -21
- data/spec/helpers/essences_helper_spec.rb +1 -18
- data/spec/helpers/pages_helper_spec.rb +212 -26
- data/spec/integration/admin/pages_controller_spec.rb +56 -0
- data/spec/integration/navigation_spec.rb +1 -1
- data/spec/integration/pages_controller_spec.rb +85 -68
- data/spec/integration/security_spec.rb +49 -22
- data/spec/models/content_spec.rb +3 -3
- data/spec/models/element_spec.rb +19 -11
- data/spec/models/essence_richtext_spec.rb +2 -2
- data/spec/models/language_spec.rb +36 -7
- data/spec/models/page_spec.rb +57 -13
- data/spec/models/user_spec.rb +1 -1
- data/spec/page_layout_spec.rb +13 -3
- data/spec/routing_spec.rb +12 -8
- data/spec/spec_helper.rb +8 -9
- data/spec/support/controller_hacks.rb +37 -0
- data/vendor/assets/javascripts/swfupload/SWFObject License.txt +4 -0
- data/vendor/assets/javascripts/swfupload/swfupload.cookies.js +53 -0
- data/vendor/assets/javascripts/swfupload/swfupload.js +1 -1
- data/vendor/assets/javascripts/swfupload/{queue.js → swfupload.queue.js} +97 -97
- data/vendor/assets/javascripts/swfupload/swfupload.speed.js +342 -0
- data/vendor/assets/javascripts/swfupload/swfupload.swfobject.js +111 -0
- data/vendor/assets/javascripts/tiny_mce/license.txt +504 -504
- data/vendor/assets/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +110 -110
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +90 -0
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +387 -387
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +36 -36
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +51 -51
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +26 -26
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +21 -21
- data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +180 -180
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +16 -16
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +25 -25
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +13 -13
- data/vendor/assets/javascripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +319 -319
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +27 -27
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +237 -237
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +484 -450
- data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +32 -32
- data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +158 -158
- data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +188 -188
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +52 -52
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +26 -26
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +55 -51
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +74 -74
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +80 -80
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +73 -73
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +43 -43
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +363 -355
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +329 -329
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +251 -251
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +153 -153
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +56 -56
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +57 -57
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +47 -47
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +50 -50
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +117 -117
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +214 -214
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +48 -48
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +117 -117
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +217 -217
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +7 -7
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +5 -5
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +25 -25
- data/vendor/assets/javascripts/tiny_mce/tiny_mce.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +70 -70
- data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +210 -210
- data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +161 -161
- data/vendor/assets/javascripts/tiny_mce/utils/validate.js +252 -252
- metadata +432 -465
- data/app/controllers/admin/attachments_controller.rb +0 -136
- data/app/controllers/admin/clipboard_controller.rb +0 -43
- data/app/controllers/admin/contents_controller.rb +0 -60
- data/app/controllers/admin/elements_controller.rb +0 -134
- data/app/controllers/admin/essence_audios_controller.rb +0 -10
- data/app/controllers/admin/essence_files_controller.rb +0 -25
- data/app/controllers/admin/essence_flashes_controller.rb +0 -10
- data/app/controllers/admin/essence_pictures_controller.rb +0 -84
- data/app/controllers/admin/essence_videos_controller.rb +0 -10
- data/app/controllers/admin/languages_controller.rb +0 -64
- data/app/controllers/admin/layoutpages_controller.rb +0 -12
- data/app/controllers/admin/pages_controller.rb +0 -251
- data/app/controllers/admin/pictures_controller.rb +0 -143
- data/app/controllers/admin/trash_controller.rb +0 -28
- data/app/controllers/admin/users_controller.rb +0 -73
- data/app/controllers/admin_controller.rb +0 -76
- data/app/controllers/alchemy_controller.rb +0 -245
- data/app/controllers/attachments_controller.rb +0 -28
- data/app/controllers/elements_controller.rb +0 -16
- data/app/controllers/messages_controller.rb +0 -113
- data/app/controllers/pages_controller.rb +0 -150
- data/app/controllers/pictures_controller.rb +0 -63
- data/app/helpers/admin/attachments_helper.rb +0 -7
- data/app/helpers/admin/elements_helper.rb +0 -112
- data/app/helpers/admin/pages_helper.rb +0 -38
- data/app/helpers/admin/pictures_helper.rb +0 -26
- data/app/helpers/alchemy_helper.rb +0 -379
- data/app/helpers/contents_helper.rb +0 -69
- data/app/helpers/elements_helper.rb +0 -170
- data/app/helpers/essences_helper.rb +0 -167
- data/app/helpers/layout_helper.rb +0 -37
- data/app/helpers/pages_helper.rb +0 -503
- data/app/mailers/messages.rb +0 -15
- data/app/mailers/notifications.rb +0 -23
- data/app/models/attachment.rb +0 -80
- data/app/models/cell.rb +0 -59
- data/app/models/content.rb +0 -145
- data/app/models/element.rb +0 -476
- data/app/models/essence_audio.rb +0 -17
- data/app/models/essence_date.rb +0 -20
- data/app/models/essence_file.rb +0 -17
- data/app/models/essence_flash.rb +0 -15
- data/app/models/essence_html.rb +0 -19
- data/app/models/essence_picture.rb +0 -27
- data/app/models/essence_richtext.rb +0 -61
- data/app/models/essence_text.rb +0 -38
- data/app/models/essence_video.rb +0 -17
- data/app/models/folded_page.rb +0 -3
- data/app/models/language.rb +0 -83
- data/app/models/message.rb +0 -69
- data/app/models/page.rb +0 -545
- data/app/models/picture.rb +0 -98
- data/app/models/user.rb +0 -70
- data/app/models/user_session.rb +0 -10
- data/app/sweepers/content_sweeper.rb +0 -20
- data/app/sweepers/pages_sweeper.rb +0 -47
- data/app/sweepers/pictures_sweeper.rb +0 -21
- data/app/views/_contact.html.erb +0 -3
- data/app/views/_intro.html.erb +0 -3
- data/app/views/_news.html.erb +0 -3
- data/app/views/_search.html.erb +0 -3
- data/app/views/_standard.html.erb +0 -1
- data/app/views/admin/attachments/_files_list.html.erb +0 -24
- data/app/views/admin/attachments/index.html.erb +0 -30
- data/app/views/admin/clipboard/index.html.erb +0 -19
- data/app/views/admin/clipboard/insert.js.erb +0 -14
- data/app/views/admin/clipboard/remove.js.erb +0 -10
- data/app/views/admin/elements/_new_element_form.html.erb +0 -25
- data/app/views/admin/elements/new.html.erb +0 -33
- data/app/views/admin/index.html.erb +0 -102
- data/app/views/admin/infos.html.erb +0 -5
- data/app/views/admin/languages/_form.html.erb +0 -34
- data/app/views/admin/languages/_language.html.erb +0 -35
- data/app/views/admin/languages/destroy.js.erb +0 -1
- data/app/views/admin/languages/index.html.erb +0 -41
- data/app/views/admin/layoutpages/index.html.erb +0 -75
- data/app/views/admin/leave.html.erb +0 -11
- data/app/views/admin/login.html.erb +0 -46
- data/app/views/admin/logout.html.erb +0 -5
- data/app/views/admin/pages/_create_language_form.html.erb +0 -43
- data/app/views/admin/pages/configure.html.erb +0 -71
- data/app/views/admin/pages/edit.html.erb +0 -185
- data/app/views/admin/pages/flush.js.erb +0 -2
- data/app/views/admin/pages/index.html.erb +0 -108
- data/app/views/admin/pages/locked.html.erb +0 -3
- data/app/views/admin/partials/_mainnavigation_entry.html.erb +0 -27
- data/app/views/admin/partials/_pagination_links.html.erb +0 -5
- data/app/views/admin/partials/_per_page_links.html.erb +0 -17
- data/app/views/admin/partials/_sub_navigation.html.erb +0 -14
- data/app/views/admin/partials/_upload_form.html.erb +0 -119
- data/app/views/admin/pictures/_pictures_list.html.erb +0 -12
- data/app/views/admin/pictures/index.html.erb +0 -89
- data/app/views/admin/pictures/show_in_window.html.erb +0 -1
- data/app/views/admin/signup.html.erb +0 -16
- data/app/views/admin/users/_table.html.erb +0 -54
- data/app/views/admin/users/index.html.erb +0 -41
- data/app/views/alchemy/error_notice.js.erb +0 -1
- data/app/views/alchemy/permission_denied.js.erb +0 -2
- data/app/views/elements/_searchresult_editor.html.erb +0 -1
- data/app/views/elements/_searchresult_view.html.erb +0 -49
- data/app/views/elements/_sitemap_editor.html.erb +0 -3
- data/app/views/elements/show.html.erb +0 -6
- data/app/views/essences/_essence_audio_editor.html.erb +0 -1
- data/app/views/essences/_essence_flash_editor.html.erb +0 -1
- data/app/views/essences/_essence_richtext_editor.html.erb +0 -9
- data/app/views/essences/_essence_video_editor.html.erb +0 -1
- data/app/views/layouts/login.html.erb +0 -59
- data/app/views/layouts/pages.html.erb +0 -29
- data/app/views/notifications/admin_user_created.text.erb +0 -13
- data/app/views/notifications/registered_user_created.text.erb +0 -10
- data/app/views/page_layouts/_newsletter_layout.html.erb +0 -1
- data/config/initializers/authorization.rb +0 -4
- data/config/initializers/fast_gettext.rb +0 -3
- data/config/locales/de.yml +0 -377
- data/config/locales/en.yml +0 -371
- data/lib/alchemy/controller.rb +0 -79
- data/lib/rails/generators/alchemy/plugin/templates/gettext.rb +0 -2
- data/lib/tasks/gettext.rake +0 -120
- data/lib/translation_extras/alchemy_core_modules.rb +0 -11
- data/locale/alchemy.pot +0 -1749
- data/locale/de/alchemy.po +0 -1795
- data/locale/en/alchemy.po +0 -1745
- data/locale/missing_translations.rb +0 -4
- data/locale/model_attributes.rb +0 -56
- data/spec/helpers/contents_helper_spec.rb +0 -27
- data/vendor/assets/javascripts/jquery-1.6.2.min.js +0 -18
- data/vendor/assets/javascripts/jquery-ui-custom-1.8.16.min.js +0 -550
- data/vendor/assets/javascripts/swfupload/fileprogress.js +0 -203
- data/vendor/assets/javascripts/swfupload/handlers.js +0 -171
- data/vendor/assets/javascripts/tiny_mce/jquery.tinymce.js +0 -1
@@ -1,251 +1,251 @@
|
|
1
|
-
var ImageDialog = {
|
2
|
-
preInit : function() {
|
3
|
-
var url;
|
4
|
-
|
5
|
-
tinyMCEPopup.requireLangPack();
|
6
|
-
|
7
|
-
if (url = tinyMCEPopup.getParam("external_image_list_url"))
|
8
|
-
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
|
9
|
-
},
|
10
|
-
|
11
|
-
init : function() {
|
12
|
-
var f = document.forms[0], ed = tinyMCEPopup.editor;
|
13
|
-
|
14
|
-
// Setup browse button
|
15
|
-
document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
|
16
|
-
if (isVisible('srcbrowser'))
|
17
|
-
document.getElementById('src').style.width = '180px';
|
18
|
-
|
19
|
-
e = ed.selection.getNode();
|
20
|
-
|
21
|
-
this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));
|
22
|
-
|
23
|
-
if (e.nodeName == 'IMG') {
|
24
|
-
f.src.value = ed.dom.getAttrib(e, 'src');
|
25
|
-
f.alt.value = ed.dom.getAttrib(e, 'alt');
|
26
|
-
f.border.value = this.getAttrib(e, 'border');
|
27
|
-
f.vspace.value = this.getAttrib(e, 'vspace');
|
28
|
-
f.hspace.value = this.getAttrib(e, 'hspace');
|
29
|
-
f.width.value = ed.dom.getAttrib(e, 'width');
|
30
|
-
f.height.value = ed.dom.getAttrib(e, 'height');
|
31
|
-
f.insert.value = ed.getLang('update');
|
32
|
-
this.styleVal = ed.dom.getAttrib(e, 'style');
|
33
|
-
selectByValue(f, 'image_list', f.src.value);
|
34
|
-
selectByValue(f, 'align', this.getAttrib(e, 'align'));
|
35
|
-
this.updateStyle();
|
36
|
-
}
|
37
|
-
},
|
38
|
-
|
39
|
-
fillFileList : function(id, l) {
|
40
|
-
var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
|
41
|
-
|
42
|
-
l = typeof(l) === 'function' ? l() : window[l];
|
43
|
-
|
44
|
-
if (l && l.length > 0) {
|
45
|
-
lst.options[lst.options.length] = new Option('', '');
|
46
|
-
|
47
|
-
tinymce.each(l, function(o) {
|
48
|
-
lst.options[lst.options.length] = new Option(o[0], o[1]);
|
49
|
-
});
|
50
|
-
} else
|
51
|
-
dom.remove(dom.getParent(id, 'tr'));
|
52
|
-
},
|
53
|
-
|
54
|
-
update : function() {
|
55
|
-
var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
|
56
|
-
|
57
|
-
tinyMCEPopup.restoreSelection();
|
58
|
-
|
59
|
-
if (f.src.value === '') {
|
60
|
-
if (ed.selection.getNode().nodeName == 'IMG') {
|
61
|
-
ed.dom.remove(ed.selection.getNode());
|
62
|
-
ed.execCommand('mceRepaint');
|
63
|
-
}
|
64
|
-
|
65
|
-
tinyMCEPopup.close();
|
66
|
-
return;
|
67
|
-
}
|
68
|
-
|
69
|
-
if (!ed.settings.inline_styles) {
|
70
|
-
args = tinymce.extend(args, {
|
71
|
-
vspace : nl.vspace.value,
|
72
|
-
hspace : nl.hspace.value,
|
73
|
-
border : nl.border.value,
|
74
|
-
align : getSelectValue(f, 'align')
|
75
|
-
});
|
76
|
-
} else
|
77
|
-
args.style = this.styleVal;
|
78
|
-
|
79
|
-
tinymce.extend(args, {
|
80
|
-
src : f.src.value.replace(/ /g, '%20'),
|
81
|
-
alt : f.alt.value,
|
82
|
-
width : f.width.value,
|
83
|
-
height : f.height.value
|
84
|
-
});
|
85
|
-
|
86
|
-
el = ed.selection.getNode();
|
87
|
-
|
88
|
-
if (el && el.nodeName == 'IMG') {
|
89
|
-
ed.dom.setAttribs(el, args);
|
90
|
-
tinyMCEPopup.editor.execCommand('mceRepaint');
|
91
|
-
tinyMCEPopup.editor.focus();
|
92
|
-
} else {
|
93
|
-
tinymce.each(args, function(value, name) {
|
94
|
-
if (value === "") {
|
95
|
-
delete args[name];
|
96
|
-
}
|
97
|
-
});
|
98
|
-
|
99
|
-
ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});
|
100
|
-
ed.undoManager.add();
|
101
|
-
}
|
102
|
-
|
103
|
-
tinyMCEPopup.close();
|
104
|
-
},
|
105
|
-
|
106
|
-
updateStyle : function() {
|
107
|
-
var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
|
108
|
-
|
109
|
-
if (tinyMCEPopup.editor.settings.inline_styles) {
|
110
|
-
st = tinyMCEPopup.dom.parseStyle(this.styleVal);
|
111
|
-
|
112
|
-
// Handle align
|
113
|
-
v = getSelectValue(f, 'align');
|
114
|
-
if (v) {
|
115
|
-
if (v == 'left' || v == 'right') {
|
116
|
-
st['float'] = v;
|
117
|
-
delete st['vertical-align'];
|
118
|
-
} else {
|
119
|
-
st['vertical-align'] = v;
|
120
|
-
delete st['float'];
|
121
|
-
}
|
122
|
-
} else {
|
123
|
-
delete st['float'];
|
124
|
-
delete st['vertical-align'];
|
125
|
-
}
|
126
|
-
|
127
|
-
// Handle border
|
128
|
-
v = f.border.value;
|
129
|
-
if (v || v == '0') {
|
130
|
-
if (v == '0')
|
131
|
-
st['border'] = '0';
|
132
|
-
else
|
133
|
-
st['border'] = v + 'px solid black';
|
134
|
-
} else
|
135
|
-
delete st['border'];
|
136
|
-
|
137
|
-
// Handle hspace
|
138
|
-
v = f.hspace.value;
|
139
|
-
if (v) {
|
140
|
-
delete st['margin'];
|
141
|
-
st['margin-left'] = v + 'px';
|
142
|
-
st['margin-right'] = v + 'px';
|
143
|
-
} else {
|
144
|
-
delete st['margin-left'];
|
145
|
-
delete st['margin-right'];
|
146
|
-
}
|
147
|
-
|
148
|
-
// Handle vspace
|
149
|
-
v = f.vspace.value;
|
150
|
-
if (v) {
|
151
|
-
delete st['margin'];
|
152
|
-
st['margin-top'] = v + 'px';
|
153
|
-
st['margin-bottom'] = v + 'px';
|
154
|
-
} else {
|
155
|
-
delete st['margin-top'];
|
156
|
-
delete st['margin-bottom'];
|
157
|
-
}
|
158
|
-
|
159
|
-
// Merge
|
160
|
-
st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img');
|
161
|
-
this.styleVal = dom.serializeStyle(st, 'img');
|
162
|
-
}
|
163
|
-
},
|
164
|
-
|
165
|
-
getAttrib : function(e, at) {
|
166
|
-
var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
|
167
|
-
|
168
|
-
if (ed.settings.inline_styles) {
|
169
|
-
switch (at) {
|
170
|
-
case 'align':
|
171
|
-
if (v = dom.getStyle(e, 'float'))
|
172
|
-
return v;
|
173
|
-
|
174
|
-
if (v = dom.getStyle(e, 'vertical-align'))
|
175
|
-
return v;
|
176
|
-
|
177
|
-
break;
|
178
|
-
|
179
|
-
case 'hspace':
|
180
|
-
v = dom.getStyle(e, 'margin-left')
|
181
|
-
v2 = dom.getStyle(e, 'margin-right');
|
182
|
-
if (v && v == v2)
|
183
|
-
return parseInt(v.replace(/[^0-9]/g, ''));
|
184
|
-
|
185
|
-
break;
|
186
|
-
|
187
|
-
case 'vspace':
|
188
|
-
v = dom.getStyle(e, 'margin-top')
|
189
|
-
v2 = dom.getStyle(e, 'margin-bottom');
|
190
|
-
if (v && v == v2)
|
191
|
-
return parseInt(v.replace(/[^0-9]/g, ''));
|
192
|
-
|
193
|
-
break;
|
194
|
-
|
195
|
-
case 'border':
|
196
|
-
v = 0;
|
197
|
-
|
198
|
-
tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
|
199
|
-
sv = dom.getStyle(e, 'border-' + sv + '-width');
|
200
|
-
|
201
|
-
// False or not the same as prev
|
202
|
-
if (!sv || (sv != v && v !== 0)) {
|
203
|
-
v = 0;
|
204
|
-
return false;
|
205
|
-
}
|
206
|
-
|
207
|
-
if (sv)
|
208
|
-
v = sv;
|
209
|
-
});
|
210
|
-
|
211
|
-
if (v)
|
212
|
-
return parseInt(v.replace(/[^0-9]/g, ''));
|
213
|
-
|
214
|
-
break;
|
215
|
-
}
|
216
|
-
}
|
217
|
-
|
218
|
-
if (v = dom.getAttrib(e, at))
|
219
|
-
return v;
|
220
|
-
|
221
|
-
return '';
|
222
|
-
},
|
223
|
-
|
224
|
-
resetImageData : function() {
|
225
|
-
var f = document.forms[0];
|
226
|
-
|
227
|
-
f.width.value = f.height.value = "";
|
228
|
-
},
|
229
|
-
|
230
|
-
updateImageData : function() {
|
231
|
-
var f = document.forms[0], t = ImageDialog;
|
232
|
-
|
233
|
-
if (f.width.value == "")
|
234
|
-
f.width.value = t.preloadImg.width;
|
235
|
-
|
236
|
-
if (f.height.value == "")
|
237
|
-
f.height.value = t.preloadImg.height;
|
238
|
-
},
|
239
|
-
|
240
|
-
getImageData : function() {
|
241
|
-
var f = document.forms[0];
|
242
|
-
|
243
|
-
this.preloadImg = new Image();
|
244
|
-
this.preloadImg.onload = this.updateImageData;
|
245
|
-
this.preloadImg.onerror = this.resetImageData;
|
246
|
-
this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
|
247
|
-
}
|
248
|
-
};
|
249
|
-
|
250
|
-
ImageDialog.preInit();
|
251
|
-
tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
|
1
|
+
var ImageDialog = {
|
2
|
+
preInit : function() {
|
3
|
+
var url;
|
4
|
+
|
5
|
+
tinyMCEPopup.requireLangPack();
|
6
|
+
|
7
|
+
if (url = tinyMCEPopup.getParam("external_image_list_url"))
|
8
|
+
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
|
9
|
+
},
|
10
|
+
|
11
|
+
init : function() {
|
12
|
+
var f = document.forms[0], ed = tinyMCEPopup.editor;
|
13
|
+
|
14
|
+
// Setup browse button
|
15
|
+
document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
|
16
|
+
if (isVisible('srcbrowser'))
|
17
|
+
document.getElementById('src').style.width = '180px';
|
18
|
+
|
19
|
+
e = ed.selection.getNode();
|
20
|
+
|
21
|
+
this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));
|
22
|
+
|
23
|
+
if (e.nodeName == 'IMG') {
|
24
|
+
f.src.value = ed.dom.getAttrib(e, 'src');
|
25
|
+
f.alt.value = ed.dom.getAttrib(e, 'alt');
|
26
|
+
f.border.value = this.getAttrib(e, 'border');
|
27
|
+
f.vspace.value = this.getAttrib(e, 'vspace');
|
28
|
+
f.hspace.value = this.getAttrib(e, 'hspace');
|
29
|
+
f.width.value = ed.dom.getAttrib(e, 'width');
|
30
|
+
f.height.value = ed.dom.getAttrib(e, 'height');
|
31
|
+
f.insert.value = ed.getLang('update');
|
32
|
+
this.styleVal = ed.dom.getAttrib(e, 'style');
|
33
|
+
selectByValue(f, 'image_list', f.src.value);
|
34
|
+
selectByValue(f, 'align', this.getAttrib(e, 'align'));
|
35
|
+
this.updateStyle();
|
36
|
+
}
|
37
|
+
},
|
38
|
+
|
39
|
+
fillFileList : function(id, l) {
|
40
|
+
var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
|
41
|
+
|
42
|
+
l = typeof(l) === 'function' ? l() : window[l];
|
43
|
+
|
44
|
+
if (l && l.length > 0) {
|
45
|
+
lst.options[lst.options.length] = new Option('', '');
|
46
|
+
|
47
|
+
tinymce.each(l, function(o) {
|
48
|
+
lst.options[lst.options.length] = new Option(o[0], o[1]);
|
49
|
+
});
|
50
|
+
} else
|
51
|
+
dom.remove(dom.getParent(id, 'tr'));
|
52
|
+
},
|
53
|
+
|
54
|
+
update : function() {
|
55
|
+
var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
|
56
|
+
|
57
|
+
tinyMCEPopup.restoreSelection();
|
58
|
+
|
59
|
+
if (f.src.value === '') {
|
60
|
+
if (ed.selection.getNode().nodeName == 'IMG') {
|
61
|
+
ed.dom.remove(ed.selection.getNode());
|
62
|
+
ed.execCommand('mceRepaint');
|
63
|
+
}
|
64
|
+
|
65
|
+
tinyMCEPopup.close();
|
66
|
+
return;
|
67
|
+
}
|
68
|
+
|
69
|
+
if (!ed.settings.inline_styles) {
|
70
|
+
args = tinymce.extend(args, {
|
71
|
+
vspace : nl.vspace.value,
|
72
|
+
hspace : nl.hspace.value,
|
73
|
+
border : nl.border.value,
|
74
|
+
align : getSelectValue(f, 'align')
|
75
|
+
});
|
76
|
+
} else
|
77
|
+
args.style = this.styleVal;
|
78
|
+
|
79
|
+
tinymce.extend(args, {
|
80
|
+
src : f.src.value.replace(/ /g, '%20'),
|
81
|
+
alt : f.alt.value,
|
82
|
+
width : f.width.value,
|
83
|
+
height : f.height.value
|
84
|
+
});
|
85
|
+
|
86
|
+
el = ed.selection.getNode();
|
87
|
+
|
88
|
+
if (el && el.nodeName == 'IMG') {
|
89
|
+
ed.dom.setAttribs(el, args);
|
90
|
+
tinyMCEPopup.editor.execCommand('mceRepaint');
|
91
|
+
tinyMCEPopup.editor.focus();
|
92
|
+
} else {
|
93
|
+
tinymce.each(args, function(value, name) {
|
94
|
+
if (value === "") {
|
95
|
+
delete args[name];
|
96
|
+
}
|
97
|
+
});
|
98
|
+
|
99
|
+
ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});
|
100
|
+
ed.undoManager.add();
|
101
|
+
}
|
102
|
+
|
103
|
+
tinyMCEPopup.close();
|
104
|
+
},
|
105
|
+
|
106
|
+
updateStyle : function() {
|
107
|
+
var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
|
108
|
+
|
109
|
+
if (tinyMCEPopup.editor.settings.inline_styles) {
|
110
|
+
st = tinyMCEPopup.dom.parseStyle(this.styleVal);
|
111
|
+
|
112
|
+
// Handle align
|
113
|
+
v = getSelectValue(f, 'align');
|
114
|
+
if (v) {
|
115
|
+
if (v == 'left' || v == 'right') {
|
116
|
+
st['float'] = v;
|
117
|
+
delete st['vertical-align'];
|
118
|
+
} else {
|
119
|
+
st['vertical-align'] = v;
|
120
|
+
delete st['float'];
|
121
|
+
}
|
122
|
+
} else {
|
123
|
+
delete st['float'];
|
124
|
+
delete st['vertical-align'];
|
125
|
+
}
|
126
|
+
|
127
|
+
// Handle border
|
128
|
+
v = f.border.value;
|
129
|
+
if (v || v == '0') {
|
130
|
+
if (v == '0')
|
131
|
+
st['border'] = '0';
|
132
|
+
else
|
133
|
+
st['border'] = v + 'px solid black';
|
134
|
+
} else
|
135
|
+
delete st['border'];
|
136
|
+
|
137
|
+
// Handle hspace
|
138
|
+
v = f.hspace.value;
|
139
|
+
if (v) {
|
140
|
+
delete st['margin'];
|
141
|
+
st['margin-left'] = v + 'px';
|
142
|
+
st['margin-right'] = v + 'px';
|
143
|
+
} else {
|
144
|
+
delete st['margin-left'];
|
145
|
+
delete st['margin-right'];
|
146
|
+
}
|
147
|
+
|
148
|
+
// Handle vspace
|
149
|
+
v = f.vspace.value;
|
150
|
+
if (v) {
|
151
|
+
delete st['margin'];
|
152
|
+
st['margin-top'] = v + 'px';
|
153
|
+
st['margin-bottom'] = v + 'px';
|
154
|
+
} else {
|
155
|
+
delete st['margin-top'];
|
156
|
+
delete st['margin-bottom'];
|
157
|
+
}
|
158
|
+
|
159
|
+
// Merge
|
160
|
+
st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img');
|
161
|
+
this.styleVal = dom.serializeStyle(st, 'img');
|
162
|
+
}
|
163
|
+
},
|
164
|
+
|
165
|
+
getAttrib : function(e, at) {
|
166
|
+
var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
|
167
|
+
|
168
|
+
if (ed.settings.inline_styles) {
|
169
|
+
switch (at) {
|
170
|
+
case 'align':
|
171
|
+
if (v = dom.getStyle(e, 'float'))
|
172
|
+
return v;
|
173
|
+
|
174
|
+
if (v = dom.getStyle(e, 'vertical-align'))
|
175
|
+
return v;
|
176
|
+
|
177
|
+
break;
|
178
|
+
|
179
|
+
case 'hspace':
|
180
|
+
v = dom.getStyle(e, 'margin-left')
|
181
|
+
v2 = dom.getStyle(e, 'margin-right');
|
182
|
+
if (v && v == v2)
|
183
|
+
return parseInt(v.replace(/[^0-9]/g, ''));
|
184
|
+
|
185
|
+
break;
|
186
|
+
|
187
|
+
case 'vspace':
|
188
|
+
v = dom.getStyle(e, 'margin-top')
|
189
|
+
v2 = dom.getStyle(e, 'margin-bottom');
|
190
|
+
if (v && v == v2)
|
191
|
+
return parseInt(v.replace(/[^0-9]/g, ''));
|
192
|
+
|
193
|
+
break;
|
194
|
+
|
195
|
+
case 'border':
|
196
|
+
v = 0;
|
197
|
+
|
198
|
+
tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
|
199
|
+
sv = dom.getStyle(e, 'border-' + sv + '-width');
|
200
|
+
|
201
|
+
// False or not the same as prev
|
202
|
+
if (!sv || (sv != v && v !== 0)) {
|
203
|
+
v = 0;
|
204
|
+
return false;
|
205
|
+
}
|
206
|
+
|
207
|
+
if (sv)
|
208
|
+
v = sv;
|
209
|
+
});
|
210
|
+
|
211
|
+
if (v)
|
212
|
+
return parseInt(v.replace(/[^0-9]/g, ''));
|
213
|
+
|
214
|
+
break;
|
215
|
+
}
|
216
|
+
}
|
217
|
+
|
218
|
+
if (v = dom.getAttrib(e, at))
|
219
|
+
return v;
|
220
|
+
|
221
|
+
return '';
|
222
|
+
},
|
223
|
+
|
224
|
+
resetImageData : function() {
|
225
|
+
var f = document.forms[0];
|
226
|
+
|
227
|
+
f.width.value = f.height.value = "";
|
228
|
+
},
|
229
|
+
|
230
|
+
updateImageData : function() {
|
231
|
+
var f = document.forms[0], t = ImageDialog;
|
232
|
+
|
233
|
+
if (f.width.value == "")
|
234
|
+
f.width.value = t.preloadImg.width;
|
235
|
+
|
236
|
+
if (f.height.value == "")
|
237
|
+
f.height.value = t.preloadImg.height;
|
238
|
+
},
|
239
|
+
|
240
|
+
getImageData : function() {
|
241
|
+
var f = document.forms[0];
|
242
|
+
|
243
|
+
this.preloadImg = new Image();
|
244
|
+
this.preloadImg.onload = this.updateImageData;
|
245
|
+
this.preloadImg.onerror = this.resetImageData;
|
246
|
+
this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
|
247
|
+
}
|
248
|
+
};
|
249
|
+
|
250
|
+
ImageDialog.preInit();
|
251
|
+
tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
|