locomotivecms 3.0.0.rc1 → 3.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +4 -3
- data/README.md +7 -1
- data/app/api/locomotive/api/entities/content_type_entity.rb +4 -1
- data/app/api/locomotive/api/forms/base_form.rb +4 -2
- data/app/api/locomotive/api/forms/content_type_form.rb +1 -0
- data/app/api/locomotive/api/forms/theme_asset_form.rb +1 -1
- data/app/api/locomotive/api/resources/content_type_resource.rb +4 -2
- data/app/assets/javascripts/locomotive/views/inputs/array_view.js.coffee +1 -0
- data/app/controllers/locomotive/current_site_controller.rb +8 -0
- data/app/helpers/locomotive/editable_elements_helper.rb +2 -2
- data/app/helpers/locomotive/errors_helper.rb +7 -3
- data/app/helpers/locomotive/pages_helper.rb +2 -2
- data/app/helpers/locomotive/shared/accounts_helper.rb +1 -1
- data/app/inputs/locomotive/api_key_input.rb +2 -2
- data/app/mailers/locomotive/notifications.rb +14 -3
- data/app/models/locomotive/concerns/content_type/entry_template.rb +7 -1
- data/app/models/locomotive/concerns/content_type/public_submission_title_template.rb +24 -0
- data/app/models/locomotive/concerns/site/access_points.rb +1 -0
- data/app/models/locomotive/concerns/site/url_redirections.rb +30 -0
- data/app/models/locomotive/content_entry.rb +9 -1
- data/app/models/locomotive/content_type.rb +1 -0
- data/app/models/locomotive/page.rb +1 -1
- data/app/models/locomotive/site.rb +1 -0
- data/app/policies/locomotive/site_policy.rb +4 -3
- data/app/uploaders/locomotive/theme_asset_uploader.rb +6 -9
- data/app/views/locomotive/content_assets/_list.html.slim +1 -1
- data/app/views/locomotive/content_entries/_entry.html.slim +1 -1
- data/app/views/locomotive/content_entries/_list.html.slim +1 -1
- data/app/views/locomotive/content_entries/edit.html.slim +2 -0
- data/app/views/locomotive/content_entries/form/_tabs.html.slim +3 -3
- data/app/views/locomotive/content_entries/new.html.slim +3 -0
- data/app/views/locomotive/current_site/_membership.html.slim +1 -1
- data/app/views/locomotive/current_site/_url_redirection.html.slim +17 -0
- data/app/views/locomotive/current_site/form/_access_points.html.slim +2 -0
- data/app/views/locomotive/current_site/form/_panes.html.slim +1 -1
- data/app/views/locomotive/current_site/form/_tabs.html.slim +3 -0
- data/app/views/locomotive/current_site/form/_url_redirections.html.slim +5 -0
- data/app/views/locomotive/custom_fields/select_options/_option.html.slim +3 -1
- data/app/views/locomotive/editable_elements/index_without_preview.html.slim +3 -3
- data/app/views/locomotive/notifications/new_content_entry.html.slim +4 -0
- data/app/views/locomotive/pages/form/_actions.html.slim +1 -1
- data/app/views/locomotive/pages/form/_tabs.html.slim +3 -3
- data/app/views/locomotive/passwords/edit.html.slim +1 -1
- data/app/views/locomotive/passwords/new.html.slim +1 -1
- data/app/views/locomotive/public_submission_accounts/edit.html.slim +1 -1
- data/app/views/locomotive/registrations/new.html.slim +1 -1
- data/app/views/locomotive/sessions/new.html.slim +1 -1
- data/app/views/locomotive/translations/index.html.slim +2 -1
- data/config/i18n-tasks.yml +110 -0
- data/config/locales/carrierwave.fr.yml +1 -1
- data/config/locales/default.en.yml +0 -49
- data/config/locales/default.fr.yml +1 -232
- data/config/locales/devise.fr.yml +1 -68
- data/config/locales/{admin_ui.en.yml → en.yml} +31 -91
- data/config/locales/flash.en.yml +8 -37
- data/config/locales/flash.fr.yml +1 -106
- data/config/locales/fr.yml +5 -0
- data/config/locales/inputs.fr.yml +1 -0
- data/config/locales/mongoid.en.yml +49 -0
- data/config/locales/mongoid.fr.yml +12 -0
- data/config/locales/simple_form.en.yml +26 -65
- data/config/locales/simple_form.fr.yml +1 -0
- data/config/{locales → old-locales}/admin_ui.bg.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.cs.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.de.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.es.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.et.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.fr.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.it.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.ja.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.nb.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.nl.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.pl.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.pt-BR.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.pt.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.ru.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.sk.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.sr.yml +0 -0
- data/config/{locales → old-locales}/admin_ui.zh-CN.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.bg.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.cs.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.de.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.es.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.et.yml +0 -0
- data/config/old-locales/carrierwave.fr.yml +4 -0
- data/config/{locales → old-locales}/carrierwave.it.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.ja.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.nb.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.nl.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.pl.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.pt-BR.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.pt.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.ru.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.sk.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.sr.yml +0 -0
- data/config/{locales → old-locales}/carrierwave.zh-CN.yml +0 -0
- data/config/{locales → old-locales}/default.bg.yml +0 -0
- data/config/{locales → old-locales}/default.cs.yml +0 -0
- data/config/{locales → old-locales}/default.de.yml +0 -0
- data/config/{locales → old-locales}/default.es.yml +0 -0
- data/config/{locales → old-locales}/default.et.yml +0 -0
- data/config/old-locales/default.fr.yml +232 -0
- data/config/{locales → old-locales}/default.it.yml +0 -0
- data/config/{locales → old-locales}/default.ja.yml +0 -0
- data/config/{locales → old-locales}/default.nb.yml +0 -0
- data/config/{locales → old-locales}/default.nl.yml +0 -0
- data/config/{locales → old-locales}/default.pl.yml +0 -0
- data/config/{locales → old-locales}/default.pt-BR.yml +0 -0
- data/config/{locales → old-locales}/default.pt.yml +0 -0
- data/config/{locales → old-locales}/default.ru.yml +0 -0
- data/config/{locales → old-locales}/default.sk.yml +0 -0
- data/config/{locales → old-locales}/default.sr.yml +0 -0
- data/config/{locales → old-locales}/default.zh-CN.yml +0 -0
- data/config/{locales → old-locales}/devise.bg.yml +0 -0
- data/config/{locales → old-locales}/devise.cs.yml +0 -0
- data/config/{locales → old-locales}/devise.de.yml +0 -0
- data/config/{locales → old-locales}/devise.es.yml +0 -0
- data/config/{locales → old-locales}/devise.et.yml +0 -0
- data/config/old-locales/devise.fr.yml +68 -0
- data/config/{locales → old-locales}/devise.it.yml +0 -0
- data/config/{locales → old-locales}/devise.ja.yml +0 -0
- data/config/{locales → old-locales}/devise.nb.yml +0 -0
- data/config/{locales → old-locales}/devise.nl.yml +0 -0
- data/config/{locales → old-locales}/devise.pl.yml +0 -0
- data/config/{locales → old-locales}/devise.pt-BR.yml +0 -0
- data/config/{locales → old-locales}/devise.pt.yml +0 -0
- data/config/{locales → old-locales}/devise.ru.yml +0 -0
- data/config/{locales → old-locales}/devise.sk.yml +0 -0
- data/config/{locales → old-locales}/devise.sr.yml +0 -0
- data/config/{locales → old-locales}/devise.zh-CN.yml +0 -0
- data/config/{locales → old-locales}/flash.bg.yml +0 -0
- data/config/{locales → old-locales}/flash.cs.yml +0 -0
- data/config/{locales → old-locales}/flash.de.yml +0 -0
- data/config/{locales → old-locales}/flash.es.yml +0 -0
- data/config/{locales → old-locales}/flash.et.yml +0 -0
- data/config/old-locales/flash.fr.yml +106 -0
- data/config/{locales → old-locales}/flash.it.yml +0 -0
- data/config/{locales → old-locales}/flash.ja.yml +0 -0
- data/config/{locales → old-locales}/flash.nb.yml +0 -0
- data/config/{locales → old-locales}/flash.nl.yml +0 -0
- data/config/{locales → old-locales}/flash.pl.yml +0 -0
- data/config/{locales → old-locales}/flash.pt-BR.yml +0 -0
- data/config/{locales → old-locales}/flash.pt.yml +0 -0
- data/config/{locales → old-locales}/flash.ru.yml +0 -0
- data/config/{locales → old-locales}/flash.sk.yml +0 -0
- data/config/{locales → old-locales}/flash.sr.yml +0 -0
- data/config/{locales → old-locales}/flash.zh-CN.yml +0 -0
- data/config/routes.rb +1 -0
- data/lib/generators/locomotive/install/templates/carrierwave.rb +12 -7
- data/lib/generators/locomotive/install/templates/devise.rb +127 -55
- data/lib/generators/locomotive/install/templates/dragonfly.rb +1 -1
- data/lib/generators/locomotive/install/templates/locomotive.rb +2 -0
- data/lib/locomotive/carrierwave/asset.rb +23 -11
- data/lib/locomotive/carrierwave/patches.rb +18 -0
- data/lib/locomotive/configuration.rb +6 -5
- data/lib/locomotive/dependencies.rb +1 -0
- data/lib/locomotive/engine.rb +4 -0
- data/lib/locomotive/middlewares/site.rb +1 -0
- data/lib/locomotive/steam/middlewares/missing_translations.rb +1 -1
- data/lib/locomotive/steam/services/api_entry_submission_service.rb +8 -1
- data/lib/locomotive/steam_adaptor.rb +9 -7
- data/lib/locomotive/version.rb +1 -1
- data/spec/fixtures/assets/ruby_logo.svg +948 -0
- data/spec/lib/locomotive/steam/services/api_entry_submission_service_spec.rb +1 -1
- data/spec/mailers/locomotive/notifications_spec.rb +39 -1
- data/spec/models/locomotive/concerns/site/url_redirections_spec.rb +42 -0
- data/spec/models/locomotive/theme_asset_spec.rb +29 -0
- data/spec/support/factories.rb +15 -1
- data/spec/support/features/site_helpers.rb +8 -1
- data/spec/support/shared_contexts/api_site_setup.rb +1 -1
- metadata +120 -106
- data/app/views/locomotive/shared/_footer.html.slim +0 -2
- data/app/views/locomotive/shared/_form_actions.html.slim +0 -14
- data/app/views/locomotive/shared/actions/_contents.html.slim +0 -7
- data/config/cucumber.yml +0 -8
@@ -1,14 +0,0 @@
|
|
1
|
-
#local-actions-bottom-bar
|
2
|
-
.span-12
|
3
|
-
p
|
4
|
-
- if defined?(back_url)
|
5
|
-
= link_to escape_once('← ') + t('.back'), back_url
|
6
|
-
- elsif defined?(delete_button)
|
7
|
-
= delete_button
|
8
|
-
|
|
9
|
-
|
10
|
-
.span-12.last
|
11
|
-
p
|
12
|
-
= submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :'data-disable-with' => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
|
13
|
-
|
14
|
-
.clear
|
data/config/cucumber.yml
DELETED
@@ -1,8 +0,0 @@
|
|
1
|
-
<%
|
2
|
-
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
|
3
|
-
rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
|
4
|
-
std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --require features --strict --tags ~@wip"
|
5
|
-
%>
|
6
|
-
default: <%= std_opts %> features
|
7
|
-
wip: --tags @wip:3 --wip features
|
8
|
-
rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
|