alchemy_cms 2.9.1 → 3.0.0.rc5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -1
- data/.travis.yml +14 -3
- data/CONTRIBUTING.md +73 -0
- data/Gemfile +25 -24
- data/LICENSE +19 -16
- data/README.md +16 -33
- data/alchemy_cms.gemspec +62 -59
- data/app/assets/images/alchemy/alchemy-logo.svg +70 -0
- data/app/assets/images/alchemy/favicon.ico +0 -0
- data/app/assets/images/alchemy/icon.svg +14 -0
- data/app/assets/javascripts/alchemy/alchemy.autocomplete.js.coffee +30 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +28 -30
- data/app/assets/javascripts/alchemy/alchemy.browser.js.coffee +20 -26
- data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +80 -0
- data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +261 -0
- data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +15 -15
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +4 -1
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +20 -9
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +67 -68
- data/app/assets/javascripts/alchemy/alchemy.file_progress.js.coffee +63 -0
- data/app/assets/javascripts/alchemy/alchemy.growler.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +2 -1
- data/app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee +32 -14
- data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +21 -0
- data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +4 -1
- data/app/assets/javascripts/alchemy/{alchemy.onload.js.coffee → alchemy.initializer.js.coffee} +22 -5
- data/app/assets/javascripts/alchemy/alchemy.js +13 -11
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +221 -0
- data/app/assets/javascripts/alchemy/alchemy.list_filter.js.coffee +2 -2
- data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +0 -2
- data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +37 -35
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +42 -69
- data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.spinner.js.coffee +4 -4
- data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb +3 -7
- data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +107 -19
- data/app/assets/javascripts/alchemy/alchemy.uploader.js.coffee +97 -0
- data/app/assets/javascripts/alchemy/alchemy.windows.js.coffee +14 -273
- data/app/assets/javascripts/alchemy/menubar.js.coffee +8 -0
- data/app/assets/javascripts/alchemy/preview.js +0 -2
- data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js +19 -0
- data/app/assets/stylesheets/alchemy/{defaults.scss → _defaults.scss} +2 -0
- data/app/assets/stylesheets/alchemy/{extends.scss → _extends.scss} +7 -61
- data/app/assets/stylesheets/alchemy/_mixins.scss +112 -0
- data/app/assets/stylesheets/alchemy/{variables.scss → _variables.scss} +31 -11
- data/app/assets/stylesheets/alchemy/admin.css.scss +6 -3
- data/app/assets/stylesheets/alchemy/archive.scss +27 -32
- data/app/assets/stylesheets/alchemy/base.scss +93 -127
- data/app/assets/stylesheets/alchemy/buttons.scss +227 -0
- data/app/assets/stylesheets/alchemy/dashboard.scss +14 -1
- data/app/assets/stylesheets/alchemy/dialogs.scss +209 -0
- data/app/assets/stylesheets/alchemy/elements.scss +173 -210
- data/app/assets/stylesheets/alchemy/errors.scss +5 -15
- data/app/assets/stylesheets/alchemy/flash.scss +12 -11
- data/app/assets/stylesheets/alchemy/form_fields.scss +56 -0
- data/app/assets/stylesheets/alchemy/forms.scss +161 -0
- data/app/assets/stylesheets/alchemy/frame.scss +8 -6
- data/app/assets/stylesheets/alchemy/icon-font.css.scss +40 -40
- data/app/assets/stylesheets/alchemy/icons.scss +14 -6
- data/app/assets/stylesheets/alchemy/jquery-ui.scss +11 -629
- data/app/assets/stylesheets/alchemy/menubar.css.scss +27 -72
- data/app/assets/stylesheets/alchemy/notices.scss +6 -5
- data/app/assets/stylesheets/alchemy/pagination.scss +1 -1
- data/app/assets/stylesheets/alchemy/search.scss +4 -3
- data/app/assets/stylesheets/alchemy/selects.scss +199 -0
- data/app/assets/stylesheets/alchemy/sitemap.scss +31 -60
- data/app/assets/stylesheets/alchemy/tables.scss +0 -77
- data/app/assets/stylesheets/alchemy/toolbar.scss +0 -2
- data/app/assets/stylesheets/alchemy/upload.scss +60 -57
- data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +81 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/readme.md +1 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.eot +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.svg +175 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.ttf +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.woff +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.eot +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.svg +153 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.ttf +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.woff +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/img/anchor.gif +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/img/loader.gif +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/img/object.gif +0 -0
- data/{vendor/assets/javascripts/tiny_mce/themes/advanced → app/assets/stylesheets/tinymce/skins/alchemy}/img/trans.gif +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/img/wline.gif +0 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/skin.ie7.min.css +1 -0
- data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +1813 -0
- data/app/controllers/alchemy/admin/attachments_controller.rb +39 -50
- data/app/controllers/alchemy/admin/base_controller.rb +32 -32
- data/app/controllers/alchemy/admin/clipboard_controller.rb +2 -2
- data/app/controllers/alchemy/admin/contents_controller.rb +12 -7
- data/app/controllers/alchemy/admin/dashboard_controller.rb +1 -1
- data/app/controllers/alchemy/admin/elements_controller.rb +41 -32
- data/app/controllers/alchemy/admin/essence_files_controller.rb +4 -3
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +13 -16
- data/app/controllers/alchemy/admin/languages_controller.rb +0 -1
- data/app/controllers/alchemy/admin/layoutpages_controller.rb +2 -1
- data/app/controllers/alchemy/admin/pages_controller.rb +106 -166
- data/app/controllers/alchemy/admin/pictures_controller.rb +54 -80
- data/app/controllers/alchemy/admin/resources_controller.rb +25 -9
- data/app/controllers/alchemy/admin/tags_controller.rb +26 -14
- data/app/controllers/alchemy/admin/trash_controller.rb +5 -2
- data/app/controllers/alchemy/attachments_controller.rb +8 -8
- data/app/controllers/alchemy/base_controller.rb +23 -89
- data/app/controllers/alchemy/contents_controller.rb +17 -0
- data/app/controllers/alchemy/elements_controller.rb +7 -30
- data/app/controllers/alchemy/messages_controller.rb +18 -18
- data/app/controllers/alchemy/pages_controller.rb +73 -48
- data/app/controllers/alchemy/pictures_controller.rb +45 -46
- data/app/helpers/alchemy/admin/attachments_helper.rb +1 -0
- data/app/helpers/alchemy/admin/base_helper.rb +95 -90
- data/app/helpers/alchemy/admin/contents_helper.rb +34 -37
- data/app/helpers/alchemy/admin/elements_helper.rb +4 -5
- data/app/helpers/alchemy/admin/essences_helper.rb +13 -90
- data/app/helpers/alchemy/admin/form_helper.rb +30 -0
- data/app/helpers/alchemy/admin/navigation_helper.rb +34 -2
- data/app/helpers/alchemy/base_helper.rb +3 -3
- data/app/helpers/alchemy/elements_helper.rb +105 -142
- data/app/helpers/alchemy/essences_helper.rb +17 -53
- data/app/helpers/alchemy/pages_helper.rb +148 -177
- data/app/helpers/alchemy/url_helper.rb +5 -25
- data/app/models/alchemy/attachment.rb +39 -14
- data/app/models/alchemy/cell.rb +18 -4
- data/app/models/alchemy/content.rb +69 -79
- data/app/models/alchemy/content/factory.rb +2 -6
- data/app/models/alchemy/element.rb +94 -89
- data/app/models/alchemy/essence_boolean.rb +13 -2
- data/app/models/alchemy/essence_date.rb +15 -8
- data/app/models/alchemy/essence_file.rb +25 -1
- data/app/models/alchemy/essence_html.rb +13 -6
- data/app/models/alchemy/essence_link.rb +16 -7
- data/app/models/alchemy/essence_picture.rb +102 -21
- data/app/models/alchemy/essence_richtext.rb +15 -37
- data/app/models/alchemy/essence_select.rb +13 -2
- data/app/models/alchemy/essence_text.rb +17 -42
- data/app/models/alchemy/folded_page.rb +10 -0
- data/app/models/alchemy/language.rb +62 -48
- data/app/models/alchemy/legacy_page_url.rb +12 -2
- data/app/models/alchemy/message.rb +11 -43
- data/app/models/alchemy/page.rb +107 -88
- data/app/models/alchemy/page/{page_cells.rb → cells.rb} +2 -2
- data/app/models/alchemy/page/{page_elements.rb → elements.rb} +5 -6
- data/app/models/alchemy/page/{page_naming.rb → naming.rb} +6 -11
- data/app/models/alchemy/page/{page_natures.rb → natures.rb} +29 -5
- data/app/models/alchemy/page/{page_scopes.rb → scopes.rb} +14 -14
- data/app/models/alchemy/page/{page_users.rb → users.rb} +4 -4
- data/app/models/alchemy/picture.rb +113 -41
- data/app/models/alchemy/picture/sweeping.rb +17 -0
- data/app/models/alchemy/site.rb +14 -2
- data/app/models/alchemy/tag.rb +8 -0
- data/app/serializers/alchemy/attachment_serializer.rb +15 -0
- data/app/serializers/alchemy/cell_serializer.rb +18 -0
- data/app/serializers/alchemy/content_serializer.rb +27 -0
- data/app/serializers/alchemy/element_serializer.rb +17 -0
- data/app/serializers/alchemy/essence_boolean_serializer.rb +11 -0
- data/app/serializers/alchemy/essence_date_serializer.rb +11 -0
- data/app/serializers/alchemy/essence_file_serializer.rb +12 -0
- data/app/serializers/alchemy/essence_html_serializer.rb +11 -0
- data/app/serializers/alchemy/essence_link_serializer.rb +14 -0
- data/app/serializers/alchemy/essence_picture_serializer.rb +28 -0
- data/app/serializers/alchemy/essence_richtext_serializer.rb +12 -0
- data/app/serializers/alchemy/essence_select_serializer.rb +11 -0
- data/app/serializers/alchemy/essence_text_serializer.rb +22 -0
- data/app/serializers/alchemy/page_serializer.rb +29 -0
- data/app/serializers/alchemy/picture_serializer.rb +16 -0
- data/app/views/alchemy/_menubar.html.erb +16 -0
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +27 -29
- data/app/views/alchemy/admin/attachments/_attachment.html.erb +24 -24
- data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +1 -1
- data/app/views/alchemy/admin/attachments/_files_list.html.erb +1 -1
- data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb +2 -2
- data/app/views/alchemy/admin/attachments/archive_overlay.js.erb +7 -4
- data/app/views/alchemy/admin/attachments/create.js.erb +11 -9
- data/app/views/alchemy/admin/attachments/edit.html.erb +9 -26
- data/app/views/alchemy/admin/attachments/index.html.erb +4 -4
- data/app/views/alchemy/admin/attachments/new.html.erb +13 -10
- data/app/views/alchemy/admin/attachments/show.html.erb +1 -1
- data/app/views/alchemy/admin/clipboard/clear.js.erb +3 -7
- data/app/views/alchemy/admin/clipboard/index.html.erb +21 -22
- data/app/views/alchemy/admin/clipboard/insert.js.erb +19 -14
- data/app/views/alchemy/admin/contents/_missing.html.erb +10 -12
- data/app/views/alchemy/admin/contents/create.js.erb +32 -36
- data/app/views/alchemy/admin/contents/destroy.js.coffee +3 -3
- data/app/views/alchemy/admin/contents/new.html.erb +9 -21
- data/app/views/alchemy/admin/contents/order.js.erb +2 -5
- data/app/views/alchemy/admin/dashboard/help.html.erb +21 -0
- data/app/views/alchemy/admin/dashboard/index.html.erb +5 -7
- data/app/views/alchemy/admin/dashboard/info.html.erb +13 -9
- data/app/views/alchemy/admin/elements/_add_picture.html.erb +6 -6
- data/app/views/alchemy/admin/elements/_element.html.erb +4 -1
- data/app/views/alchemy/admin/elements/_element_head.html.erb +2 -2
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +20 -27
- data/app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb +7 -7
- data/app/views/alchemy/admin/elements/_refresh_editor.js.erb +1 -1
- data/app/views/alchemy/admin/elements/create.js.erb +6 -6
- data/app/views/alchemy/admin/elements/fold.js.erb +10 -10
- data/app/views/alchemy/admin/elements/index.html.erb +24 -26
- data/app/views/alchemy/admin/elements/list.html.erb +16 -0
- data/app/views/alchemy/admin/elements/new.html.erb +12 -28
- data/app/views/alchemy/admin/elements/trash.js.erb +3 -3
- data/app/views/alchemy/admin/elements/update.js.erb +12 -8
- data/app/views/alchemy/admin/essence_files/assign.js.erb +9 -14
- data/app/views/alchemy/admin/essence_files/edit.html.erb +17 -27
- data/app/views/alchemy/admin/essence_pictures/assign.js.erb +18 -0
- data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
- data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +9 -13
- data/app/views/alchemy/admin/essence_pictures/edit.html.erb +27 -67
- data/app/views/alchemy/admin/essence_pictures/save_link.js.erb +1 -1
- data/app/views/alchemy/admin/essence_pictures/update.js.erb +3 -3
- data/app/views/alchemy/admin/languages/_form.html.erb +13 -55
- data/app/views/alchemy/admin/languages/_language.html.erb +10 -16
- data/app/views/alchemy/admin/languages/_table.html.erb +1 -1
- data/app/views/alchemy/admin/languages/index.html.erb +4 -4
- data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +25 -27
- data/app/views/alchemy/admin/layoutpages/index.html.erb +5 -5
- data/app/views/alchemy/admin/pages/_create_language_form.html.erb +25 -31
- data/app/views/alchemy/admin/pages/_external_link.html.erb +24 -35
- data/app/views/alchemy/admin/pages/_file_link.html.erb +31 -45
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +36 -42
- data/app/views/alchemy/admin/pages/_new_page_form.html.erb +8 -26
- data/app/views/alchemy/admin/pages/_page.html.erb +76 -75
- data/app/views/alchemy/admin/pages/_page_for_links.html.erb +15 -16
- data/app/views/alchemy/admin/pages/configure.html.erb +56 -86
- data/app/views/alchemy/admin/pages/configure_external.html.erb +32 -39
- data/app/views/alchemy/admin/pages/destroy.js.erb +10 -10
- data/app/views/alchemy/admin/pages/edit.html.erb +57 -63
- data/app/views/alchemy/admin/pages/fold.js.erb +3 -5
- data/app/views/alchemy/admin/pages/index.html.erb +11 -13
- data/app/views/alchemy/admin/pages/info.html.erb +28 -31
- data/app/views/alchemy/admin/pages/link.html.erb +8 -19
- data/app/views/alchemy/admin/pages/new.html.erb +11 -35
- data/app/views/alchemy/admin/pages/show.html.erb +1 -1
- data/app/views/alchemy/admin/pages/sort.js.erb +5 -7
- data/app/views/alchemy/admin/pages/update.js.erb +19 -20
- data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb +1 -9
- data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +8 -19
- data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_sub_navigation.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_toolbar_button.html.erb +3 -3
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +37 -55
- data/app/views/alchemy/admin/pictures/_archive.html.erb +3 -3
- data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +11 -13
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +4 -2
- data/app/views/alchemy/admin/pictures/_picture.html.erb +37 -37
- data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/archive_overlay.js.erb +8 -5
- data/app/views/alchemy/admin/pictures/edit.html.erb +8 -21
- data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +15 -33
- data/app/views/alchemy/admin/pictures/index.html.erb +9 -7
- data/app/views/alchemy/admin/pictures/index.js.erb +2 -2
- data/app/views/alchemy/admin/pictures/info.html.erb +35 -40
- data/app/views/alchemy/admin/pictures/new.html.erb +15 -11
- data/app/views/alchemy/admin/pictures/show.html.erb +5 -5
- data/app/views/alchemy/admin/resources/_form.html.erb +7 -31
- data/app/views/alchemy/admin/resources/_resource.html.erb +9 -16
- data/app/views/alchemy/admin/resources/_table.html.erb +1 -1
- data/app/views/alchemy/admin/resources/index.html.erb +5 -5
- data/app/views/alchemy/admin/sites/index.html.erb +3 -3
- data/app/views/alchemy/admin/tags/_tag.html.erb +15 -15
- data/app/views/alchemy/admin/tags/edit.html.erb +20 -37
- data/app/views/alchemy/admin/tags/index.html.erb +16 -19
- data/app/views/alchemy/admin/tags/new.html.erb +6 -15
- data/app/views/alchemy/admin/trash/clear.js.coffee +2 -2
- data/app/views/alchemy/admin/trash/index.html.erb +24 -20
- data/app/views/alchemy/base/500.html.erb +2 -2
- data/app/views/alchemy/base/error_notice.js.erb +1 -1
- data/app/views/alchemy/base/leave.html.erb +11 -11
- data/app/views/alchemy/base/permission_denied.js.erb +1 -1
- data/app/views/alchemy/base/redirect.js.erb +12 -1
- data/app/views/alchemy/base/update.js.erb +4 -4
- data/app/views/alchemy/breadcrumb/_spacer.html.erb +1 -1
- data/app/views/alchemy/elements/show.js.erb +1 -5
- data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_boolean_view.html.erb +3 -1
- data/app/views/alchemy/essences/_essence_date_editor.html.erb +4 -3
- data/app/views/alchemy/essences/_essence_date_view.html.erb +9 -5
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +33 -32
- data/app/views/alchemy/essences/_essence_file_view.html.erb +9 -7
- data/app/views/alchemy/essences/_essence_html_view.html.erb +3 -1
- data/app/views/alchemy/essences/_essence_link_editor.html.erb +2 -2
- data/app/views/alchemy/essences/_essence_link_view.html.erb +5 -1
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +11 -11
- data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -1
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_richtext_view.html.erb +3 -4
- data/app/views/alchemy/essences/_essence_select_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_select_view.html.erb +3 -1
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +14 -28
- data/app/views/alchemy/essences/_essence_text_view.html.erb +4 -0
- data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +29 -29
- data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +9 -9
- data/app/views/alchemy/language_links/_language.html.erb +1 -1
- data/app/views/kaminari/{_first_page.html.erb → alchemy/_first_page.html.erb} +1 -1
- data/app/views/kaminari/{_gap.html.erb → alchemy/_gap.html.erb} +0 -0
- data/app/views/kaminari/{_last_page.html.erb → alchemy/_last_page.html.erb} +1 -1
- data/app/views/kaminari/{_next_page.html.erb → alchemy/_next_page.html.erb} +2 -2
- data/app/views/kaminari/{_page.html.erb → alchemy/_page.html.erb} +2 -2
- data/app/views/kaminari/{_paginator.html.erb → alchemy/_paginator.html.erb} +0 -0
- data/app/views/kaminari/{_prev_page.html.erb → alchemy/_prev_page.html.erb} +2 -2
- data/app/views/layouts/alchemy/admin.html.erb +17 -17
- data/bin/alchemy +179 -44
- data/bin/rails +8 -0
- data/config/alchemy/config.yml +24 -22
- data/config/alchemy/modules.yml +7 -1
- data/config/initializers/dragonfly.rb +20 -23
- data/config/initializers/simple_form.rb +144 -0
- data/config/locales/alchemy.de.yml +42 -33
- data/config/locales/alchemy.en.yml +32 -19
- data/config/locales/alchemy.nl.yml +937 -0
- data/config/locales/simple_form.de.yml +26 -0
- data/config/locales/simple_form.en.yml +25 -0
- data/config/locales/simple_form.nl.yml +25 -0
- data/config/routes.rb +9 -10
- data/db/migrate/20130827094554_alchemy_two_point_six.rb +261 -251
- data/db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb +5 -0
- data/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb +5 -0
- data/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb +5 -0
- data/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb +21 -0
- data/lib/alchemy/auth_accessors.rb +23 -2
- data/lib/alchemy/cache_digests/template_tracker.rb +65 -0
- data/lib/alchemy/capistrano.rb +28 -38
- data/lib/alchemy/controller_actions.rb +130 -0
- data/lib/alchemy/engine.rb +54 -47
- data/lib/alchemy/essence.rb +83 -63
- data/lib/alchemy/forms/builder.rb +23 -0
- data/lib/alchemy/hints.rb +57 -0
- data/lib/alchemy/locale.rb +63 -0
- data/lib/alchemy/modules.rb +17 -17
- data/lib/alchemy/mount_point.rb +1 -1
- data/lib/alchemy/permissions.rb +199 -0
- data/lib/alchemy/picture_attributes.rb +1 -1
- data/lib/alchemy/resource.rb +13 -17
- data/lib/alchemy/resources_helper.rb +16 -18
- data/lib/alchemy/seeder.rb +8 -10
- data/lib/alchemy/shell.rb +8 -6
- data/lib/alchemy/tasks/helpers.rb +6 -4
- data/lib/alchemy/test_support/auth_helpers.rb +3 -3
- data/lib/alchemy/test_support/controller_requests.rb +1 -1
- data/lib/alchemy/test_support/essence_shared_examples.rb +141 -0
- data/lib/alchemy/test_support/factories.rb +27 -9
- data/lib/alchemy/test_support/integration_helpers.rb +1 -27
- data/lib/alchemy/tinymce.rb +12 -32
- data/lib/alchemy/touching.rb +41 -0
- data/lib/alchemy/upgrader.rb +17 -12
- data/lib/alchemy/upgrader/three_point_zero.rb +62 -0
- data/lib/alchemy/version.rb +2 -1
- data/lib/alchemy_cms.rb +1 -7
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +3 -2
- data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +0 -2
- data/lib/rails/generators/alchemy/elements/templates/editor.html.haml +2 -3
- data/lib/rails/generators/alchemy/elements/templates/editor.html.slim +0 -2
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +23 -23
- data/lib/rails/generators/alchemy/elements/templates/view.html.haml +16 -17
- data/lib/rails/generators/alchemy/elements/templates/view.html.slim +16 -17
- data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +1 -1
- data/lib/rails/generators/alchemy/scaffold/files/_article_editor.html.erb +5 -0
- data/lib/rails/generators/alchemy/scaffold/files/_article_view.html.erb +7 -0
- data/lib/rails/generators/alchemy/scaffold/files/alchemy.de.yml +31 -0
- data/lib/rails/generators/alchemy/scaffold/files/alchemy.elements.css.scss +30 -0
- data/lib/rails/generators/alchemy/scaffold/files/alchemy.en.yml +31 -0
- data/lib/rails/generators/alchemy/scaffold/files/application.html.erb +4 -2
- data/lib/rails/generators/alchemy/scaffold/files/elements.yml +16 -0
- data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +16 -7
- data/lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt +3 -2
- data/lib/rails/templates/alchemy.rb +3 -6
- data/lib/tasks/alchemy/install.rake +29 -38
- data/lib/tasks/alchemy/tidy.rake +1 -1
- data/spec/controllers/admin/attachments_controller_spec.rb +101 -35
- data/spec/controllers/admin/clipboard_controller_spec.rb +16 -18
- data/spec/controllers/admin/contents_controller_spec.rb +34 -27
- data/spec/controllers/admin/dashboard_controller_spec.rb +2 -4
- data/spec/controllers/admin/elements_controller_spec.rb +288 -160
- data/spec/controllers/admin/essence_files_controller_spec.rb +11 -18
- data/spec/controllers/admin/essence_pictures_controller_spec.rb +15 -24
- data/spec/controllers/admin/languages_controller_spec.rb +11 -4
- data/spec/controllers/admin/layoutpages_controller_spec.rb +1 -2
- data/spec/controllers/admin/pages_controller_spec.rb +137 -167
- data/spec/controllers/admin/pictures_controller_spec.rb +286 -14
- data/spec/controllers/admin/resources_controller_spec.rb +4 -1
- data/spec/controllers/alchemy/admin/tags_controller_spec.rb +63 -0
- data/spec/controllers/attachments_controller_spec.rb +3 -3
- data/spec/controllers/base_controller_spec.rb +12 -104
- data/spec/controllers/elements_controller_spec.rb +2 -5
- data/spec/controllers/messages_controller_spec.rb +49 -51
- data/spec/controllers/pages_controller_spec.rb +91 -111
- data/spec/controllers/pictures_controller_spec.rb +126 -72
- data/spec/dummy/Rakefile +0 -1
- data/spec/dummy/app/assets/javascripts/application.js +11 -7
- data/spec/dummy/app/assets/stylesheets/application.css +11 -5
- data/spec/dummy/app/models/ability.rb +9 -0
- data/spec/dummy/app/models/dummy_user.rb +7 -0
- data/spec/dummy/app/models/event.rb +7 -2
- data/spec/dummy/app/models/location.rb +0 -1
- data/spec/dummy/app/views/alchemy/elements/_article_editor.html.erb +0 -1
- data/spec/dummy/app/views/alchemy/elements/_headline_editor.html.erb +1 -0
- data/spec/dummy/app/views/layouts/application.html.erb +3 -1
- data/spec/dummy/bin/bundle +3 -0
- data/spec/dummy/bin/rails +4 -0
- data/spec/dummy/bin/rake +4 -0
- data/spec/dummy/config.ru +2 -2
- data/spec/dummy/config/alchemy/elements.yml +0 -3
- data/spec/dummy/config/alchemy/page_layouts.yml +0 -6
- data/spec/dummy/config/application.rb +5 -57
- data/spec/dummy/config/boot.rb +4 -9
- data/spec/dummy/config/environment.rb +2 -2
- data/spec/dummy/config/environments/development.rb +11 -19
- data/spec/dummy/config/environments/production.rb +40 -27
- data/spec/dummy/config/environments/test.rb +15 -14
- data/spec/dummy/config/initializers/alchemy.rb +2 -0
- data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
- data/spec/dummy/config/initializers/inflections.rb +9 -3
- data/spec/dummy/config/initializers/secret_token.rb +7 -2
- data/spec/dummy/config/initializers/session_store.rb +1 -6
- data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
- data/spec/dummy/config/routes.rb +3 -1
- data/spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb +261 -251
- data/spec/dummy/db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb +5 -0
- data/spec/dummy/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb +5 -0
- data/spec/dummy/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb +5 -0
- data/spec/dummy/db/migrate/20131209225243_create_dummy_users.rb +9 -0
- data/spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb +21 -0
- data/spec/dummy/db/schema.rb +112 -105
- data/spec/dummy/public/404.html +46 -26
- data/spec/dummy/public/422.html +46 -26
- data/spec/dummy/public/500.html +45 -26
- data/spec/features/admin/language_tree_feature_spec.rb +2 -2
- data/spec/features/admin/modules_integration_spec.rb +7 -13
- data/spec/features/admin/page_creation_feature_spec.rb +50 -0
- data/spec/features/admin/page_editing_feature_spec.rb +16 -0
- data/spec/features/admin/picture_library_integration_spec.rb +4 -4
- data/spec/features/admin/resources_integration_spec.rb +11 -11
- data/spec/features/page_feature_spec.rb +225 -0
- data/spec/features/translation_integration_spec.rb +7 -7
- data/spec/fixtures/500x500.png +0 -0
- data/spec/helpers/admin/attachments_helper_spec.rb +15 -0
- data/spec/helpers/admin/base_helper_spec.rb +88 -13
- data/spec/helpers/admin/contents_helper_spec.rb +53 -12
- data/spec/helpers/admin/elements_helper_spec.rb +24 -36
- data/spec/helpers/admin/essences_helper_spec.rb +48 -10
- data/spec/helpers/admin/navigation_helper_spec.rb +64 -29
- data/spec/helpers/admin/pages_helper_spec.rb +22 -1
- data/spec/helpers/admin/pictures_helper_spec.rb +29 -0
- data/spec/helpers/admin/tags_helper_spec.rb +1 -1
- data/spec/helpers/base_helper_spec.rb +6 -13
- data/spec/helpers/elements_block_helper_spec.rb +3 -3
- data/spec/helpers/elements_helper_spec.rb +203 -167
- data/spec/helpers/essences_helper_spec.rb +69 -15
- data/spec/helpers/pages_helper_spec.rb +28 -66
- data/spec/helpers/url_helper_spec.rb +41 -73
- data/spec/javascripts/alchemy/dialog_spec.coffee +82 -0
- data/spec/javascripts/alchemy/link_overlay_spec.coffee +25 -0
- data/spec/javascripts/alchemy_integration_spec.coffee +3 -12
- data/spec/javascripts/helpers/mock-ajax.js +52 -60
- data/spec/javascripts/support/jasmine.yml +29 -0
- data/spec/libraries/auth_accessors_spec.rb +24 -0
- data/spec/libraries/config_spec.rb +3 -3
- data/spec/libraries/controller_actions_spec.rb +133 -0
- data/spec/libraries/kaminari/scoped_pagination_url_helper_spec.rb +30 -0
- data/spec/libraries/modules_spec.rb +17 -0
- data/spec/libraries/mount_point_spec.rb +7 -7
- data/spec/libraries/page_layout_spec.rb +1 -1
- data/spec/libraries/permissions_spec.rb +219 -0
- data/spec/libraries/resource_spec.rb +61 -68
- data/spec/libraries/resources_helper_spec.rb +51 -51
- data/spec/libraries/shell_spec.rb +7 -8
- data/spec/libraries/template_tracker_spec.rb +94 -0
- data/spec/libraries/tinymce_spec.rb +0 -12
- data/spec/libraries/userstamp_spec.rb +10 -0
- data/spec/models/attachment_spec.rb +51 -18
- data/spec/models/cell_spec.rb +5 -5
- data/spec/models/content_spec.rb +103 -15
- data/spec/models/element_spec.rb +82 -18
- data/spec/models/essence_boolean_spec.rb +3 -8
- data/spec/models/essence_date_spec.rb +11 -7
- data/spec/models/essence_file_spec.rb +24 -4
- data/spec/models/essence_html_spec.rb +8 -3
- data/spec/models/essence_link_spec.rb +10 -0
- data/spec/models/essence_picture_spec.rb +109 -0
- data/spec/models/essence_richtext_spec.rb +6 -35
- data/spec/models/essence_select_spec.rb +3 -8
- data/spec/models/essence_text_spec.rb +83 -39
- data/spec/models/language_spec.rb +20 -54
- data/spec/models/message_spec.rb +12 -7
- data/spec/models/page_spec.rb +192 -185
- data/spec/models/picture_spec.rb +200 -45
- data/spec/models/resource_spec.rb +4 -24
- data/spec/models/site_spec.rb +69 -3
- data/spec/models/tag_spec.rb +6 -6
- data/spec/routing/routing_spec.rb +0 -32
- data/spec/spec_helper.rb +29 -38
- data/spec/support/hint_examples.rb +30 -0
- data/spec/support/phantomjs_mavericks_fix.rb +32 -0
- data/spec/support/test_tweaks.rb +31 -0
- data/spec/views/essences/essence_boolean_view_spec.rb +25 -0
- data/spec/views/essences/essence_date_view_spec.rb +39 -0
- data/spec/views/essences/essence_file_view_spec.rb +24 -0
- data/spec/views/essences/essence_html_view_spec.rb +22 -0
- data/spec/views/essences/essence_link_view_spec.rb +30 -0
- data/spec/views/essences/essence_picture_view_spec.rb +1 -1
- data/spec/views/essences/essence_richtext_view_spec.rb +20 -0
- data/spec/views/essences/essence_select_view_spec.rb +12 -0
- data/spec/views/essences/essence_text_view_spec.rb +40 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js +172 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js +120 -0
- data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +1416 -0
- data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +210 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +381 -352
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +1 -52
- data/vendor/assets/javascripts/keymaster.js +296 -0
- data/vendor/assets/javascripts/requestAnimationFrame.js +31 -0
- data/vendor/assets/javascripts/tinymce/langs/de.js +179 -0
- data/vendor/assets/javascripts/tinymce/langs/nl.js +179 -0
- data/vendor/assets/javascripts/{tiny_mce → tinymce}/license.txt +504 -504
- data/vendor/assets/javascripts/tinymce/plugins/autoresize/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/charmap/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/code/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/directionality/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/fullscreen/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/link/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/paste/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/tabfocus/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/plugins/table/plugin.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/themes/modern/theme.min.js +1 -0
- data/vendor/assets/javascripts/tinymce/tinymce.min.js +10 -0
- metadata +351 -332
- data/.simplecov +0 -14
- data/app/assets/images/alchemy/alchemy-logo.png +0 -0
- data/app/assets/images/alchemy/swfupload/browse_button.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.file_progress.js +0 -102
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +0 -227
- data/app/assets/javascripts/alchemy/alchemy.menubar.js +0 -62
- data/app/assets/javascripts/alchemy/alchemy.swf_upload.js +0 -212
- data/app/assets/javascripts/alchemy/alchemy.uploader.js +0 -274
- data/app/assets/javascripts/alchemy/menubar.js +0 -2
- data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +0 -42
- data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/de.js +0 -4
- data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/en.js +0 -4
- data/app/assets/stylesheets/alchemy/form_elements.scss +0 -538
- data/app/assets/stylesheets/alchemy/login.scss +0 -55
- data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +0 -98
- data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +0 -420
- data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy-tinymce-dialog/window.css.scss +0 -434
- data/app/controllers/alchemy/admin/users_controller.rb +0 -76
- data/app/models/alchemy/tree_node.rb +0 -4
- data/app/sweepers/alchemy/content_sweeper.rb +0 -41
- data/app/sweepers/alchemy/pages_sweeper.rb +0 -44
- data/app/sweepers/alchemy/pictures_sweeper.rb +0 -21
- data/app/views/alchemy/admin/elements/_elements_select.html.erb +0 -9
- data/app/views/alchemy/admin/elements/list.js.erb +0 -22
- data/app/views/alchemy/admin/essence_pictures/assign.js.coffee +0 -15
- data/app/views/alchemy/admin/pages/_contactform_links.html.erb +0 -62
- data/app/views/alchemy/admin/partials/_flash_upload.html.erb +0 -37
- data/app/views/alchemy/admin/partials/_pagination_links.html.erb +0 -1
- data/app/views/alchemy/admin/pictures/create.js.erb +0 -3
- data/app/views/alchemy/admin/resources/_boolean.html.erb +0 -5
- data/app/views/alchemy/admin/resources/_date.html.erb +0 -8
- data/app/views/alchemy/admin/resources/_datetime.html.erb +0 -1
- data/app/views/alchemy/admin/resources/_string.html.erb +0 -5
- data/app/views/alchemy/admin/resources/_text.html.erb +0 -5
- data/app/views/alchemy/admin/resources/destroy.js.erb +0 -1
- data/app/views/alchemy/base/remote_errors.js.erb +0 -6
- data/app/views/alchemy/search/_form.html.erb +0 -11
- data/app/views/alchemy/search/_result.html.erb +0 -7
- data/app/views/alchemy/search/_results.html.erb +0 -27
- data/config/authorization_rules.rb +0 -110
- data/config/initializers/cache_storage.rb +0 -1
- data/lib/alchemy/auth/engine.rb +0 -9
- data/lib/alchemy/ferret/search.rb +0 -86
- data/lib/alchemy/language_helpers.rb +0 -55
- data/lib/alchemy/upgrader/two_point_five.rb +0 -86
- data/lib/alchemy/upgrader/two_point_four.rb +0 -25
- data/lib/alchemy/upgrader/two_point_nine.rb +0 -33
- data/lib/alchemy/upgrader/two_point_one.rb +0 -95
- data/lib/alchemy/upgrader/two_point_six.rb +0 -32
- data/lib/alchemy/upgrader/two_point_three.rb +0 -25
- data/lib/alchemy/upgrader/two_point_two.rb +0 -114
- data/lib/alchemy/upgrader/two_point_zero.rb +0 -13
- data/lib/middleware/flash_session_cookie.rb +0 -22
- data/lib/rails/generators/alchemy/gallery_pictures_migration/gallery_pictures_migration_generator.rb +0 -40
- data/lib/tasks/ferret.rake +0 -10
- data/script/rails +0 -6
- data/spec/dummy/app/models/user.rb +0 -14
- data/spec/dummy/app/views/alchemy/elements/_searchresult_view.html.erb +0 -4
- data/spec/dummy/config/authorization_rules.rb +0 -7
- data/spec/dummy/public/stylesheets/.gitkeep +0 -0
- data/spec/dummy/script/rails +0 -6
- data/spec/fast_specs.rb +0 -15
- data/spec/features/admin/element_create_feature_spec.rb +0 -18
- data/spec/features/admin/element_trash_feature_spec.rb +0 -21
- data/spec/features/admin/pages_controller_spec.rb +0 -59
- data/spec/features/pages_controller_spec.rb +0 -262
- data/spec/javascripts/alchemy/link_overlay_spec.js.coffee +0 -42
- data/spec/javascripts/helpers/.gitkeep +0 -0
- data/spec/javascripts/helpers/jasmine-jquery-1.3.1.js +0 -289
- data/spec/javascripts/spec.css +0 -3
- data/spec/javascripts/spec.js +0 -2
- data/spec/libraries/essence_spec.rb +0 -76
- data/spec/support/alchemy/controller_hacks.rb +0 -41
- data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.js +0 -684
- data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +0 -271
- data/vendor/assets/javascripts/jquery_plugins/jquery.selectboxit.min.js +0 -11
- data/vendor/assets/javascripts/jquery_plugins/preloadCssImages.jQuery_v5.js +0 -152
- data/vendor/assets/javascripts/keymage.min.js +0 -6
- data/vendor/assets/javascripts/swfupload/SWFObject License.txt +0 -4
- data/vendor/assets/javascripts/swfupload/swfupload.cookies.js +0 -53
- data/vendor/assets/javascripts/swfupload/swfupload.js +0 -980
- data/vendor/assets/javascripts/swfupload/swfupload.queue.js +0 -98
- data/vendor/assets/javascripts/swfupload/swfupload.speed.js +0 -342
- data/vendor/assets/javascripts/swfupload/swfupload.swf +0 -0
- data/vendor/assets/javascripts/swfupload/swfupload.swfobject.js +0 -715
- data/vendor/assets/javascripts/tiny_mce/langs/de.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/langs/en.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +0 -110
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +0 -387
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/editor_plugin.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +0 -36
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +0 -51
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/langs/de_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/langs/en_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +0 -27
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +0 -21
- data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +0 -180
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +0 -17
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +0 -25
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +0 -13
- data/vendor/assets/javascripts/tiny_mce/plugins/table/editor_plugin.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +0 -319
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +0 -27
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +0 -254
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +0 -501
- data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/de_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/en_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +0 -32
- data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +0 -158
- data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +0 -188
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +0 -52
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +0 -26
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +0 -55
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +0 -70
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +0 -80
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/pagebreak.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/realmedia.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/video.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/windowsmedia.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +0 -73
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +0 -56
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +0 -363
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +0 -345
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +0 -253
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +0 -159
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +0 -78
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +0 -57
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +0 -47
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +0 -50
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +0 -118
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/progress.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +0 -219
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +0 -24
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +0 -106
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +0 -106
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +0 -48
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +0 -118
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +0 -222
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +0 -8
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +0 -5
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +0 -25
- data/vendor/assets/javascripts/tiny_mce/tiny_mce.js +0 -1
- data/vendor/assets/javascripts/tiny_mce/tiny_mce_popup.js +0 -5
- data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +0 -70
- data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +0 -210
- data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +0 -162
- data/vendor/assets/javascripts/tiny_mce/utils/validate.js +0 -252
@@ -6,7 +6,7 @@
|
|
6
6
|
Please consult Alchemy::Content.rb docs for further methods on the content object
|
7
7
|
%>
|
8
8
|
<%% cache(content) do %>
|
9
|
-
<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%=
|
9
|
+
<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%= content.dom_id %>">
|
10
10
|
<%%= label_and_remove_link(content) %>
|
11
11
|
<%%= text_field_tag(
|
12
12
|
content.form_field_name,
|
@@ -0,0 +1,31 @@
|
|
1
|
+
de:
|
2
|
+
alchemy:
|
3
|
+
|
4
|
+
# Translations for page layout names
|
5
|
+
page_layout_names:
|
6
|
+
index: Startseite
|
7
|
+
|
8
|
+
# Translations for element names
|
9
|
+
element_names:
|
10
|
+
article: Artikel
|
11
|
+
|
12
|
+
# Translations for content names
|
13
|
+
content_names:
|
14
|
+
headline: Überschrift
|
15
|
+
text: Text
|
16
|
+
picture: Bild
|
17
|
+
|
18
|
+
# Default texts for new contents created
|
19
|
+
default_content_texts:
|
20
|
+
article_headline: "Willkommen auf Ihrer Alchemy Seite"
|
21
|
+
article_text: '<p>Als erstes sollte man sich mit der Struktur von Alchemy vertraut machen. <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">Mehr dazu in den Guidelines</a>.</p><p>Die wichtigsten beiden Dinge die man über Alchemy wissen muss sind Elemente und Seitentypen.</p><p><span style="text-decoration: underline;"><strong>Elemente:</strong></span></p><p>Mit Alchemy kann man eine Seite in Inhaltsbereiche aufteilen, Elemente. Diese Elemente werden aus verschiedenen Grundtypen (Essenzen) zusammengesetzt. Die Essenzen sind:</p><ul><li>EssenceText - <em>Eine Zeile Text</em></li><li>EssenceRichtext - <em>Ein TinyMCE basierter formatierter Textblock</em></li><li>EssencePicture - <em>Ein Verweis auf ein Bild</em></li><li>EssenceHtml - <em>HTML Code</em></li><li>EssenceSelect - <em>Eine Auswahl an Werten</em></li><li>EssenceBoolean - <em>Eine Checkbox</em></li></ul><p>Elemente werden in einer YAML Datei definiert: <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Mehr über Elemente und wie sie definiert werden, kann in den Guidelines nachgelesen werden.</a></p><p><span style="text-decoration: underline;"><strong>Seitentypen:</strong></span></p><p>Es können verschiedene Seitentypen definiert werden. Diesen können Elemente zugewiesen und ihr Verhalten definiert werden.</p><p>Seitentypen werden ein einer YAML Datei definiert: <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Mehr über das Erstellen von Seitentypen kann in den Guidelines nachgelesen werden.</a></p>'
|
22
|
+
|
23
|
+
# Hint texts for elements
|
24
|
+
element_hints:
|
25
|
+
article: "Dies ist ein Hinweistext für das Artikel Element. Dieser Text kann in der `config/locales/alchemy.de.yml` Datei angepasst werden."
|
26
|
+
|
27
|
+
# Hint texts for contents
|
28
|
+
content_hints:
|
29
|
+
headline: "Dies ist ein einzeiliger unformatierter Text"
|
30
|
+
picture: "Bilder werden in der Bibliothek gespeichert. Ein Bild kann mehrfach einem Element zugewiesen werden. Auch ein Bildauswahlwerkzeug ist in Alchemy integriert."
|
31
|
+
text: "Dies ist ein formatierbarer Textblock. Die Einstellungen des Editors können angepasst werden. Siehe http://guides.alchemy-cms.com/edge/customize_tinymce.html"
|
@@ -0,0 +1,30 @@
|
|
1
|
+
article {
|
2
|
+
width: 50%;
|
3
|
+
font: 16px/20px Helvetica, Arial, sans-serif;
|
4
|
+
color: #333;
|
5
|
+
margin: 1em auto;
|
6
|
+
padding: 0.5em 1em;
|
7
|
+
background: #f4f4f4;
|
8
|
+
|
9
|
+
h2 {
|
10
|
+
font-size: 24px;
|
11
|
+
line-height: 1.25;
|
12
|
+
font-weight: bold;
|
13
|
+
}
|
14
|
+
|
15
|
+
a {
|
16
|
+
color: #5588D3;
|
17
|
+
}
|
18
|
+
|
19
|
+
img {
|
20
|
+
max-width: 100%;
|
21
|
+
}
|
22
|
+
|
23
|
+
figure {
|
24
|
+
margin: 0;
|
25
|
+
}
|
26
|
+
|
27
|
+
figcaption {
|
28
|
+
font-size: 14px;
|
29
|
+
}
|
30
|
+
}
|
@@ -0,0 +1,31 @@
|
|
1
|
+
en:
|
2
|
+
alchemy:
|
3
|
+
|
4
|
+
# Translations for page layout names
|
5
|
+
page_layout_names:
|
6
|
+
index: Homepage
|
7
|
+
|
8
|
+
# Translations for element names
|
9
|
+
element_names:
|
10
|
+
article: Article
|
11
|
+
|
12
|
+
# Translations for content names
|
13
|
+
content_names:
|
14
|
+
headline: Headline
|
15
|
+
text: Text
|
16
|
+
picture: Picture
|
17
|
+
|
18
|
+
# Default texts for new contents created
|
19
|
+
default_content_texts:
|
20
|
+
article_headline: "Welcome to your first Alchemy CMS page"
|
21
|
+
article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/edge/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/edge/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
|
22
|
+
|
23
|
+
# Hint texts for elements
|
24
|
+
element_hints:
|
25
|
+
article: "This is a hint text for the article element. You can change this text in `config/locales/alchemy.en.yml`. Feel free to change it as you like, it's yours."
|
26
|
+
|
27
|
+
# Hint texts for contents
|
28
|
+
content_hints:
|
29
|
+
headline: "This is a single line of unformatable Text"
|
30
|
+
picture: "Pictures are stored in the library. You can assign a picture multiple times throughout your site. Alchemy has an image cropper build right in."
|
31
|
+
text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/edge/customize_tinymce.html"
|
@@ -2,11 +2,13 @@
|
|
2
2
|
<html>
|
3
3
|
<head>
|
4
4
|
<%= render_meta_data %>
|
5
|
-
<%= stylesheet_link_tag 'application' %>
|
5
|
+
<%= stylesheet_link_tag 'application', media: 'all' %>
|
6
|
+
<%= javascript_include_tag 'application' %>
|
7
|
+
<%= csrf_meta_tags %>
|
6
8
|
</head>
|
7
9
|
<body>
|
8
10
|
<%= yield %>
|
9
11
|
<%= alchemy_preview_mode_code %>
|
10
|
-
<%=
|
12
|
+
<%= render "alchemy/menubar" %>
|
11
13
|
</body>
|
12
14
|
</html>
|
@@ -1,3 +1,19 @@
|
|
1
1
|
# == In this configuration you setup Alchemy´s element layouts.
|
2
2
|
#
|
3
3
|
# For further informations please see http://guides.alchemy-cms.com/create_elements.html
|
4
|
+
|
5
|
+
- name: article
|
6
|
+
hint: true
|
7
|
+
unique: true
|
8
|
+
contents:
|
9
|
+
- name: headline
|
10
|
+
type: EssenceText
|
11
|
+
default: :article_headline
|
12
|
+
hint: true
|
13
|
+
- name: picture
|
14
|
+
type: EssencePicture
|
15
|
+
hint: true
|
16
|
+
- name: text
|
17
|
+
type: EssenceRichtext
|
18
|
+
default: :article_text
|
19
|
+
hint: true
|
@@ -4,7 +4,7 @@ module Alchemy
|
|
4
4
|
module Generators
|
5
5
|
class ScaffoldGenerator < ::Rails::Generators::Base
|
6
6
|
|
7
|
-
ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation
|
7
|
+
ALCHEMY_VIEWS = %w(breadcrumb language_links messages navigation)
|
8
8
|
|
9
9
|
desc "This generator generates the Alchemy scaffold."
|
10
10
|
class_option :copy_views, :default => false, :type => :boolean, :desc => "Copy all Alchemy views into your app.", :aliases => '-v'
|
@@ -28,26 +28,35 @@ module Alchemy
|
|
28
28
|
end
|
29
29
|
|
30
30
|
def copy_files
|
31
|
-
copy_file "#{
|
31
|
+
copy_file "#{current_path}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
|
32
32
|
template "page_layouts.yml.tt", "#{Rails.root}/config/alchemy/page_layouts.yml"
|
33
|
-
copy_file "#{
|
34
|
-
copy_file "#{
|
33
|
+
copy_file "#{current_path}/files/alchemy.en.yml", "#{Rails.root}/config/locales/alchemy.en.yml"
|
34
|
+
copy_file "#{current_path}/files/alchemy.de.yml", "#{Rails.root}/config/locales/alchemy.de.yml"
|
35
|
+
copy_file "#{current_path}/files/application.html.erb", "#{Rails.root}/app/views/layouts/application.html.erb"
|
36
|
+
copy_file "#{current_path}/files/_standard.html.erb", "#{Rails.root}/app/views/alchemy/page_layouts/_standard.html.erb"
|
37
|
+
copy_file "#{current_path}/files/_article_view.html.erb", "#{Rails.root}/app/views/alchemy/elements/_article_view.html.erb"
|
38
|
+
copy_file "#{current_path}/files/_article_editor.html.erb", "#{Rails.root}/app/views/alchemy/elements/_article_editor.html.erb"
|
39
|
+
copy_file "#{current_path}/files/alchemy.elements.css.scss", "#{Rails.root}/app/assets/stylesheets/alchemy.elements.css.scss"
|
35
40
|
end
|
36
41
|
|
37
|
-
|
42
|
+
private
|
38
43
|
|
39
44
|
def config_path
|
40
|
-
@config_path ||= File.expand_path('../../../../../config/alchemy',
|
45
|
+
@config_path ||= File.expand_path('../../../../../config/alchemy', current_path)
|
41
46
|
end
|
42
47
|
|
43
48
|
def copy_alchemy_views
|
44
49
|
ALCHEMY_VIEWS.each do |dir|
|
45
|
-
src = File.expand_path("../../../../../app/views/alchemy/#{dir}",
|
50
|
+
src = File.expand_path("../../../../../app/views/alchemy/#{dir}", current_path)
|
46
51
|
dest = Rails.root.join('app/views/alchemy', dir)
|
47
52
|
directory src, dest
|
48
53
|
end
|
49
54
|
end
|
50
55
|
|
56
|
+
def current_path
|
57
|
+
@current_path ||= File.dirname(__FILE__)
|
58
|
+
end
|
59
|
+
|
51
60
|
end
|
52
61
|
end
|
53
62
|
end
|
@@ -1,7 +1,8 @@
|
|
1
|
-
# == This file defines the
|
1
|
+
# == This file defines the page layouts for new pages.
|
2
2
|
#
|
3
3
|
# For further informations please see http://guides.alchemy-cms.com/create_page_layouts.html
|
4
4
|
|
5
5
|
- name: <%= Alchemy::Config.get(:default_language)['page_layout'] %>
|
6
6
|
unique: true
|
7
|
-
elements: []
|
7
|
+
elements: [article]
|
8
|
+
autogenerate: [article]
|
@@ -1,9 +1,6 @@
|
|
1
1
|
# This rails template installs Alchemy and all depending gems.
|
2
2
|
require File.expand_path('../../../alchemy/version', __FILE__)
|
3
3
|
|
4
|
-
gem 'alchemy_cms',
|
5
|
-
gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: '
|
6
|
-
|
7
|
-
if yes?("\nDo you want to use Capistrano for deployment? (y/N)")
|
8
|
-
gem 'capistrano', group: 'development'
|
9
|
-
end
|
4
|
+
gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
|
5
|
+
gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
|
6
|
+
gem 'capistrano', '~> 2.15.5', group: 'development'
|
@@ -1,15 +1,24 @@
|
|
1
1
|
require 'thor'
|
2
2
|
|
3
|
-
class Alchemy::
|
3
|
+
class Alchemy::InstallTask < Thor
|
4
4
|
include Thor::Actions
|
5
5
|
|
6
6
|
no_tasks do
|
7
|
-
def
|
8
|
-
mountpoint = ask "\
|
7
|
+
def inject_routes
|
8
|
+
mountpoint = ask "\nAt which path do you want to mount Alchemy CMS at? (DEFAULT: At root path '/')"
|
9
9
|
mountpoint = "/" if mountpoint.empty?
|
10
10
|
sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
|
11
|
-
inject_into_file "./config/routes.rb", "\n mount Alchemy::Engine => '#{mountpoint}'\n", { :
|
12
|
-
|
11
|
+
inject_into_file "./config/routes.rb", "\n mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
|
12
|
+
end
|
13
|
+
|
14
|
+
def set_primary_language
|
15
|
+
code = ask "\nWhat's the language code of your site's primary language? (DEFAULT: en)"
|
16
|
+
code = "en" if code.empty?
|
17
|
+
name = ask "What's the name of your site's primary language? (DEFAULT: English)"
|
18
|
+
name = "English" if name.empty?
|
19
|
+
gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do |match|
|
20
|
+
match = "default_language:\n code: #{code}\n name: #{name}"
|
21
|
+
end
|
13
22
|
end
|
14
23
|
end
|
15
24
|
|
@@ -17,44 +26,26 @@ end
|
|
17
26
|
|
18
27
|
namespace :alchemy do
|
19
28
|
|
20
|
-
desc "Creates, migrates and seeds the database to run Alchemy."
|
21
|
-
task :prepare => ["db:create", "alchemy:install:migrations", "db:migrate", "alchemy:db:seed"]
|
22
|
-
|
23
29
|
desc "Installs Alchemy CMS into your app."
|
24
|
-
task :install
|
25
|
-
|
26
|
-
puts
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
http://localhost:3000/#{@mountpoint.gsub(/^\//, '')}
|
39
|
-
|
40
|
-
3. Follow the instructions to complete the installation!
|
41
|
-
|
42
|
-
== First time Alchemy user?
|
43
|
-
|
44
|
-
Then we recommend to install the Alchemy demo kit.
|
45
|
-
|
46
|
-
Just add `gem "alchemy-demo_kit"` to your apps Gemfile and run `bundle install`.
|
47
|
-
|
48
|
-
Thank you for using Alchemy CMS!
|
49
|
-
|
50
|
-
http://alchemy-cms.com/
|
51
|
-
|
52
|
-
EOF
|
30
|
+
task :install do
|
31
|
+
puts "\nAlchemy Installer"
|
32
|
+
puts "-----------------"
|
33
|
+
Rake::Task["alchemy:mount"].invoke
|
34
|
+
system('rails g alchemy:scaffold') || exit!(1)
|
35
|
+
Alchemy::InstallTask.new.set_primary_language
|
36
|
+
Rake::Task["db:create"].invoke
|
37
|
+
Rake::Task["alchemy:install:migrations"].invoke
|
38
|
+
Rake::Task["db:migrate"].invoke
|
39
|
+
Rake::Task["alchemy:db:seed"].invoke
|
40
|
+
puts "\nAlchemy successfully installed."
|
41
|
+
puts "\nNow start the server with:"
|
42
|
+
puts "\n$ bin/rails server"
|
43
|
+
puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
|
53
44
|
end
|
54
45
|
|
55
46
|
desc "Mounts Alchemy into your routes."
|
56
47
|
task :mount do
|
57
|
-
|
48
|
+
Alchemy::InstallTask.new.inject_routes
|
58
49
|
end
|
59
50
|
|
60
51
|
end
|
data/lib/tasks/alchemy/tidy.rake
CHANGED
@@ -37,7 +37,7 @@ module Alchemy
|
|
37
37
|
cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
|
38
38
|
Alchemy::Page.where(page_layout: layout['name']).each do |page|
|
39
39
|
cells_for_layout.each do |cell_for_layout|
|
40
|
-
cell = Alchemy::Cell.
|
40
|
+
cell = Alchemy::Cell.find_or_initialize_by(name: cell_for_layout['name'], page_id: page.id)
|
41
41
|
cell.elements << page.elements.select { |element| cell_for_layout['elements'].include?(element.name) }
|
42
42
|
if cell.new_record?
|
43
43
|
cell.save
|
@@ -2,15 +2,13 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe Admin::AttachmentsController do
|
5
|
-
|
6
|
-
let(:attachment) { mock_model('Attachment', file_name: 'testfile', file_mime_type: 'image/png', file: mock('File', data: nil)) }
|
5
|
+
let(:attachment) { build_stubbed(:attachment) }
|
7
6
|
|
8
7
|
before do
|
9
8
|
sign_in(admin_user)
|
10
9
|
end
|
11
10
|
|
12
11
|
describe "#index" do
|
13
|
-
|
14
12
|
it "should always paginate the records" do
|
15
13
|
Attachment.should_receive(:find_paginated)
|
16
14
|
get :index
|
@@ -18,19 +16,20 @@ module Alchemy
|
|
18
16
|
|
19
17
|
context "when params[:tagged_with] is set" do
|
20
18
|
it "should filter the records by tags" do
|
21
|
-
Attachment.should_receive(:tagged_with).and_return(Attachment.
|
19
|
+
Attachment.should_receive(:tagged_with).and_return(Attachment.all)
|
22
20
|
get :index, tagged_with: "pdf"
|
23
21
|
end
|
24
22
|
end
|
25
23
|
|
26
24
|
context "when params[:content_id]" do
|
27
|
-
|
25
|
+
let(:content) { mock_model(Content) }
|
28
26
|
|
29
27
|
context "is set" do
|
30
|
-
it "
|
31
|
-
Content.
|
32
|
-
get :index, {content_id:
|
28
|
+
it "it renders the archive_overlay partial" do
|
29
|
+
Content.stub_chain(:select, :find_by).and_return(content)
|
30
|
+
get :index, {content_id: content.id}
|
33
31
|
expect(response).to render_template(partial: '_archive_overlay')
|
32
|
+
assigns(:content).should eq(content)
|
34
33
|
end
|
35
34
|
end
|
36
35
|
|
@@ -40,17 +39,24 @@ module Alchemy
|
|
40
39
|
expect(response).to render_template(:index)
|
41
40
|
end
|
42
41
|
end
|
42
|
+
end
|
43
|
+
end
|
43
44
|
|
45
|
+
describe '#show' do
|
46
|
+
before do
|
47
|
+
Attachment.stub(find: attachment)
|
44
48
|
end
|
45
49
|
|
50
|
+
it "renders the show template" do
|
51
|
+
get :show, id: attachment.id
|
52
|
+
expect(response).to render_template(:show)
|
53
|
+
end
|
46
54
|
end
|
47
55
|
|
48
56
|
describe "#new" do
|
49
|
-
|
50
57
|
context "in overlay" do
|
51
|
-
|
52
58
|
before do
|
53
|
-
controller.stub
|
59
|
+
controller.stub(:in_overlay?).and_return(true)
|
54
60
|
Content.stub(:find).and_return(mock_model('Content'))
|
55
61
|
end
|
56
62
|
|
@@ -64,49 +70,110 @@ module Alchemy
|
|
64
70
|
assigns(:swap).should eq('true')
|
65
71
|
end
|
66
72
|
end
|
67
|
-
|
68
73
|
end
|
69
74
|
|
70
|
-
describe
|
71
|
-
|
72
|
-
Attachment.stub!(:find).with("#{attachment.id}").and_return(attachment)
|
73
|
-
end
|
75
|
+
describe '#create' do
|
76
|
+
subject { post :create, params }
|
74
77
|
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
+
let(:attachment) { mock_model('Attachment', name: 'contract.pdf', to_jq_upload: {}) }
|
79
|
+
let(:params) { {attachment: {name: ''}} }
|
80
|
+
|
81
|
+
context 'with passing validations' do
|
82
|
+
before do
|
83
|
+
Attachment.should_receive(:new).and_return(attachment)
|
84
|
+
attachment.should_receive(:save).and_return(true)
|
85
|
+
end
|
86
|
+
|
87
|
+
context 'if inside of archive overlay' do
|
88
|
+
let(:params) { {attachment: {name: ''}, content_id: 1} }
|
89
|
+
let(:content) { mock_model('Content') }
|
90
|
+
|
91
|
+
before do
|
92
|
+
Content.stub_chain(:select, :find_by).and_return(content)
|
93
|
+
end
|
94
|
+
|
95
|
+
it "assigns lots of instance variables" do
|
96
|
+
subject
|
97
|
+
assigns(:options).should eq({})
|
98
|
+
assigns(:while_assigning).should be_true
|
99
|
+
assigns(:content).should eq(content)
|
100
|
+
assigns(:swap).should eq(nil)
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
it "renders json response with success message" do
|
105
|
+
subject
|
106
|
+
response.content_type.should eq('application/json')
|
107
|
+
response.status.should eq(201)
|
108
|
+
json = JSON.parse(response.body)
|
109
|
+
json.should have_key('growl_message')
|
110
|
+
json.should have_key('files')
|
111
|
+
end
|
78
112
|
end
|
79
113
|
|
80
|
-
context
|
81
|
-
it "
|
82
|
-
|
83
|
-
|
114
|
+
context 'without passing validations' do
|
115
|
+
it "renders json response with error message" do
|
116
|
+
subject
|
117
|
+
response.content_type.should eq('application/json')
|
118
|
+
response.status.should eq(422)
|
119
|
+
json = JSON.parse(response.body)
|
120
|
+
json.should have_key('growl_message')
|
121
|
+
json.should have_key('files')
|
84
122
|
end
|
85
123
|
end
|
86
124
|
end
|
87
125
|
|
88
|
-
describe
|
126
|
+
describe '#update' do
|
127
|
+
subject { put :update, attachment: {name: ''} }
|
128
|
+
|
129
|
+
let(:attachment) { build_stubbed(:attachment) }
|
130
|
+
|
89
131
|
before do
|
90
|
-
Attachment.stub
|
132
|
+
Attachment.stub(find: attachment)
|
91
133
|
end
|
92
134
|
|
93
|
-
|
94
|
-
|
95
|
-
|
135
|
+
context 'with passing validations' do
|
136
|
+
before do
|
137
|
+
attachment.should_receive(:update_attributes).and_return(true)
|
138
|
+
end
|
139
|
+
|
140
|
+
it "redirects to index path" do
|
141
|
+
should redirect_to admin_attachments_path
|
142
|
+
end
|
96
143
|
end
|
97
144
|
|
98
|
-
context
|
99
|
-
|
100
|
-
|
101
|
-
|
145
|
+
context 'with failing validations' do
|
146
|
+
before do
|
147
|
+
attachment.stub(update_attributes: false)
|
148
|
+
attachment.stub_chain(:errors, :empty?).and_return(false)
|
102
149
|
end
|
150
|
+
|
151
|
+
it "renders edit form" do
|
152
|
+
should render_template(:edit)
|
153
|
+
end
|
154
|
+
end
|
155
|
+
end
|
156
|
+
|
157
|
+
describe '#destroy' do
|
158
|
+
let(:attachment) { build_stubbed(:attachment) }
|
159
|
+
|
160
|
+
before do
|
161
|
+
Attachment.stub(find: attachment)
|
162
|
+
end
|
163
|
+
|
164
|
+
it "destroys the attachment and sets and success message" do
|
165
|
+
attachment.should_receive(:destroy)
|
166
|
+
xhr :delete, :destroy
|
167
|
+
assigns(:attachment).should eq(attachment)
|
168
|
+
assigns(:url).should_not be_blank
|
169
|
+
flash[:notice].should_not be_blank
|
103
170
|
end
|
104
171
|
end
|
105
172
|
|
106
173
|
describe "#download" do
|
107
174
|
before do
|
108
|
-
Attachment.stub
|
109
|
-
controller.stub
|
175
|
+
Attachment.stub(:find).with("#{attachment.id}").and_return(attachment)
|
176
|
+
controller.stub(:render).and_return(nil)
|
110
177
|
end
|
111
178
|
|
112
179
|
it "should assign @attachment with Attachment found by id" do
|
@@ -119,6 +186,5 @@ module Alchemy
|
|
119
186
|
get :download, id: attachment.id
|
120
187
|
end
|
121
188
|
end
|
122
|
-
|
123
189
|
end
|
124
190
|
end
|