locomotive_cms 2.0.3 → 2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +15 -0
- data/Gemfile +3 -3
- data/README.textile +7 -7
- data/app/assets/images/locomotive/icons/flags/ja.png +0 -0
- data/app/assets/javascripts/locomotive/aloha.js.coffee +3 -0
- data/app/assets/javascripts/locomotive/models/page.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/models/site.js.coffee +16 -6
- data/app/assets/javascripts/locomotive/utils/aloha_settings.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee +5 -0
- data/app/assets/javascripts/locomotive/views/my_account/edit_view.js.coffee +14 -0
- data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/views/pages/edit_view.js.coffee +2 -1
- data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/de.js +1 -0
- data/app/assets/stylesheets/locomotive.css +1 -0
- data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +18 -3
- data/app/assets/stylesheets/locomotive/backoffice/layout.css.scss +1 -1
- data/app/assets/stylesheets/locomotive/backoffice/menu/main.css.scss +7 -3
- data/app/assets/stylesheets/locomotive/backoffice/pagination.css.scss +37 -0
- data/app/assets/stylesheets/locomotive/backoffice/tagit_changes.css.scss +49 -0
- data/app/cells/locomotive/content_locale_picker/show.html.haml +1 -1
- data/app/cells/locomotive/global_actions_cell.rb +8 -8
- data/app/cells/locomotive/main_menu/show.html.haml +2 -2
- data/app/cells/locomotive/main_menu_cell.rb +2 -2
- data/app/cells/locomotive/menu_cell.rb +6 -6
- data/app/cells/locomotive/partials_cell.rb +21 -0
- data/app/cells/locomotive/settings_menu_cell.rb +4 -4
- data/app/cells/locomotive/sub_menu/show.html.haml +2 -2
- data/app/cells/locomotive/sub_menu_cell.rb +1 -1
- data/app/controllers/locomotive/accounts_controller.rb +4 -4
- data/app/controllers/locomotive/api/accounts_controller.rb +1 -0
- data/app/controllers/locomotive/api/content_assets_controller.rb +1 -1
- data/app/controllers/locomotive/api/content_entries_controller.rb +1 -1
- data/app/controllers/locomotive/api/content_types_controller.rb +2 -2
- data/app/controllers/locomotive/api/pages_controller.rb +1 -1
- data/app/controllers/locomotive/api/snippets_controller.rb +1 -1
- data/app/controllers/locomotive/api/theme_assets_controller.rb +47 -0
- data/app/controllers/locomotive/api/tokens_controller.rb +2 -2
- data/app/controllers/locomotive/base_controller.rb +5 -2
- data/app/controllers/locomotive/content_assets_controller.rb +1 -1
- data/app/controllers/locomotive/content_entries_controller.rb +22 -9
- data/app/controllers/locomotive/content_types_controller.rb +6 -6
- data/app/controllers/locomotive/current_site_controller.rb +6 -6
- data/app/controllers/locomotive/installation_controller.rb +11 -3
- data/app/controllers/locomotive/memberships_controller.rb +6 -6
- data/app/controllers/locomotive/my_account_controller.rb +9 -3
- data/app/controllers/locomotive/pages_controller.rb +10 -6
- data/app/controllers/locomotive/passwords_controller.rb +1 -1
- data/app/controllers/locomotive/public/content_entries_controller.rb +1 -1
- data/app/controllers/locomotive/public/pages_controller.rb +5 -5
- data/app/controllers/locomotive/public/robots_controller.rb +1 -1
- data/app/controllers/locomotive/public/sitemaps_controller.rb +1 -1
- data/app/controllers/locomotive/sessions_controller.rb +1 -1
- data/app/controllers/locomotive/sites_controller.rb +5 -5
- data/app/controllers/locomotive/snippets_controller.rb +6 -6
- data/app/controllers/locomotive/theme_assets_controller.rb +6 -6
- data/app/controllers/locomotive/translations_controller.rb +1 -1
- data/app/helpers/locomotive/accounts_helper.rb +1 -1
- data/app/helpers/locomotive/base_helper.rb +13 -21
- data/app/helpers/locomotive/content_types_helper.rb +3 -3
- data/app/helpers/locomotive/custom_fields_helper.rb +5 -5
- data/app/helpers/locomotive/installation_helper.rb +1 -1
- data/app/helpers/locomotive/pages_helper.rb +5 -5
- data/app/helpers/locomotive/snippets_helper.rb +1 -1
- data/app/helpers/locomotive/theme_assets_helper.rb +1 -1
- data/app/helpers/locomotive/translations_helper.rb +2 -2
- data/app/inputs/locomotive/api_key_input.rb +40 -0
- data/app/inputs/locomotive/code_input.rb +5 -5
- data/app/inputs/locomotive/file_input.rb +6 -6
- data/app/inputs/locomotive/locale_input.rb +5 -5
- data/app/inputs/locomotive/locales_input.rb +4 -4
- data/app/inputs/locomotive/rte_input.rb +1 -1
- data/app/inputs/locomotive/small_code_input.rb +1 -1
- data/app/inputs/locomotive/subdomain_input.rb +1 -1
- data/app/mailers/locomotive/devise_mailer.rb +1 -1
- data/app/mailers/locomotive/notifications.rb +3 -3
- data/app/models/locomotive/ability.rb +10 -11
- data/app/models/locomotive/account.rb +61 -26
- data/app/models/locomotive/content_asset.rb +8 -8
- data/app/models/locomotive/content_entry.rb +8 -7
- data/app/models/locomotive/content_type.rb +12 -7
- data/app/models/locomotive/editable_control.rb +2 -2
- data/app/models/locomotive/editable_element.rb +13 -8
- data/app/models/locomotive/editable_file.rb +5 -3
- data/app/models/locomotive/editable_short_text.rb +3 -3
- data/app/models/locomotive/extensions/asset/types.rb +2 -2
- data/app/models/locomotive/extensions/content_entry/csv.rb +78 -0
- data/app/models/locomotive/extensions/content_type/item_template.rb +3 -3
- data/app/models/locomotive/extensions/content_type/sync.rb +4 -4
- data/app/models/locomotive/extensions/page/editable_elements.rb +1 -1
- data/app/models/locomotive/extensions/page/parse.rb +2 -2
- data/app/models/locomotive/extensions/page/render.rb +7 -1
- data/app/models/locomotive/extensions/page/templatized.rb +20 -15
- data/app/models/locomotive/extensions/page/tree.rb +4 -4
- data/app/models/locomotive/extensions/shared/seo.rb +3 -3
- data/app/models/locomotive/extensions/site/first_installation.rb +5 -2
- data/app/models/locomotive/extensions/site/locales.rb +9 -6
- data/app/models/locomotive/extensions/site/subdomain_domains.rb +8 -8
- data/app/models/locomotive/membership.rb +6 -6
- data/app/models/locomotive/page.rb +30 -23
- data/app/models/locomotive/site.rb +19 -15
- data/app/models/locomotive/snippet.rb +5 -5
- data/app/models/locomotive/theme_asset.rb +17 -6
- data/app/models/locomotive/translation.rb +21 -16
- data/app/presenters/locomotive/account_presenter.rb +1 -1
- data/app/presenters/locomotive/content_entry_presenter.rb +2 -2
- data/app/presenters/locomotive/content_field_presenter.rb +2 -2
- data/app/presenters/locomotive/content_type_presenter.rb +6 -1
- data/app/presenters/locomotive/theme_asset_presenter.rb +2 -2
- data/app/uploaders/locomotive/editable_file_uploader.rb +1 -1
- data/app/uploaders/locomotive/theme_asset_uploader.rb +1 -1
- data/app/views/locomotive/accounts/new.html.haml +6 -6
- data/app/views/locomotive/content_assets/_asset.html.haml +3 -3
- data/app/views/locomotive/content_assets/_picker.html.haml +12 -12
- data/app/views/locomotive/content_entries/_form.html.haml +9 -8
- data/app/views/locomotive/content_entries/_list.html.haml +8 -5
- data/app/views/locomotive/content_entries/edit.html.haml +6 -6
- data/app/views/locomotive/content_entries/index.html.haml +8 -6
- data/app/views/locomotive/content_entries/new.html.haml +5 -5
- data/app/views/locomotive/content_types/_form.html.haml +16 -16
- data/app/views/locomotive/content_types/edit.html.haml +5 -5
- data/app/views/locomotive/content_types/new.html.haml +3 -3
- data/app/views/locomotive/current_site/_form.html.haml +12 -12
- data/app/views/locomotive/current_site/edit.html.haml +5 -5
- data/app/views/locomotive/custom_fields/_form.html.haml +23 -19
- data/app/views/locomotive/custom_fields/_select_templates.html.haml +5 -5
- data/app/views/locomotive/custom_fields/types/_belongs_to.html.haml +4 -4
- data/app/views/locomotive/custom_fields/types/_boolean.html.haml +3 -3
- data/app/views/locomotive/custom_fields/types/_date.html.haml +4 -4
- data/app/views/locomotive/custom_fields/types/_email.html.haml +4 -0
- data/app/views/locomotive/custom_fields/types/_file.html.haml +3 -3
- data/app/views/locomotive/custom_fields/types/_float.html.haml +6 -0
- data/app/views/locomotive/custom_fields/types/_has_many.html.haml +10 -10
- data/app/views/locomotive/custom_fields/types/_integer.html.haml +5 -0
- data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml +10 -10
- data/app/views/locomotive/custom_fields/types/_select.html.haml +10 -10
- data/app/views/locomotive/custom_fields/types/_string.html.haml +3 -3
- data/app/views/locomotive/custom_fields/types/_tags.html.haml +4 -0
- data/app/views/locomotive/custom_fields/types/_text.html.haml +4 -4
- data/app/views/locomotive/devise_mailer/reset_password_instructions.html.haml +1 -1
- data/app/views/locomotive/installation/step_1.html.haml +5 -5
- data/app/views/locomotive/installation/step_2.html.haml +6 -6
- data/app/views/locomotive/kaminari/_first_page.html.haml +2 -0
- data/app/views/locomotive/kaminari/_gap.html.haml +2 -0
- data/app/views/locomotive/kaminari/_last_page.html.haml +2 -0
- data/app/views/locomotive/kaminari/_next_page.html.haml +2 -0
- data/app/views/locomotive/kaminari/_page.html.haml +2 -0
- data/app/views/locomotive/kaminari/_paginator.html.haml +11 -0
- data/app/views/locomotive/kaminari/_prev_page.html.haml +2 -0
- data/app/views/locomotive/layouts/application.html.haml +2 -2
- data/app/views/locomotive/layouts/not_logged_in.html.haml +3 -3
- data/app/views/locomotive/memberships/new.html.haml +4 -4
- data/app/views/locomotive/my_account/edit.html.haml +14 -13
- data/app/views/locomotive/notifications/new_content_entry.html.haml +2 -2
- data/app/views/locomotive/pages/_editable_elements.html.haml +20 -20
- data/app/views/locomotive/pages/_form.html.haml +23 -27
- data/app/views/locomotive/pages/_page.html.haml +6 -6
- data/app/views/locomotive/pages/edit.html.haml +5 -5
- data/app/views/locomotive/pages/index.html.haml +2 -2
- data/app/views/locomotive/pages/new.html.haml +4 -4
- data/app/views/locomotive/passwords/edit.html.haml +3 -3
- data/app/views/locomotive/passwords/new.html.haml +2 -2
- data/app/views/locomotive/public/pages/show_toolbar.html.haml +15 -15
- data/app/views/locomotive/sessions/new.html.haml +4 -4
- data/app/views/locomotive/shared/_footer.html.haml +1 -1
- data/app/views/locomotive/shared/_head.html.haml +7 -7
- data/app/views/locomotive/shared/_header.html.haml +2 -2
- data/app/views/locomotive/shared/_locale_picker_link.html.haml +1 -1
- data/app/views/locomotive/shared/_site_picker.html.haml +2 -2
- data/app/views/locomotive/shared/actions/_contents.html.haml +1 -1
- data/app/views/locomotive/shared/menu/_contents.html.haml +5 -5
- data/app/views/locomotive/sites/_domains.html.haml +7 -7
- data/app/views/locomotive/sites/_form.html.haml +6 -1
- data/app/views/locomotive/sites/_memberships.html.haml +3 -3
- data/app/views/locomotive/sites/new.html.haml +3 -3
- data/app/views/locomotive/snippets/_form.html.haml +6 -6
- data/app/views/locomotive/snippets/_snippet.html.haml +2 -2
- data/app/views/locomotive/snippets/edit.html.haml +5 -5
- data/app/views/locomotive/snippets/new.html.haml +3 -3
- data/app/views/locomotive/theme_assets/_asset.html.haml +2 -2
- data/app/views/locomotive/theme_assets/_form.html.haml +10 -10
- data/app/views/locomotive/theme_assets/_list.html.haml +3 -3
- data/app/views/locomotive/theme_assets/_picker.html.haml +8 -8
- data/app/views/locomotive/theme_assets/edit.html.haml +7 -7
- data/app/views/locomotive/theme_assets/index.html.haml +6 -6
- data/app/views/locomotive/theme_assets/new.html.haml +3 -3
- data/app/views/locomotive/translations/_form.html.haml +3 -3
- data/app/views/locomotive/translations/edit.html.haml +6 -6
- data/app/views/locomotive/translations/index.html.haml +2 -0
- data/app/views/locomotive/translations/new.html.haml +2 -2
- data/config/initializers/csv_renderer.rb +10 -0
- data/config/locales/admin_ui.de.yml +1 -0
- data/config/locales/admin_ui.en.yml +12 -0
- data/config/locales/admin_ui.es.yml +1 -0
- data/config/locales/admin_ui.et.yml +1 -0
- data/config/locales/admin_ui.fr.yml +12 -0
- data/config/locales/admin_ui.it.yml +1 -0
- data/config/locales/admin_ui.ja.yml +335 -0
- data/config/locales/admin_ui.nb.yml +1 -0
- data/config/locales/admin_ui.nl.yml +1 -0
- data/config/locales/admin_ui.pl.yml +1 -0
- data/config/locales/admin_ui.pt-BR.yml +8 -0
- data/config/locales/admin_ui.ru.yml +1 -0
- data/config/locales/carrierwave.ja.yml +4 -0
- data/config/locales/default.de.yml +1 -1
- data/config/locales/default.en.yml +1 -1
- data/config/locales/default.es.yml +3 -0
- data/config/locales/default.et.yml +2 -2
- data/config/locales/default.fr.yml +1 -1
- data/config/locales/default.it.yml +3 -0
- data/config/locales/default.ja.yml +94 -0
- data/config/locales/default.nb.yml +1 -1
- data/config/locales/default.nl.yml +5 -0
- data/config/locales/default.pl.yml +2 -2
- data/config/locales/default.pt-BR.yml +3 -2
- data/config/locales/default.ru.yml +19 -16
- data/config/locales/devise.ja.yml +63 -0
- data/config/locales/flash.ja.yml +115 -0
- data/config/locales/formtastic.en.yml +7 -0
- data/config/locales/formtastic.fr.yml +9 -0
- data/config/locales/formtastic.ja.yml +103 -0
- data/config/locales/formtastic.pt-BR.yml +1 -1
- data/config/routes.rb +5 -2
- data/features/api/authentication.feature +24 -2
- data/features/api/authorization/pages.feature +3 -1
- data/features/api/entries_custom_fields.feature +2 -2
- data/features/backoffice/authorization/pages.feature +7 -7
- data/features/backoffice/content_types/email.feature +26 -0
- data/features/backoffice/content_types/has_many.feature +20 -0
- data/features/backoffice/content_types/integer.feature +26 -0
- data/features/backoffice/content_types/many_to_many.feature +29 -1
- data/features/backoffice/content_types/tags.feature +22 -0
- data/features/backoffice/content_types/uniqueness.feature +29 -0
- data/features/backoffice/contents.feature +16 -0
- data/features/backoffice/installation.feature +33 -0
- data/features/backoffice/my_account.feature +21 -0
- data/features/backoffice/pages.feature +21 -1
- data/features/backoffice/site.feature +59 -40
- data/features/backoffice/snippets.feature +1 -1
- data/features/backoffice/translations.feature +7 -1
- data/features/public/basic.feature +1 -1
- data/features/public/pages.feature +92 -0
- data/features/public/session.feature +40 -0
- data/features/public/tags.feature +45 -0
- data/features/step_definitions/backoffice_steps.rb +4 -0
- data/features/step_definitions/content_types_steps.rb +16 -3
- data/features/step_definitions/more_web_steps.rb +35 -4
- data/features/step_definitions/page_steps.rb +52 -35
- data/features/step_definitions/pagination_steps.rb +4 -4
- data/features/step_definitions/site_steps.rb +22 -10
- data/features/step_definitions/snippet_steps.rb +1 -1
- data/features/step_definitions/theme_asset_steps.rb +2 -2
- data/features/step_definitions/translation_steps.rb +1 -1
- data/features/step_definitions/web_steps.rb +1 -1
- data/features/support/http.rb +1 -1
- data/features/support/locales.rb +5 -0
- data/lib/generators/locomotive/install/install_generator.rb +1 -6
- data/lib/generators/locomotive/install/templates/carrierwave.rb +4 -4
- data/lib/generators/locomotive/install/templates/locomotive.rb +12 -7
- data/lib/locomotive.rb +4 -4
- data/lib/locomotive/action_controller.rb +1 -0
- data/lib/locomotive/action_controller/responder.rb +9 -10
- data/lib/locomotive/action_controller/section_helpers.rb +1 -1
- data/lib/locomotive/action_controller/ssl.rb +11 -0
- data/lib/locomotive/action_controller/url_helpers.rb +9 -5
- data/lib/locomotive/carrierwave/asset.rb +6 -6
- data/lib/locomotive/configuration.rb +28 -26
- data/lib/locomotive/core_ext.rb +1 -2
- data/lib/locomotive/custom_fields.rb +12 -6
- data/lib/locomotive/dependencies.rb +1 -0
- data/lib/locomotive/dragonfly.rb +1 -1
- data/lib/locomotive/engine.rb +3 -3
- data/lib/locomotive/formtastic.rb +1 -1
- data/lib/locomotive/httparty/webservice.rb +1 -1
- data/lib/locomotive/kaminari.rb +28 -13
- data/lib/locomotive/liquid.rb +1 -0
- data/lib/locomotive/liquid/drops/content_entry.rb +1 -1
- data/lib/locomotive/liquid/drops/content_types.rb +27 -2
- data/lib/locomotive/liquid/drops/page.rb +14 -2
- data/lib/locomotive/liquid/drops/proxy_collection.rb +4 -0
- data/lib/locomotive/liquid/drops/session_proxy.rb +16 -0
- data/lib/locomotive/liquid/drops/site.rb +11 -3
- data/lib/locomotive/liquid/drops/uploader.rb +1 -1
- data/lib/locomotive/liquid/filters/base.rb +1 -1
- data/lib/locomotive/liquid/filters/date.rb +2 -2
- data/lib/locomotive/liquid/filters/html.rb +12 -12
- data/lib/locomotive/liquid/filters/translate.rb +21 -3
- data/lib/locomotive/liquid/tags/consume.rb +50 -19
- data/lib/locomotive/liquid/tags/editable/base.rb +9 -9
- data/lib/locomotive/liquid/tags/editable/control.rb +1 -1
- data/lib/locomotive/liquid/tags/editable/file.rb +1 -1
- data/lib/locomotive/liquid/tags/editable/short_text.rb +1 -1
- data/lib/locomotive/liquid/tags/fetch_page.rb +28 -0
- data/lib/locomotive/liquid/tags/hybrid.rb +25 -0
- data/lib/locomotive/liquid/tags/inherited_block.rb +2 -2
- data/lib/locomotive/liquid/tags/inline_editor.rb +4 -4
- data/lib/locomotive/liquid/tags/javascript.rb +16 -0
- data/lib/locomotive/liquid/tags/link_to.rb +42 -0
- data/lib/locomotive/liquid/tags/locale_switcher.rb +1 -1
- data/lib/locomotive/liquid/tags/nav.rb +2 -2
- data/lib/locomotive/liquid/tags/paginate.rb +2 -2
- data/lib/locomotive/liquid/tags/session_assign.rb +39 -0
- data/lib/locomotive/liquid/tags/snippet.rb +1 -1
- data/lib/locomotive/liquid/tags/with_scope.rb +6 -2
- data/lib/locomotive/logger.rb +1 -1
- data/lib/locomotive/middlewares/cache.rb +1 -1
- data/lib/locomotive/middlewares/fonts.rb +1 -1
- data/lib/locomotive/middlewares/inline_editor.rb +1 -1
- data/lib/locomotive/middlewares/permalink.rb +1 -1
- data/lib/locomotive/middlewares/seo_trailing_slash.rb +1 -1
- data/lib/locomotive/mongoid/patches.rb +21 -21
- data/lib/locomotive/rails/action_view.rb +20 -4
- data/lib/locomotive/regexps.rb +1 -1
- data/lib/locomotive/render.rb +4 -2
- data/lib/locomotive/routing/default_constraint.rb +1 -1
- data/lib/locomotive/routing/site_dispatcher.rb +1 -1
- data/lib/locomotive/session_store.rb +7 -7
- data/lib/locomotive/version.rb +1 -1
- data/lib/tasks/development.rake +11 -9
- data/lib/tasks/locomotive.rake +11 -11
- data/mongodb/migrate/20130204072721_make_editable_elements_consistent.rb +3 -1
- data/mongodb/migrate/20130326201349_rename_entry_to_content_entry.rb +6 -6
- data/mongodb/migrate/20130511121956_generate_checksum_for_theme_assets.rb +14 -0
- data/mongodb/migrate/20130530162559_api_key_for_all_accounts.rb +10 -0
- data/spec/cells/locomotive/global_actions_spec.rb +11 -11
- data/spec/cells/locomotive/main_menu_cell_spec.rb +9 -9
- data/spec/cells/locomotive/settings_menu_cell_spec.rb +11 -11
- data/spec/dummy/config/environments/development.rb +1 -1
- data/spec/dummy/config/initializers/locomotive.rb +16 -11
- data/spec/dummy/config/mongoid.yml +99 -18
- data/spec/lib/action_view_spec.rb +19 -0
- data/spec/lib/core_ext_spec.rb +2 -2
- data/spec/lib/locomotive/configuration_spec.rb +1 -1
- data/spec/lib/locomotive/httparty/webservice_spec.rb +6 -6
- data/spec/lib/locomotive/liquid/drops/content_entry_spec.rb +1 -1
- data/spec/lib/locomotive/liquid/drops/current_user.rb +3 -3
- data/spec/lib/locomotive/liquid/drops/page_spec.rb +63 -14
- data/spec/lib/locomotive/liquid/drops/site_spec.rb +3 -3
- data/spec/lib/locomotive/liquid/filters/html_spec.rb +22 -7
- data/spec/lib/locomotive/liquid/filters/resize_spec.rb +3 -3
- data/spec/lib/locomotive/liquid/filters/translate_spec.rb +26 -12
- data/spec/lib/locomotive/liquid/tags/consume_spec.rb +26 -2
- data/spec/lib/locomotive/liquid/tags/csrf_spec.rb +3 -3
- data/spec/lib/locomotive/liquid/tags/editable/short_text_spec.rb +1 -1
- data/spec/lib/locomotive/liquid/tags/extends_spec.rb +5 -5
- data/spec/lib/locomotive/liquid/tags/javascript_spec.rb +18 -0
- data/spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb +23 -13
- data/spec/lib/locomotive/liquid/tags/nav_spec.rb +11 -11
- data/spec/lib/locomotive/liquid/tags/paginate_spec.rb +13 -13
- data/spec/lib/locomotive/liquid/tags/seo_spec.rb +8 -8
- data/spec/lib/locomotive/liquid/tags/with_scope_spec.rb +8 -2
- data/spec/lib/locomotive/presentable_spec.rb +10 -10
- data/spec/lib/locomotive/render_spec.rb +14 -14
- data/spec/mailers/locomotive/notifications_spec.rb +3 -3
- data/spec/models/locomotive/ability_spec.rb +23 -9
- data/spec/models/locomotive/account_spec.rb +30 -8
- data/spec/models/locomotive/content_asset_spec.rb +1 -1
- data/spec/models/locomotive/content_entry_spec.rb +57 -2
- data/spec/models/locomotive/content_type_spec.rb +42 -41
- data/spec/models/locomotive/editable_control_spec.rb +5 -5
- data/spec/models/locomotive/editable_file_spec.rb +21 -5
- data/spec/models/locomotive/editable_long_text_spec.rb +3 -3
- data/spec/models/locomotive/editable_short_text_spec.rb +8 -8
- data/spec/models/locomotive/extensions/page/editable_elements_spec.rb +9 -9
- data/spec/models/locomotive/extensions/page/redirect_spec.rb +1 -1
- data/spec/models/locomotive/extensions/page/render_spec.rb +4 -8
- data/spec/models/locomotive/extensions/site/locales_spec.rb +2 -2
- data/spec/models/locomotive/membership_spec.rb +5 -5
- data/spec/models/locomotive/page_spec.rb +10 -1
- data/spec/models/locomotive/site_spec.rb +19 -19
- data/spec/models/locomotive/snippet_spec.rb +9 -9
- data/spec/models/locomotive/theme_asset_spec.rb +91 -57
- data/spec/requests/admin_ssl_spec.rb +25 -0
- data/spec/support/factories.rb +32 -27
- data/spec/support/locomotive.rb +2 -0
- data/vendor/assets/javascripts/locomotive/backbone.sync.js +1 -1
- data/vendor/assets/javascripts/locomotive/tag-it.min.js +16 -0
- data/vendor/assets/stylesheets/locomotive/jquery.tagit.css +67 -0
- metadata +108 -138
@@ -1,4 +1,4 @@
|
|
1
1
|
= f.input name,
|
2
|
-
:
|
3
|
-
:
|
4
|
-
:
|
2
|
+
label: field.label,
|
3
|
+
hint: field.hint,
|
4
|
+
wrapper_html: { class: "#{'highlighted' if highlighted}" }
|
@@ -1,5 +1,5 @@
|
|
1
1
|
= f.input field.name.to_sym,
|
2
|
-
:
|
3
|
-
:
|
4
|
-
:
|
5
|
-
:
|
2
|
+
label: field.label,
|
3
|
+
hint: field.hint,
|
4
|
+
as: field.text_formatting == 'html' ? :'Locomotive::Rte' : :text,
|
5
|
+
input_html: { class: field.text_formatting }
|
@@ -5,7 +5,7 @@
|
|
5
5
|
%p
|
6
6
|
!= t('.reset_password_instruction')
|
7
7
|
%p
|
8
|
-
= link_to t('.change_my_password'), edit_locomotive_account_password_url(:
|
8
|
+
= link_to t('.change_my_password'), edit_locomotive_account_password_url(reset_password_token: @resource.reset_password_token)
|
9
9
|
%p
|
10
10
|
!= t('.wrong_request_instruction')
|
11
11
|
%p
|
@@ -4,13 +4,13 @@
|
|
4
4
|
- title t('.title')
|
5
5
|
|
6
6
|
- if @step_done.blank?
|
7
|
-
= semantic_form_for(@account, :
|
7
|
+
= semantic_form_for(@account, url: installation_step_url(1)) do |f|
|
8
8
|
.inner
|
9
9
|
= f.inputs do
|
10
|
-
= f.input :name, :
|
11
|
-
= f.input :email, :
|
12
|
-
= f.input :password, :
|
13
|
-
= f.input :password_confirmation, :
|
10
|
+
= f.input :name, label: t('.name'), required: false
|
11
|
+
= f.input :email, label: t('.email'), required: false
|
12
|
+
= f.input :password, label: t('.password'), required: false
|
13
|
+
= f.input :password_confirmation, label: t('.password_confirmation'), required: false
|
14
14
|
|
15
15
|
.footer
|
16
16
|
= submit_tag t('.next')
|
@@ -3,21 +3,21 @@
|
|
3
3
|
|
4
4
|
- title t('.title')
|
5
5
|
|
6
|
-
= semantic_form_for(@site, :
|
6
|
+
= semantic_form_for(@site, url: installation_step_url(2), html: { multipart: true }) do |f|
|
7
7
|
.inner
|
8
8
|
|
9
9
|
%p.explanations
|
10
10
|
!= t('.explanations')
|
11
11
|
|
12
12
|
= f.inputs do
|
13
|
-
= f.input :name, :
|
13
|
+
= f.input :name, required: true
|
14
14
|
|
15
15
|
- if multi_sites?
|
16
|
-
= f.input :subdomain, :
|
16
|
+
= f.input :subdomain, required: true
|
17
17
|
|
18
|
-
%li{ :
|
19
|
-
%label{ :
|
20
|
-
= select_tag 'site[locales][]', options_for_select(options_for_site_locales, @site.default_locale), :
|
18
|
+
%li{ class: 'select optional', id: 'default_site_locale' }
|
19
|
+
%label{ for: 'default_site_locale_input' }= t('.default_site_locale')
|
20
|
+
= select_tag 'site[locales][]', options_for_select(options_for_site_locales, @site.default_locale), id: 'default_site_locale_input'
|
21
21
|
%p.inline-hints!= t('.default_site_locales_hints')
|
22
22
|
|
23
23
|
.footer
|
@@ -0,0 +1,11 @@
|
|
1
|
+
= paginator.render do
|
2
|
+
%nav.pagination
|
3
|
+
= first_page_tag unless current_page.first?
|
4
|
+
= prev_page_tag unless current_page.first?
|
5
|
+
- each_page do |page|
|
6
|
+
- if page.left_outer? || page.right_outer? || page.inside_window?
|
7
|
+
= page_tag page
|
8
|
+
- elsif !page.was_truncated?
|
9
|
+
= gap_tag
|
10
|
+
= next_page_tag unless current_page.last?
|
11
|
+
= last_page_tag unless current_page.last?
|
@@ -1,15 +1,15 @@
|
|
1
1
|
!!! XML
|
2
2
|
!!!
|
3
|
-
%html{ :
|
3
|
+
%html{ xmlns: 'http://www.w3.org/1999/xhtml' }
|
4
4
|
%head
|
5
5
|
%title= escape_once(title || "#{Locomotive.config.name} — #{current_site.name}")
|
6
6
|
|
7
7
|
= javascript_include_tag 'locomotive/not_logged_in'
|
8
|
-
= stylesheet_link_tag 'locomotive/not_logged_in', :
|
8
|
+
= stylesheet_link_tag 'locomotive/not_logged_in', media: 'screen'
|
9
9
|
|
10
10
|
= yield :head
|
11
11
|
|
12
|
-
%body{ :
|
12
|
+
%body{ class: controller.controller_name }
|
13
13
|
#wrapper
|
14
14
|
#light
|
15
15
|
#panel.container
|
@@ -5,10 +5,10 @@
|
|
5
5
|
|
6
6
|
%p!= t('.help')
|
7
7
|
|
8
|
-
= semantic_form_for @membership, :
|
8
|
+
= semantic_form_for @membership, url: memberships_url do |f|
|
9
9
|
|
10
|
-
= f.inputs :
|
10
|
+
= f.inputs name: :membership_email, class: 'inputs email' do
|
11
11
|
|
12
|
-
= f.input :email, :
|
12
|
+
= f.input :email, label: false, wrapper_html: { class: 'no-label' }
|
13
13
|
|
14
|
-
= render 'locomotive/shared/form_actions', :
|
14
|
+
= render 'locomotive/shared/form_actions', back_url: edit_current_site_url, button_label: :create
|
@@ -1,31 +1,32 @@
|
|
1
|
-
- title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :
|
1
|
+
- title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', rel: 'account_name', title: t('.ask_for_name'), class: 'editable')
|
2
2
|
|
3
3
|
- content_for :backbone_view_data do
|
4
4
|
:plain
|
5
|
-
account: #{
|
5
|
+
account: #{escape_json @account.to_json.html_safe}
|
6
6
|
|
7
7
|
- content_for :submenu do
|
8
8
|
= render_cell 'locomotive/settings_menu', :show
|
9
9
|
|
10
10
|
- if multi_sites?
|
11
11
|
- content_for :buttons do
|
12
|
-
= local_action_button t('.new_site'), new_site_url, :
|
12
|
+
= local_action_button t('.new_site'), new_site_url, icon: 'icon-plus' if can?(:create, Locomotive::Site)
|
13
13
|
|
14
14
|
%p= t('.help')
|
15
15
|
|
16
|
-
= semantic_form_for @account, :
|
16
|
+
= semantic_form_for @account, url: my_account_url do |f|
|
17
17
|
|
18
|
-
= f.inputs :
|
18
|
+
= f.inputs name: :information do
|
19
19
|
= f.input :name
|
20
|
-
= f.input :locale, :
|
20
|
+
= f.input :locale, as: '::Locomotive::Locale'
|
21
21
|
|
22
|
-
= f.inputs :
|
22
|
+
= f.inputs name: :credentials, class: "inputs foldable folded" do
|
23
23
|
= f.input :email
|
24
|
-
= f.input :password, :
|
25
|
-
= f.input :password_confirmation, :
|
24
|
+
= f.input :password, input_html: { autocomplete: 'off' }
|
25
|
+
= f.input :password_confirmation, input_html: { autocomplete: 'off' }
|
26
|
+
= f.input :api_key, as: '::Locomotive::ApiKey', url: regenerate_api_key_my_account_url
|
26
27
|
|
27
28
|
- if multi_sites?
|
28
|
-
= f.inputs :
|
29
|
+
= f.inputs name: :sites, class: "sites inputs foldable" do
|
29
30
|
%li#account_sites_input.input.empty.no-label.last
|
30
31
|
.list
|
31
32
|
- @account.sites.each do |site|
|
@@ -34,7 +35,7 @@
|
|
34
35
|
%em= site.domains.join(', ')
|
35
36
|
|
36
37
|
- if admin_on?(site) && site != current_site
|
37
|
-
%span{ :
|
38
|
-
= link_to_icon :trash, site_url(site), :
|
38
|
+
%span{ class: 'actions' }
|
39
|
+
= link_to_icon :trash, site_url(site), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
|
39
40
|
|
40
|
-
= render 'locomotive/shared/form_actions', :
|
41
|
+
= render 'locomotive/shared/form_actions', button_label: :update
|
@@ -1,7 +1,7 @@
|
|
1
|
-
%p= t('.title', :
|
1
|
+
%p= t('.title', name: @account.name, domain: @domain, date: I18n.l(Time.now), locale: @account.locale).html_safe
|
2
2
|
|
3
3
|
%p
|
4
|
-
%b= t('.type', :
|
4
|
+
%b= t('.type', type: @type.name, locale: @account.locale)
|
5
5
|
%br
|
6
6
|
%i= @type.description
|
7
7
|
|
@@ -1,64 +1,64 @@
|
|
1
|
-
%script{ :
|
1
|
+
%script{ type: 'text/html', id: 'editable_elements_edit' }
|
2
2
|
|
3
3
|
.nav
|
4
4
|
{{#each blocks}}
|
5
|
-
= link_to '{{name}}', '#block-{{index}}', :
|
5
|
+
= link_to '{{name}}', '#block-{{index}}', class: '{{#unless index}}on{{/unless}}'
|
6
6
|
{{/each}}
|
7
7
|
.clear
|
8
8
|
|
9
9
|
.wrapper
|
10
10
|
%ul
|
11
11
|
{{#each blocks}}
|
12
|
-
%li{ :
|
12
|
+
%li{ id: 'block-{{index}}', class: 'block', style: 'display: {{#if index}}none{{else}}block{{/if}}' }
|
13
13
|
%fieldset.inputs
|
14
14
|
%ol
|
15
15
|
{{/each}}
|
16
16
|
|
17
|
-
%script{ :
|
17
|
+
%script{ type: 'text/html', id: 'editable_text_input' }
|
18
18
|
|
19
|
-
%label{ :
|
19
|
+
%label{ for: 'page_editable_elements_attributes_{{index}}_content' } {{label}}
|
20
20
|
|
21
|
-
= text_area_tag 'page[editable_elements_attributes][{{index}}][content]', '{{content}}', :
|
21
|
+
= text_area_tag 'page[editable_elements_attributes][{{index}}][content]', '{{content}}', id: 'page_editable_elements_attributes_{{index}}_content'
|
22
22
|
|
23
23
|
{{#if hint}}
|
24
24
|
%p.inline-hints {{hint}}
|
25
25
|
{{/if}}
|
26
26
|
|
27
|
-
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', :
|
27
|
+
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', id: 'page_editable_elements_attributes_{{index}}_id'
|
28
28
|
|
29
|
-
%script{ :
|
29
|
+
%script{ type: 'text/html', id: 'editable_file_input' }
|
30
30
|
|
31
|
-
%label{ :
|
31
|
+
%label{ for: 'page_editable_elements_attributes_{{index}}_content' } {{label}}
|
32
32
|
|
33
33
|
%span.file
|
34
34
|
{{#if content}}
|
35
|
-
= link_to '{{filename}}', '{{content}}', :
|
35
|
+
= link_to '{{filename}}', '{{content}}', target: '_blank'
|
36
36
|
|
37
|
-
= file_field_tag 'page[editable_elements_attributes][{{index}}][source]', :
|
37
|
+
= file_field_tag 'page[editable_elements_attributes][{{index}}][source]', id: 'page_editable_elements_attributes_{{index}}_source', style: 'display: none'
|
38
38
|
|
39
|
-
= link_to t('locomotive.pages.form.change_file'), '#', :
|
40
|
-
= link_to t('locomotive.pages.form.delete_file'), '#', :
|
39
|
+
= link_to t('locomotive.pages.form.change_file'), '#', class: 'change', :'data-alt-label' => t('locomotive.pages.form.cancel')
|
40
|
+
= link_to t('locomotive.pages.form.delete_file'), '#', class: 'delete', :'data-alt-label' => t('locomotive.pages.form.cancel')
|
41
41
|
|
42
|
-
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][remove_source]', '0', :
|
42
|
+
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][remove_source]', '0', class: 'remove-flag'
|
43
43
|
|
44
44
|
{{else}}
|
45
|
-
= file_field_tag 'page[editable_elements_attributes][{{index}}][source]', :
|
45
|
+
= file_field_tag 'page[editable_elements_attributes][{{index}}][source]', id: 'page_editable_elements_attributes_{{index}}_source'
|
46
46
|
{{/if}}
|
47
47
|
|
48
48
|
{{#if hint}}
|
49
49
|
%p.inline-hints {{hint}}
|
50
50
|
{{/if}}
|
51
51
|
|
52
|
-
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', :
|
52
|
+
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', id: 'page_editable_elements_attributes_{{index}}_id'
|
53
53
|
|
54
|
-
%script{ :
|
54
|
+
%script{ type: 'text/html', id: 'editable_control_input' }
|
55
55
|
|
56
|
-
%label{ :
|
56
|
+
%label{ for: 'page_editable_elements_attributes_{{index}}_content' } {{label}}
|
57
57
|
|
58
|
-
= select_tag 'page[editable_elements_attributes][{{index}}][content]', raw('{{#each options}}<option value="{{this.value}}" {{#if this.selected}}selected="selected"{{/if}}>{{this.text}}</option>{{/each}}'), :
|
58
|
+
= select_tag 'page[editable_elements_attributes][{{index}}][content]', raw('{{#each options}}<option value="{{this.value}}" {{#if this.selected}}selected="selected"{{/if}}>{{this.text}}</option>{{/each}}'), id: 'page_editable_elements_attributes_{{index}}_content', class: 'content'
|
59
59
|
|
60
60
|
{{#if hint}}
|
61
61
|
%p.inline-hints {{hint}}
|
62
62
|
{{/if}}
|
63
63
|
|
64
|
-
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', :
|
64
|
+
= hidden_field_tag 'page[editable_elements_attributes][{{index}}][id]', '{{id}}', id: 'page_editable_elements_attributes_{{index}}_id'
|
@@ -5,24 +5,18 @@
|
|
5
5
|
|
6
6
|
- content_for :backbone_view_data do
|
7
7
|
:plain
|
8
|
-
page: #{
|
8
|
+
page: #{escape_json to_json(@page)}
|
9
9
|
|
10
|
-
|
10
|
+
= f.inputs name: :information do
|
11
11
|
|
12
|
-
= f.
|
12
|
+
= f.input :title, wrapper_html: { class: 'highlighted' }
|
13
13
|
|
14
|
-
|
14
|
+
- if not @page.index? and not @page.not_found?
|
15
|
+
= f.input :parent_id, as: :select, collection: parent_pages_options, include_blank: false
|
15
16
|
|
16
|
-
|
17
|
-
= f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false
|
17
|
+
= f.input :slug, required: false, hint: @page.slug.blank? ? t('.empty_slug') : public_page_url(@page, locale: current_content_locale), input_html: { :'data-url' => get_path_pages_url, disabled: @page.index? || @page.not_found? }, wrapper_html: { style: "#{'display: none' if @page.templatized? && !@page.templatized_from_parent?};", class: 'em-inline-hints' }
|
18
18
|
|
19
|
-
|
20
|
-
|
21
|
-
- else
|
22
|
-
= f.inputs :name => :information, :style => 'display: none' do
|
23
|
-
= f.text_field :title
|
24
|
-
|
25
|
-
= f.inputs :name => :seo, :class => "inputs foldable #{'folded' if inputs_folded?(@page)}" do
|
19
|
+
= f.inputs name: :seo, class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
|
26
20
|
|
27
21
|
= f.input :seo_title
|
28
22
|
|
@@ -30,32 +24,34 @@
|
|
30
24
|
|
31
25
|
= f.input :meta_description
|
32
26
|
|
33
|
-
- if
|
34
|
-
|
35
|
-
= f.inputs :name => :advanced_options, :id => 'advanced-options', :class => "inputs foldable #{'folded' if inputs_folded?(@page)}" do
|
27
|
+
= f.inputs name: :advanced_options, id: 'advanced-options', class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
|
36
28
|
|
29
|
+
- if can?(:customize, @page)
|
37
30
|
= f.input :handle
|
38
31
|
|
39
|
-
= f.input :response_type, :
|
32
|
+
= f.input :response_type, as: :select, collection: options_for_page_response_type, include_blank: false
|
33
|
+
|
34
|
+
= f.input :templatized, as: :'Locomotive::Toggle', style: "#{'display: none' if @page.redirect? || @page.templatized_from_parent?}"
|
40
35
|
|
41
|
-
= f.input :
|
36
|
+
= f.input :target_klass_name, as: :select, collection: options_for_target_klass_name, include_blank: false, wrapper_html: { style: "#{'display: none' if !@page.templatized? || @page.templatized_from_parent?}" }
|
42
37
|
|
43
|
-
|
38
|
+
= f.input :published, as: :'Locomotive::Toggle'
|
44
39
|
|
45
|
-
|
40
|
+
= f.input :listed, as: :'Locomotive::Toggle'
|
46
41
|
|
47
|
-
|
42
|
+
= f.input :redirect, as: :'Locomotive::Toggle', wrapper_html: { style: "#{'display: none' if @page.templatized? || !@page.default_response_type?}" }
|
48
43
|
|
49
|
-
|
44
|
+
= f.input :redirect_url, required: true, wrapper_html: { style: "#{'display: none' unless @page.redirect?}" }
|
50
45
|
|
51
|
-
|
46
|
+
= f.input :redirect_type, as: :select, collection: options_for_page_redirect_type, include_blank: false, wrapper_html: { style: "#{'display: none' unless @page.redirect?}" }
|
52
47
|
|
53
|
-
|
48
|
+
- if can?(:customize, @page)
|
54
49
|
|
55
|
-
= f.input :cache_strategy, :
|
50
|
+
= f.input :cache_strategy, as: :select, collection: options_for_page_cache_strategy, include_blank: false, wrapper_html: { style: "#{'display: none' if @page.redirect?}" }
|
56
51
|
|
57
|
-
|
52
|
+
- if can?(:customize, @page)
|
53
|
+
= f.inputs name: :raw_template, class: "inputs foldable #{'folded' if inputs_folded?(@page)}" do
|
58
54
|
|
59
|
-
= f.input :raw_template, :
|
55
|
+
= f.input :raw_template, as: :'Locomotive::Code', main_locale_template_url: page_main_template_path(@page)
|
60
56
|
|
61
57
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
- if page.not_found?
|
2
2
|
%li.sep
|
3
3
|
|
4
|
-
%li{ :
|
4
|
+
%li{ id: "item-#{page.id}", class: "page #{css_for_page(page)}" }
|
5
5
|
|
6
6
|
- children = can?(:manage, page) ? page.children : page.children.find_all { |p| !p.templatized? }
|
7
7
|
|
@@ -15,7 +15,7 @@
|
|
15
15
|
- unless page.index_or_not_found?
|
16
16
|
%em
|
17
17
|
|
18
|
-
= link_to truncate(page.title, :
|
18
|
+
= link_to truncate(page.title, length: 80), edit_page_url(page)
|
19
19
|
|
20
20
|
- if page.templatized?
|
21
21
|
%i.icon-cog
|
@@ -31,12 +31,12 @@
|
|
31
31
|
|
32
32
|
.more
|
33
33
|
%span!= t('.updated_at')
|
34
|
-
= l page.updated_at, :
|
34
|
+
= l page.updated_at, format: :short
|
35
35
|
|
36
|
-
- if !page.index_or_not_found? && can?(:
|
37
|
-
= link_to_icon :trash, page_url(page), :
|
36
|
+
- if !page.index_or_not_found? && can?(:destroy, page)
|
37
|
+
= link_to_icon :trash, page_url(page), class: 'remove', data: { confirm: t('locomotive.messages.confirm') }, method: :delete
|
38
38
|
|
39
39
|
- if with_children
|
40
|
-
%ul{ :
|
40
|
+
%ul{ id: "folder-#{page._id}", class: "page folder depth-#{(page.depth || 0) + 1}", :'data-url' => sort_page_url(page), style: "display: #{cookies["folder-#{page._id}"] || 'block'}" }
|
41
41
|
|
42
42
|
= render children
|
@@ -1,4 +1,4 @@
|
|
1
|
-
- title link_to(@page.title.blank? ? @page.title_was : @page.title, '#', :
|
1
|
+
- title link_to(@page.title.blank? ? @page.title_was : @page.title, '#', rel: 'page_title', title: t('.ask_for_title'), class: 'editable')
|
2
2
|
|
3
3
|
- content_for :submenu do
|
4
4
|
= render 'locomotive/shared/menu/contents'
|
@@ -7,12 +7,12 @@
|
|
7
7
|
= render 'locomotive/shared/actions/contents'
|
8
8
|
|
9
9
|
- content_for :buttons do
|
10
|
-
= local_action_button :show, "/#{current_site.localized_page_fullpath(@page,
|
10
|
+
= local_action_button :show, "/#{current_site.localized_page_fullpath(@page, current_content_locale)}", class: 'show', icon: 'icon-eye-open'
|
11
11
|
|
12
12
|
%p!= t('.help')
|
13
13
|
|
14
|
-
= semantic_form_for @page, :
|
14
|
+
= semantic_form_for @page, url: page_url(@page), html: { multipart: true } do |form|
|
15
15
|
|
16
|
-
= render 'form', :
|
16
|
+
= render 'form', f: form
|
17
17
|
|
18
|
-
= render 'locomotive/shared/form_actions', :
|
18
|
+
= render 'locomotive/shared/form_actions', back_url: pages_url, button_label: :update
|