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,98 +1,98 @@
|
|
1
|
-
/*
|
2
|
-
Queue Plug-in
|
3
|
-
|
4
|
-
Features:
|
5
|
-
*Adds a cancelQueue() method for cancelling the entire queue.
|
6
|
-
*All queued files are uploaded when startUpload() is called.
|
7
|
-
*If false is returned from uploadComplete then the queue upload is stopped.
|
8
|
-
If false is not returned (strict comparison) then the queue upload is continued.
|
9
|
-
*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
|
10
|
-
Set the event handler with the queue_complete_handler setting.
|
11
|
-
|
12
|
-
*/
|
13
|
-
|
14
|
-
var SWFUpload;
|
15
|
-
if (typeof(SWFUpload) === "function") {
|
16
|
-
SWFUpload.queue = {};
|
17
|
-
|
18
|
-
SWFUpload.prototype.initSettings = (function (oldInitSettings) {
|
19
|
-
return function () {
|
20
|
-
if (typeof(oldInitSettings) === "function") {
|
21
|
-
oldInitSettings.call(this);
|
22
|
-
}
|
23
|
-
|
24
|
-
this.queueSettings = {};
|
25
|
-
|
26
|
-
this.queueSettings.queue_cancelled_flag = false;
|
27
|
-
this.queueSettings.queue_upload_count = 0;
|
28
|
-
|
29
|
-
this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
|
30
|
-
this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
|
31
|
-
this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
|
32
|
-
this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
|
33
|
-
|
34
|
-
this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
|
35
|
-
};
|
36
|
-
})(SWFUpload.prototype.initSettings);
|
37
|
-
|
38
|
-
SWFUpload.prototype.startUpload = function (fileID) {
|
39
|
-
this.queueSettings.queue_cancelled_flag = false;
|
40
|
-
this.callFlash("StartUpload", [fileID]);
|
41
|
-
};
|
42
|
-
|
43
|
-
SWFUpload.prototype.cancelQueue = function () {
|
44
|
-
this.queueSettings.queue_cancelled_flag = true;
|
45
|
-
this.stopUpload();
|
46
|
-
|
47
|
-
var stats = this.getStats();
|
48
|
-
while (stats.files_queued > 0) {
|
49
|
-
this.cancelUpload();
|
50
|
-
stats = this.getStats();
|
51
|
-
}
|
52
|
-
};
|
53
|
-
|
54
|
-
SWFUpload.queue.uploadStartHandler = function (file) {
|
55
|
-
var returnValue;
|
56
|
-
if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
|
57
|
-
returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
|
58
|
-
}
|
59
|
-
|
60
|
-
// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
|
61
|
-
returnValue = (returnValue === false) ? false : true;
|
62
|
-
|
63
|
-
this.queueSettings.queue_cancelled_flag = !returnValue;
|
64
|
-
|
65
|
-
return returnValue;
|
66
|
-
};
|
67
|
-
|
68
|
-
SWFUpload.queue.uploadCompleteHandler = function (file) {
|
69
|
-
var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
|
70
|
-
var continueUpload;
|
71
|
-
|
72
|
-
if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
|
73
|
-
this.queueSettings.queue_upload_count++;
|
74
|
-
}
|
75
|
-
|
76
|
-
if (typeof(user_upload_complete_handler) === "function") {
|
77
|
-
continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
|
78
|
-
} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
|
79
|
-
// If the file was stopped and re-queued don't restart the upload
|
80
|
-
continueUpload = false;
|
81
|
-
} else {
|
82
|
-
continueUpload = true;
|
83
|
-
}
|
84
|
-
|
85
|
-
if (continueUpload) {
|
86
|
-
var stats = this.getStats();
|
87
|
-
if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
|
88
|
-
this.startUpload();
|
89
|
-
} else if (this.queueSettings.queue_cancelled_flag === false) {
|
90
|
-
this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
|
91
|
-
this.queueSettings.queue_upload_count = 0;
|
92
|
-
} else {
|
93
|
-
this.queueSettings.queue_cancelled_flag = false;
|
94
|
-
this.queueSettings.queue_upload_count = 0;
|
95
|
-
}
|
96
|
-
}
|
97
|
-
};
|
1
|
+
/*
|
2
|
+
Queue Plug-in
|
3
|
+
|
4
|
+
Features:
|
5
|
+
*Adds a cancelQueue() method for cancelling the entire queue.
|
6
|
+
*All queued files are uploaded when startUpload() is called.
|
7
|
+
*If false is returned from uploadComplete then the queue upload is stopped.
|
8
|
+
If false is not returned (strict comparison) then the queue upload is continued.
|
9
|
+
*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
|
10
|
+
Set the event handler with the queue_complete_handler setting.
|
11
|
+
|
12
|
+
*/
|
13
|
+
|
14
|
+
var SWFUpload;
|
15
|
+
if (typeof(SWFUpload) === "function") {
|
16
|
+
SWFUpload.queue = {};
|
17
|
+
|
18
|
+
SWFUpload.prototype.initSettings = (function (oldInitSettings) {
|
19
|
+
return function () {
|
20
|
+
if (typeof(oldInitSettings) === "function") {
|
21
|
+
oldInitSettings.call(this);
|
22
|
+
}
|
23
|
+
|
24
|
+
this.queueSettings = {};
|
25
|
+
|
26
|
+
this.queueSettings.queue_cancelled_flag = false;
|
27
|
+
this.queueSettings.queue_upload_count = 0;
|
28
|
+
|
29
|
+
this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
|
30
|
+
this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
|
31
|
+
this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
|
32
|
+
this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
|
33
|
+
|
34
|
+
this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
|
35
|
+
};
|
36
|
+
})(SWFUpload.prototype.initSettings);
|
37
|
+
|
38
|
+
SWFUpload.prototype.startUpload = function (fileID) {
|
39
|
+
this.queueSettings.queue_cancelled_flag = false;
|
40
|
+
this.callFlash("StartUpload", [fileID]);
|
41
|
+
};
|
42
|
+
|
43
|
+
SWFUpload.prototype.cancelQueue = function () {
|
44
|
+
this.queueSettings.queue_cancelled_flag = true;
|
45
|
+
this.stopUpload();
|
46
|
+
|
47
|
+
var stats = this.getStats();
|
48
|
+
while (stats.files_queued > 0) {
|
49
|
+
this.cancelUpload();
|
50
|
+
stats = this.getStats();
|
51
|
+
}
|
52
|
+
};
|
53
|
+
|
54
|
+
SWFUpload.queue.uploadStartHandler = function (file) {
|
55
|
+
var returnValue;
|
56
|
+
if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
|
57
|
+
returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
|
58
|
+
}
|
59
|
+
|
60
|
+
// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
|
61
|
+
returnValue = (returnValue === false) ? false : true;
|
62
|
+
|
63
|
+
this.queueSettings.queue_cancelled_flag = !returnValue;
|
64
|
+
|
65
|
+
return returnValue;
|
66
|
+
};
|
67
|
+
|
68
|
+
SWFUpload.queue.uploadCompleteHandler = function (file) {
|
69
|
+
var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
|
70
|
+
var continueUpload;
|
71
|
+
|
72
|
+
if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
|
73
|
+
this.queueSettings.queue_upload_count++;
|
74
|
+
}
|
75
|
+
|
76
|
+
if (typeof(user_upload_complete_handler) === "function") {
|
77
|
+
continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
|
78
|
+
} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
|
79
|
+
// If the file was stopped and re-queued don't restart the upload
|
80
|
+
continueUpload = false;
|
81
|
+
} else {
|
82
|
+
continueUpload = true;
|
83
|
+
}
|
84
|
+
|
85
|
+
if (continueUpload) {
|
86
|
+
var stats = this.getStats();
|
87
|
+
if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
|
88
|
+
this.startUpload();
|
89
|
+
} else if (this.queueSettings.queue_cancelled_flag === false) {
|
90
|
+
this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
|
91
|
+
this.queueSettings.queue_upload_count = 0;
|
92
|
+
} else {
|
93
|
+
this.queueSettings.queue_cancelled_flag = false;
|
94
|
+
this.queueSettings.queue_upload_count = 0;
|
95
|
+
}
|
96
|
+
}
|
97
|
+
};
|
98
98
|
}
|
@@ -0,0 +1,342 @@
|
|
1
|
+
/*
|
2
|
+
Speed Plug-in
|
3
|
+
|
4
|
+
Features:
|
5
|
+
*Adds several properties to the 'file' object indicated upload speed, time left, upload time, etc.
|
6
|
+
- currentSpeed -- String indicating the upload speed, bytes per second
|
7
|
+
- averageSpeed -- Overall average upload speed, bytes per second
|
8
|
+
- movingAverageSpeed -- Speed over averaged over the last several measurements, bytes per second
|
9
|
+
- timeRemaining -- Estimated remaining upload time in seconds
|
10
|
+
- timeElapsed -- Number of seconds passed for this upload
|
11
|
+
- percentUploaded -- Percentage of the file uploaded (0 to 100)
|
12
|
+
- sizeUploaded -- Formatted size uploaded so far, bytes
|
13
|
+
|
14
|
+
*Adds setting 'moving_average_history_size' for defining the window size used to calculate the moving average speed.
|
15
|
+
|
16
|
+
*Adds several Formatting functions for formatting that values provided on the file object.
|
17
|
+
- SWFUpload.speed.formatBPS(bps) -- outputs string formatted in the best units (Gbps, Mbps, Kbps, bps)
|
18
|
+
- SWFUpload.speed.formatTime(seconds) -- outputs string formatted in the best units (x Hr y M z S)
|
19
|
+
- SWFUpload.speed.formatSize(bytes) -- outputs string formatted in the best units (w GB x MB y KB z B )
|
20
|
+
- SWFUpload.speed.formatPercent(percent) -- outputs string formatted with a percent sign (x.xx %)
|
21
|
+
- SWFUpload.speed.formatUnits(baseNumber, divisionArray, unitLabelArray, fractionalBoolean)
|
22
|
+
- Formats a number using the division array to determine how to apply the labels in the Label Array
|
23
|
+
- factionalBoolean indicates whether the number should be returned as a single fractional number with a unit (speed)
|
24
|
+
or as several numbers labeled with units (time)
|
25
|
+
*/
|
26
|
+
|
27
|
+
var SWFUpload;
|
28
|
+
if (typeof(SWFUpload) === "function") {
|
29
|
+
SWFUpload.speed = {};
|
30
|
+
|
31
|
+
SWFUpload.prototype.initSettings = (function (oldInitSettings) {
|
32
|
+
return function () {
|
33
|
+
if (typeof(oldInitSettings) === "function") {
|
34
|
+
oldInitSettings.call(this);
|
35
|
+
}
|
36
|
+
|
37
|
+
this.ensureDefault = function (settingName, defaultValue) {
|
38
|
+
this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
|
39
|
+
};
|
40
|
+
|
41
|
+
// List used to keep the speed stats for the files we are tracking
|
42
|
+
this.fileSpeedStats = {};
|
43
|
+
this.speedSettings = {};
|
44
|
+
|
45
|
+
this.ensureDefault("moving_average_history_size", "10");
|
46
|
+
|
47
|
+
this.speedSettings.user_file_queued_handler = this.settings.file_queued_handler;
|
48
|
+
this.speedSettings.user_file_queue_error_handler = this.settings.file_queue_error_handler;
|
49
|
+
this.speedSettings.user_upload_start_handler = this.settings.upload_start_handler;
|
50
|
+
this.speedSettings.user_upload_error_handler = this.settings.upload_error_handler;
|
51
|
+
this.speedSettings.user_upload_progress_handler = this.settings.upload_progress_handler;
|
52
|
+
this.speedSettings.user_upload_success_handler = this.settings.upload_success_handler;
|
53
|
+
this.speedSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
|
54
|
+
|
55
|
+
this.settings.file_queued_handler = SWFUpload.speed.fileQueuedHandler;
|
56
|
+
this.settings.file_queue_error_handler = SWFUpload.speed.fileQueueErrorHandler;
|
57
|
+
this.settings.upload_start_handler = SWFUpload.speed.uploadStartHandler;
|
58
|
+
this.settings.upload_error_handler = SWFUpload.speed.uploadErrorHandler;
|
59
|
+
this.settings.upload_progress_handler = SWFUpload.speed.uploadProgressHandler;
|
60
|
+
this.settings.upload_success_handler = SWFUpload.speed.uploadSuccessHandler;
|
61
|
+
this.settings.upload_complete_handler = SWFUpload.speed.uploadCompleteHandler;
|
62
|
+
|
63
|
+
delete this.ensureDefault;
|
64
|
+
};
|
65
|
+
})(SWFUpload.prototype.initSettings);
|
66
|
+
|
67
|
+
|
68
|
+
SWFUpload.speed.fileQueuedHandler = function (file) {
|
69
|
+
if (typeof this.speedSettings.user_file_queued_handler === "function") {
|
70
|
+
file = SWFUpload.speed.extendFile(file);
|
71
|
+
|
72
|
+
return this.speedSettings.user_file_queued_handler.call(this, file);
|
73
|
+
}
|
74
|
+
};
|
75
|
+
|
76
|
+
SWFUpload.speed.fileQueueErrorHandler = function (file, errorCode, message) {
|
77
|
+
if (typeof this.speedSettings.user_file_queue_error_handler === "function") {
|
78
|
+
file = SWFUpload.speed.extendFile(file);
|
79
|
+
|
80
|
+
return this.speedSettings.user_file_queue_error_handler.call(this, file, errorCode, message);
|
81
|
+
}
|
82
|
+
};
|
83
|
+
|
84
|
+
SWFUpload.speed.uploadStartHandler = function (file) {
|
85
|
+
if (typeof this.speedSettings.user_upload_start_handler === "function") {
|
86
|
+
file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
|
87
|
+
return this.speedSettings.user_upload_start_handler.call(this, file);
|
88
|
+
}
|
89
|
+
};
|
90
|
+
|
91
|
+
SWFUpload.speed.uploadErrorHandler = function (file, errorCode, message) {
|
92
|
+
file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
|
93
|
+
SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
|
94
|
+
|
95
|
+
if (typeof this.speedSettings.user_upload_error_handler === "function") {
|
96
|
+
return this.speedSettings.user_upload_error_handler.call(this, file, errorCode, message);
|
97
|
+
}
|
98
|
+
};
|
99
|
+
SWFUpload.speed.uploadProgressHandler = function (file, bytesComplete, bytesTotal) {
|
100
|
+
this.updateTracking(file, bytesComplete);
|
101
|
+
file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
|
102
|
+
|
103
|
+
if (typeof this.speedSettings.user_upload_progress_handler === "function") {
|
104
|
+
return this.speedSettings.user_upload_progress_handler.call(this, file, bytesComplete, bytesTotal);
|
105
|
+
}
|
106
|
+
};
|
107
|
+
|
108
|
+
SWFUpload.speed.uploadSuccessHandler = function (file, serverData) {
|
109
|
+
if (typeof this.speedSettings.user_upload_success_handler === "function") {
|
110
|
+
file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
|
111
|
+
return this.speedSettings.user_upload_success_handler.call(this, file, serverData);
|
112
|
+
}
|
113
|
+
};
|
114
|
+
SWFUpload.speed.uploadCompleteHandler = function (file) {
|
115
|
+
file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
|
116
|
+
SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
|
117
|
+
|
118
|
+
if (typeof this.speedSettings.user_upload_complete_handler === "function") {
|
119
|
+
return this.speedSettings.user_upload_complete_handler.call(this, file);
|
120
|
+
}
|
121
|
+
};
|
122
|
+
|
123
|
+
// Private: extends the file object with the speed plugin values
|
124
|
+
SWFUpload.speed.extendFile = function (file, trackingList) {
|
125
|
+
var tracking;
|
126
|
+
|
127
|
+
if (trackingList) {
|
128
|
+
tracking = trackingList[file.id];
|
129
|
+
}
|
130
|
+
|
131
|
+
if (tracking) {
|
132
|
+
file.currentSpeed = tracking.currentSpeed;
|
133
|
+
file.averageSpeed = tracking.averageSpeed;
|
134
|
+
file.movingAverageSpeed = tracking.movingAverageSpeed;
|
135
|
+
file.timeRemaining = tracking.timeRemaining;
|
136
|
+
file.timeElapsed = tracking.timeElapsed;
|
137
|
+
file.percentUploaded = tracking.percentUploaded;
|
138
|
+
file.sizeUploaded = tracking.bytesUploaded;
|
139
|
+
|
140
|
+
} else {
|
141
|
+
file.currentSpeed = 0;
|
142
|
+
file.averageSpeed = 0;
|
143
|
+
file.movingAverageSpeed = 0;
|
144
|
+
file.timeRemaining = 0;
|
145
|
+
file.timeElapsed = 0;
|
146
|
+
file.percentUploaded = 0;
|
147
|
+
file.sizeUploaded = 0;
|
148
|
+
}
|
149
|
+
|
150
|
+
return file;
|
151
|
+
};
|
152
|
+
|
153
|
+
// Private: Updates the speed tracking object, or creates it if necessary
|
154
|
+
SWFUpload.prototype.updateTracking = function (file, bytesUploaded) {
|
155
|
+
var tracking = this.fileSpeedStats[file.id];
|
156
|
+
if (!tracking) {
|
157
|
+
this.fileSpeedStats[file.id] = tracking = {};
|
158
|
+
}
|
159
|
+
|
160
|
+
// Sanity check inputs
|
161
|
+
bytesUploaded = bytesUploaded || tracking.bytesUploaded || 0;
|
162
|
+
if (bytesUploaded < 0) {
|
163
|
+
bytesUploaded = 0;
|
164
|
+
}
|
165
|
+
if (bytesUploaded > file.size) {
|
166
|
+
bytesUploaded = file.size;
|
167
|
+
}
|
168
|
+
|
169
|
+
var tickTime = (new Date()).getTime();
|
170
|
+
if (!tracking.startTime) {
|
171
|
+
tracking.startTime = (new Date()).getTime();
|
172
|
+
tracking.lastTime = tracking.startTime;
|
173
|
+
tracking.currentSpeed = 0;
|
174
|
+
tracking.averageSpeed = 0;
|
175
|
+
tracking.movingAverageSpeed = 0;
|
176
|
+
tracking.movingAverageHistory = [];
|
177
|
+
tracking.timeRemaining = 0;
|
178
|
+
tracking.timeElapsed = 0;
|
179
|
+
tracking.percentUploaded = bytesUploaded / file.size;
|
180
|
+
tracking.bytesUploaded = bytesUploaded;
|
181
|
+
} else if (tracking.startTime > tickTime) {
|
182
|
+
this.debug("When backwards in time");
|
183
|
+
} else {
|
184
|
+
// Get time and deltas
|
185
|
+
var now = (new Date()).getTime();
|
186
|
+
var lastTime = tracking.lastTime;
|
187
|
+
var deltaTime = now - lastTime;
|
188
|
+
var deltaBytes = bytesUploaded - tracking.bytesUploaded;
|
189
|
+
|
190
|
+
if (deltaBytes === 0 || deltaTime === 0) {
|
191
|
+
return tracking;
|
192
|
+
}
|
193
|
+
|
194
|
+
// Update tracking object
|
195
|
+
tracking.lastTime = now;
|
196
|
+
tracking.bytesUploaded = bytesUploaded;
|
197
|
+
|
198
|
+
// Calculate speeds
|
199
|
+
tracking.currentSpeed = (deltaBytes * 8 ) / (deltaTime / 1000);
|
200
|
+
tracking.averageSpeed = (tracking.bytesUploaded * 8) / ((now - tracking.startTime) / 1000);
|
201
|
+
|
202
|
+
// Calculate moving average
|
203
|
+
tracking.movingAverageHistory.push(tracking.currentSpeed);
|
204
|
+
if (tracking.movingAverageHistory.length > this.settings.moving_average_history_size) {
|
205
|
+
tracking.movingAverageHistory.shift();
|
206
|
+
}
|
207
|
+
|
208
|
+
tracking.movingAverageSpeed = SWFUpload.speed.calculateMovingAverage(tracking.movingAverageHistory);
|
209
|
+
|
210
|
+
// Update times
|
211
|
+
tracking.timeRemaining = (file.size - tracking.bytesUploaded) * 8 / tracking.movingAverageSpeed;
|
212
|
+
tracking.timeElapsed = (now - tracking.startTime) / 1000;
|
213
|
+
|
214
|
+
// Update percent
|
215
|
+
tracking.percentUploaded = (tracking.bytesUploaded / file.size * 100);
|
216
|
+
}
|
217
|
+
|
218
|
+
return tracking;
|
219
|
+
};
|
220
|
+
SWFUpload.speed.removeTracking = function (file, trackingList) {
|
221
|
+
try {
|
222
|
+
trackingList[file.id] = null;
|
223
|
+
delete trackingList[file.id];
|
224
|
+
} catch (ex) {
|
225
|
+
}
|
226
|
+
};
|
227
|
+
|
228
|
+
SWFUpload.speed.formatUnits = function (baseNumber, unitDivisors, unitLabels, singleFractional) {
|
229
|
+
var i, unit, unitDivisor, unitLabel;
|
230
|
+
|
231
|
+
if (baseNumber === 0) {
|
232
|
+
return "0 " + unitLabels[unitLabels.length - 1];
|
233
|
+
}
|
234
|
+
|
235
|
+
if (singleFractional) {
|
236
|
+
unit = baseNumber;
|
237
|
+
unitLabel = unitLabels.length >= unitDivisors.length ? unitLabels[unitDivisors.length - 1] : "";
|
238
|
+
for (i = 0; i < unitDivisors.length; i++) {
|
239
|
+
if (baseNumber >= unitDivisors[i]) {
|
240
|
+
unit = (baseNumber / unitDivisors[i]).toFixed(2);
|
241
|
+
unitLabel = unitLabels.length >= i ? " " + unitLabels[i] : "";
|
242
|
+
break;
|
243
|
+
}
|
244
|
+
}
|
245
|
+
|
246
|
+
return unit + unitLabel;
|
247
|
+
} else {
|
248
|
+
var formattedStrings = [];
|
249
|
+
var remainder = baseNumber;
|
250
|
+
|
251
|
+
for (i = 0; i < unitDivisors.length; i++) {
|
252
|
+
unitDivisor = unitDivisors[i];
|
253
|
+
unitLabel = unitLabels.length > i ? " " + unitLabels[i] : "";
|
254
|
+
|
255
|
+
unit = remainder / unitDivisor;
|
256
|
+
if (i < unitDivisors.length -1) {
|
257
|
+
unit = Math.floor(unit);
|
258
|
+
} else {
|
259
|
+
unit = unit.toFixed(2);
|
260
|
+
}
|
261
|
+
if (unit > 0) {
|
262
|
+
remainder = remainder % unitDivisor;
|
263
|
+
|
264
|
+
formattedStrings.push(unit + unitLabel);
|
265
|
+
}
|
266
|
+
}
|
267
|
+
|
268
|
+
return formattedStrings.join(" ");
|
269
|
+
}
|
270
|
+
};
|
271
|
+
|
272
|
+
SWFUpload.speed.formatBPS = function (baseNumber) {
|
273
|
+
var bpsUnits = [1073741824, 1048576, 1024, 1], bpsUnitLabels = ["Gbps", "Mbps", "Kbps", "bps"];
|
274
|
+
return SWFUpload.speed.formatUnits(baseNumber, bpsUnits, bpsUnitLabels, true);
|
275
|
+
|
276
|
+
};
|
277
|
+
SWFUpload.speed.formatTime = function (baseNumber) {
|
278
|
+
var timeUnits = [86400, 3600, 60, 1], timeUnitLabels = ["d", "h", "m", "s"];
|
279
|
+
return SWFUpload.speed.formatUnits(baseNumber, timeUnits, timeUnitLabels, false);
|
280
|
+
|
281
|
+
};
|
282
|
+
SWFUpload.speed.formatBytes = function (baseNumber) {
|
283
|
+
var sizeUnits = [1073741824, 1048576, 1024, 1], sizeUnitLabels = ["GB", "MB", "KB", "bytes"];
|
284
|
+
return SWFUpload.speed.formatUnits(baseNumber, sizeUnits, sizeUnitLabels, true);
|
285
|
+
|
286
|
+
};
|
287
|
+
SWFUpload.speed.formatPercent = function (baseNumber) {
|
288
|
+
return baseNumber.toFixed(2) + " %";
|
289
|
+
};
|
290
|
+
|
291
|
+
SWFUpload.speed.calculateMovingAverage = function (history) {
|
292
|
+
var vals = [], size, sum = 0.0, mean = 0.0, varianceTemp = 0.0, variance = 0.0, standardDev = 0.0;
|
293
|
+
var i;
|
294
|
+
var mSum = 0, mCount = 0;
|
295
|
+
|
296
|
+
size = history.length;
|
297
|
+
|
298
|
+
// Check for sufficient data
|
299
|
+
if (size >= 8) {
|
300
|
+
// Clone the array and Calculate sum of the values
|
301
|
+
for (i = 0; i < size; i++) {
|
302
|
+
vals[i] = history[i];
|
303
|
+
sum += vals[i];
|
304
|
+
}
|
305
|
+
|
306
|
+
mean = sum / size;
|
307
|
+
|
308
|
+
// Calculate variance for the set
|
309
|
+
for (i = 0; i < size; i++) {
|
310
|
+
varianceTemp += Math.pow((vals[i] - mean), 2);
|
311
|
+
}
|
312
|
+
|
313
|
+
variance = varianceTemp / size;
|
314
|
+
standardDev = Math.sqrt(variance);
|
315
|
+
|
316
|
+
//Standardize the Data
|
317
|
+
for (i = 0; i < size; i++) {
|
318
|
+
vals[i] = (vals[i] - mean) / standardDev;
|
319
|
+
}
|
320
|
+
|
321
|
+
// Calculate the average excluding outliers
|
322
|
+
var deviationRange = 2.0;
|
323
|
+
for (i = 0; i < size; i++) {
|
324
|
+
|
325
|
+
if (vals[i] <= deviationRange && vals[i] >= -deviationRange) {
|
326
|
+
mCount++;
|
327
|
+
mSum += history[i];
|
328
|
+
}
|
329
|
+
}
|
330
|
+
|
331
|
+
} else {
|
332
|
+
// Calculate the average (not enough data points to remove outliers)
|
333
|
+
mCount = size;
|
334
|
+
for (i = 0; i < size; i++) {
|
335
|
+
mSum += history[i];
|
336
|
+
}
|
337
|
+
}
|
338
|
+
|
339
|
+
return mSum / mCount;
|
340
|
+
};
|
341
|
+
|
342
|
+
}
|