alchemy_cms 2.5.3.1 → 2.6.0.rc5
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -1
- data/.travis.yml +5 -13
- data/Gemfile +6 -3
- data/README.md +3 -2
- data/alchemy_cms.gemspec +22 -22
- data/app/assets/fonts/alchemy-icons.eot +0 -0
- data/app/assets/fonts/alchemy-icons.svg +54 -0
- data/app/assets/fonts/alchemy-icons.ttf +0 -0
- data/app/assets/fonts/alchemy-icons.woff +0 -0
- data/app/assets/images/alchemy/icons.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +151 -0
- data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +3 -2
- data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +31 -0
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +1 -1
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +98 -0
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +23 -24
- data/app/assets/javascripts/alchemy/alchemy.growler.js.coffee +27 -0
- data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +11 -8
- data/app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee +32 -0
- data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +46 -0
- data/app/assets/javascripts/alchemy/alchemy.js +8 -2
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +5 -4
- data/app/assets/javascripts/alchemy/alchemy.list_filter.js.coffee +49 -0
- data/app/assets/javascripts/alchemy/alchemy.onload.js.coffee +3 -0
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +71 -0
- data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +61 -0
- data/app/assets/javascripts/alchemy/alchemy.spinner.js.coffee +35 -0
- data/app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee +11 -0
- data/app/assets/javascripts/alchemy/alchemy.windows.js.coffee +278 -0
- data/app/assets/stylesheets/alchemy/admin.css.scss +2 -0
- data/app/assets/stylesheets/alchemy/archive.scss +109 -65
- data/app/assets/stylesheets/alchemy/base.scss +16 -188
- data/app/assets/stylesheets/alchemy/dashboard.scss +2 -2
- data/app/assets/stylesheets/alchemy/defaults.scss +2 -1
- data/app/assets/stylesheets/alchemy/elements.scss +58 -94
- data/app/assets/stylesheets/alchemy/errors.scss +2 -2
- data/app/assets/stylesheets/alchemy/{mixins.scss → extends.scss} +104 -80
- data/app/assets/stylesheets/alchemy/flash.scss +4 -6
- data/app/assets/stylesheets/alchemy/fonts.scss +46 -0
- data/app/assets/stylesheets/alchemy/form_elements.scss +46 -45
- data/app/assets/stylesheets/alchemy/frame.scss +20 -15
- data/app/assets/stylesheets/alchemy/icons.scss +22 -9
- data/app/assets/stylesheets/alchemy/jquery-ui.scss +476 -399
- data/app/assets/stylesheets/alchemy/login.scss +1 -1
- data/app/assets/stylesheets/alchemy/menubar.css.scss +1 -1
- data/app/assets/stylesheets/alchemy/notices.scss +5 -5
- data/app/assets/stylesheets/alchemy/pagination.scss +25 -13
- data/app/assets/stylesheets/alchemy/search.scss +29 -17
- data/app/assets/stylesheets/alchemy/sitemap.scss +41 -36
- data/app/assets/stylesheets/alchemy/tables.scss +102 -50
- data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +18 -16
- data/app/assets/stylesheets/alchemy/toolbar.scss +84 -24
- data/app/assets/stylesheets/alchemy/upload.scss +14 -9
- data/app/assets/stylesheets/alchemy/variables.scss +1 -0
- data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +18 -21
- data/app/controllers/alchemy/admin/attachments_controller.rb +29 -39
- data/app/controllers/alchemy/admin/base_controller.rb +3 -9
- data/app/controllers/alchemy/admin/clipboard_controller.rb +1 -1
- data/app/controllers/alchemy/admin/contents_controller.rb +1 -1
- data/app/controllers/alchemy/admin/dashboard_controller.rb +1 -1
- data/app/controllers/alchemy/admin/elements_controller.rb +3 -3
- data/app/controllers/alchemy/admin/essence_files_controller.rb +1 -1
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +5 -5
- data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
- data/app/controllers/alchemy/admin/pages_controller.rb +18 -16
- data/app/controllers/alchemy/admin/pictures_controller.rb +11 -10
- data/app/controllers/alchemy/admin/resources_controller.rb +87 -14
- data/app/controllers/alchemy/admin/tags_controller.rb +3 -3
- data/app/controllers/alchemy/admin/trash_controller.rb +3 -3
- data/app/controllers/alchemy/admin/users_controller.rb +6 -11
- data/app/controllers/alchemy/attachments_controller.rb +8 -9
- data/app/controllers/alchemy/base_controller.rb +17 -10
- data/app/controllers/alchemy/pages_controller.rb +7 -19
- data/app/controllers/alchemy/passwords_controller.rb +15 -3
- data/app/controllers/alchemy/user_sessions_controller.rb +5 -4
- data/app/controllers/alchemy/users_controller.rb +1 -1
- data/app/helpers/alchemy/admin/attachments_helper.rb +2 -2
- data/app/helpers/alchemy/admin/base_helper.rb +62 -90
- data/app/helpers/alchemy/admin/elements_helper.rb +13 -5
- data/app/helpers/alchemy/admin/essences_helper.rb +3 -5
- data/app/helpers/alchemy/admin/pages_helper.rb +6 -3
- data/app/helpers/alchemy/admin/tags_helper.rb +60 -0
- data/app/helpers/alchemy/base_helper.rb +16 -20
- data/app/helpers/alchemy/elements_helper.rb +7 -11
- data/app/helpers/alchemy/essences_helper.rb +2 -2
- data/app/helpers/alchemy/pages_helper.rb +31 -69
- data/app/helpers/alchemy/url_helper.rb +11 -3
- data/app/models/alchemy/attachment.rb +73 -45
- data/app/models/alchemy/cell.rb +1 -1
- data/app/models/alchemy/content.rb +20 -9
- data/app/models/alchemy/element.rb +9 -7
- data/app/models/alchemy/page.rb +15 -248
- data/app/models/alchemy/page/cells.rb +71 -0
- data/app/models/alchemy/page/elements.rb +147 -0
- data/app/models/alchemy/page/naming.rb +90 -0
- data/app/models/alchemy/picture.rb +18 -13
- data/app/models/alchemy/tag.rb +1 -1
- data/app/models/alchemy/user.rb +38 -6
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +14 -7
- data/app/views/alchemy/admin/attachments/_attachment.html.erb +17 -12
- data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -8
- data/app/views/alchemy/admin/attachments/_files_list.html.erb +20 -12
- data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb +11 -0
- data/app/views/alchemy/admin/attachments/_tag_list.html.erb +31 -0
- data/app/views/alchemy/admin/attachments/archive_overlay.js.erb +4 -0
- data/app/views/alchemy/admin/attachments/edit.html.erb +8 -7
- data/app/views/alchemy/admin/attachments/index.html.erb +19 -12
- data/app/views/alchemy/admin/attachments/new.html.erb +2 -2
- data/app/views/alchemy/admin/attachments/show.html.erb +3 -0
- data/app/views/alchemy/admin/contents/_missing.html.erb +4 -4
- data/app/views/alchemy/admin/contents/create.js.erb +1 -1
- data/app/views/alchemy/admin/contents/new.html.erb +6 -3
- data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb +1 -1
- data/app/views/alchemy/admin/dashboard/_users.html.erb +1 -1
- data/app/views/alchemy/admin/dashboard/index.html.erb +3 -3
- data/app/views/alchemy/admin/dashboard/info.html.erb +16 -13
- data/app/views/alchemy/admin/elements/_add_picture.html.erb +1 -1
- data/app/views/alchemy/admin/elements/_element_foot.html.erb +4 -4
- data/app/views/alchemy/admin/elements/_element_head.html.erb +1 -7
- data/app/views/alchemy/admin/elements/_elements_select.html.erb +2 -2
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +4 -4
- data/app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb +1 -1
- data/app/views/alchemy/admin/elements/create.js.erb +2 -2
- data/app/views/alchemy/admin/elements/fold.js.erb +3 -6
- data/app/views/alchemy/admin/elements/new.html.erb +1 -1
- data/app/views/alchemy/admin/elements/order.js.erb +1 -1
- data/app/views/alchemy/admin/elements/trash.js.erb +1 -1
- data/app/views/alchemy/admin/elements/update.js.erb +2 -2
- data/app/views/alchemy/admin/essence_files/edit.html.erb +4 -4
- data/app/views/alchemy/admin/essence_pictures/crop.html.erb +17 -18
- data/app/views/alchemy/admin/essence_pictures/edit.html.erb +2 -2
- data/app/views/alchemy/admin/essence_pictures/update.js.erb +1 -0
- data/app/views/alchemy/admin/languages/_form.html.erb +12 -10
- data/app/views/alchemy/admin/languages/_language.html.erb +2 -1
- data/app/views/alchemy/admin/languages/_table.html.erb +3 -3
- data/app/views/alchemy/admin/languages/index.html.erb +15 -15
- data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +6 -6
- data/app/views/alchemy/admin/layoutpages/index.html.erb +41 -40
- data/app/views/alchemy/admin/pages/_contactform_links.html.erb +4 -4
- data/app/views/alchemy/admin/pages/_create_language_form.html.erb +6 -6
- data/app/views/alchemy/admin/pages/_external_link.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_file_link.html.erb +3 -3
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_page.html.erb +13 -13
- data/app/views/alchemy/admin/pages/_page_for_links.html.erb +2 -4
- data/app/views/alchemy/admin/pages/_sitemap.html.erb +5 -0
- data/app/views/alchemy/admin/pages/configure.html.erb +7 -7
- data/app/views/alchemy/admin/pages/configure_external.html.erb +4 -4
- data/app/views/alchemy/admin/pages/edit.html.erb +23 -30
- data/app/views/alchemy/admin/pages/index.html.erb +34 -23
- data/app/views/alchemy/admin/pages/new.html.erb +1 -1
- data/app/views/alchemy/admin/pages/sort.js.erb +1 -1
- data/app/views/alchemy/admin/partials/_flash_upload.html.erb +2 -3
- data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -2
- data/app/views/alchemy/admin/partials/_search_form.html.erb +3 -3
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +2 -2
- data/app/views/alchemy/admin/pictures/_archive.html.erb +7 -7
- data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +6 -6
- data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +4 -4
- data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_picture.html.erb +3 -8
- data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +9 -14
- data/app/views/alchemy/admin/pictures/_tag_list.html.erb +27 -25
- data/app/views/alchemy/admin/pictures/archive_overlay.js.erb +3 -1
- data/app/views/alchemy/admin/pictures/index.html.erb +49 -42
- data/app/views/alchemy/admin/pictures/new.html.erb +2 -2
- data/app/views/alchemy/admin/pictures/show.html.erb +11 -0
- data/app/views/alchemy/admin/resources/_boolean.html.erb +2 -2
- data/app/views/alchemy/admin/resources/_datetime.html.erb +2 -2
- data/app/views/alchemy/admin/resources/_form.html.erb +9 -8
- data/app/views/alchemy/admin/resources/_resource.html.erb +15 -21
- data/app/views/alchemy/admin/resources/_string.html.erb +2 -2
- data/app/views/alchemy/admin/resources/_table.html.erb +11 -13
- data/app/views/alchemy/admin/resources/_text.html.erb +2 -2
- data/app/views/alchemy/admin/resources/index.csv.erb +13 -0
- data/app/views/alchemy/admin/resources/index.html.erb +24 -15
- data/app/views/alchemy/admin/sites/index.html.erb +23 -0
- data/app/views/alchemy/admin/tags/_radio_tag.html.erb +1 -1
- data/app/views/alchemy/admin/tags/_tag.html.erb +2 -1
- data/app/views/alchemy/admin/tags/edit.html.erb +1 -1
- data/app/views/alchemy/admin/tags/index.html.erb +16 -11
- data/app/views/alchemy/admin/tags/new.html.erb +3 -3
- data/app/views/alchemy/admin/trash/clear.js.coffee +1 -1
- data/app/views/alchemy/admin/users/_table.html.erb +12 -5
- data/app/views/alchemy/admin/users/_user.html.erb +16 -16
- data/app/views/alchemy/admin/users/index.html.erb +28 -16
- data/app/views/alchemy/breadcrumb/_page.html.erb +15 -0
- data/app/views/alchemy/breadcrumb/_spacer.html.erb +1 -0
- data/app/views/alchemy/elements/_editor_not_found.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +16 -16
- data/app/views/alchemy/essences/_essence_file_view.html.erb +8 -9
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +3 -6
- data/app/views/alchemy/essences/_essence_picture_tools.html.erb +9 -8
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +0 -5
- data/app/views/alchemy/essences/_linkable_essence_tools.html.erb +2 -2
- data/app/views/alchemy/navigation/_link.html.erb +7 -7
- data/app/views/alchemy/navigation/_renderer.html.erb +29 -36
- data/app/views/alchemy/notifications/admin_user_created.de.text.erb +5 -1
- data/app/views/alchemy/notifications/admin_user_created.en.text.erb +5 -1
- data/app/views/alchemy/notifications/registered_user_created.de.text.erb +13 -0
- data/app/views/alchemy/notifications/registered_user_created.en.text.erb +13 -0
- data/app/views/alchemy/search/_result.html.erb +4 -6
- data/app/views/alchemy/search/_results.html.erb +4 -5
- data/app/views/alchemy/user_sessions/leave.html.erb +1 -1
- data/app/views/alchemy/user_sessions/new.html.erb +2 -2
- data/app/views/kaminari/_first_page.html.erb +11 -0
- data/app/views/kaminari/_gap.html.erb +1 -1
- data/app/views/kaminari/_last_page.html.erb +11 -0
- data/app/views/kaminari/_next_page.html.erb +2 -2
- data/app/views/kaminari/_page.html.erb +1 -1
- data/app/views/kaminari/_paginator.html.erb +2 -0
- data/app/views/kaminari/_prev_page.html.erb +2 -2
- data/app/views/layouts/alchemy/admin.html.erb +4 -5
- data/config/alchemy/config.yml +8 -12
- data/config/authorization_rules.rb +4 -3
- data/config/initializers/dragonfly.rb +20 -12
- data/config/locales/alchemy.de.yml +20 -15
- data/config/locales/alchemy.en.yml +15 -10
- data/config/locales/devise.de.yml +1 -0
- data/config/routes.rb +3 -3
- data/{spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb → db/migrate/20130214233001_alchemy_two_point_five.rb} +50 -36
- data/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb +21 -0
- data/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb +11 -0
- data/lib/alchemy/capistrano.rb +10 -8
- data/lib/alchemy/errors.rb +7 -0
- data/lib/alchemy/filetypes.rb +33 -0
- data/lib/alchemy/i18n.rb +9 -1
- data/lib/alchemy/name_conversions.rb +28 -0
- data/lib/alchemy/page_layout.rb +5 -3
- data/lib/alchemy/resource.rb +132 -29
- data/lib/alchemy/resources_helper.rb +81 -12
- data/lib/alchemy/upgrader.rb +14 -276
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy_cms.rb +17 -2
- data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +1 -1
- data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +1 -1
- data/lib/tasks/alchemy/convert.rake +39 -0
- data/lib/tasks/alchemy/install.rake +4 -6
- data/lib/tasks/alchemy/upgrade.rake +18 -1
- data/spec/controllers/admin/clipboard_controller_spec.rb +4 -4
- data/spec/controllers/admin/elements_controller_spec.rb +23 -23
- data/spec/controllers/admin/pages_controller_spec.rb +15 -0
- data/spec/controllers/admin/resources_controller_spec.rb +1 -11
- data/spec/controllers/admin/trash_controller_spec.rb +9 -9
- data/spec/controllers/attachments_controller_spec.rb +3 -3
- data/spec/controllers/elements_controller_spec.rb +2 -2
- data/spec/controllers/pages_controller_spec.rb +160 -129
- data/spec/controllers/pictures_controller_spec.rb +2 -2
- data/spec/controllers/user_sessions_controller_spec.rb +3 -3
- data/spec/controllers/users_controller_spec.rb +2 -2
- data/spec/dummy/app/models/event.rb +2 -2
- data/spec/dummy/app/models/location.rb +4 -0
- data/spec/dummy/app/views/layouts/application.html.erb +6 -42
- data/spec/dummy/config/routes.rb +1 -1
- data/spec/dummy/db/migrate/20121026104128_create_events.rb +0 -1
- data/{db/migrate/20121118000000_alchemy_two_point_four.rb → spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb} +50 -36
- data/spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb +21 -0
- data/spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb +11 -0
- data/spec/dummy/db/migrate/20130328101418_create_locations.rb +9 -0
- data/spec/dummy/db/schema.rb +15 -6
- data/spec/factories.rb +4 -4
- data/spec/{integration → features}/admin/link_overlay_spec.rb +0 -0
- data/spec/{integration → features}/admin/modules_integration_spec.rb +1 -1
- data/spec/{integration → features}/admin/pages_controller_spec.rb +9 -4
- data/spec/{integration → features}/admin/picture_library_integration_spec.rb +5 -5
- data/spec/{integration → features}/admin/resources_integration_spec.rb +1 -1
- data/spec/{integration → features}/navigation_spec.rb +0 -0
- data/spec/{integration → features}/pages_controller_spec.rb +42 -112
- data/spec/{integration → features}/picture_security_spec.rb +2 -2
- data/spec/{integration → features}/security_spec.rb +7 -7
- data/spec/{integration → features}/translation_integration_spec.rb +0 -0
- data/spec/helpers/admin/base_helper_spec.rb +0 -50
- data/spec/helpers/admin/tags_helper_spec.rb +53 -0
- data/spec/helpers/base_helper_spec.rb +19 -3
- data/spec/helpers/pages_helper_spec.rb +92 -44
- data/spec/{url_helpers_spec.rb → helpers/picture_url_helpers_spec.rb} +7 -7
- data/spec/helpers/url_helper_spec.rb +92 -72
- data/spec/{config_spec.rb → libraries/config_spec.rb} +0 -0
- data/spec/libraries/resource_spec.rb +215 -76
- data/spec/libraries/resources_helper_spec.rb +70 -28
- data/spec/models/attachment_spec.rb +75 -9
- data/spec/models/clipboard_spec.rb +1 -1
- data/spec/models/element_spec.rb +7 -0
- data/spec/models/page_spec.rb +144 -25
- data/spec/models/picture_spec.rb +5 -5
- data/spec/models/resource_spec.rb +47 -10
- data/spec/models/user_spec.rb +115 -3
- data/spec/{routing_spec.rb → routing/routing_spec.rb} +8 -20
- data/spec/spec_helper.rb +5 -6
- data/spec/support/alchemy/specs_helpers.rb +1 -1
- data/spec/support/ci/install_phantomjs +1 -1
- data/spec/support/image with spaces.png +0 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +18 -18
- data/vendor/assets/javascripts/jquery_plugins/{jquery.dialogextend.1_0_1.js → jquery.dialogextend.js} +25 -17
- data/vendor/assets/javascripts/jquery_plugins/jquery.scrollTo.min.js +7 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +7 -7
- data/vendor/assets/javascripts/keymage.min.js +6 -0
- data/vendor/assets/javascripts/spin.min.js +1 -0
- metadata +122 -124
- data/app/assets/images/alchemy/ajax_loader.gif +0 -0
- data/app/assets/images/alchemy/gui/toggle.png +0 -0
- data/app/assets/images/alchemy/image_loader.gif +0 -0
- data/app/assets/images/alchemy/shading.png +0 -0
- data/app/assets/images/alchemy/tabs.gif +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js +0 -172
- data/app/assets/javascripts/alchemy/alchemy.datepicker.js +0 -47
- data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +0 -91
- data/app/assets/javascripts/alchemy/alchemy.growler.js +0 -46
- data/app/assets/javascripts/alchemy/alchemy.image_cropper.js +0 -60
- data/app/assets/javascripts/alchemy/alchemy.js_extensions.js +0 -15
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js +0 -97
- data/app/assets/javascripts/alchemy/alchemy.windows.js +0 -321
- data/app/models/alchemy/clipboard_spec.rb +0 -0
- data/app/views/alchemy/admin/pictures/show_in_window.html.erb +0 -8
- data/app/views/alchemy/notifications/registered_user_created.text.erb +0 -11
- data/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +0 -21
- data/db/migrate/20121205155004_create_alchemy_sites.rb +0 -14
- data/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +0 -6
- data/db/migrate/20121220102223_add_aliases_to_site.rb +0 -6
- data/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb +0 -11
- data/db/migrate/20130121092645_migrate_to_devise.rb +0 -24
- data/spec/alchemy_spec.rb +0 -7
- data/spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +0 -21
- data/spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb +0 -14
- data/spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +0 -6
- data/spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb +0 -6
- data/spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb +0 -11
- data/spec/dummy/db/migrate/20130121092645_migrate_to_devise.rb +0 -24
- data/vendor/assets/javascripts/jquery_plugins/jquery.scrollTo-1.4.2-min.js +0 -11
@@ -1,321 +0,0 @@
|
|
1
|
-
if (typeof(Alchemy) === 'undefined') {
|
2
|
-
var Alchemy = {};
|
3
|
-
}
|
4
|
-
|
5
|
-
(function($) {
|
6
|
-
|
7
|
-
$.extend(Alchemy, {
|
8
|
-
|
9
|
-
getOverlaySpinner: function(options) {
|
10
|
-
var defaults = {
|
11
|
-
x: '400',
|
12
|
-
y: '300'
|
13
|
-
};
|
14
|
-
var settings = $.extend({}, defaults, options);
|
15
|
-
var $spinner_container = $('<div class="spinner_container"/>').css({
|
16
|
-
width: settings.x,
|
17
|
-
height: settings.y
|
18
|
-
});
|
19
|
-
var $spinner = $('<img src="/assets/alchemy/ajax_loader.gif" />');
|
20
|
-
$spinner_container.append($spinner);
|
21
|
-
$spinner.css({
|
22
|
-
position: 'absolute',
|
23
|
-
width: 32,
|
24
|
-
height: 32,
|
25
|
-
left: '50%',
|
26
|
-
top: '50%',
|
27
|
-
marginLeft: '-16px',
|
28
|
-
marginTop: '-16px'
|
29
|
-
});
|
30
|
-
return $spinner_container;
|
31
|
-
},
|
32
|
-
|
33
|
-
AjaxErrorHandler: function($dialog, status, textStatus, errorThrown) {
|
34
|
-
var $div = $('<div class="with_padding" />');
|
35
|
-
var $errorDiv = $('<div id="errorExplanation" class="ajax_status_code_' + status + '" />');
|
36
|
-
$dialog.html($div);
|
37
|
-
$div.append($errorDiv);
|
38
|
-
if (status === 0) {
|
39
|
-
$errorDiv.append('<h2>The server does not respond.</h2>');
|
40
|
-
$errorDiv.append('<p>Please check server and try again.</p>');
|
41
|
-
} else {
|
42
|
-
$errorDiv.append('<h2>' + errorThrown + ' (' + status + ')</h2>');
|
43
|
-
$errorDiv.append('<p>Please check log and try again.</p>');
|
44
|
-
}
|
45
|
-
},
|
46
|
-
|
47
|
-
ToolbarButton: function(options) {
|
48
|
-
var $btn = $('<div class="button_with_label"></div>'),
|
49
|
-
$lnk;
|
50
|
-
if (options.buttonId) $btn.attr({
|
51
|
-
'id': options.buttonId
|
52
|
-
});
|
53
|
-
$lnk = $('<a title="' + options.buttonTitle + '" class="icon_button" href="#"></a>');
|
54
|
-
$lnk.click(options.onClick);
|
55
|
-
$lnk.append('<span class="icon ' + options.iconClass + '"></span>');
|
56
|
-
$btn.append($lnk);
|
57
|
-
$btn.append('<br><label>' + options.buttonLabel + '</label>');
|
58
|
-
return $btn;
|
59
|
-
},
|
60
|
-
|
61
|
-
openConfirmWindow: function(options) {
|
62
|
-
var $confirmation = $('<div style="display:none" id="alchemyConfirmation"></div>');
|
63
|
-
$confirmation.appendTo('body');
|
64
|
-
$confirmation.html('<p>' + options.message + '</p>');
|
65
|
-
Alchemy.ConfirmationWindow = $confirmation.dialog({
|
66
|
-
resizable: false,
|
67
|
-
minHeight: 100,
|
68
|
-
minWidth: 300,
|
69
|
-
modal: true,
|
70
|
-
title: options.title,
|
71
|
-
show: "fade",
|
72
|
-
hide: "fade",
|
73
|
-
buttons: [{
|
74
|
-
text: options.cancelLabel,
|
75
|
-
click: function() {
|
76
|
-
$(this).dialog("close");
|
77
|
-
Alchemy.Buttons.enable();
|
78
|
-
}
|
79
|
-
}, {
|
80
|
-
text: options.okLabel,
|
81
|
-
click: function() {
|
82
|
-
$(this).dialog("close");
|
83
|
-
options.okCallback();
|
84
|
-
}
|
85
|
-
}],
|
86
|
-
open: function() {
|
87
|
-
Alchemy.Buttons.observe('#alchemyConfirmation');
|
88
|
-
},
|
89
|
-
close: function() {
|
90
|
-
$('#alchemyConfirmation').remove();
|
91
|
-
}
|
92
|
-
});
|
93
|
-
},
|
94
|
-
|
95
|
-
confirmToDeleteWindow: function(url, title, message, okLabel, cancelLabel) {
|
96
|
-
Alchemy.openConfirmWindow({
|
97
|
-
message: message,
|
98
|
-
title: title,
|
99
|
-
okLabel: okLabel,
|
100
|
-
cancelLabel: cancelLabel,
|
101
|
-
okCallback: function() {
|
102
|
-
Alchemy.pleaseWaitOverlay();
|
103
|
-
$.ajax({
|
104
|
-
url: url,
|
105
|
-
type: 'DELETE'
|
106
|
-
});
|
107
|
-
}
|
108
|
-
});
|
109
|
-
},
|
110
|
-
|
111
|
-
openWindow: function(action_url, title, size_x, size_y, resizable, modal, overflow) {
|
112
|
-
overflow == undefined ? overflow = true : overflow = overflow;
|
113
|
-
if (size_x === 'fullscreen') {
|
114
|
-
size_x = $(window).width() - 50;
|
115
|
-
size_y = $(window).height() - 50;
|
116
|
-
}
|
117
|
-
var $dialog = $('<div style="display:none" id="alchemyOverlay"></div>');
|
118
|
-
$dialog.appendTo('body');
|
119
|
-
$dialog.html(Alchemy.getOverlaySpinner({
|
120
|
-
x: size_x === 'auto' ? 400 : size_x,
|
121
|
-
y: size_y === 'auto' ? 300 : size_y
|
122
|
-
}));
|
123
|
-
Alchemy.CurrentWindow = $dialog.dialog({
|
124
|
-
modal: modal,
|
125
|
-
minWidth: size_x === 'auto' ? 400 : size_x,
|
126
|
-
minHeight: size_y === 'auto' ? 300 : size_y,
|
127
|
-
title: title,
|
128
|
-
resizable: resizable,
|
129
|
-
show: "fade",
|
130
|
-
hide: "fade",
|
131
|
-
width: size_x,
|
132
|
-
open: function(event, ui) {
|
133
|
-
$.ajax({
|
134
|
-
url: action_url,
|
135
|
-
success: function(data, textStatus, XMLHttpRequest) {
|
136
|
-
$dialog.html(data);
|
137
|
-
$dialog.css({
|
138
|
-
overflow: overflow ? 'visible' : 'auto'
|
139
|
-
});
|
140
|
-
$dialog.dialog('widget').css({
|
141
|
-
overflow: overflow ? 'visible' : 'hidden'
|
142
|
-
});
|
143
|
-
if (size_x === 'auto') {
|
144
|
-
$dialog.dialog('widget').css({
|
145
|
-
left: (($(window).width() / 2) - ($dialog.width() / 2))
|
146
|
-
});
|
147
|
-
}
|
148
|
-
if (size_y === 'auto') {
|
149
|
-
$dialog.dialog('widget').css({
|
150
|
-
top: ($(window).height() - $dialog.dialog('widget').height()) / 2
|
151
|
-
});
|
152
|
-
}
|
153
|
-
Alchemy.SelectBox('#alchemyOverlay');
|
154
|
-
Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
|
155
|
-
Alchemy.Buttons.observe('#alchemyOverlay');
|
156
|
-
Alchemy.overlayObserver('#alchemyOverlay');
|
157
|
-
},
|
158
|
-
error: function(XMLHttpRequest, textStatus, errorThrown) {
|
159
|
-
Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
|
160
|
-
},
|
161
|
-
complete: function(jqXHR, textStatus) {
|
162
|
-
Alchemy.Buttons.enable();
|
163
|
-
}
|
164
|
-
});
|
165
|
-
},
|
166
|
-
close: function() {
|
167
|
-
$dialog.remove();
|
168
|
-
}
|
169
|
-
});
|
170
|
-
},
|
171
|
-
|
172
|
-
closeCurrentWindow: function() {
|
173
|
-
if (Alchemy.CurrentWindow) {
|
174
|
-
Alchemy.CurrentWindow.dialog('close');
|
175
|
-
Alchemy.CurrentWindow = null;
|
176
|
-
} else {
|
177
|
-
$('#alchemyOverlay').dialog('close');
|
178
|
-
}
|
179
|
-
return true;
|
180
|
-
},
|
181
|
-
|
182
|
-
zoomImage: function(url, title, width, height) {
|
183
|
-
var window_height = height;
|
184
|
-
var window_width = width;
|
185
|
-
var $doc_width = $(window).width();
|
186
|
-
var $doc_height = $(window).height();
|
187
|
-
if (width > $doc_width) {
|
188
|
-
window_width = $doc_width - 50;
|
189
|
-
}
|
190
|
-
if (height > $doc_height) {
|
191
|
-
window_height = $doc_height - 50;
|
192
|
-
}
|
193
|
-
var $dialog = $('<div style="display:none" id="alchemyOverlay"></div>');
|
194
|
-
$dialog.appendTo('body');
|
195
|
-
$dialog.html(Alchemy.getOverlaySpinner({
|
196
|
-
x: width,
|
197
|
-
y: height
|
198
|
-
}));
|
199
|
-
$dialog.dialog({
|
200
|
-
modal: false,
|
201
|
-
minWidth: window_width < 320 ? 320 : window_width,
|
202
|
-
minHeight: window_height < 240 ? 240 : window_height,
|
203
|
-
title: title,
|
204
|
-
show: "fade",
|
205
|
-
hide: "fade",
|
206
|
-
open: function(event, ui) {
|
207
|
-
$.ajax({
|
208
|
-
url: url,
|
209
|
-
success: function(data, textStatus, XMLHttpRequest) {
|
210
|
-
$dialog.html(data);
|
211
|
-
},
|
212
|
-
error: function(XMLHttpRequest, textStatus, errorThrown) {
|
213
|
-
Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
|
214
|
-
}
|
215
|
-
});
|
216
|
-
},
|
217
|
-
close: function() {
|
218
|
-
$dialog.remove();
|
219
|
-
}
|
220
|
-
});
|
221
|
-
return false;
|
222
|
-
},
|
223
|
-
|
224
|
-
openTrashWindow: function(page_id, title) {
|
225
|
-
var size_x = 380,
|
226
|
-
size_y = 270;
|
227
|
-
if (size_x === 'fullscreen') {
|
228
|
-
size_x = $(window).width() - 50;
|
229
|
-
size_y = $(window).height() - 50;
|
230
|
-
}
|
231
|
-
var $dialog = $('<div style="display:none" id="alchemyTrashWindow"></div>');
|
232
|
-
$dialog.appendTo('body');
|
233
|
-
$dialog.html(Alchemy.getOverlaySpinner({
|
234
|
-
x: size_x,
|
235
|
-
y: size_y
|
236
|
-
}));
|
237
|
-
|
238
|
-
Alchemy.trashWindow = $dialog.dialog({
|
239
|
-
modal: false,
|
240
|
-
width: 380,
|
241
|
-
minHeight: 450,
|
242
|
-
maxHeight: $(window).height() - 50,
|
243
|
-
title: title,
|
244
|
-
resizable: false,
|
245
|
-
show: "fade",
|
246
|
-
hide: "fade",
|
247
|
-
open: function(event, ui) {
|
248
|
-
$.ajax({
|
249
|
-
url: Alchemy.routes.admin_trash_path(page_id),
|
250
|
-
success: function(data, textStatus, XMLHttpRequest) {
|
251
|
-
$dialog.html(data);
|
252
|
-
// Need this for DragnDrop elements into elements window.
|
253
|
-
// Badly this is screwing up maxHeight option
|
254
|
-
$dialog.css({
|
255
|
-
overflow: 'visible'
|
256
|
-
}).dialog('widget').css({
|
257
|
-
overflow: 'visible'
|
258
|
-
});
|
259
|
-
Alchemy.overlayObserver('#alchemyTrashWindow');
|
260
|
-
},
|
261
|
-
error: function(XMLHttpRequest, textStatus, errorThrown) {
|
262
|
-
Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
|
263
|
-
}
|
264
|
-
});
|
265
|
-
},
|
266
|
-
close: function() {
|
267
|
-
$dialog.remove();
|
268
|
-
}
|
269
|
-
});
|
270
|
-
},
|
271
|
-
|
272
|
-
refreshTrashWindow: function(page_id) {
|
273
|
-
if ($('#alchemyTrashWindow').length > 0) {
|
274
|
-
$('#alchemyTrashWindow').html(Alchemy.getOverlaySpinner({
|
275
|
-
x: 380,
|
276
|
-
y: 270
|
277
|
-
}));
|
278
|
-
$.get(Alchemy.routes.admin_trash_path(page_id), function(html) {
|
279
|
-
$('#alchemyTrashWindow').html(html);
|
280
|
-
});
|
281
|
-
}
|
282
|
-
},
|
283
|
-
|
284
|
-
overlayObserver: function(scope) {
|
285
|
-
$('a[data-alchemy-overlay]', scope).on('click', function(event) {
|
286
|
-
var $this = $(this);
|
287
|
-
var options = $this.data('alchemy-overlay');
|
288
|
-
event.preventDefault();
|
289
|
-
Alchemy.openWindow($this.attr('href'), options.title, options.size_x, options.size_y, options.resizable, options.modal, options.overflow);
|
290
|
-
return false;
|
291
|
-
});
|
292
|
-
|
293
|
-
$('a[data-alchemy-confirm-delete]', scope).on('click', function(event) {
|
294
|
-
var $this = $(this);
|
295
|
-
var options = $this.data('alchemy-confirm-delete');
|
296
|
-
event.preventDefault();
|
297
|
-
Alchemy.confirmToDeleteWindow($this.attr('href'), options.title, options.message, options.ok_label, options.cancel_label);
|
298
|
-
return false;
|
299
|
-
});
|
300
|
-
|
301
|
-
$('input[data-alchemy-confirm], button[data-alchemy-confirm]', scope).on('click', function(event) {
|
302
|
-
var $this = $(this), self = this;
|
303
|
-
var options = $this.data('alchemy-confirm');
|
304
|
-
event.preventDefault();
|
305
|
-
Alchemy.openConfirmWindow($.extend(options, {
|
306
|
-
okCallback: function() {
|
307
|
-
Alchemy.pleaseWaitOverlay();
|
308
|
-
self.form.submit();
|
309
|
-
}
|
310
|
-
}));
|
311
|
-
return false;
|
312
|
-
});
|
313
|
-
}
|
314
|
-
|
315
|
-
});
|
316
|
-
|
317
|
-
$(document).ready(function() {
|
318
|
-
Alchemy.overlayObserver();
|
319
|
-
});
|
320
|
-
|
321
|
-
})(jQuery);
|
File without changes
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<%= Alchemy::I18n.t('mailer.new_user_mail.welcome') %>!
|
2
|
-
|
3
|
-
<%= Alchemy::I18n.t('mailer.new_user_mail.login_url_explanation') %>:
|
4
|
-
|
5
|
-
<%= @url %>
|
6
|
-
|
7
|
-
<%= Alchemy::I18n.t('mailer.new_user_mail.username') %>: <%= @user.login %>
|
8
|
-
|
9
|
-
<%= Alchemy::I18n.t('mailer.new_user_mail.password_notice') % {:url => new_password_url(@user)}%>
|
10
|
-
|
11
|
-
<%= Alchemy::I18n.t('mailer.new_user_mail.greeting') %>
|
@@ -1,21 +0,0 @@
|
|
1
|
-
class SwitchFromFleximageToDragonfly < ActiveRecord::Migration
|
2
|
-
def up
|
3
|
-
change_table :alchemy_pictures do |t|
|
4
|
-
t.string :image_file_uid
|
5
|
-
t.integer :image_file_size
|
6
|
-
t.rename :image_width, :image_file_width
|
7
|
-
t.rename :image_height, :image_file_height
|
8
|
-
t.rename :image_filename, :image_file_name
|
9
|
-
end
|
10
|
-
end
|
11
|
-
|
12
|
-
def down
|
13
|
-
change_table :alchemy_pictures do |t|
|
14
|
-
t.remove :image_file_uid
|
15
|
-
t.remove :image_file_size
|
16
|
-
t.rename :image_file_width, :image_width
|
17
|
-
t.rename :image_file_height, :image_height
|
18
|
-
t.rename :image_file_name, :image_filename
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
class CreateAlchemySites < ActiveRecord::Migration
|
2
|
-
def change
|
3
|
-
create_table "alchemy_sites" do |t|
|
4
|
-
t.string :host
|
5
|
-
t.string :name
|
6
|
-
t.timestamps
|
7
|
-
end
|
8
|
-
add_index :alchemy_sites, :host, uniq: true
|
9
|
-
|
10
|
-
# add Language#site_id
|
11
|
-
add_column :alchemy_languages, :site_id, :integer
|
12
|
-
add_index :alchemy_languages, :site_id
|
13
|
-
end
|
14
|
-
end
|
@@ -1,11 +0,0 @@
|
|
1
|
-
class CreateAlchemyLegacyPageUrls < ActiveRecord::Migration
|
2
|
-
def change
|
3
|
-
create_table :alchemy_legacy_page_urls do |t|
|
4
|
-
t.string :urlname, null: false
|
5
|
-
t.integer :page_id, null: false
|
6
|
-
|
7
|
-
t.timestamps
|
8
|
-
end
|
9
|
-
add_index :alchemy_legacy_page_urls, :urlname
|
10
|
-
end
|
11
|
-
end
|
@@ -1,24 +0,0 @@
|
|
1
|
-
class MigrateToDevise < ActiveRecord::Migration
|
2
|
-
def change
|
3
|
-
change_table :alchemy_users do |t|
|
4
|
-
t.rename :crypted_password, :encrypted_password
|
5
|
-
t.rename :login_count, :sign_in_count
|
6
|
-
t.rename :current_login_at, :current_sign_in_at
|
7
|
-
t.rename :last_login_at, :last_sign_in_at
|
8
|
-
t.rename :current_login_ip, :current_sign_in_ip
|
9
|
-
t.rename :last_login_ip, :last_sign_in_ip
|
10
|
-
t.rename :failed_login_count, :failed_attempts
|
11
|
-
|
12
|
-
t.remove :persistence_token
|
13
|
-
t.remove :perishable_token
|
14
|
-
t.remove :single_access_token
|
15
|
-
|
16
|
-
t.column :reset_password_token, :string
|
17
|
-
t.column :reset_password_sent_at, :datetime
|
18
|
-
|
19
|
-
t.index :email, :unique => true
|
20
|
-
t.index :login, :unique => true
|
21
|
-
t.index :reset_password_token, :unique => true
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
data/spec/alchemy_spec.rb
DELETED
@@ -1,21 +0,0 @@
|
|
1
|
-
class SwitchFromFleximageToDragonfly < ActiveRecord::Migration
|
2
|
-
def up
|
3
|
-
change_table :alchemy_pictures do |t|
|
4
|
-
t.string :image_file_uid
|
5
|
-
t.integer :image_file_size
|
6
|
-
t.rename :image_width, :image_file_width
|
7
|
-
t.rename :image_height, :image_file_height
|
8
|
-
t.rename :image_filename, :image_file_name
|
9
|
-
end
|
10
|
-
end
|
11
|
-
|
12
|
-
def down
|
13
|
-
change_table :alchemy_pictures do |t|
|
14
|
-
t.remove :image_file_uid
|
15
|
-
t.remove :image_file_size
|
16
|
-
t.rename :image_file_width, :image_width
|
17
|
-
t.rename :image_file_height, :image_height
|
18
|
-
t.rename :image_file_name, :image_filename
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|