alchemy_cms 2.1.12 → 2.2.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/.travis.yml +1 -1
- data/Gemfile +20 -16
- data/README.md +11 -7
- data/alchemy_cms.gemspec +31 -29
- data/app/assets/javascripts/alchemy/alchemy.base.js +234 -233
- data/app/assets/javascripts/alchemy/alchemy.buttons.js +26 -26
- data/app/assets/javascripts/alchemy/alchemy.datepicker.js +32 -32
- data/app/assets/javascripts/alchemy/alchemy.dirty.js +78 -78
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +103 -103
- data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +84 -84
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js +88 -88
- data/app/assets/javascripts/alchemy/alchemy.file_progress.js +92 -0
- data/app/assets/javascripts/alchemy/alchemy.growler.js +23 -23
- data/app/assets/javascripts/alchemy/alchemy.html5.js +23 -0
- data/app/assets/javascripts/alchemy/alchemy.image_cropper.js +53 -52
- data/app/assets/javascripts/alchemy/alchemy.jquery_loader.js +33 -30
- data/app/assets/javascripts/alchemy/alchemy.js +2 -0
- data/app/assets/javascripts/alchemy/alchemy.js_extensions.js +14 -14
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +181 -0
- data/app/assets/javascripts/alchemy/alchemy.menubar.js +48 -48
- data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +39 -39
- data/app/assets/javascripts/alchemy/alchemy.preview.js +81 -83
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js +86 -86
- data/app/assets/javascripts/alchemy/alchemy.routes.js.erb +23 -23
- data/app/assets/javascripts/alchemy/alchemy.swf_upload.js +208 -353
- data/app/assets/javascripts/alchemy/alchemy.uploader.js +279 -0
- data/app/assets/javascripts/alchemy/alchemy.windows.js +268 -268
- data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +42 -42
- data/app/assets/stylesheets/alchemy/_defaults.scss +89 -89
- data/app/assets/stylesheets/alchemy/base.css.scss +790 -804
- data/app/assets/stylesheets/alchemy/buttons.css.scss +263 -264
- data/app/assets/stylesheets/alchemy/dashboard.css.scss +66 -66
- data/app/assets/stylesheets/alchemy/elements.css.scss +575 -564
- data/app/assets/stylesheets/alchemy/flash.css.scss +45 -45
- data/app/assets/stylesheets/alchemy/frame.css.scss +262 -262
- data/app/assets/stylesheets/alchemy/icons.css.scss +86 -86
- data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +706 -707
- data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss +46 -27
- data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +107 -107
- data/app/assets/stylesheets/alchemy/login.css.scss +40 -38
- data/app/assets/stylesheets/alchemy/menubar.css.scss +84 -82
- data/app/assets/stylesheets/alchemy/modules.css.scss +9 -9
- data/app/assets/stylesheets/alchemy/pagination.css.scss +49 -49
- data/app/assets/stylesheets/alchemy/print.css +7 -7
- data/app/assets/stylesheets/alchemy/sitemap.css.scss +185 -154
- data/app/assets/stylesheets/alchemy/standard_set.css +205 -206
- data/app/assets/stylesheets/alchemy/tables.css.scss +94 -60
- data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +34 -34
- data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +177 -177
- data/app/assets/stylesheets/alchemy/upload.css.scss +68 -45
- data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +222 -221
- data/app/controllers/alchemy/admin/attachments_controller.rb +100 -100
- data/app/controllers/alchemy/admin/base_controller.rb +116 -116
- data/app/controllers/alchemy/admin/clipboard_controller.rb +44 -44
- data/app/controllers/alchemy/admin/contents_controller.rb +55 -55
- data/app/controllers/alchemy/admin/dashboard_controller.rb +12 -11
- data/app/controllers/alchemy/admin/elements_controller.rb +109 -109
- data/app/controllers/alchemy/admin/essence_audios_controller.rb +8 -8
- data/app/controllers/alchemy/admin/essence_files_controller.rb +20 -20
- data/app/controllers/alchemy/admin/essence_flashes_controller.rb +8 -8
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +81 -81
- data/app/controllers/alchemy/admin/essence_videos_controller.rb +8 -8
- data/app/controllers/alchemy/admin/languages_controller.rb +16 -4
- data/app/controllers/alchemy/admin/layoutpages_controller.rb +9 -9
- data/app/controllers/alchemy/admin/pages_controller.rb +249 -248
- data/app/controllers/alchemy/admin/pictures_controller.rb +105 -105
- data/app/controllers/alchemy/admin/resources_controller.rb +111 -166
- data/app/controllers/alchemy/admin/trash_controller.rb +18 -18
- data/app/controllers/alchemy/admin/users_controller.rb +69 -69
- data/app/controllers/alchemy/attachments_controller.rb +27 -27
- data/app/controllers/alchemy/base_controller.rb +159 -155
- data/app/controllers/alchemy/elements_controller.rb +16 -16
- data/app/controllers/alchemy/messages_controller.rb +59 -59
- data/app/controllers/alchemy/pages_controller.rb +194 -198
- data/app/controllers/alchemy/pictures_controller.rb +57 -57
- data/app/controllers/alchemy/user_sessions_controller.rb +70 -70
- data/app/helpers/alchemy/admin/attachments_helper.rb +7 -7
- data/app/helpers/alchemy/admin/base_helper.rb +425 -425
- data/app/helpers/alchemy/admin/contents_helper.rb +72 -72
- data/app/helpers/alchemy/admin/elements_helper.rb +108 -107
- data/app/helpers/alchemy/admin/essences_helper.rb +108 -108
- data/app/helpers/alchemy/admin/pages_helper.rb +42 -42
- data/app/helpers/alchemy/admin/pictures_helper.rb +26 -26
- data/app/helpers/alchemy/base_helper.rb +90 -90
- data/app/helpers/alchemy/elements_helper.rb +167 -168
- data/app/helpers/alchemy/essences_helper.rb +133 -133
- data/app/helpers/alchemy/pages_helper.rb +515 -526
- data/app/helpers/alchemy/pictures_helper.rb +19 -0
- data/app/mailers/alchemy/messages.rb +13 -13
- data/app/mailers/alchemy/notifications.rb +19 -19
- data/app/models/alchemy.rb +3 -3
- data/app/models/alchemy/attachment.rb +52 -78
- data/app/models/alchemy/cell.rb +48 -48
- data/app/models/alchemy/content.rb +196 -196
- data/app/models/alchemy/element.rb +500 -490
- data/app/models/alchemy/essence_audio.rb +7 -7
- data/app/models/alchemy/essence_date.rb +10 -10
- data/app/models/alchemy/essence_file.rb +7 -7
- data/app/models/alchemy/essence_flash.rb +6 -6
- data/app/models/alchemy/essence_html.rb +9 -9
- data/app/models/alchemy/essence_picture.rb +17 -17
- data/app/models/alchemy/essence_richtext.rb +53 -53
- data/app/models/alchemy/essence_text.rb +21 -21
- data/app/models/alchemy/essence_video.rb +7 -7
- data/app/models/alchemy/folded_page.rb +3 -3
- data/app/models/alchemy/language.rb +91 -91
- data/app/models/alchemy/language/code.rb +14 -14
- data/app/models/alchemy/message.rb +48 -45
- data/app/models/alchemy/page.rb +555 -558
- data/app/models/alchemy/picture.rb +100 -99
- data/app/models/alchemy/user.rb +76 -74
- data/app/models/alchemy/user_session.rb +8 -8
- data/app/sweepers/alchemy/content_sweeper.rb +15 -15
- data/app/sweepers/alchemy/pages_sweeper.rb +50 -50
- data/app/sweepers/alchemy/pictures_sweeper.rb +14 -14
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +23 -23
- data/app/views/alchemy/admin/attachments/_attachment.html.erb +56 -56
- data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +15 -15
- data/app/views/alchemy/admin/attachments/_files_list.html.erb +16 -16
- data/app/views/alchemy/admin/attachments/create.js.erb +2 -2
- data/app/views/alchemy/admin/attachments/destroy.js.erb +3 -3
- data/app/views/alchemy/admin/attachments/edit.html.erb +10 -10
- data/app/views/alchemy/admin/attachments/index.html.erb +14 -14
- data/app/views/alchemy/admin/attachments/new.html.erb +9 -9
- data/app/views/alchemy/admin/clipboard/index.html.erb +21 -21
- data/app/views/alchemy/admin/clipboard/insert.js.erb +5 -5
- data/app/views/alchemy/admin/contents/_missing.html.erb +1 -1
- data/app/views/alchemy/admin/contents/create.js.erb +33 -33
- data/app/views/alchemy/admin/contents/destroy.js.erb +5 -5
- data/app/views/alchemy/admin/contents/new.html.erb +13 -13
- data/app/views/alchemy/admin/contents/order.js.erb +2 -2
- data/app/views/alchemy/admin/dashboard/index.html.erb +96 -92
- data/app/views/alchemy/admin/elements/_add_content.html.erb +12 -12
- data/app/views/alchemy/admin/elements/_element.html.erb +3 -3
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +28 -28
- data/app/views/alchemy/admin/elements/_picture_editor.html.erb +21 -21
- data/app/views/alchemy/admin/elements/create.js.erb +32 -32
- data/app/views/alchemy/admin/elements/index.html.erb +2 -2
- data/app/views/alchemy/admin/elements/new.html.erb +31 -31
- data/app/views/alchemy/admin/elements/order.js.erb +3 -3
- data/app/views/alchemy/admin/elements/trash.js.erb +13 -13
- data/app/views/alchemy/admin/elements/update.js.erb +6 -6
- data/app/views/alchemy/admin/essence_files/assign.js.erb +6 -6
- data/app/views/alchemy/admin/essence_pictures/crop.html.erb +32 -32
- data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +1 -1
- data/app/views/alchemy/admin/essence_pictures/edit.html.erb +1 -1
- data/app/views/alchemy/admin/essence_pictures/update.js.erb +11 -11
- data/app/views/alchemy/admin/languages/_form.html.erb +51 -45
- data/app/views/alchemy/admin/languages/_language.html.erb +45 -45
- data/app/views/alchemy/admin/languages/_table.html.erb +25 -25
- data/app/views/alchemy/admin/layoutpages/index.html.erb +35 -35
- data/app/views/alchemy/admin/pages/_create_language_form.html.erb +42 -42
- data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_new_page_form.html.erb +27 -27
- data/app/views/alchemy/admin/pages/_page.html.erb +112 -112
- data/app/views/alchemy/admin/pages/_sitemap.html.erb +1 -1
- data/app/views/alchemy/admin/pages/configure.html.erb +71 -69
- data/app/views/alchemy/admin/pages/configure_external.html.erb +38 -38
- data/app/views/alchemy/admin/pages/destroy.js.erb +10 -10
- data/app/views/alchemy/admin/pages/edit.html.erb +165 -165
- data/app/views/alchemy/admin/pages/fold.js.erb +2 -2
- data/app/views/alchemy/admin/pages/index.html.erb +66 -66
- data/app/views/alchemy/admin/pages/locked.html.erb +1 -1
- data/app/views/alchemy/admin/pages/new.html.erb +40 -40
- data/app/views/alchemy/admin/pages/sort.js.erb +4 -4
- data/app/views/alchemy/admin/pages/unlock.js.erb +6 -6
- data/app/views/alchemy/admin/pages/update.js.erb +19 -19
- data/app/views/alchemy/admin/partials/_flash.html.erb +2 -2
- data/app/views/alchemy/admin/partials/_flash_notices.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_flash_upload.html.erb +38 -0
- data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +15 -15
- data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +8 -8
- data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +35 -35
- data/app/views/alchemy/admin/partials/_search_form.html.erb +14 -14
- data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb +6 -6
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +56 -118
- data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +11 -11
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +71 -71
- data/app/views/alchemy/admin/pictures/_picture.html.erb +32 -32
- data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +26 -26
- data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +6 -6
- data/app/views/alchemy/admin/pictures/create.js.erb +7 -7
- data/app/views/alchemy/admin/pictures/index.html.erb +67 -67
- data/app/views/alchemy/admin/pictures/show_in_window.html.erb +5 -4
- data/app/views/alchemy/admin/resources/_form.html.erb +25 -19
- data/app/views/alchemy/admin/resources/_resource.html.erb +37 -36
- data/app/views/alchemy/admin/resources/_table.html.erb +17 -17
- data/app/views/alchemy/admin/resources/destroy.js.erb +1 -1
- data/app/views/alchemy/admin/resources/index.html.erb +14 -14
- data/app/views/alchemy/admin/trash/index.html.erb +20 -20
- data/app/views/alchemy/admin/users/_table.html.erb +52 -52
- data/app/views/alchemy/admin/users/_user.html.erb +35 -36
- data/app/views/alchemy/admin/users/index.html.erb +26 -27
- data/app/views/alchemy/base/error_notice.html.erb +2 -2
- data/app/views/alchemy/base/update.js.erb +1 -1
- data/app/views/alchemy/elements/_contactform_view.html.erb +76 -76
- data/app/views/alchemy/elements/_download_view.html.erb +1 -1
- data/app/views/alchemy/elements/_editor_not_found.html.erb +3 -3
- data/app/views/alchemy/elements/_searchresult_view.html.erb +2 -2
- data/app/views/alchemy/elements/_sitemap_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_audio_view.html.erb +13 -13
- data/app/views/alchemy/essences/_essence_date_editor.html.erb +10 -10
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +62 -62
- data/app/views/alchemy/essences/_essence_file_view.html.erb +8 -8
- data/app/views/alchemy/essences/_essence_flash_view.html.erb +19 -19
- data/app/views/alchemy/essences/_essence_html_editor.html.erb +6 -6
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +73 -73
- data/app/views/alchemy/essences/_essence_picture_view.html.erb +34 -34
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +7 -7
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +8 -8
- data/app/views/alchemy/navigation/_image_link.html.erb +12 -12
- data/app/views/alchemy/navigation/_link.html.erb +13 -13
- data/app/views/alchemy/navigation/_renderer.html.erb +17 -17
- data/app/views/alchemy/page_layouts/_layout_footer.html.erb +1 -1
- data/app/views/alchemy/page_layouts/_layout_header.html.erb +1 -1
- data/app/views/alchemy/pages/show.rss.builder +14 -14
- data/app/views/alchemy/search/_result.html.erb +7 -7
- data/app/views/alchemy/user_sessions/leave.html.erb +9 -9
- data/app/views/alchemy/user_sessions/login.html.erb +39 -39
- data/app/views/alchemy/user_sessions/logout.html.erb +1 -1
- data/app/views/layouts/alchemy/admin.html.erb +81 -81
- data/app/views/layouts/alchemy/login.html.erb +36 -36
- data/app/views/layouts/alchemy/pages.html.erb +48 -27
- data/bin/alchemy +136 -134
- data/config/alchemy/config.yml +13 -9
- data/config/locales/alchemy.de.yml +24 -30
- data/config/locales/alchemy.en.yml +11 -28
- data/config/routes.rb +146 -146
- data/db/migrate/20100607193638_create_essence_pictures.rb +3 -3
- data/db/migrate/20101109150312_alter_pages_visible_column_default.rb +1 -1
- data/db/migrate/20101109151812_create_languages.rb +3 -3
- data/db/migrate/20110115123343_remove_css_class_default_from_essence_pictures.rb +3 -3
- data/db/migrate/20110224105120_change_pages_visible_default.rb +3 -3
- data/db/migrate/20110228182659_remove_default_page_layout_from_pages.rb +2 -2
- data/db/migrate/20110414163140_remove_display_name_from_elements.rb +3 -3
- data/db/migrate/20110511100516_rename_essence_texts_title_to_link_title.rb +2 -2
- data/db/migrate/20110529130500_add_cell_id_to_elements.rb +3 -3
- data/db/migrate/20110530102804_change_pages_page_layout_column.rb +3 -3
- data/db/migrate/20110711142057_change_open_link_in_new_window_to_link_target.rb +1 -1
- data/db/migrate/20111116125112_namespace_alchemy_models.rb +21 -21
- data/lib/alchemy/auth_engine.rb +5 -5
- data/lib/alchemy/capistrano.rb +64 -64
- data/lib/alchemy/config.rb +47 -44
- data/lib/alchemy/engine.rb +41 -41
- data/lib/alchemy/essence.rb +50 -51
- data/lib/alchemy/i18n.rb +48 -48
- data/lib/alchemy/modules.rb +30 -30
- data/lib/alchemy/mount_point.rb +6 -6
- data/lib/alchemy/page_layout.rb +94 -93
- data/lib/alchemy/resource.rb +82 -0
- data/lib/alchemy/resources_helper.rb +56 -0
- data/lib/alchemy/scoped_pagination_url_helper.rb +8 -8
- data/lib/alchemy/seeder.rb +88 -88
- data/lib/alchemy/tinymce.rb +49 -49
- data/lib/alchemy/upgrader.rb +103 -103
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy_cms.rb +26 -27
- data/lib/extensions/action_view.rb +1 -1
- data/lib/extensions/array.rb +3 -3
- data/lib/extensions/hash.rb +3 -3
- data/lib/middleware/flash_session_cookie.rb +1 -1
- data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +24 -24
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +7 -7
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +17 -17
- data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +6 -6
- data/lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb +8 -8
- data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +7 -7
- data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +36 -36
- data/lib/rails/templates/alchemy.rb +1 -1
- data/lib/tasks/ferret.rake +2 -2
- data/lib/tasks/fleximage.rake +32 -32
- data/lib/tasks/install.rake +12 -12
- data/lib/tasks/upgrade.rake +4 -4
- data/spec/controllers/admin/clipboard_controller_spec.rb +43 -43
- data/spec/controllers/admin/contents_controller_spec.rb +22 -22
- data/spec/controllers/admin/elements_controller_spec.rb +13 -13
- data/spec/controllers/admin/languages_controller_spec.rb +31 -0
- data/spec/controllers/admin/pages_controller_spec.rb +10 -41
- data/spec/controllers/admin/resources_controller_spec.rb +19 -0
- data/spec/controllers/admin/trash_controller_spec.rb +11 -11
- data/spec/controllers/base_controller_spec.rb +46 -46
- data/spec/controllers/pages_controller_spec.rb +102 -92
- data/spec/dummy/app/controllers/admin/events_controller.rb +3 -0
- data/spec/dummy/app/controllers/errors_controller.rb +5 -0
- data/spec/dummy/app/models/event.rb +3 -0
- data/spec/dummy/config.ru +1 -1
- data/spec/dummy/config/application.rb +3 -0
- data/spec/dummy/config/authorization_rules.rb +7 -0
- data/spec/dummy/config/environments/development.rb +8 -1
- data/spec/dummy/config/environments/production.rb +1 -1
- data/spec/dummy/config/environments/test.rb +5 -2
- data/spec/dummy/config/routes.rb +9 -1
- data/spec/dummy/db/schema.rb +47 -35
- data/spec/dummy/public/404.html +19 -7
- data/spec/dummy/public/404.html.bak +26 -0
- data/spec/dummy/public/422.html +19 -7
- data/spec/dummy/public/500.html +19 -7
- data/spec/dummy/script/rails +2 -2
- data/spec/factories.rb +76 -76
- data/spec/helpers/admin/base_helper_spec.rb +21 -21
- data/spec/helpers/admin/contents_helper_spec.rb +14 -14
- data/spec/helpers/admin/elements_helper_spec.rb +40 -40
- data/spec/helpers/admin/essences_helper_spec.rb +7 -7
- data/spec/helpers/elements_helper_spec.rb +154 -154
- data/spec/helpers/essences_helper_spec.rb +10 -10
- data/spec/helpers/pages_helper_spec.rb +369 -372
- data/spec/helpers/pictures_helper_spec.rb +14 -0
- data/spec/helpers/url_helpers_spec.rb +29 -34
- data/spec/integration/admin/pages_controller_spec.rb +50 -50
- data/spec/integration/admin/resources_integration_spec.rb +100 -0
- data/spec/integration/navigation_spec.rb +1 -1
- data/spec/integration/pages_controller_spec.rb +205 -207
- data/spec/integration/security_spec.rb +47 -47
- data/spec/javascripts/alchemy/link_overlay_spec.js.coffee +42 -0
- data/spec/javascripts/alchemy_integration_spec.coffee +12 -0
- data/spec/javascripts/fixtures/select.html +3 -0
- data/spec/javascripts/helpers/.gitkeep +0 -0
- data/spec/javascripts/helpers/jasmine-jquery-1.3.1.js +289 -0
- data/spec/javascripts/helpers/mock-ajax.js +207 -0
- data/spec/javascripts/helpers/test_responses/test_responses.js +1 -0
- data/spec/javascripts/spec.css +3 -0
- data/spec/javascripts/spec.js +2 -0
- data/spec/libraries/resource_spec.rb +122 -0
- data/spec/libraries/resources_helper_spec.rb +105 -0
- data/spec/models/content_spec.rb +67 -67
- data/spec/models/element_spec.rb +133 -133
- data/spec/models/essence_picture_spec.rb +5 -5
- data/spec/models/essence_richtext_spec.rb +4 -4
- data/spec/models/language_spec.rb +89 -89
- data/spec/models/page_spec.rb +436 -506
- data/spec/models/picture_spec.rb +34 -34
- data/spec/models/user_spec.rb +2 -2
- data/spec/page_layout_spec.rb +24 -20
- data/spec/routing_spec.rb +253 -253
- data/spec/spec_helper.rb +51 -50
- data/spec/support/alchemy/controller_hacks.rb +25 -25
- data/spec/support/alchemy/specs_helpers.rb +25 -25
- data/spec/support/integration_spec_helper.rb +24 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +271 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js +86 -85
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +380 -377
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +285 -279
- data/vendor/assets/javascripts/swfupload/SWFObject License.txt +3 -3
- data/vendor/assets/javascripts/swfupload/swfupload.cookies.js +47 -47
- data/vendor/assets/javascripts/swfupload/swfupload.js +612 -612
- data/vendor/assets/javascripts/swfupload/swfupload.queue.js +93 -93
- data/vendor/assets/javascripts/swfupload/swfupload.speed.js +337 -337
- data/vendor/assets/javascripts/swfupload/swfupload.swfobject.js +706 -102
- data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +386 -376
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +20 -17
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
- data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +183 -173
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +282 -280
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +204 -204
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +435 -435
- data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +24 -22
- data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +144 -136
- data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +184 -168
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +62 -46
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +17 -16
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +56 -47
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +67 -54
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +852 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +79 -69
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +28 -28
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +248 -246
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +246 -246
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +146 -146
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +31 -31
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +53 -46
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +57 -45
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +182 -47
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +399 -92
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +891 -187
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +102 -24
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +377 -78
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +452 -77
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +167 -45
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +399 -92
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +890 -190
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +33 -7
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +15 -4
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +18 -15
- data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
- data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
- data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
- data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
- metadata +102 -115
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js +0 -216
- data/lib/tasks/routes.rake +0 -29
- data/spec/integration/admin/resources_spec.rb +0 -19
@@ -1,35 +1,54 @@
|
|
1
1
|
@import "alchemy/defaults";
|
2
|
+
|
2
3
|
/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
|
3
|
-
.jcrop-holder {
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
.jcrop-vline
|
14
|
-
|
4
|
+
.jcrop-holder {
|
5
|
+
text-align: left;
|
6
|
+
}
|
7
|
+
|
8
|
+
.jcrop-vline, .jcrop-hline {
|
9
|
+
font-size: 0px;
|
10
|
+
position: absolute;
|
11
|
+
background: white image-url('alchemy/Jcrop.gif') top left repeat;
|
12
|
+
}
|
13
|
+
|
14
|
+
.jcrop-vline {
|
15
|
+
height: 100%;
|
16
|
+
width: 1px !important;
|
17
|
+
}
|
18
|
+
|
19
|
+
.jcrop-hline {
|
20
|
+
width: 100%;
|
21
|
+
height: 1px !important;
|
22
|
+
}
|
23
|
+
|
24
|
+
.jcrop-vline.right {
|
25
|
+
right: 0px;
|
26
|
+
}
|
27
|
+
|
28
|
+
.jcrop-hline.bottom {
|
29
|
+
bottom: 0px;
|
30
|
+
}
|
31
|
+
|
15
32
|
.jcrop-handle {
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
33
|
+
font-size: 1px;
|
34
|
+
width: 7px !important;
|
35
|
+
height: 7px !important;
|
36
|
+
border: 1px #eee solid;
|
37
|
+
background-color: #333;
|
21
38
|
}
|
22
39
|
|
23
|
-
.jcrop-tracker {
|
40
|
+
.jcrop-tracker {
|
41
|
+
width: 100%;
|
42
|
+
height: 100%;
|
43
|
+
}
|
24
44
|
|
25
45
|
.custom .jcrop-vline,
|
26
|
-
.custom .jcrop-hline
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
.custom .jcrop-handle
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
@include rounded-corner;
|
46
|
+
.custom .jcrop-hline {
|
47
|
+
background: yellow;
|
48
|
+
}
|
49
|
+
|
50
|
+
.custom .jcrop-handle {
|
51
|
+
border-color: black;
|
52
|
+
background-color: #C7BB00;
|
53
|
+
@include rounded-corner;
|
35
54
|
}
|
@@ -3,252 +3,252 @@
|
|
3
3
|
/* always visible styles */
|
4
4
|
|
5
5
|
#alchemy select.has_sb {
|
6
|
-
|
6
|
+
display: none !important;
|
7
7
|
}
|
8
8
|
|
9
9
|
#alchemy .selectbox {
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
10
|
+
display: inline-block;
|
11
|
+
*display: inline;
|
12
|
+
margin: 0;
|
13
|
+
position: relative;
|
14
|
+
zoom: 1;
|
15
|
+
font-size: 11px;
|
16
|
+
@include disable-user-select;
|
17
17
|
}
|
18
18
|
|
19
19
|
#alchemy .selectbox.full_width .display.full_width {
|
20
|
-
|
20
|
+
width: 402px;
|
21
21
|
}
|
22
22
|
|
23
23
|
#alchemy .selectbox .display {
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
24
|
+
border: 1px solid $button-border-color;
|
25
|
+
cursor: default;
|
26
|
+
display: block;
|
27
|
+
font-weight: normal;
|
28
|
+
height: 23px;
|
29
|
+
line-height: 23px;
|
30
|
+
padding: 0 23px 0 5px;
|
31
|
+
position: relative;
|
32
|
+
text-decoration: none;
|
33
|
+
overflow: hidden;
|
34
|
+
@include rounded-corner;
|
35
|
+
background: $button-bg-color image-url('alchemy/shading.png') repeat-x 0 -69px;
|
36
36
|
}
|
37
37
|
|
38
38
|
#alchemy .content_editor.validation_failed .selectbox .display {
|
39
|
-
|
39
|
+
border-color: #931f23;
|
40
40
|
}
|
41
41
|
|
42
42
|
#alchemy .selectbox .display .text {
|
43
|
-
|
43
|
+
text-shadow: $button-text-shadow;
|
44
44
|
}
|
45
45
|
|
46
46
|
#alchemy .selectbox .display {
|
47
|
-
|
47
|
+
width: 190px;
|
48
48
|
}
|
49
49
|
|
50
50
|
#alchemy .selectbox .display.short {
|
51
|
-
|
51
|
+
width: 60px;
|
52
52
|
}
|
53
53
|
|
54
54
|
#alchemy .selectbox .display.medium {
|
55
|
-
|
55
|
+
width: 100px;
|
56
56
|
}
|
57
57
|
|
58
58
|
#alchemy .selectbox .display.long {
|
59
|
-
|
59
|
+
width: 220px;
|
60
60
|
}
|
61
61
|
|
62
62
|
#alchemy .selectbox .display.very_long {
|
63
|
-
|
63
|
+
width: 280px;
|
64
64
|
}
|
65
65
|
|
66
66
|
#alchemy .selectbox.disabled .display {
|
67
|
-
|
67
|
+
color: #999;
|
68
68
|
}
|
69
69
|
|
70
70
|
#alchemy .selectbox.focused .display {
|
71
|
-
|
71
|
+
border: 1px solid $button-hover-border-color;
|
72
72
|
}
|
73
73
|
|
74
74
|
#alchemy .selectbox.focused .display .text {
|
75
|
-
|
75
|
+
text-shadow: none;
|
76
76
|
}
|
77
77
|
|
78
78
|
#alchemy .selectbox.focused .display .arrow_btn,
|
79
79
|
#alchemy .selectbox .display:hover .arrow_btn {
|
80
|
-
|
80
|
+
background: $button-hover-bg-color image-url('alchemy/shading.png') repeat-x 50% -75px;
|
81
81
|
}
|
82
82
|
|
83
83
|
#alchemy .selectbox .display:active .arrow_btn {
|
84
|
-
|
84
|
+
background-color: #e5e5e5;
|
85
85
|
}
|
86
86
|
|
87
87
|
#alchemy .selectbox .display:active .arrow_btn .interior {
|
88
|
-
|
88
|
+
background-color: #e5e5e5;
|
89
89
|
}
|
90
90
|
|
91
91
|
#alchemy .selectbox .display.hover {
|
92
|
-
|
92
|
+
cursor: pointer;
|
93
93
|
}
|
94
94
|
|
95
95
|
#alchemy .selectbox .display.hover .arrow_btn .interior {
|
96
|
-
|
96
|
+
background: #e6f0f5 image-url('alchemy/shading.png') repeat-x 0 -75px;
|
97
97
|
}
|
98
98
|
|
99
99
|
#alchemy .selectbox .display .arrow_btn {
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
100
|
+
background: #ededed image-url('alchemy/shading.png') repeat-x 0 -75px;
|
101
|
+
display: block;
|
102
|
+
height: 23px;
|
103
|
+
padding: 0;
|
104
|
+
position: absolute;
|
105
|
+
right: 0;
|
106
|
+
top: 0;
|
107
|
+
width: 19px;
|
108
108
|
}
|
109
109
|
|
110
110
|
#alchemy .selectbox .display .arrow_btn .interior {
|
111
|
-
|
112
|
-
|
113
|
-
|
111
|
+
display: block;
|
112
|
+
height: 23px;
|
113
|
+
width: 19px;
|
114
114
|
}
|
115
115
|
|
116
116
|
#alchemy .selectbox .display .arrow_btn .arrow {
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
117
|
+
background: image-url('alchemy/ui-icons_666666_256x240.png') no-repeat -63px -11px;
|
118
|
+
display: block;
|
119
|
+
height: 23px;
|
120
|
+
width: 19px;
|
121
121
|
}
|
122
122
|
|
123
123
|
#alchemy .selectbox .text {
|
124
|
-
|
125
|
-
|
124
|
+
line-height: 24px;
|
125
|
+
text-align: left;
|
126
126
|
}
|
127
127
|
|
128
128
|
#alchemy .selectbox .value {
|
129
|
-
|
129
|
+
display: none;
|
130
130
|
}
|
131
131
|
|
132
132
|
/* dropdown styles */
|
133
133
|
|
134
134
|
#alchemy .items {
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
135
|
+
background: $button-bg-color;
|
136
|
+
border: 1px solid $button-border-color;
|
137
|
+
display: block;
|
138
|
+
list-style-type: none;
|
139
|
+
margin: 0;
|
140
|
+
overflow-x: hidden;
|
141
|
+
overflow-y: auto;
|
142
|
+
z-index: 99999;
|
143
|
+
-moz-box-shadow: 0 3px 5px rgba(0, 0, 0, .5);
|
144
|
+
-webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, .5);
|
145
|
+
box-shadow: 0 3px 5px rgba(0, 0, 0, .5);
|
146
|
+
@include rounded-corner;
|
147
|
+
padding: 0;
|
148
|
+
line-height: 15px;
|
149
|
+
font-size: 11px;
|
150
150
|
}
|
151
151
|
|
152
152
|
#alchemy .items.short {
|
153
|
-
|
153
|
+
width: 88px;
|
154
154
|
}
|
155
155
|
|
156
156
|
#alchemy .items.medium {
|
157
|
-
|
157
|
+
width: 128px;
|
158
158
|
}
|
159
159
|
|
160
160
|
#alchemy .items {
|
161
|
-
|
161
|
+
width: 218px;
|
162
162
|
}
|
163
163
|
|
164
164
|
#alchemy .items.long {
|
165
|
-
|
165
|
+
width: 248px;
|
166
166
|
}
|
167
167
|
|
168
168
|
#alchemy .items.very_long {
|
169
|
-
|
169
|
+
width: 308px;
|
170
170
|
}
|
171
171
|
|
172
172
|
#alchemy .items.full_width {
|
173
|
-
|
173
|
+
width: 431px;
|
174
174
|
}
|
175
175
|
|
176
|
-
#new_page_form tbody tr td.second_row div.selectbox .display{
|
177
|
-
|
176
|
+
#new_page_form tbody tr td.second_row div.selectbox .display {
|
177
|
+
width: 100px;
|
178
178
|
}
|
179
179
|
|
180
180
|
#alchemy .items.above {
|
181
|
-
|
181
|
+
|
182
182
|
}
|
183
183
|
|
184
184
|
#alchemy .items li {
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
185
|
+
display: block;
|
186
|
+
margin: 0;
|
187
|
+
padding: 0;
|
188
|
+
white-space: nowrap;
|
189
189
|
}
|
190
190
|
|
191
191
|
#alchemy .items li:first-child {
|
192
|
-
|
192
|
+
margin-top: 0;
|
193
193
|
}
|
194
194
|
|
195
195
|
#alchemy .items li .item {
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
196
|
+
color: $text-color;
|
197
|
+
cursor: default;
|
198
|
+
display: block;
|
199
|
+
text-decoration: none;
|
200
|
+
padding: 2px 12px 2px 6px;
|
201
201
|
}
|
202
202
|
|
203
203
|
#alchemy .items li.selected .item {
|
204
|
-
|
205
|
-
|
204
|
+
background-color: #e6f0f5;
|
205
|
+
color: $text-color;
|
206
206
|
}
|
207
207
|
|
208
208
|
#alchemy .items li.disabled .item {
|
209
|
-
|
209
|
+
color: #999;
|
210
210
|
}
|
211
211
|
|
212
212
|
#alchemy .items li.hover > .item {
|
213
|
-
|
214
|
-
|
215
|
-
|
213
|
+
background-color: #e6f0f5;
|
214
|
+
color: $text-color;
|
215
|
+
cursor: pointer;
|
216
216
|
}
|
217
217
|
|
218
218
|
#alchemy .items .value {
|
219
|
-
|
219
|
+
display: none;
|
220
220
|
}
|
221
221
|
|
222
222
|
/* optgroup styles */
|
223
223
|
|
224
224
|
#alchemy .items .optgroup .items {
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
225
|
+
border: none;
|
226
|
+
margin: 0;
|
227
|
+
padding: 0;
|
228
|
+
-moz-box-shadow: none;
|
229
|
+
-webkit-box-shadow: none;
|
230
230
|
}
|
231
231
|
|
232
232
|
#alchemy .items .optgroup>.label {
|
233
|
-
|
234
|
-
|
233
|
+
font-weight: bold;
|
234
|
+
line-height: 23px;
|
235
235
|
}
|
236
236
|
|
237
237
|
#alchemy .items .optgroup .items li .item {
|
238
|
-
|
238
|
+
padding-left: 1em;
|
239
239
|
}
|
240
240
|
|
241
241
|
#alchemy .items>li.first .item {
|
242
|
-
|
242
|
+
@include top-rounded-border;
|
243
243
|
}
|
244
244
|
|
245
245
|
#alchemy .items>li.last .item {
|
246
|
-
|
246
|
+
@include bottom-rounded-border;
|
247
247
|
}
|
248
248
|
|
249
249
|
/* for optgroups */
|
250
250
|
|
251
251
|
#alchemy .items>li>.label {
|
252
|
-
|
253
|
-
|
252
|
+
line-height: 27px;
|
253
|
+
padding: 4px 6px;
|
254
254
|
}
|
@@ -1,57 +1,59 @@
|
|
1
1
|
@import "alchemy/defaults";
|
2
2
|
|
3
3
|
div#alchemy_greeting {
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
4
|
+
width: 370px;
|
5
|
+
margin-right: auto;
|
6
|
+
margin-left: auto;
|
7
|
+
padding: 2*$default-padding;
|
8
|
+
margin-top: 1em;
|
9
|
+
text-align: center;
|
10
|
+
|
11
|
+
p {
|
12
|
+
margin-top: 1em;
|
13
|
+
margin-bottom: 1em;
|
14
|
+
}
|
15
|
+
|
16
|
+
h1 {
|
17
|
+
margin-top: 1em;
|
18
|
+
margin-bottom: 0;
|
19
|
+
font-size: 1.2em;
|
20
|
+
}
|
21
21
|
}
|
22
22
|
|
23
23
|
div.login_signup_box {
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
24
|
+
width: 360px;
|
25
|
+
padding: 4*$default-padding;
|
26
|
+
border: $default-border;
|
27
|
+
background-color: $medium-gray;
|
28
|
+
@include rounded-corner;
|
29
|
+
margin: 2em auto;
|
30
|
+
|
31
|
+
select {
|
32
|
+
width: 220px;
|
33
|
+
}
|
34
34
|
}
|
35
35
|
|
36
36
|
html.no-js {
|
37
|
-
|
37
|
+
div.login_signup_box, div#alchemy_greeting h1 {
|
38
|
+
display: none;
|
39
|
+
}
|
38
40
|
}
|
39
41
|
|
40
42
|
#login_box {
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
43
|
+
height: 310px;
|
44
|
+
width: 394px;
|
45
|
+
margin-top: -230px;
|
46
|
+
margin-left: -197px;
|
47
|
+
position: absolute;
|
48
|
+
top: 50%;
|
49
|
+
left: 50%;
|
48
50
|
}
|
49
51
|
|
50
52
|
#login table tbody tr td.label {
|
51
|
-
|
52
|
-
|
53
|
+
width: 155px;
|
54
|
+
text-align: right;
|
53
55
|
}
|
54
56
|
|
55
57
|
form#login.new_user_session {
|
56
|
-
|
58
|
+
text-align: right;
|
57
59
|
}
|