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
@@ -1 +0,0 @@
|
|
1
|
-
ActionController::Base.cache_store = :file_store, "#{Rails.root.to_s}/tmp/cache"
|
data/lib/alchemy/auth/engine.rb
DELETED
@@ -1,86 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
# Provides full text search methods in your controller
|
3
|
-
#
|
4
|
-
# === Usage
|
5
|
-
#
|
6
|
-
# include Alchemy::Ferret::Search
|
7
|
-
#
|
8
|
-
module Ferret
|
9
|
-
module Search
|
10
|
-
|
11
|
-
# Adds a +before_filter+ to your controller
|
12
|
-
#
|
13
|
-
def self.included(controller)
|
14
|
-
controller.send(:before_filter, :perform_search, :only => :show)
|
15
|
-
controller.send(:helper_method, :find_search_result_page)
|
16
|
-
end
|
17
|
-
|
18
|
-
# Performs a full text search with +Ferret+.
|
19
|
-
#
|
20
|
-
# Gets invoked everytime 'query' is given in params.
|
21
|
-
#
|
22
|
-
# This method only sets the +@search_results+ instance variable.
|
23
|
-
#
|
24
|
-
# You have to redirect to the search result page within a search form.
|
25
|
-
#
|
26
|
-
# === Alchemy provides a handy helper for rendering the search form:
|
27
|
-
#
|
28
|
-
# render_search_form
|
29
|
-
#
|
30
|
-
# === Note
|
31
|
-
#
|
32
|
-
# If in preview mode a fake search value "lorem" will be set.
|
33
|
-
#
|
34
|
-
# @see Alchemy::PagesHelper#render_search_form
|
35
|
-
#
|
36
|
-
def perform_search
|
37
|
-
if @preview_mode && params[:query].blank?
|
38
|
-
params[:query] = 'lorem'
|
39
|
-
end
|
40
|
-
return if params[:query].blank?
|
41
|
-
@search_results = get_search_results
|
42
|
-
end
|
43
|
-
|
44
|
-
# Finds what is provided in "query" param with Ferret on EssenceText and EssenceRichtext
|
45
|
-
#
|
46
|
-
# @return [Array]
|
47
|
-
#
|
48
|
-
def get_search_results
|
49
|
-
search_results = []
|
50
|
-
%w(Alchemy::EssenceText Alchemy::EssenceRichtext).each do |e|
|
51
|
-
search_results += e.constantize.includes(:contents => {:element => :page}).find_with_ferret(
|
52
|
-
"*#{params[:query]}*",
|
53
|
-
{:limit => :all},
|
54
|
-
{:conditions => [
|
55
|
-
'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ? AND alchemy_pages.language_id = ?',
|
56
|
-
true, false, false, session[:language_id]
|
57
|
-
]}
|
58
|
-
)
|
59
|
-
end
|
60
|
-
if search_results.any?
|
61
|
-
search_results.sort { |y, x| x.ferret_score <=> y.ferret_score }
|
62
|
-
end
|
63
|
-
end
|
64
|
-
|
65
|
-
# A view helper that loads the search result page.
|
66
|
-
#
|
67
|
-
# === Raises a ActiveRecord::RecordNotFound error, if the page could not be found or is not published.
|
68
|
-
#
|
69
|
-
# @return [Alchemy::Page]
|
70
|
-
#
|
71
|
-
def find_search_result_page
|
72
|
-
if searchresult_page_layout = PageLayout.get_all_by_attributes(:searchresults => true).first
|
73
|
-
search_result_page = Page.published.where(
|
74
|
-
:page_layout => searchresult_page_layout["name"],
|
75
|
-
:language_id => session[:language_id]
|
76
|
-
).limit(1).first
|
77
|
-
end
|
78
|
-
if search_result_page.nil?
|
79
|
-
logger.warn "\n++++++\nNo published search result page found. Please create one or publish your search result page.\n++++++\n"
|
80
|
-
end
|
81
|
-
search_result_page
|
82
|
-
end
|
83
|
-
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
@@ -1,55 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module LanguageHelpers
|
3
|
-
def self.included(controller)
|
4
|
-
controller.send(:before_filter, :set_language)
|
5
|
-
end
|
6
|
-
|
7
|
-
private
|
8
|
-
|
9
|
-
# Sets the language for rendering pages in pages controller.
|
10
|
-
#
|
11
|
-
def set_language(lang = nil)
|
12
|
-
if lang
|
13
|
-
@language = lang.is_a?(Language) ? lang : load_language_from(lang)
|
14
|
-
else
|
15
|
-
# find the best language and remember it for later
|
16
|
-
@language = load_language_from_params ||
|
17
|
-
load_language_from_session ||
|
18
|
-
load_language_default
|
19
|
-
end
|
20
|
-
|
21
|
-
# store language in session
|
22
|
-
store_language_in_session(@language)
|
23
|
-
|
24
|
-
# switch locale to selected language
|
25
|
-
::I18n.locale = @language.code
|
26
|
-
end
|
27
|
-
|
28
|
-
def load_language_from_params
|
29
|
-
if params[:lang].present?
|
30
|
-
Language.find_by_code(params[:lang])
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
def load_language_from_session
|
35
|
-
if session[:language_id].present?
|
36
|
-
Language.find_by_id(session[:language_id])
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
def load_language_from(language_code_or_id)
|
41
|
-
Language.find_by_id(language_code_or_id) || Language.find_by_code(language_code_or_id)
|
42
|
-
end
|
43
|
-
|
44
|
-
def load_language_default
|
45
|
-
Language.get_default || raise(DefaultLanguageNotFoundError)
|
46
|
-
end
|
47
|
-
|
48
|
-
def store_language_in_session(language)
|
49
|
-
if language && language.id
|
50
|
-
session[:language_id] = language.id
|
51
|
-
session[:language_code] = language.code
|
52
|
-
end
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
@@ -1,86 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointFive
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
def convert_picture_storage
|
7
|
-
desc "Convert the picture storage"
|
8
|
-
converted_images = []
|
9
|
-
images = Dir.glob Rails.root.join 'uploads/pictures/**/*.*'
|
10
|
-
if images.blank?
|
11
|
-
log "No pictures found", :skip
|
12
|
-
else
|
13
|
-
images.each do |image|
|
14
|
-
image_uid = image.gsub(/#{Rails.root.to_s}\/uploads\/pictures\//, '')
|
15
|
-
image_id = image_uid.split('/').last.split('.').first
|
16
|
-
picture = Alchemy::Picture.find_by_id(image_id)
|
17
|
-
if picture && picture.image_file_uid.blank?
|
18
|
-
picture.image_file_uid = image_uid
|
19
|
-
picture.image_file_size = File.new(image).size
|
20
|
-
if picture.save!
|
21
|
-
log "Converted #{image_uid}"
|
22
|
-
end
|
23
|
-
else
|
24
|
-
log "Picture with id #{image_id} not found or already converted.", :skip
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def removed_standard_set_notice
|
31
|
-
warn = <<-WARN
|
32
|
-
We removed the standard set from Alchemy core!
|
33
|
-
In order to get the standard set back, install the `alchemy-demo_kit` gem.
|
34
|
-
WARN
|
35
|
-
todo warn
|
36
|
-
end
|
37
|
-
|
38
|
-
def renamed_t_method
|
39
|
-
warn = <<-WARN
|
40
|
-
We renamed alchemy's `t` method override into `_t` to avoid conflicts with Rails own t method!
|
41
|
-
If you use the `t` method to translate alchemy scoped keys, then you have to use the `_t` method from now on.
|
42
|
-
WARN
|
43
|
-
todo warn
|
44
|
-
end
|
45
|
-
|
46
|
-
def migrated_to_devise
|
47
|
-
warn = <<-WARN
|
48
|
-
We changed the authentication provider from Authlogic to Devise.
|
49
|
-
|
50
|
-
If you are upgrading from an old Alchemy version < 2.5.0, then you have to make changes to your Devise configuration.
|
51
|
-
|
52
|
-
1. Add devise-encryptable to your Gemfile
|
53
|
-
|
54
|
-
# Gemfile
|
55
|
-
gem 'devise-encryptable'
|
56
|
-
|
57
|
-
$ bundle install
|
58
|
-
|
59
|
-
2. Generate devise config:
|
60
|
-
|
61
|
-
$ rails g alchemy:devise
|
62
|
-
|
63
|
-
And alter the encryptor and stretches values
|
64
|
-
|
65
|
-
# config/initializers/devise.rb
|
66
|
-
...
|
67
|
-
config.stretches = Rails.env.test? ? 1 : 20
|
68
|
-
config.encryptor = :authlogic_sha512
|
69
|
-
|
70
|
-
3. Add the encryptable module to your Alchemy config.yml:
|
71
|
-
|
72
|
-
# config/alchemy/config.yml
|
73
|
-
devise_modules:
|
74
|
-
- :database_authenticatable
|
75
|
-
- :trackable
|
76
|
-
- :validatable
|
77
|
-
- :timeoutable
|
78
|
-
- :recoverable
|
79
|
-
- :encryptable
|
80
|
-
|
81
|
-
WARN
|
82
|
-
todo warn
|
83
|
-
end
|
84
|
-
|
85
|
-
end
|
86
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointFour
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
def removed_richmedia_essences_notice
|
7
|
-
warn = <<-WARN
|
8
|
-
We removed the EssenceAudio, EssenceFlash and EssenceVideo essences from Alchemy core!
|
9
|
-
|
10
|
-
In order to get the essences back, install the `alchemy-richmedia-essences` gem.
|
11
|
-
|
12
|
-
gem 'alchemy-richmedia-essences'
|
13
|
-
|
14
|
-
We left the tables in your database, you can simply drop them if you don't use these essences in your project.
|
15
|
-
|
16
|
-
drop_table :alchemy_essence_audios
|
17
|
-
drop_table :alchemy_essence_flashes
|
18
|
-
drop_table :alchemy_essence_videos
|
19
|
-
|
20
|
-
WARN
|
21
|
-
todo warn
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointNine
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
def alchemy_29_todos
|
7
|
-
notice = <<-NOTE
|
8
|
-
|
9
|
-
Alchemy User Class Removed
|
10
|
-
--------------------------
|
11
|
-
|
12
|
-
We removed the user model from the Alchemy core!
|
13
|
-
|
14
|
-
You have to provide your own user model or
|
15
|
-
add the `alchemy-devise` gem to your Gemfile.
|
16
|
-
|
17
|
-
If you want to use the default user class from Alchemy:
|
18
|
-
|
19
|
-
# Gemfile
|
20
|
-
gem 'alchemy-devise', '~> 1.1'
|
21
|
-
|
22
|
-
$ bin/rake alchemy_devise:install:migrations db:migrate
|
23
|
-
|
24
|
-
In order to add your own user class to Alchemy, please
|
25
|
-
make shure it meets the API:
|
26
|
-
|
27
|
-
https://github.com/magiclabs/alchemy_cms/blob/2.9-stable/lib/alchemy/auth_accessors.rb
|
28
|
-
|
29
|
-
NOTE
|
30
|
-
todo notice
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,95 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointOne
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
# Creates Language model if it does not exist (Alchemy CMS prior v1.5)
|
7
|
-
# Also creates missing associations between pages and languages
|
8
|
-
def upgrade_to_language
|
9
|
-
desc "Creating languages for pages"
|
10
|
-
Alchemy::Page.contentpages.each do |page|
|
11
|
-
if page.language_id.nil? && page.language_code.present?
|
12
|
-
root = page.get_language_root
|
13
|
-
lang = Alchemy::Language.find_or_create_by_language_code(
|
14
|
-
name: page.language_code.capitalize,
|
15
|
-
language_code: page.language_code,
|
16
|
-
frontpage_name: root.name,
|
17
|
-
page_layout: root.page_layout,
|
18
|
-
public: true
|
19
|
-
)
|
20
|
-
page.language = lang
|
21
|
-
if page.save(validate: false)
|
22
|
-
log "Set language for page #{page.name} to #{lang.name}."
|
23
|
-
end
|
24
|
-
else
|
25
|
-
log("Language for page #{page.name} already set.", :skip)
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def upgrade_layoutpages
|
31
|
-
desc "Setting language of layoutpages"
|
32
|
-
default_language = Alchemy::Language.get_default
|
33
|
-
raise "No default language found." if default_language.nil?
|
34
|
-
layoutpages = Alchemy::Page.layoutpages
|
35
|
-
if layoutpages.any?
|
36
|
-
layoutpages.each do |page|
|
37
|
-
if page.language_id.nil?
|
38
|
-
page.language = default_language
|
39
|
-
if page.save(validate: false)
|
40
|
-
log "Set language for page #{page.name} to #{default_language.name}."
|
41
|
-
end
|
42
|
-
else
|
43
|
-
log "Language for page #{page.name} already set.", :skip
|
44
|
-
end
|
45
|
-
end
|
46
|
-
else
|
47
|
-
log "No layoutpages found.", :skip
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def upgrade_essence_link_target_default
|
52
|
-
desc "Setting new link_target default"
|
53
|
-
essences = (Alchemy::EssencePicture.all + Alchemy::EssenceText.all)
|
54
|
-
if essences.any?
|
55
|
-
essences.each do |essence|
|
56
|
-
case essence.link_target
|
57
|
-
when '1'
|
58
|
-
if essence.update_attribute(:link_target, 'blank')
|
59
|
-
log("Updated #{essence.preview_text} link target to #{essence.link_target}.")
|
60
|
-
end
|
61
|
-
when '0'
|
62
|
-
essence.update_attribute(:link_target, nil)
|
63
|
-
log("Updated #{essence.preview_text} link target to #{essence.link_target.inspect}.")
|
64
|
-
else
|
65
|
-
log("#{essence.preview_text} already upgraded.", :skip)
|
66
|
-
end
|
67
|
-
end
|
68
|
-
else
|
69
|
-
log("No essences to upgrade found.", :skip)
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
# Updates all essence_type of Content if not already namespaced.
|
74
|
-
def upgrade_to_namespaced_essence_type
|
75
|
-
desc "Namespacing essence_type columns"
|
76
|
-
depricated_contents = Alchemy::Content.where("essence_type LIKE ?", "Essence%")
|
77
|
-
if depricated_contents.any?
|
78
|
-
success = 0
|
79
|
-
errors = []
|
80
|
-
depricated_contents.each do |c|
|
81
|
-
if c.update_attribute(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
|
82
|
-
success += 1
|
83
|
-
else
|
84
|
-
errors << c.errors.full_messages
|
85
|
-
end
|
86
|
-
end
|
87
|
-
log("Namespaced #{success} essence_type columns.") if success > 0
|
88
|
-
log("#{errors.count} errors while namespacing essence_type columns.\n#{errors.join('\n')}", :error) if errors.count > 0
|
89
|
-
else
|
90
|
-
log "No essence_type columns to be namespaced found.", :skip
|
91
|
-
end
|
92
|
-
end
|
93
|
-
|
94
|
-
end
|
95
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointSix
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
def convert_attachment_storage
|
7
|
-
desc "Convert the attachment storage"
|
8
|
-
converted_files = []
|
9
|
-
files = Dir.glob Rails.root.join 'uploads/attachments/**/*.*'
|
10
|
-
if files.blank?
|
11
|
-
log "No attachments found", :skip
|
12
|
-
else
|
13
|
-
files.each do |file|
|
14
|
-
file_uid = file.gsub(/#{Rails.root.to_s}\/uploads\/attachments\//, '')
|
15
|
-
file_id = file_uid.split('/')[1].to_i
|
16
|
-
attachment = Alchemy::Attachment.find_by_id(file_id)
|
17
|
-
if attachment && attachment.file_uid.blank?
|
18
|
-
attachment.file_uid = file_uid
|
19
|
-
attachment.file_size = File.new(file).size
|
20
|
-
attachment.file_name = attachment.sanitized_filename
|
21
|
-
if attachment.save!
|
22
|
-
log "Converted #{file_uid}"
|
23
|
-
end
|
24
|
-
else
|
25
|
-
log "Attachment with id #{file_id} not found or already converted.", :skip
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
end
|
32
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
module Alchemy
|
2
|
-
module Upgrader::TwoPointThree
|
3
|
-
|
4
|
-
private
|
5
|
-
|
6
|
-
def gallery_pictures_change_notice
|
7
|
-
note =<<NOTE
|
8
|
-
We have changed the way Alchemy handles EssencePictures in elements.
|
9
|
-
|
10
|
-
It is now possible to have single EssencePictures and galleries side by side in the same element.
|
11
|
-
All element editor views containing render_picture_editor with option `maximum_amount_of_images => 1` must be changed into render_essence_editor_by_name.
|
12
|
-
In the yml description of these elements add a new content for this picture.
|
13
|
-
|
14
|
-
In order to upgrade your elements in the database run:
|
15
|
-
|
16
|
-
rails g alchemy:gallery_pictures_migration
|
17
|
-
|
18
|
-
and alter `db/seeds.rb`, so that it contains all elements that have essence pictures.
|
19
|
-
|
20
|
-
NOTE
|
21
|
-
todo note
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
end
|