comfortable_mexican_sofa 2.0.9 → 2.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/comfy/vendor/bootstrap.min.js +3 -3
- data/app/assets/stylesheets/comfy/admin/cms/application.sass +1 -2
- data/app/assets/stylesheets/comfy/admin/cms/base.sass +12 -13
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_alert.scss +3 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_button-group.scss +31 -72
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_buttons.scss +26 -19
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_card.scss +23 -12
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_carousel.scss +2 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_close.scss +6 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_code.scss +4 -12
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_custom-forms.scss +124 -84
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_dropdown.scss +30 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_forms.scss +46 -71
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_functions.scss +4 -4
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_images.scss +0 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_input-group.scss +99 -126
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_list-group.scss +2 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_modal.scss +24 -9
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_nav.scss +2 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_navbar.scss +8 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_pagination.scss +32 -19
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_popover.scss +106 -117
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_print.scss +17 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_progress.scss +4 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_reboot.scss +3 -25
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_tables.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_tooltip.scss +65 -57
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_type.scss +2 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_variables.scss +174 -108
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-grid.scss +32 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-reboot.scss +12 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap.scss +42 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_background-variant.scss +2 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_breakpoints.scss +11 -7
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_buttons.scss +37 -22
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_caret.scss +30 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_forms.scss +48 -19
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_grid-framework.scss +5 -7
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_hover.scss +24 -46
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_list-group.scss +10 -13
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_screen-reader.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-hide.scss +1 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_borders.scss +6 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_display.scss +10 -28
- data/app/controllers/comfy/admin/cms/files_controller.rb +6 -7
- data/app/helpers/comfy/admin/cms_helper.rb +5 -4
- data/app/models/concerns/comfy/cms/with_categories.rb +20 -9
- data/app/views/comfy/admin/cms/categories/_edit.html.haml +3 -3
- data/app/views/comfy/admin/cms/categories/_form.html.haml +3 -9
- data/app/views/comfy/admin/cms/categories/_index.html.haml +2 -2
- data/app/views/comfy/admin/cms/categories/_show.html.haml +4 -3
- data/app/views/comfy/admin/cms/categories/create.js.erb +1 -1
- data/app/views/comfy/admin/cms/files/_form.html.haml +11 -12
- data/app/views/comfy/admin/cms/files/edit.html.haml +2 -2
- data/app/views/comfy/admin/cms/files/new.html.haml +2 -2
- data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml +7 -5
- data/app/views/comfy/admin/cms/fragments/_form_fragments.html.haml +1 -1
- data/app/views/comfy/admin/cms/layouts/_form.html.haml +3 -2
- data/app/views/comfy/admin/cms/layouts/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/layouts/new.html.haml +2 -2
- data/app/views/comfy/admin/cms/pages/_form.html.haml +3 -5
- data/app/views/comfy/admin/cms/pages/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/pages/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/revisions/show.html.haml +2 -2
- data/app/views/comfy/admin/cms/sites/_form.html.haml +4 -4
- data/app/views/comfy/admin/cms/sites/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/sites/new.html.haml +2 -2
- data/app/views/comfy/admin/cms/snippets/_form.html.haml +2 -2
- data/app/views/comfy/admin/cms/snippets/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/snippets/new.html.haml +2 -2
- data/app/views/comfy/admin/cms/translations/_form.html.haml +5 -7
- data/app/views/comfy/admin/cms/translations/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/translations/new.html.haml +2 -2
- data/comfortable_mexican_sofa.gemspec +6 -3
- data/config/locales/fr.yml +33 -33
- data/lib/comfortable_mexican_sofa/content/tags/file.rb +1 -1
- data/lib/comfortable_mexican_sofa/content/tags/files.rb +1 -1
- data/lib/comfortable_mexican_sofa/form_builder.rb +10 -15
- data/lib/comfortable_mexican_sofa/seeds.rb +2 -5
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- metadata +9 -116
- data/app/assets/stylesheets/comfy/vendor/_bootstrap.scss +0 -42
- data/doc/preview.jpg +0 -0
- data/test/controllers/comfy/admin/cms/base_controller_test.rb +0 -18
- data/test/controllers/comfy/admin/cms/categories_controller_test.rb +0 -74
- data/test/controllers/comfy/admin/cms/files_controller_test.rb +0 -242
- data/test/controllers/comfy/admin/cms/layouts_controller_test.rb +0 -137
- data/test/controllers/comfy/admin/cms/pages_controller_test.rb +0 -580
- data/test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb +0 -62
- data/test/controllers/comfy/admin/cms/revisions/page_controller_test.rb +0 -87
- data/test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb +0 -60
- data/test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb +0 -68
- data/test/controllers/comfy/admin/cms/sites_controller_test.rb +0 -106
- data/test/controllers/comfy/admin/cms/snippets_controller_test.rb +0 -156
- data/test/controllers/comfy/admin/cms/translations_controller_test.rb +0 -182
- data/test/controllers/comfy/cms/assets_controller_test.rb +0 -61
- data/test/controllers/comfy/cms/content_controller_test.rb +0 -249
- data/test/fixtures/active_storage/attachments.yml +0 -9
- data/test/fixtures/active_storage/blobs.yml +0 -13
- data/test/fixtures/comfy/cms/categories.yml +0 -4
- data/test/fixtures/comfy/cms/categorizations.yml +0 -3
- data/test/fixtures/comfy/cms/files.yml +0 -5
- data/test/fixtures/comfy/cms/fragments.yml +0 -25
- data/test/fixtures/comfy/cms/layouts.yml +0 -34
- data/test/fixtures/comfy/cms/pages.yml +0 -24
- data/test/fixtures/comfy/cms/revisions.yml +0 -29
- data/test/fixtures/comfy/cms/sites.yml +0 -5
- data/test/fixtures/comfy/cms/snippets.yml +0 -6
- data/test/fixtures/comfy/cms/translations.yml +0 -7
- data/test/fixtures/files/data.zip +0 -0
- data/test/fixtures/files/document.pdf +0 -0
- data/test/fixtures/files/image.gif +0 -0
- data/test/fixtures/files/image.jpg +0 -0
- data/test/fixtures/generators/cms/application.rb +0 -7
- data/test/fixtures/generators/cms/routes.rb +0 -5
- data/test/fixtures/generators/scaffold/controller.rb +0 -62
- data/test/fixtures/generators/scaffold/migration.rb +0 -9
- data/test/fixtures/generators/scaffold/model.rb +0 -21
- data/test/fixtures/generators/scaffold/routes.rb +0 -6
- data/test/fixtures/generators/scaffold/tests/controller.rb +0 -111
- data/test/fixtures/generators/scaffold/tests/fixture +0 -2
- data/test/fixtures/generators/scaffold/tests/model.rb +0 -24
- data/test/fixtures/generators/scaffold/views/_form.haml +0 -5
- data/test/fixtures/generators/scaffold/views/edit.haml +0 -5
- data/test/fixtures/generators/scaffold/views/index.haml +0 -21
- data/test/fixtures/generators/scaffold/views/new.haml +0 -5
- data/test/fixtures/generators/scaffold/views/show.haml +0 -4
- data/test/fixtures/views/_nav_hook.html.erb +0 -1
- data/test/fixtures/views/_nav_hook_2.html.erb +0 -1
- data/test/fixtures/views/render_test/_test.html.erb +0 -1
- data/test/fixtures/views/render_test/new.html.erb +0 -1
- data/test/fixtures/views/render_test/render_layout.html.erb +0 -1
- data/test/gemfiles/5.2.gemfile +0 -19
- data/test/generators/cms_assets_generator_test.rb +0 -14
- data/test/generators/cms_controllers_generator_test.rb +0 -14
- data/test/generators/cms_generator_test.rb +0 -26
- data/test/generators/cms_models_generator_test.rb +0 -14
- data/test/generators/cms_views_generator_test.rb +0 -14
- data/test/generators/scaffold_generator_test.rb +0 -32
- data/test/helpers/cms_helper_test.rb +0 -106
- data/test/integration/access_control_test.rb +0 -179
- data/test/integration/i18n_test.rb +0 -38
- data/test/integration/meta_variables_test.rb +0 -27
- data/test/integration/render_cms_test.rb +0 -255
- data/test/integration/routing_test.rb +0 -19
- data/test/integration/seeds_test.rb +0 -75
- data/test/integration/sites_test.rb +0 -107
- data/test/integration/view_hooks_test.rb +0 -47
- data/test/lib/configuration_test.rb +0 -38
- data/test/lib/content/block_test.rb +0 -26
- data/test/lib/content/params_parser_test.rb +0 -126
- data/test/lib/content/renderer_test.rb +0 -276
- data/test/lib/content/tag_test.rb +0 -58
- data/test/lib/content/tags/asset_test.rb +0 -104
- data/test/lib/content/tags/checkbox_test.rb +0 -21
- data/test/lib/content/tags/date_test.rb +0 -21
- data/test/lib/content/tags/datetime_test.rb +0 -21
- data/test/lib/content/tags/file_link_test.rb +0 -91
- data/test/lib/content/tags/file_test.rb +0 -69
- data/test/lib/content/tags/files_test.rb +0 -52
- data/test/lib/content/tags/fragment_test.rb +0 -68
- data/test/lib/content/tags/helper_test.rb +0 -62
- data/test/lib/content/tags/markdown_test.rb +0 -37
- data/test/lib/content/tags/number_test.rb +0 -14
- data/test/lib/content/tags/partial_test.rb +0 -65
- data/test/lib/content/tags/snippet_test.rb +0 -37
- data/test/lib/content/tags/template_test.rb +0 -51
- data/test/lib/content/tags/text_test.rb +0 -14
- data/test/lib/content/tags/textarea_test.rb +0 -14
- data/test/lib/content/tags/wysiwyg_test.rb +0 -14
- data/test/lib/revisions_test.rb +0 -222
- data/test/lib/seeds/files_test.rb +0 -97
- data/test/lib/seeds/layouts_test.rb +0 -156
- data/test/lib/seeds/pages_test.rb +0 -230
- data/test/lib/seeds/snippets_test.rb +0 -99
- data/test/lib/seeds_test.rb +0 -51
- data/test/models/categorization_test.rb +0 -76
- data/test/models/category_test.rb +0 -39
- data/test/models/file_test.rb +0 -43
- data/test/models/fragment_test.rb +0 -132
- data/test/models/layout_test.rb +0 -194
- data/test/models/page_test.rb +0 -575
- data/test/models/site_test.rb +0 -190
- data/test/models/snippet_test.rb +0 -56
- data/test/models/translation_test.rb +0 -67
- data/test/system/layouts_frontend_test.rb +0 -15
- data/test/system/pages_frontend_test.rb +0 -15
- data/test/system/sites_frontend_test.rb +0 -11
- data/test/system/snippets_frontend_test.rb +0 -15
- data/test/tasks/cms_seeds_test.rb +0 -34
- data/test/test_helper.rb +0 -201
@@ -20,13 +20,11 @@
|
|
20
20
|
- if (options = ::Comfy::Cms::Page.options_for_select(site: @site, page: @page)).present?
|
21
21
|
= form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
|
22
22
|
|
23
|
-
.
|
24
|
-
.col-sm-10.ml-auto
|
25
|
-
= form.check_box :is_published
|
23
|
+
= form.check_box :is_published
|
26
24
|
|
27
25
|
= comfy_admin_partial "comfy/admin/cms/partials/page_form_after", form: form
|
28
26
|
|
29
27
|
= form.form_actions do
|
30
|
-
=
|
31
|
-
=
|
28
|
+
= submit_tag t(".preview"), name: "preview", id: nil, class: "btn btn-secondary", data: {disable_with: false}
|
29
|
+
= submit_tag t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1", data: {disable_with: false}
|
32
30
|
= link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link"
|
@@ -30,7 +30,7 @@
|
|
30
30
|
.current.d-none= content
|
31
31
|
.content
|
32
32
|
|
33
|
-
=
|
33
|
+
= comfy_form_with model: @revision, url: { action: :revert } do |form|
|
34
34
|
= form.form_actions do
|
35
|
-
=
|
35
|
+
= submit_tag t(".update"), class: "btn btn-primary"
|
36
36
|
= link_to t(".cancel"), record_path, class: "btn btn-link"
|
@@ -1,4 +1,4 @@
|
|
1
|
-
= comfy_admin_partial
|
1
|
+
= comfy_admin_partial "comfy/admin/cms/partials/site_form_before", form: form
|
2
2
|
|
3
3
|
= form.text_field :label, data: {slugify: @site.new_record?}
|
4
4
|
= form.text_field :identifier, data: {slug: true}
|
@@ -6,8 +6,8 @@
|
|
6
6
|
= form.text_field :path
|
7
7
|
= form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
|
8
8
|
|
9
|
-
= comfy_admin_partial
|
9
|
+
= comfy_admin_partial "comfy/admin/cms/partials/site_form_after", form: form
|
10
10
|
|
11
11
|
= form.form_actions do
|
12
|
-
=
|
13
|
-
= link_to t(
|
12
|
+
= submit_tag t(@site.new_record? ? ".create" : ".update"), class: "btn btn-primary"
|
13
|
+
= link_to t(".cancel"), comfy_admin_cms_sites_path, class: "btn btn-link"
|
@@ -9,5 +9,5 @@
|
|
9
9
|
= comfy_admin_partial "comfy/admin/cms/partials/snippet_form_after", form: form
|
10
10
|
|
11
11
|
= form.form_actions do
|
12
|
-
=
|
13
|
-
= link_to t(
|
12
|
+
= submit_tag t(@snippet.new_record? ? ".create" : ".update"), class: "btn btn-primary"
|
13
|
+
= link_to t(".cancel"), comfy_admin_cms_site_snippets_path, class: "btn btn-link"
|
@@ -1,4 +1,4 @@
|
|
1
|
-
|
1
|
+
= comfy_admin_partial "comfy/admin/cms/partials/translation_form_before", form: form
|
2
2
|
|
3
3
|
= form.select :locale, translation_select_options
|
4
4
|
|
@@ -9,13 +9,11 @@
|
|
9
9
|
|
10
10
|
= render "comfy/admin/cms/fragments/form_fragments", record: @translation
|
11
11
|
|
12
|
-
.
|
13
|
-
.col-sm-10.ml-auto
|
14
|
-
= form.check_box :is_published
|
12
|
+
= form.check_box :is_published
|
15
13
|
|
16
|
-
|
14
|
+
= comfy_admin_partial "comfy/admin/cms/partials/translation_form_after", form: form
|
17
15
|
|
18
16
|
= form.form_actions do
|
19
|
-
=
|
20
|
-
=
|
17
|
+
= submit_tag t(".preview"), name: "preview", id: nil, class: "btn btn-secondary", data: {disable_with: false}
|
18
|
+
= submit_tag t(@translation.new_record? ? ".create" : ".update"), class: "btn btn-primary", data: {disable_with: false}
|
21
19
|
= link_to t(".cancel"), edit_comfy_admin_cms_site_page_path(@site, @page), class: "btn btn-link"
|
@@ -6,5 +6,5 @@
|
|
6
6
|
.page-header
|
7
7
|
%h2= t('.title')
|
8
8
|
|
9
|
-
=
|
9
|
+
= comfy_form_with model: @translation, scope: :translation, url: {action: :update}, html: {multipart: true} do |form|
|
10
10
|
= render form
|
@@ -1,5 +1,5 @@
|
|
1
1
|
.page-header
|
2
|
-
%h2= t(
|
2
|
+
%h2= t(".title")
|
3
3
|
|
4
|
-
=
|
4
|
+
= comfy_form_with model: @translation, scope: :translation, url: {action: :create}, html: {multipart: true} do |form|
|
5
5
|
= render form
|
@@ -10,19 +10,22 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.summary = "Rails 5.2+ CMS Engine"
|
11
11
|
s.description = "ComfortableMexicanSofa is a powerful Rails 5.2+ CMS Engine"
|
12
12
|
s.license = "MIT"
|
13
|
-
|
13
|
+
|
14
|
+
s.files = `git ls-files -z`.split("\x0").reject do |f|
|
15
|
+
f.match(%r{^(test|doc)/})
|
16
|
+
end
|
14
17
|
|
15
18
|
s.required_ruby_version = ">= 2.2.2"
|
16
19
|
|
17
20
|
s.add_dependency "active_link_to", ">= 1.0.0"
|
18
21
|
s.add_dependency "coffee-rails", ">= 4.2.0"
|
19
|
-
s.add_dependency "comfy_bootstrap_form", ">= 4.0.0
|
22
|
+
s.add_dependency "comfy_bootstrap_form", ">= 4.0.0"
|
20
23
|
s.add_dependency "haml-rails", ">= 1.0.0"
|
21
24
|
s.add_dependency "jquery-rails", ">= 4.3.1"
|
22
25
|
s.add_dependency "kramdown", ">= 1.0.0"
|
23
26
|
s.add_dependency "mimemagic", ">= 0.3.2"
|
24
27
|
s.add_dependency "mini_magick", ">= 4.8.0"
|
25
|
-
s.add_dependency "rails", ">= 5.2.0.
|
28
|
+
s.add_dependency "rails", ">= 5.2.0.rc1"
|
26
29
|
s.add_dependency "rails-i18n", ">= 5.0.0"
|
27
30
|
s.add_dependency "sass-rails", ">= 5.0.0"
|
28
31
|
end
|
data/config/locales/fr.yml
CHANGED
@@ -6,7 +6,7 @@ fr:
|
|
6
6
|
comfy/cms/page: Page
|
7
7
|
comfy/cms/snippet: Fragment
|
8
8
|
comfy/cms/file: Fichier
|
9
|
-
comfy/cms/translation:
|
9
|
+
comfy/cms/translation: Traduction
|
10
10
|
|
11
11
|
attributes:
|
12
12
|
comfy/cms/site:
|
@@ -27,11 +27,11 @@ fr:
|
|
27
27
|
label: Nom de la page
|
28
28
|
layout_id: Mise en page
|
29
29
|
slug: Identifiant
|
30
|
-
full_path:
|
30
|
+
full_path: Chemin complet
|
31
31
|
parent_id: Parent
|
32
32
|
target_page_id: Rediriger vers
|
33
33
|
content: Contenu
|
34
|
-
is_published:
|
34
|
+
is_published: Publiée
|
35
35
|
comfy/cms/file:
|
36
36
|
label: Nom
|
37
37
|
file: Fichier
|
@@ -41,10 +41,10 @@ fr:
|
|
41
41
|
label: Nom
|
42
42
|
content: Contenu
|
43
43
|
comfy/cms/translation:
|
44
|
-
locale:
|
45
|
-
label:
|
46
|
-
layout_id:
|
47
|
-
is_published:
|
44
|
+
locale: Langue
|
45
|
+
label: Nom
|
46
|
+
layout_id: Mise en page
|
47
|
+
is_published: Publiée
|
48
48
|
|
49
49
|
comfy:
|
50
50
|
cms:
|
@@ -144,7 +144,7 @@ fr:
|
|
144
144
|
create: Créer la page
|
145
145
|
cancel: Annuler
|
146
146
|
update: Modifier la page
|
147
|
-
choose_link:
|
147
|
+
choose_link: Sélectionner une page...
|
148
148
|
|
149
149
|
fragments:
|
150
150
|
form_fragments:
|
@@ -153,25 +153,25 @@ fr:
|
|
153
153
|
Modifiez le contenu pour y ajouter un tag de page ou de champ. Exemple : <code>{{cms:wysiwyg content}}</code>
|
154
154
|
|
155
155
|
translations:
|
156
|
-
created:
|
157
|
-
creation_failure:
|
158
|
-
updated:
|
159
|
-
update_failure:
|
160
|
-
deleted:
|
161
|
-
not_found:
|
156
|
+
created: Traduction créée
|
157
|
+
creation_failure: Échec de la création de la traduction
|
158
|
+
updated: Traduction modifiée
|
159
|
+
update_failure: Échec de la modification de la traduction
|
160
|
+
deleted: Traduction supprimée
|
161
|
+
not_found: Traduction introuvable
|
162
162
|
|
163
163
|
new:
|
164
|
-
title:
|
164
|
+
title: Nouvelle Traduction
|
165
165
|
edit:
|
166
|
-
title:
|
166
|
+
title: Modification de la Traduction
|
167
167
|
form:
|
168
|
-
preview:
|
169
|
-
create:
|
170
|
-
update:
|
171
|
-
cancel:
|
168
|
+
preview: Prévisualiser
|
169
|
+
create: Créer
|
170
|
+
update: Modifier
|
171
|
+
cancel: Annuler
|
172
172
|
sidebar:
|
173
|
-
new:
|
174
|
-
confirm:
|
173
|
+
new: Nouvelle Traduction
|
174
|
+
confirm: Êtes-vous sûr ?
|
175
175
|
|
176
176
|
snippets:
|
177
177
|
created: Fragment créé
|
@@ -206,17 +206,17 @@ fr:
|
|
206
206
|
revision: révision
|
207
207
|
update: Restaurer cette révision
|
208
208
|
cancel: Annuler
|
209
|
-
content:
|
210
|
-
changes:
|
211
|
-
previous:
|
212
|
-
current:
|
209
|
+
content: Contenu
|
210
|
+
changes: Changements
|
211
|
+
previous: Précédente
|
212
|
+
current: Actuelle
|
213
213
|
sidebar:
|
214
214
|
revision:
|
215
|
-
zero:
|
216
|
-
one: '%{count}
|
217
|
-
few: '%{count}
|
218
|
-
many: '%{count}
|
219
|
-
other: '%{count}
|
215
|
+
zero: Pas de Révision
|
216
|
+
one: '%{count} Révision'
|
217
|
+
few: '%{count} Révisions'
|
218
|
+
many: '%{count} Révisions'
|
219
|
+
other: '%{count} Révisions'
|
220
220
|
|
221
221
|
files:
|
222
222
|
created: Fichier téléchargé
|
@@ -250,9 +250,9 @@ fr:
|
|
250
250
|
|
251
251
|
categories:
|
252
252
|
index:
|
253
|
-
edit: Modifier
|
253
|
+
edit: Modifier
|
254
254
|
done: Terminé
|
255
|
-
all:
|
255
|
+
all: Toutes les Catégories
|
256
256
|
add: Ajouter
|
257
257
|
add_placeholder: Ajouter la Catégorie
|
258
258
|
show:
|
@@ -42,7 +42,7 @@ class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Conte
|
|
42
42
|
|
43
43
|
def form_field(object_name, view, index)
|
44
44
|
name = "#{object_name}[fragments_attributes][#{index}][files]"
|
45
|
-
input = view.send(:file_field_tag, name, id: nil)
|
45
|
+
input = view.send(:file_field_tag, name, id: nil, class: "form-control")
|
46
46
|
|
47
47
|
attachments_partial =
|
48
48
|
if fragment.attachments
|
@@ -17,7 +17,7 @@ class ComfortableMexicanSofa::Content::Tag::Files < ComfortableMexicanSofa::Cont
|
|
17
17
|
|
18
18
|
def form_field(object_name, view, index)
|
19
19
|
name = "#{object_name}[fragments_attributes][#{index}][files][]"
|
20
|
-
input = view.send(:file_field_tag, name, id: nil, multiple: true)
|
20
|
+
input = view.send(:file_field_tag, name, id: nil, multiple: true, class: "form-control")
|
21
21
|
|
22
22
|
attachments_partial =
|
23
23
|
if fragment.attachments
|
@@ -1,9 +1,5 @@
|
|
1
1
|
class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
|
2
2
|
|
3
|
-
def default_label_col
|
4
|
-
"col-sm-2 text-md-right"
|
5
|
-
end
|
6
|
-
|
7
3
|
def field(record, tag, index)
|
8
4
|
object_name = record.class.to_s.demodulize.underscore
|
9
5
|
|
@@ -17,8 +13,11 @@ class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
|
|
17
13
|
|
18
14
|
label = I18n.t("comfy.cms.content.tag.#{tag.identifier}", default: tag.identifier.titleize)
|
19
15
|
renderable = tag.respond_to?(:renderable) ? tag.renderable : true
|
20
|
-
|
21
|
-
|
16
|
+
|
17
|
+
form_group bootstrap: { label: { text: label, class: "renderable-#{renderable}" } } do
|
18
|
+
concat identifer_input
|
19
|
+
concat tag_name_input
|
20
|
+
concat tag_input
|
22
21
|
end
|
23
22
|
end
|
24
23
|
end
|
@@ -26,15 +25,11 @@ class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
|
|
26
25
|
# Wrapper for form action that is sticking to the bottom of the viewport
|
27
26
|
def form_actions(&block)
|
28
27
|
<<-HTML.strip_heredoc.html_safe
|
29
|
-
<div class="form-actions bg-light">
|
30
|
-
<div class="
|
31
|
-
<div class="
|
32
|
-
|
33
|
-
|
34
|
-
<div class="col-sm-2"></div>
|
35
|
-
<div class="col-sm-10">
|
36
|
-
#{capture(&block)}
|
37
|
-
</div>
|
28
|
+
<div class="form-actions row bg-light">
|
29
|
+
<div class="col-lg-8 offset-lg-2">
|
30
|
+
<div class="form-group row mb-0">
|
31
|
+
<div class="col-sm-10 offset-sm-2">
|
32
|
+
#{capture(&block)}
|
38
33
|
</div>
|
39
34
|
</div>
|
40
35
|
</div>
|
@@ -52,15 +52,12 @@ module ComfortableMexicanSofa::Seeds
|
|
52
52
|
end
|
53
53
|
|
54
54
|
def category_names_to_ids(record, names)
|
55
|
-
|
56
|
-
category_ids[id] = 0
|
57
|
-
end
|
58
|
-
[names].flatten.each_with_object(existing_category_ids) do |name, category_ids|
|
55
|
+
[names].flatten.map do |name|
|
59
56
|
category = site.categories.find_or_create_by(
|
60
57
|
label: name,
|
61
58
|
categorized_type: record.class.to_s
|
62
59
|
)
|
63
|
-
|
60
|
+
category.id
|
64
61
|
end
|
65
62
|
end
|
66
63
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comfortable_mexican_sofa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Oleg Khabarov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-02-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_link_to
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 4.0.0
|
47
|
+
version: 4.0.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 4.0.0
|
54
|
+
version: 4.0.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: haml-rails
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -128,14 +128,14 @@ dependencies:
|
|
128
128
|
requirements:
|
129
129
|
- - ">="
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 5.2.0.
|
131
|
+
version: 5.2.0.rc1
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - ">="
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 5.2.0.
|
138
|
+
version: 5.2.0.rc1
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: rails-i18n
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
@@ -318,7 +318,6 @@ files:
|
|
318
318
|
- app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass
|
319
319
|
- app/assets/stylesheets/comfy/admin/cms/custom.sass
|
320
320
|
- app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass
|
321
|
-
- app/assets/stylesheets/comfy/vendor/_bootstrap.scss
|
322
321
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_alert.scss
|
323
322
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_badge.scss
|
324
323
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_breadcrumb.scss
|
@@ -354,6 +353,9 @@ files:
|
|
354
353
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_type.scss
|
355
354
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_utilities.scss
|
356
355
|
- app/assets/stylesheets/comfy/vendor/bootstrap/_variables.scss
|
356
|
+
- app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-grid.scss
|
357
|
+
- app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-reboot.scss
|
358
|
+
- app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap.scss
|
357
359
|
- app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_alert.scss
|
358
360
|
- app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_background-variant.scss
|
359
361
|
- app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_badge.scss
|
@@ -549,7 +551,6 @@ files:
|
|
549
551
|
- db/cms_seeds/sample-site/snippets/default.html
|
550
552
|
- db/migrate/00_create_active_storage_tables.active_storage.rb
|
551
553
|
- db/migrate/01_create_cms.rb
|
552
|
-
- doc/preview.jpg
|
553
554
|
- lib/comfortable_mexican_sofa.rb
|
554
555
|
- lib/comfortable_mexican_sofa/access_control/admin_authentication.rb
|
555
556
|
- lib/comfortable_mexican_sofa/access_control/admin_authorization.rb
|
@@ -618,114 +619,6 @@ files:
|
|
618
619
|
- lib/generators/comfy/scaffold/templates/views/show.haml.tt
|
619
620
|
- lib/tasks/cms_seeds.rake
|
620
621
|
- public/favicon.ico
|
621
|
-
- test/controllers/comfy/admin/cms/base_controller_test.rb
|
622
|
-
- test/controllers/comfy/admin/cms/categories_controller_test.rb
|
623
|
-
- test/controllers/comfy/admin/cms/files_controller_test.rb
|
624
|
-
- test/controllers/comfy/admin/cms/layouts_controller_test.rb
|
625
|
-
- test/controllers/comfy/admin/cms/pages_controller_test.rb
|
626
|
-
- test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb
|
627
|
-
- test/controllers/comfy/admin/cms/revisions/page_controller_test.rb
|
628
|
-
- test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb
|
629
|
-
- test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb
|
630
|
-
- test/controllers/comfy/admin/cms/sites_controller_test.rb
|
631
|
-
- test/controllers/comfy/admin/cms/snippets_controller_test.rb
|
632
|
-
- test/controllers/comfy/admin/cms/translations_controller_test.rb
|
633
|
-
- test/controllers/comfy/cms/assets_controller_test.rb
|
634
|
-
- test/controllers/comfy/cms/content_controller_test.rb
|
635
|
-
- test/fixtures/active_storage/attachments.yml
|
636
|
-
- test/fixtures/active_storage/blobs.yml
|
637
|
-
- test/fixtures/comfy/cms/categories.yml
|
638
|
-
- test/fixtures/comfy/cms/categorizations.yml
|
639
|
-
- test/fixtures/comfy/cms/files.yml
|
640
|
-
- test/fixtures/comfy/cms/fragments.yml
|
641
|
-
- test/fixtures/comfy/cms/layouts.yml
|
642
|
-
- test/fixtures/comfy/cms/pages.yml
|
643
|
-
- test/fixtures/comfy/cms/revisions.yml
|
644
|
-
- test/fixtures/comfy/cms/sites.yml
|
645
|
-
- test/fixtures/comfy/cms/snippets.yml
|
646
|
-
- test/fixtures/comfy/cms/translations.yml
|
647
|
-
- test/fixtures/files/data.zip
|
648
|
-
- test/fixtures/files/document.pdf
|
649
|
-
- test/fixtures/files/image.gif
|
650
|
-
- test/fixtures/files/image.jpg
|
651
|
-
- test/fixtures/generators/cms/application.rb
|
652
|
-
- test/fixtures/generators/cms/routes.rb
|
653
|
-
- test/fixtures/generators/scaffold/controller.rb
|
654
|
-
- test/fixtures/generators/scaffold/migration.rb
|
655
|
-
- test/fixtures/generators/scaffold/model.rb
|
656
|
-
- test/fixtures/generators/scaffold/routes.rb
|
657
|
-
- test/fixtures/generators/scaffold/tests/controller.rb
|
658
|
-
- test/fixtures/generators/scaffold/tests/fixture
|
659
|
-
- test/fixtures/generators/scaffold/tests/model.rb
|
660
|
-
- test/fixtures/generators/scaffold/views/_form.haml
|
661
|
-
- test/fixtures/generators/scaffold/views/edit.haml
|
662
|
-
- test/fixtures/generators/scaffold/views/index.haml
|
663
|
-
- test/fixtures/generators/scaffold/views/new.haml
|
664
|
-
- test/fixtures/generators/scaffold/views/show.haml
|
665
|
-
- test/fixtures/views/_nav_hook.html.erb
|
666
|
-
- test/fixtures/views/_nav_hook_2.html.erb
|
667
|
-
- test/fixtures/views/render_test/_test.html.erb
|
668
|
-
- test/fixtures/views/render_test/new.html.erb
|
669
|
-
- test/fixtures/views/render_test/render_layout.html.erb
|
670
|
-
- test/gemfiles/5.2.gemfile
|
671
|
-
- test/generators/cms_assets_generator_test.rb
|
672
|
-
- test/generators/cms_controllers_generator_test.rb
|
673
|
-
- test/generators/cms_generator_test.rb
|
674
|
-
- test/generators/cms_models_generator_test.rb
|
675
|
-
- test/generators/cms_views_generator_test.rb
|
676
|
-
- test/generators/scaffold_generator_test.rb
|
677
|
-
- test/helpers/cms_helper_test.rb
|
678
|
-
- test/integration/access_control_test.rb
|
679
|
-
- test/integration/i18n_test.rb
|
680
|
-
- test/integration/meta_variables_test.rb
|
681
|
-
- test/integration/render_cms_test.rb
|
682
|
-
- test/integration/routing_test.rb
|
683
|
-
- test/integration/seeds_test.rb
|
684
|
-
- test/integration/sites_test.rb
|
685
|
-
- test/integration/view_hooks_test.rb
|
686
|
-
- test/lib/configuration_test.rb
|
687
|
-
- test/lib/content/block_test.rb
|
688
|
-
- test/lib/content/params_parser_test.rb
|
689
|
-
- test/lib/content/renderer_test.rb
|
690
|
-
- test/lib/content/tag_test.rb
|
691
|
-
- test/lib/content/tags/asset_test.rb
|
692
|
-
- test/lib/content/tags/checkbox_test.rb
|
693
|
-
- test/lib/content/tags/date_test.rb
|
694
|
-
- test/lib/content/tags/datetime_test.rb
|
695
|
-
- test/lib/content/tags/file_link_test.rb
|
696
|
-
- test/lib/content/tags/file_test.rb
|
697
|
-
- test/lib/content/tags/files_test.rb
|
698
|
-
- test/lib/content/tags/fragment_test.rb
|
699
|
-
- test/lib/content/tags/helper_test.rb
|
700
|
-
- test/lib/content/tags/markdown_test.rb
|
701
|
-
- test/lib/content/tags/number_test.rb
|
702
|
-
- test/lib/content/tags/partial_test.rb
|
703
|
-
- test/lib/content/tags/snippet_test.rb
|
704
|
-
- test/lib/content/tags/template_test.rb
|
705
|
-
- test/lib/content/tags/text_test.rb
|
706
|
-
- test/lib/content/tags/textarea_test.rb
|
707
|
-
- test/lib/content/tags/wysiwyg_test.rb
|
708
|
-
- test/lib/revisions_test.rb
|
709
|
-
- test/lib/seeds/files_test.rb
|
710
|
-
- test/lib/seeds/layouts_test.rb
|
711
|
-
- test/lib/seeds/pages_test.rb
|
712
|
-
- test/lib/seeds/snippets_test.rb
|
713
|
-
- test/lib/seeds_test.rb
|
714
|
-
- test/models/categorization_test.rb
|
715
|
-
- test/models/category_test.rb
|
716
|
-
- test/models/file_test.rb
|
717
|
-
- test/models/fragment_test.rb
|
718
|
-
- test/models/layout_test.rb
|
719
|
-
- test/models/page_test.rb
|
720
|
-
- test/models/site_test.rb
|
721
|
-
- test/models/snippet_test.rb
|
722
|
-
- test/models/translation_test.rb
|
723
|
-
- test/system/layouts_frontend_test.rb
|
724
|
-
- test/system/pages_frontend_test.rb
|
725
|
-
- test/system/sites_frontend_test.rb
|
726
|
-
- test/system/snippets_frontend_test.rb
|
727
|
-
- test/tasks/cms_seeds_test.rb
|
728
|
-
- test/test_helper.rb
|
729
622
|
homepage: http://github.com/comfy/comfortable-mexican-sofa
|
730
623
|
licenses:
|
731
624
|
- MIT
|