comfortable_mexican_sofa 1.12.11 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/.codeclimate.yml +4 -0
- data/.gitattributes +2 -0
- data/.github/issue_template.md +22 -0
- data/.github/pull_request_template.md +6 -0
- data/.gitignore +3 -0
- data/.rubocop.yml +5 -0
- data/.rubocop_todo.yml +974 -0
- data/.travis.yml +2 -10
- data/Gemfile +5 -7
- data/README.md +40 -39
- data/Rakefile +1 -31
- data/app/assets/javascripts/comfy/admin/cms/application.js.coffee +7 -4
- data/app/assets/javascripts/comfy/admin/cms/base.js.coffee +23 -33
- data/app/assets/javascripts/comfy/admin/cms/lib/diff/pretty_text_diff.js +76 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr.min.js +2 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ar.js +52 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/bg.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/bn.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cat.js +83 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cs.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cy.js +92 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/da.js +71 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/de.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/default.js +80 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/eo.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/es.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/et.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fa.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fi.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fr.js +75 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/gr.js +74 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/he.js +57 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hi.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hr.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hu.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/id.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/it.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ja.js +57 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ko.js +60 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/lt.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/lv.js +67 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/mk.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/mn.js +67 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ms.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/my.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/nl.js +75 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/no.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pa.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pl.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pt-BR.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pt.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ro.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ru.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/si.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sk.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sl.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sq.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sr.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sv.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/th.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/tr.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/uk.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/vn.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-CN.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-TW.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/redactor.js +9 -3
- data/app/assets/javascripts/comfy/admin/cms/uploader.js.coffee +9 -10
- data/app/assets/stylesheets/comfy/admin/cms/application.sass +4 -4
- data/app/assets/stylesheets/comfy/admin/cms/base.sass +215 -338
- data/app/assets/stylesheets/comfy/admin/cms/lib/flatpickr.min.css +13 -0
- data/app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass +2 -2
- data/app/controllers/comfy/admin/base_controller.rb +20 -0
- data/app/controllers/comfy/admin/cms/base_controller.rb +9 -22
- data/app/controllers/comfy/admin/cms/categories_controller.rb +2 -3
- data/app/controllers/comfy/admin/cms/files_controller.rb +50 -31
- data/app/controllers/comfy/admin/cms/layouts_controller.rb +12 -13
- data/app/controllers/comfy/admin/cms/pages_controller.rb +28 -28
- data/app/controllers/comfy/admin/cms/revisions_controller.rb +23 -14
- data/app/controllers/comfy/admin/cms/sites_controller.rb +9 -10
- data/app/controllers/comfy/admin/cms/snippets_controller.rb +11 -11
- data/app/controllers/comfy/admin/cms/translations_controller.rb +98 -0
- data/app/controllers/comfy/cms/assets_controller.rb +9 -10
- data/app/controllers/comfy/cms/base_controller.rb +0 -2
- data/app/controllers/comfy/cms/content_controller.rb +50 -31
- data/app/controllers/concerns/comfy/paginate.rb +2 -2
- data/app/helpers/comfy/admin/cms_helper.rb +29 -0
- data/app/helpers/comfy/cms_helper.rb +40 -60
- data/app/models/comfy/cms/categorization.rb +8 -11
- data/app/models/comfy/cms/category.rb +10 -14
- data/app/models/comfy/cms/file.rb +31 -47
- data/app/models/comfy/cms/fragment.rb +55 -0
- data/app/models/comfy/cms/layout.rb +45 -40
- data/app/models/comfy/cms/page.rb +47 -36
- data/app/models/comfy/cms/revision.rb +5 -8
- data/app/models/comfy/cms/site.rb +26 -51
- data/app/models/comfy/cms/snippet.rb +20 -24
- data/app/models/comfy/cms/translation.rb +37 -0
- data/app/models/concerns/comfy/cms/with_categories.rb +38 -0
- data/app/models/concerns/comfy/cms/with_fragments.rb +121 -0
- data/app/views/comfy/admin/cms/categories/_categories.html.haml +2 -1
- data/app/views/comfy/admin/cms/categories/_edit.html.haml +7 -6
- data/app/views/comfy/admin/cms/categories/_form.html.haml +8 -5
- data/app/views/comfy/admin/cms/categories/_index.html.haml +24 -20
- data/app/views/comfy/admin/cms/categories/_show.html.haml +10 -9
- data/app/views/comfy/admin/cms/categories/create.js.erb +2 -2
- data/app/views/comfy/admin/cms/categories/edit.js.erb +1 -1
- data/app/views/comfy/admin/cms/categories/update.js.erb +2 -2
- data/app/views/comfy/admin/cms/files/_file.html.haml +31 -25
- data/app/views/comfy/admin/cms/files/_form.html.haml +16 -12
- data/app/views/comfy/admin/cms/files/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/files/index.html.haml +17 -19
- data/app/views/comfy/admin/cms/files/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/layouts/_form.html.haml +10 -10
- data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml +21 -19
- data/app/views/comfy/admin/cms/layouts/edit.html.haml +5 -5
- data/app/views/comfy/admin/cms/layouts/index.html.haml +4 -7
- data/app/views/comfy/admin/cms/pages/_form.html.haml +15 -21
- data/app/views/comfy/admin/cms/pages/_form_fragments.html.haml +40 -0
- data/app/views/comfy/admin/cms/pages/_fragment_attachments.html.haml +10 -0
- data/app/views/comfy/admin/cms/pages/_index_branch.html.haml +34 -26
- data/app/views/comfy/admin/cms/pages/edit.html.haml +19 -5
- data/app/views/comfy/admin/cms/pages/form_fragments.js.erb +1 -0
- data/app/views/comfy/admin/cms/pages/index.html.haml +5 -8
- data/app/views/comfy/admin/cms/pages/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/revisions/show.html.haml +29 -27
- data/app/views/comfy/admin/cms/sites/_form.html.haml +6 -8
- data/app/views/comfy/admin/cms/sites/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/sites/index.html.haml +23 -22
- data/app/views/comfy/admin/cms/sites/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/snippets/_form.html.haml +9 -9
- data/app/views/comfy/admin/cms/snippets/edit.html.haml +6 -5
- data/app/views/comfy/admin/cms/snippets/index.html.haml +25 -25
- data/app/views/comfy/admin/cms/snippets/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/translations/_form.html.haml +21 -0
- data/app/views/comfy/admin/cms/translations/edit.html.haml +9 -0
- data/app/views/comfy/admin/cms/translations/form_fragments.js.erb +1 -0
- data/app/views/comfy/admin/cms/translations/new.html.haml +5 -0
- data/app/views/kaminari/comfy/_first_page.html.haml +3 -2
- data/app/views/kaminari/comfy/_gap.html.haml +2 -2
- data/app/views/kaminari/comfy/_last_page.html.haml +3 -2
- data/app/views/kaminari/comfy/_next_page.html.haml +2 -2
- data/app/views/kaminari/comfy/_page.html.haml +2 -2
- data/app/views/kaminari/comfy/_prev_page.html.haml +1 -1
- data/app/views/layouts/comfy/admin/cms/_body.html.haml +13 -15
- data/app/views/layouts/comfy/admin/cms/_footer_js.html.haml +10 -3
- data/app/views/layouts/comfy/admin/cms/_head.html.haml +7 -10
- data/app/views/layouts/comfy/admin/cms/_left.html.haml +33 -15
- data/app/views/layouts/comfy/admin/cms/_right.html.haml +2 -2
- data/comfortable_mexican_sofa.gemspec +19 -19
- data/config/application.rb +14 -8
- data/config/boot.rb +2 -2
- data/config/cms_routes.rb +3 -3
- data/config/environments/development.rb +37 -4
- data/config/environments/test.rb +12 -14
- data/config/initializers/comfortable_mexican_sofa.rb +5 -12
- data/config/locales/cs.yml +33 -7
- data/config/locales/da.yml +33 -7
- data/config/locales/de.yml +32 -6
- data/config/locales/en.yml +33 -7
- data/config/locales/es.yml +33 -7
- data/config/locales/fr.yml +33 -7
- data/config/locales/it.yml +33 -7
- data/config/locales/ja.yml +33 -7
- data/config/locales/nb.yml +33 -7
- data/config/locales/nl.yml +33 -7
- data/config/locales/pl.yml +33 -7
- data/config/locales/pt-BR.yml +33 -7
- data/config/locales/ru.yml +33 -7
- data/config/locales/sk.yml +33 -7
- data/config/locales/sv.yml +33 -7
- data/config/locales/tr.yml +33 -7
- data/config/locales/uk.yml +33 -7
- data/config/locales/zh-CN.yml +33 -7
- data/config/locales/zh-TW.yml +33 -7
- data/config/storage.yml +35 -0
- data/db/cms_seeds/sample-site/files/_default.jpg.yml +5 -0
- data/db/{cms_fixtures/sample-site/files/sample.jpg → cms_seeds/sample-site/files/default.jpg} +0 -0
- data/db/cms_seeds/sample-site/layouts/default/content.html +16 -0
- data/db/cms_seeds/sample-site/layouts/default/nested/content.html +14 -0
- data/db/cms_seeds/sample-site/pages/index/child_a/content.html +7 -0
- data/db/cms_seeds/sample-site/pages/index/child_b/content.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.es.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.fr.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.html +24 -0
- data/db/{cms_fixtures/sample-site/pages/index/child/thumbnail.png → cms_seeds/sample-site/pages/index/footer.png} +0 -0
- data/db/cms_seeds/sample-site/pages/index/header.png +0 -0
- data/db/cms_seeds/sample-site/snippets/default.html +8 -0
- data/db/migrate/00_create_active_storage_tables.active_storage.rb +26 -0
- data/db/migrate/01_create_cms.rb +113 -104
- data/doc/preview.jpg +0 -0
- data/lib/comfortable_mexican_sofa.rb +10 -14
- data/lib/comfortable_mexican_sofa/configuration.rb +9 -13
- data/lib/comfortable_mexican_sofa/content.rb +28 -0
- data/lib/comfortable_mexican_sofa/content/block.rb +11 -0
- data/lib/comfortable_mexican_sofa/content/params_parser.rb +80 -0
- data/lib/comfortable_mexican_sofa/content/renderer.rb +125 -0
- data/lib/comfortable_mexican_sofa/content/tag.rb +37 -0
- data/lib/comfortable_mexican_sofa/content/tags/asset.rb +56 -0
- data/lib/comfortable_mexican_sofa/content/tags/checkbox.rb +21 -0
- data/lib/comfortable_mexican_sofa/content/tags/date.rb +22 -0
- data/lib/comfortable_mexican_sofa/content/tags/datetime.rb +22 -0
- data/lib/comfortable_mexican_sofa/content/tags/file.rb +77 -0
- data/lib/comfortable_mexican_sofa/content/tags/file_link.rb +66 -0
- data/lib/comfortable_mexican_sofa/content/tags/files.rb +39 -0
- data/lib/comfortable_mexican_sofa/content/tags/fragment.rb +54 -0
- data/lib/comfortable_mexican_sofa/content/tags/helper.rb +52 -0
- data/lib/comfortable_mexican_sofa/content/tags/markdown.rb +21 -0
- data/lib/comfortable_mexican_sofa/content/tags/number.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/partial.rb +42 -0
- data/lib/comfortable_mexican_sofa/content/tags/snippet.rb +31 -0
- data/lib/comfortable_mexican_sofa/content/tags/template.rb +41 -0
- data/lib/comfortable_mexican_sofa/content/tags/text.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/textarea.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/wysiwyg.rb +18 -0
- data/lib/comfortable_mexican_sofa/engine.rb +3 -2
- data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb +33 -30
- data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb +27 -23
- data/lib/comfortable_mexican_sofa/form_builder.rb +32 -104
- data/lib/comfortable_mexican_sofa/render_methods.rb +24 -21
- data/lib/comfortable_mexican_sofa/routes/cms.rb +6 -14
- data/lib/comfortable_mexican_sofa/routes/cms_admin.rb +39 -29
- data/lib/comfortable_mexican_sofa/routing.rb +1 -1
- data/lib/comfortable_mexican_sofa/seeds.rb +102 -0
- data/lib/comfortable_mexican_sofa/seeds/file/exporter.rb +40 -0
- data/lib/comfortable_mexican_sofa/seeds/file/importer.rb +61 -0
- data/lib/comfortable_mexican_sofa/seeds/layout/exporter.rb +37 -0
- data/lib/comfortable_mexican_sofa/seeds/layout/importer.rb +59 -0
- data/lib/comfortable_mexican_sofa/seeds/page/exporter.rb +88 -0
- data/lib/comfortable_mexican_sofa/seeds/page/importer.rb +213 -0
- data/lib/comfortable_mexican_sofa/seeds/snippet/exporter.rb +31 -0
- data/lib/comfortable_mexican_sofa/seeds/snippet/importer.rb +48 -0
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/lib/comfortable_mexican_sofa/view_hooks.rb +0 -1
- data/lib/generators/comfy/cms/assets_generator.rb +0 -1
- data/lib/generators/comfy/cms/cms_generator.rb +15 -5
- data/lib/generators/comfy/scaffold/scaffold_generator.rb +26 -20
- data/lib/generators/comfy/scaffold/templates/{controller.rb → controller.rb.tt} +10 -10
- data/lib/generators/comfy/scaffold/templates/{migration.rb → migration.rb.tt} +2 -3
- data/lib/generators/comfy/scaffold/templates/{model.rb → model.rb.tt} +7 -7
- data/lib/generators/comfy/scaffold/templates/tests/{controller.rb → controller.rb.tt} +37 -24
- data/lib/generators/comfy/scaffold/templates/tests/{fixture.yml → fixture.yml.tt} +0 -0
- data/lib/generators/comfy/scaffold/templates/tests/{model.rb → model.rb.tt} +3 -4
- data/lib/generators/comfy/scaffold/templates/views/_form.haml.tt +7 -0
- data/lib/generators/comfy/scaffold/templates/views/{edit.haml → edit.haml.tt} +1 -1
- data/lib/generators/comfy/scaffold/templates/views/index.haml.tt +21 -0
- data/lib/generators/comfy/scaffold/templates/views/{new.haml → new.haml.tt} +1 -1
- data/lib/generators/comfy/scaffold/templates/views/{show.haml → show.haml.tt} +2 -2
- data/lib/tasks/cms_seeds.rake +37 -0
- data/test/controllers/comfy/admin/cms/base_controller_test.rb +5 -6
- data/test/controllers/comfy/admin/cms/categories_controller_test.rb +27 -24
- data/test/controllers/comfy/admin/cms/files_controller_test.rb +97 -97
- data/test/controllers/comfy/admin/cms/layouts_controller_test.rb +32 -31
- data/test/controllers/comfy/admin/cms/pages_controller_test.rb +317 -263
- data/test/controllers/comfy/admin/cms/revisions_controller_test.rb +175 -65
- data/test/controllers/comfy/admin/cms/sites_controller_test.rb +27 -29
- data/test/controllers/comfy/admin/cms/snippets_controller_test.rb +54 -51
- data/test/controllers/comfy/admin/cms/translations_controller_test.rb +181 -0
- data/test/controllers/comfy/cms/assets_controller_test.rb +24 -22
- data/test/controllers/comfy/cms/content_controller_test.rb +126 -140
- data/test/fixtures/active_storage/attachments.yml +9 -0
- data/test/fixtures/active_storage/blobs.yml +13 -0
- data/test/fixtures/comfy/cms/files.yml +2 -6
- data/test/fixtures/comfy/cms/fragments.yml +25 -0
- data/test/fixtures/comfy/cms/layouts.yml +7 -13
- data/test/fixtures/comfy/cms/pages.yml +2 -17
- data/test/fixtures/comfy/cms/revisions.yml +16 -8
- data/test/fixtures/comfy/cms/sites.yml +0 -1
- data/test/fixtures/comfy/cms/snippets.yml +1 -1
- data/test/fixtures/comfy/cms/translations.yml +7 -0
- data/test/fixtures/generators/cms/application.rb +7 -0
- data/test/fixtures/generators/cms/routes.rb +4 -7
- data/test/fixtures/generators/scaffold/controller.rb +10 -10
- data/test/fixtures/generators/scaffold/migration.rb +2 -3
- data/test/fixtures/generators/scaffold/model.rb +7 -7
- data/test/fixtures/generators/scaffold/routes.rb +1 -2
- data/test/fixtures/generators/scaffold/tests/controller.rb +37 -24
- data/test/fixtures/generators/scaffold/tests/model.rb +3 -4
- data/test/fixtures/generators/scaffold/views/_form.haml +3 -2
- data/test/fixtures/generators/scaffold/views/edit.haml +1 -1
- data/test/fixtures/generators/scaffold/views/index.haml +15 -13
- data/test/fixtures/generators/scaffold/views/new.haml +1 -1
- data/test/fixtures/generators/scaffold/views/show.haml +2 -2
- data/test/gemfiles/Gemfile.rails.5.2 +32 -0
- data/test/generators/cms_assets_generator_test.rb +1 -2
- data/test/generators/cms_generator_test.rb +3 -1
- data/test/generators/cms_views_generator_test.rb +1 -1
- data/test/generators/scaffold_generator_test.rb +2 -2
- data/test/helpers/cms_helper_test.rb +52 -73
- data/test/integration/access_control_test.rb +35 -28
- data/test/integration/js_variables_test.rb +1 -2
- data/test/integration/render_cms_test.rb +37 -37
- data/test/integration/routing_test.rb +4 -5
- data/test/integration/seeds_test.rb +76 -0
- data/test/integration/sites_test.rb +35 -49
- data/test/integration/view_hooks_test.rb +12 -13
- data/test/lib/configuration_test.rb +3 -4
- data/test/lib/content/block_test.rb +26 -0
- data/test/lib/content/params_parser_test.rb +125 -0
- data/test/lib/content/renderer_test.rb +240 -0
- data/test/lib/content/tag_test.rb +48 -0
- data/test/lib/content/tags/asset_test.rb +79 -0
- data/test/lib/content/tags/checkbox_test.rb +20 -0
- data/test/lib/content/tags/date_test.rb +20 -0
- data/test/lib/content/tags/datetime_test.rb +20 -0
- data/test/lib/content/tags/file_link_test.rb +78 -0
- data/test/lib/content/tags/file_test.rb +60 -0
- data/test/lib/content/tags/files_test.rb +49 -0
- data/test/lib/content/tags/fragment_test.rb +63 -0
- data/test/lib/content/tags/helper_test.rb +52 -0
- data/test/lib/content/tags/markdown_test.rb +33 -0
- data/test/lib/content/tags/number_test.rb +13 -0
- data/test/lib/content/tags/partial_test.rb +43 -0
- data/test/lib/content/tags/snippet_test.rb +36 -0
- data/test/lib/content/tags/template_test.rb +35 -0
- data/test/lib/content/tags/text_test.rb +13 -0
- data/test/lib/content/tags/textarea_test.rb +13 -0
- data/test/lib/content/tags/wysiwyg_test.rb +13 -0
- data/test/lib/revisions_test.rb +146 -111
- data/test/lib/seeds/files_test.rb +96 -0
- data/test/lib/seeds/layouts_test.rb +155 -0
- data/test/lib/seeds/pages_test.rb +227 -0
- data/test/lib/seeds/snippets_test.rb +98 -0
- data/test/lib/seeds_test.rb +50 -0
- data/test/models/categorization_test.rb +37 -38
- data/test/models/category_test.rb +14 -14
- data/test/models/file_test.rb +23 -96
- data/test/models/fragment_test.rb +131 -0
- data/test/models/layout_test.rb +105 -74
- data/test/models/page_test.rb +352 -97
- data/test/models/site_test.rb +101 -90
- data/test/models/snippet_test.rb +29 -23
- data/test/models/translation_test.rb +60 -0
- data/test/tasks/cms_seeds_test.rb +33 -0
- data/test/test_helper.rb +49 -32
- metadata +235 -210
- data/_config.yml +0 -1
- data/app/assets/images/comfy/admin/cms/arrow_bottom.gif +0 -0
- data/app/assets/images/comfy/admin/cms/arrow_right.gif +0 -0
- data/app/assets/images/comfy/admin/cms/checkerboard.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_draft.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_file.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_layout.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_move.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_page.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_site.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_snippet.gif +0 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/bootstrap-datetimepicker.js +0 -29
- data/app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee +0 -9
- data/app/assets/javascripts/comfy/admin/cms/lib/diff/pretty_text_diff.min.js +0 -5
- data/app/assets/stylesheets/comfy/admin/cms/bootstrap_overrides.sass +0 -32
- data/app/assets/stylesheets/comfy/admin/cms/lib/bootstrap-datetimepicker.css +0 -9
- data/app/models/comfy/cms/block.rb +0 -63
- data/app/views/comfy/admin/cms/files/_page_form.html.haml +0 -10
- data/app/views/comfy/admin/cms/pages/_form_blocks.html.haml +0 -32
- data/app/views/comfy/admin/cms/pages/form_blocks.js.erb +0 -1
- data/app/views/comfy/admin/cms/partials/_body_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_file_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_file_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_files_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_files_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_html_footer.html.haml +0 -2
- data/app/views/comfy/admin/cms/partials/_html_head.html.haml +0 -2
- data/app/views/comfy/admin/cms/partials/_layout_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layout_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layouts_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layouts_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_inner.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_inner.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_pages_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_pages_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_right_column_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_right_column_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_site_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_site_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_sites_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_sites_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippet_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippet_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippets_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippets_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/sites/_mirrors.html.haml +0 -18
- data/app/views/comfy/cms/content/render_sitemap.xml.builder +0 -14
- data/app/views/layouts/comfy/admin/cms/_footer.html.haml +0 -3
- data/config/initializers/paperclip.rb +0 -3
- data/config/initializers/secret_token.rb +0 -15
- data/db/cms_fixtures/sample-site/categories/files.yml +0 -1
- data/db/cms_fixtures/sample-site/categories/pages.yml +0 -1
- data/db/cms_fixtures/sample-site/categories/snippets.yml +0 -1
- data/db/cms_fixtures/sample-site/files/_sample.jpg.yml +0 -5
- data/db/cms_fixtures/sample-site/layouts/default/attributes.yml +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/content.html +0 -5
- data/db/cms_fixtures/sample-site/layouts/default/javascript.js +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/nested/attributes.yml +0 -2
- data/db/cms_fixtures/sample-site/layouts/default/nested/content.haml +0 -3
- data/db/cms_fixtures/sample-site/layouts/default/nested/javascript.js +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/nested/stylesheet.css +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/stylesheet.css +0 -1
- data/db/cms_fixtures/sample-site/pages/index/attributes.yml +0 -6
- data/db/cms_fixtures/sample-site/pages/index/child/attributes.yml +0 -3
- data/db/cms_fixtures/sample-site/pages/index/child/left.haml +0 -1
- data/db/cms_fixtures/sample-site/pages/index/child/right.html +0 -1
- data/db/cms_fixtures/sample-site/pages/index/content.html +0 -2
- data/db/cms_fixtures/sample-site/snippets/default/attributes.yml +0 -4
- data/db/cms_fixtures/sample-site/snippets/default/content.html +0 -1
- data/db/seeds.rb +0 -7
- data/db/upgrade_migrations/02_upgrade_to_1_1_0.rb +0 -19
- data/db/upgrade_migrations/03_upgrade_to_1_2_0.rb +0 -15
- data/db/upgrade_migrations/04_upgrade_to_1_3_0.rb +0 -23
- data/db/upgrade_migrations/05_upgrade_to_1_4_0.rb +0 -33
- data/db/upgrade_migrations/06_upgrade_to_1_5_0.rb +0 -21
- data/db/upgrade_migrations/07_upgrade_to_1_6_0.rb +0 -25
- data/db/upgrade_migrations/08_upgrade_to_1_12_0.rb +0 -83
- data/doc/preview.png +0 -0
- data/lib/comfortable_mexican_sofa/extensions/cms_manageable.rb +0 -106
- data/lib/comfortable_mexican_sofa/extensions/is_categorized.rb +0 -49
- data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb +0 -86
- data/lib/comfortable_mexican_sofa/extensions/rails.rb +0 -17
- data/lib/comfortable_mexican_sofa/fixture.rb +0 -82
- data/lib/comfortable_mexican_sofa/fixture/category.rb +0 -42
- data/lib/comfortable_mexican_sofa/fixture/file.rb +0 -85
- data/lib/comfortable_mexican_sofa/fixture/layout.rb +0 -95
- data/lib/comfortable_mexican_sofa/fixture/page.rb +0 -129
- data/lib/comfortable_mexican_sofa/fixture/snippet.rb +0 -75
- data/lib/comfortable_mexican_sofa/tag.rb +0 -154
- data/lib/comfortable_mexican_sofa/tags/asset.rb +0 -30
- data/lib/comfortable_mexican_sofa/tags/collection.rb +0 -64
- data/lib/comfortable_mexican_sofa/tags/field_boolean.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_datetime.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_integer.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_string.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_text.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/file.rb +0 -29
- data/lib/comfortable_mexican_sofa/tags/helper.rb +0 -24
- data/lib/comfortable_mexican_sofa/tags/page_datetime.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_file.rb +0 -62
- data/lib/comfortable_mexican_sofa/tags/page_files.rb +0 -51
- data/lib/comfortable_mexican_sofa/tags/page_integer.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_markdown.rb +0 -16
- data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_string.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_text.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/partial.rb +0 -23
- data/lib/comfortable_mexican_sofa/tags/snippet.rb +0 -19
- data/lib/comfortable_mexican_sofa/tags/template.rb +0 -22
- data/lib/generators/comfy/scaffold/templates/views/_form.haml +0 -6
- data/lib/generators/comfy/scaffold/templates/views/index.haml +0 -23
- data/lib/tasks/comfortable_mexican_sofa.rake +0 -37
- data/test/fixtures/comfy/cms/blocks.yml +0 -12
- data/test/gemfiles/Gemfile.rails.4.1 +0 -22
- data/test/gemfiles/Gemfile.rails.4.2 +0 -22
- data/test/gemfiles/Gemfile.rails.5.0 +0 -23
- data/test/gemfiles/Gemfile.rails.master +0 -23
- data/test/integration/fixtures_test.rb +0 -65
- data/test/integration/mirrors_test.rb +0 -72
- data/test/lib/fixtures/categories_test.rb +0 -36
- data/test/lib/fixtures/files_test.rb +0 -109
- data/test/lib/fixtures/layouts_test.rb +0 -135
- data/test/lib/fixtures/pages_test.rb +0 -168
- data/test/lib/fixtures/snippets_test.rb +0 -106
- data/test/lib/fixtures_test.rb +0 -43
- data/test/lib/mirrors_test.rb +0 -254
- data/test/lib/tag_test.rb +0 -309
- data/test/lib/tags/asset_test.rb +0 -95
- data/test/lib/tags/collection_test.rb +0 -117
- data/test/lib/tags/field_boolean_test.rb +0 -49
- data/test/lib/tags/field_datetime_test.rb +0 -50
- data/test/lib/tags/field_integer_test.rb +0 -49
- data/test/lib/tags/field_rich_text_test.rb +0 -49
- data/test/lib/tags/field_string_test.rb +0 -52
- data/test/lib/tags/field_text_test.rb +0 -48
- data/test/lib/tags/file_test.rb +0 -67
- data/test/lib/tags/helper_test.rb +0 -86
- data/test/lib/tags/page_datetime_test.rb +0 -50
- data/test/lib/tags/page_file_test.rb +0 -119
- data/test/lib/tags/page_files_test.rb +0 -117
- data/test/lib/tags/page_integer_test.rb +0 -49
- data/test/lib/tags/page_markdown_test.rb +0 -48
- data/test/lib/tags/page_rich_text_test.rb +0 -49
- data/test/lib/tags/page_string_test.rb +0 -49
- data/test/lib/tags/page_text_test.rb +0 -52
- data/test/lib/tags/partial_test.rb +0 -76
- data/test/lib/tags/snippet_test.rb +0 -45
- data/test/lib/tags/template_test.rb +0 -56
- data/test/models/block_test.rb +0 -233
data/config/locales/fr.yml
CHANGED
|
@@ -7,6 +7,7 @@ fr:
|
|
|
7
7
|
comfy/cms/page: Page
|
|
8
8
|
comfy/cms/snippet: Fragment
|
|
9
9
|
comfy/cms/file: Fichier
|
|
10
|
+
comfy/cms/translation: Translation
|
|
10
11
|
|
|
11
12
|
attributes:
|
|
12
13
|
comfy/cms/site:
|
|
@@ -15,7 +16,6 @@ fr:
|
|
|
15
16
|
hostname: Nom d'hôte
|
|
16
17
|
path: Chemin
|
|
17
18
|
locale: Langue
|
|
18
|
-
is_mirrored: En miroir
|
|
19
19
|
comfy/cms/layout:
|
|
20
20
|
identifier: Identifiant
|
|
21
21
|
label: Nom de la mise en page
|
|
@@ -41,6 +41,11 @@ fr:
|
|
|
41
41
|
identifier: Identifiant
|
|
42
42
|
label: Nom
|
|
43
43
|
content: Contenu
|
|
44
|
+
comfy/cms/translation:
|
|
45
|
+
locale: Language
|
|
46
|
+
label: Label
|
|
47
|
+
layout_id: Layout
|
|
48
|
+
is_published: Published
|
|
44
49
|
|
|
45
50
|
comfy:
|
|
46
51
|
cms:
|
|
@@ -53,7 +58,7 @@ fr:
|
|
|
53
58
|
cms:
|
|
54
59
|
base:
|
|
55
60
|
site_not_found: Site introuvable
|
|
56
|
-
|
|
61
|
+
seeds_enabled: Fixtures activés. Toutes les modifications seront supprimées.
|
|
57
62
|
|
|
58
63
|
sites: Sites
|
|
59
64
|
layouts: Mises en page
|
|
@@ -84,7 +89,6 @@ fr:
|
|
|
84
89
|
create: Créer le site
|
|
85
90
|
cancel: Annuler
|
|
86
91
|
update: Modifier le site
|
|
87
|
-
is_mirrored: En miroir
|
|
88
92
|
|
|
89
93
|
layouts:
|
|
90
94
|
created: Mise en page créée
|
|
@@ -141,6 +145,10 @@ fr:
|
|
|
141
145
|
title: Nouvelle page
|
|
142
146
|
edit:
|
|
143
147
|
title: Modification de la page
|
|
148
|
+
translation:
|
|
149
|
+
create: Create Translation
|
|
150
|
+
delete: Delete
|
|
151
|
+
confirm: Are you sure?
|
|
144
152
|
revision:
|
|
145
153
|
<<: *revision
|
|
146
154
|
form:
|
|
@@ -149,12 +157,31 @@ fr:
|
|
|
149
157
|
create: Créer la page
|
|
150
158
|
cancel: Annuler
|
|
151
159
|
update: Modifier la page
|
|
152
|
-
is_published: Publié
|
|
153
160
|
choose_link: Select page...
|
|
154
161
|
form_blocks:
|
|
155
162
|
no_tags: |-
|
|
156
163
|
Mise en page sans aucun tag de contenu.<br/>
|
|
157
|
-
Modifiez le contenu pour y ajouter un tag de page ou de champ. Exemple : <code>{{cms:
|
|
164
|
+
Modifiez le contenu pour y ajouter un tag de page ou de champ. Exemple : <code>{{cms:fragment content}}</code>
|
|
165
|
+
|
|
166
|
+
translations:
|
|
167
|
+
created: Translation created
|
|
168
|
+
creation_failure: Failed to create translation
|
|
169
|
+
updated: Translation updated
|
|
170
|
+
update_failure: Failed to update translation
|
|
171
|
+
deleted: Translation deleted
|
|
172
|
+
not_found: Translation not found
|
|
173
|
+
|
|
174
|
+
new:
|
|
175
|
+
title: New Translation
|
|
176
|
+
edit:
|
|
177
|
+
title: Editing Translation
|
|
178
|
+
revision:
|
|
179
|
+
<<: *revision
|
|
180
|
+
form:
|
|
181
|
+
preview: Preview
|
|
182
|
+
create: Create
|
|
183
|
+
update: Update
|
|
184
|
+
cancel: Return to Page
|
|
158
185
|
|
|
159
186
|
snippets:
|
|
160
187
|
created: Fragment créé
|
|
@@ -189,9 +216,8 @@ fr:
|
|
|
189
216
|
show:
|
|
190
217
|
title: "Révisions :"
|
|
191
218
|
revision: révision
|
|
192
|
-
full_path: Chemin complet
|
|
193
|
-
slug: Identifiant
|
|
194
219
|
update: Restaurer cette révision
|
|
220
|
+
cancel: Annuler
|
|
195
221
|
content: Content
|
|
196
222
|
changes: Changes
|
|
197
223
|
previous: Previous
|
data/config/locales/it.yml
CHANGED
|
@@ -7,6 +7,7 @@ it:
|
|
|
7
7
|
comfy/cms/page: Pagina
|
|
8
8
|
comfy/cms/snippet: Snippet
|
|
9
9
|
comfy/cms/file: File
|
|
10
|
+
comfy/cms/translation: Translation
|
|
10
11
|
|
|
11
12
|
attributes:
|
|
12
13
|
comfy/cms/site:
|
|
@@ -15,7 +16,6 @@ it:
|
|
|
15
16
|
hostname: Indirizzo Host
|
|
16
17
|
path: Percorso
|
|
17
18
|
locale: Lingua
|
|
18
|
-
is_mirrored: Mirrored
|
|
19
19
|
comfy/cms/layout:
|
|
20
20
|
identifier: Identificatore
|
|
21
21
|
label: Nome Layout
|
|
@@ -41,6 +41,11 @@ it:
|
|
|
41
41
|
label: Etichetta
|
|
42
42
|
identifier: Identificatore
|
|
43
43
|
content: Contenuto
|
|
44
|
+
comfy/cms/translation:
|
|
45
|
+
locale: Language
|
|
46
|
+
label: Label
|
|
47
|
+
layout_id: Layout
|
|
48
|
+
is_published: Published
|
|
44
49
|
|
|
45
50
|
comfy:
|
|
46
51
|
cms:
|
|
@@ -53,7 +58,7 @@ it:
|
|
|
53
58
|
cms:
|
|
54
59
|
base:
|
|
55
60
|
site_not_found: Sito non trovato
|
|
56
|
-
|
|
61
|
+
seeds_enabled: Le Fixtures CMS sono abilitate. Tutti i cambiamenti fatti qui saranno scartati.
|
|
57
62
|
|
|
58
63
|
sites: Siti
|
|
59
64
|
layouts: Layout
|
|
@@ -84,7 +89,6 @@ it:
|
|
|
84
89
|
create: Crea sito
|
|
85
90
|
cancel: Cancellare
|
|
86
91
|
update: Modifica sito
|
|
87
|
-
is_mirrored: Mirrored
|
|
88
92
|
|
|
89
93
|
layouts:
|
|
90
94
|
created: Layout creato
|
|
@@ -141,6 +145,10 @@ it:
|
|
|
141
145
|
title: Nuova Pagina
|
|
142
146
|
edit:
|
|
143
147
|
title: Modifica Pagina
|
|
148
|
+
translation:
|
|
149
|
+
create: Create Translation
|
|
150
|
+
delete: Delete
|
|
151
|
+
confirm: Are you sure?
|
|
144
152
|
revision:
|
|
145
153
|
<<: *revision
|
|
146
154
|
form:
|
|
@@ -149,12 +157,31 @@ it:
|
|
|
149
157
|
create: Crea Pagina
|
|
150
158
|
cancel: Cancellare
|
|
151
159
|
update: Modifica Pagina
|
|
152
|
-
is_published: Pubblicata
|
|
153
160
|
choose_link: Select page...
|
|
154
161
|
form_blocks:
|
|
155
162
|
no_tags: |-
|
|
156
163
|
Il Layout non ha tag di contenuto definiti.<br/>
|
|
157
|
-
Modifica il contenuto per includere una pagina o un campo. Per esempio: <code>{{cms:
|
|
164
|
+
Modifica il contenuto per includere una pagina o un campo. Per esempio: <code>{{cms:fragment content}}</code>
|
|
165
|
+
|
|
166
|
+
translations:
|
|
167
|
+
created: Translation created
|
|
168
|
+
creation_failure: Failed to create translation
|
|
169
|
+
updated: Translation updated
|
|
170
|
+
update_failure: Failed to update translation
|
|
171
|
+
deleted: Translation deleted
|
|
172
|
+
not_found: Translation not found
|
|
173
|
+
|
|
174
|
+
new:
|
|
175
|
+
title: New Translation
|
|
176
|
+
edit:
|
|
177
|
+
title: Editing Translation
|
|
178
|
+
revision:
|
|
179
|
+
<<: *revision
|
|
180
|
+
form:
|
|
181
|
+
preview: Preview
|
|
182
|
+
create: Create
|
|
183
|
+
update: Update
|
|
184
|
+
cancel: Return to Page
|
|
158
185
|
|
|
159
186
|
snippets:
|
|
160
187
|
created: Snippet creato
|
|
@@ -189,9 +216,8 @@ it:
|
|
|
189
216
|
show:
|
|
190
217
|
title: Revisioni per
|
|
191
218
|
revision: Revisione
|
|
192
|
-
full_path: Percorso intero
|
|
193
|
-
slug: Slug
|
|
194
219
|
update: Aggiorna a questa revisione
|
|
220
|
+
cancel: Cancellare
|
|
195
221
|
content: Contenuto
|
|
196
222
|
changes: Cambiamenti
|
|
197
223
|
previous: Precedente
|
data/config/locales/ja.yml
CHANGED
|
@@ -7,6 +7,7 @@ ja:
|
|
|
7
7
|
comfy/cms/page: ページ
|
|
8
8
|
comfy/cms/snippet: スニペット
|
|
9
9
|
comfy/cms/file: File
|
|
10
|
+
comfy/cms/translation: Translation
|
|
10
11
|
|
|
11
12
|
attributes:
|
|
12
13
|
comfy/cms/site:
|
|
@@ -15,7 +16,6 @@ ja:
|
|
|
15
16
|
hostname: ホスト名
|
|
16
17
|
path: パス
|
|
17
18
|
locale: 言語
|
|
18
|
-
is_mirrored: ミラーリング済み
|
|
19
19
|
comfy/cms/layout:
|
|
20
20
|
identifier: Identifier
|
|
21
21
|
label: レイアウト名
|
|
@@ -41,6 +41,11 @@ ja:
|
|
|
41
41
|
identifier: Identifier
|
|
42
42
|
label: ラベル
|
|
43
43
|
content: コンテンツ
|
|
44
|
+
comfy/cms/translation:
|
|
45
|
+
locale: Language
|
|
46
|
+
label: Label
|
|
47
|
+
layout_id: Layout
|
|
48
|
+
is_published: Published
|
|
44
49
|
|
|
45
50
|
comfy:
|
|
46
51
|
cms:
|
|
@@ -53,7 +58,7 @@ ja:
|
|
|
53
58
|
cms:
|
|
54
59
|
base:
|
|
55
60
|
site_not_found: サイトが見つかりません
|
|
56
|
-
|
|
61
|
+
seeds_enabled: CMS フィクスチャが有効です。 ここでの変更はすべて破棄されます。
|
|
57
62
|
|
|
58
63
|
sites: サイト
|
|
59
64
|
layouts: レイアウト
|
|
@@ -84,7 +89,6 @@ ja:
|
|
|
84
89
|
create: サイトを作成
|
|
85
90
|
cancel: キャンセル
|
|
86
91
|
update: サイトを更新
|
|
87
|
-
is_mirrored: ミラーリング済み
|
|
88
92
|
|
|
89
93
|
layouts:
|
|
90
94
|
created: レイアウトが作成されました
|
|
@@ -141,6 +145,10 @@ ja:
|
|
|
141
145
|
title: 新規ページ
|
|
142
146
|
edit:
|
|
143
147
|
title: ページを編集
|
|
148
|
+
translation:
|
|
149
|
+
create: Create Translation
|
|
150
|
+
delete: Delete
|
|
151
|
+
confirm: Are you sure?
|
|
144
152
|
revision:
|
|
145
153
|
<<: *revision
|
|
146
154
|
form:
|
|
@@ -149,12 +157,31 @@ ja:
|
|
|
149
157
|
create: ページを作成
|
|
150
158
|
cancel: キャンセル
|
|
151
159
|
update: ページを更新
|
|
152
|
-
is_published: パブリッシュ済み
|
|
153
160
|
choose_link: Select page...
|
|
154
161
|
form_blocks:
|
|
155
162
|
no_tags: |-
|
|
156
163
|
レイアウトにはコンテンツタグが定義されていません。<br/>
|
|
157
|
-
コンテンツを編集してページまたはフィールドタグを含めてください。 例: <code>{{cms:
|
|
164
|
+
コンテンツを編集してページまたはフィールドタグを含めてください。 例: <code>{{cms:fragment content}}</code>
|
|
165
|
+
|
|
166
|
+
translations:
|
|
167
|
+
created: Translation created
|
|
168
|
+
creation_failure: Failed to create translation
|
|
169
|
+
updated: Translation updated
|
|
170
|
+
update_failure: Failed to update translation
|
|
171
|
+
deleted: Translation deleted
|
|
172
|
+
not_found: Translation not found
|
|
173
|
+
|
|
174
|
+
new:
|
|
175
|
+
title: New Translation
|
|
176
|
+
edit:
|
|
177
|
+
title: Editing Translation
|
|
178
|
+
revision:
|
|
179
|
+
<<: *revision
|
|
180
|
+
form:
|
|
181
|
+
preview: Preview
|
|
182
|
+
create: Create
|
|
183
|
+
update: Update
|
|
184
|
+
cancel: Return to Page
|
|
158
185
|
|
|
159
186
|
snippets:
|
|
160
187
|
created: スニペットが作成されました
|
|
@@ -189,9 +216,8 @@ ja:
|
|
|
189
216
|
show:
|
|
190
217
|
title: リビジョン
|
|
191
218
|
revision: リビジョン
|
|
192
|
-
full_path: フルパス
|
|
193
|
-
slug: スラッグ
|
|
194
219
|
update: このリビジョンに更新
|
|
220
|
+
cancel: キャンセル
|
|
195
221
|
content: Content
|
|
196
222
|
changes: Changes
|
|
197
223
|
previous: Previous
|
data/config/locales/nb.yml
CHANGED
|
@@ -7,6 +7,7 @@ nb:
|
|
|
7
7
|
comfy/cms/page: Side
|
|
8
8
|
comfy/cms/snippet: Snutt
|
|
9
9
|
comfy/cms/file: Fil
|
|
10
|
+
comfy/cms/translation: Translation
|
|
10
11
|
|
|
11
12
|
attributes:
|
|
12
13
|
comfy/cms/site:
|
|
@@ -15,7 +16,6 @@ nb:
|
|
|
15
16
|
hostname: Tjenestenavn
|
|
16
17
|
path: Sti
|
|
17
18
|
locale: Språk
|
|
18
|
-
is_mirrored: Speilet
|
|
19
19
|
comfy/cms/layout:
|
|
20
20
|
identifier: Identifikator
|
|
21
21
|
label: Layoutnavn
|
|
@@ -41,6 +41,11 @@ nb:
|
|
|
41
41
|
identifier: Identifikator
|
|
42
42
|
label: Navn
|
|
43
43
|
content: Innhold
|
|
44
|
+
comfy/cms/translation:
|
|
45
|
+
locale: Language
|
|
46
|
+
label: Label
|
|
47
|
+
layout_id: Layout
|
|
48
|
+
is_published: Published
|
|
44
49
|
|
|
45
50
|
comfy:
|
|
46
51
|
cms:
|
|
@@ -53,7 +58,7 @@ nb:
|
|
|
53
58
|
cms:
|
|
54
59
|
base:
|
|
55
60
|
site_not_found: Fant ikke nettside
|
|
56
|
-
|
|
61
|
+
seeds_enabled: CMS Fixtures er aktivert. Alle endringer som er er utført vil bli fjernet.
|
|
57
62
|
|
|
58
63
|
sites: Nettsider
|
|
59
64
|
layouts: Layouter
|
|
@@ -84,7 +89,6 @@ nb:
|
|
|
84
89
|
create: Opprett nettside
|
|
85
90
|
cancel: Cancel
|
|
86
91
|
update: Oppdater nettside
|
|
87
|
-
is_mirrored: Speilet
|
|
88
92
|
|
|
89
93
|
layouts:
|
|
90
94
|
created: Layout opprettet
|
|
@@ -141,6 +145,10 @@ nb:
|
|
|
141
145
|
title: Ny side
|
|
142
146
|
edit:
|
|
143
147
|
title: Endrer side
|
|
148
|
+
translation:
|
|
149
|
+
create: Create Translation
|
|
150
|
+
delete: Delete
|
|
151
|
+
confirm: Are you sure?
|
|
144
152
|
revision:
|
|
145
153
|
<<: *revision
|
|
146
154
|
form:
|
|
@@ -149,12 +157,31 @@ nb:
|
|
|
149
157
|
create: Opprett side
|
|
150
158
|
cancel: Cancel
|
|
151
159
|
update: Endre side
|
|
152
|
-
is_published: Publisert
|
|
153
160
|
choose_link: Velg side...
|
|
154
161
|
form_blocks:
|
|
155
162
|
no_tags: |-
|
|
156
163
|
layout har ingen innholdsknagger definert.<br/>
|
|
157
|
-
Endre innholdet til å inkludere innhold- eller feltknagg. For eksempel: <code>{{cms:
|
|
164
|
+
Endre innholdet til å inkludere innhold- eller feltknagg. For eksempel: <code>{{cms:fragment content}}</code>
|
|
165
|
+
|
|
166
|
+
translations:
|
|
167
|
+
created: Translation created
|
|
168
|
+
creation_failure: Failed to create translation
|
|
169
|
+
updated: Translation updated
|
|
170
|
+
update_failure: Failed to update translation
|
|
171
|
+
deleted: Translation deleted
|
|
172
|
+
not_found: Translation not found
|
|
173
|
+
|
|
174
|
+
new:
|
|
175
|
+
title: New Translation
|
|
176
|
+
edit:
|
|
177
|
+
title: Editing Translation
|
|
178
|
+
revision:
|
|
179
|
+
<<: *revision
|
|
180
|
+
form:
|
|
181
|
+
preview: Preview
|
|
182
|
+
create: Create
|
|
183
|
+
update: Update
|
|
184
|
+
cancel: Return to Page
|
|
158
185
|
|
|
159
186
|
snippets:
|
|
160
187
|
created: Snutt opprettet
|
|
@@ -189,9 +216,8 @@ nb:
|
|
|
189
216
|
show:
|
|
190
217
|
title: Revisjon for
|
|
191
218
|
revision: Revisjon
|
|
192
|
-
full_path: Fullstendig sti
|
|
193
|
-
slug: Sti
|
|
194
219
|
update: Oppdatert til denne revisjonen
|
|
220
|
+
cancel: Cancel
|
|
195
221
|
content: Innhold
|
|
196
222
|
changes: Endringer
|
|
197
223
|
previous: Forrige
|
data/config/locales/nl.yml
CHANGED
|
@@ -7,6 +7,7 @@ nl:
|
|
|
7
7
|
comfy/cms/page: Pagina
|
|
8
8
|
comfy/cms/snippet: Snippet
|
|
9
9
|
comfy/cms/file: Bestand
|
|
10
|
+
comfy/cms/translation: Translation
|
|
10
11
|
|
|
11
12
|
attributes:
|
|
12
13
|
comfy/cms/site:
|
|
@@ -15,7 +16,6 @@ nl:
|
|
|
15
16
|
hostname: Hostname
|
|
16
17
|
path: Pad
|
|
17
18
|
locale: Taal
|
|
18
|
-
is_mirrored: Gespiegeld
|
|
19
19
|
comfy/cms/layout:
|
|
20
20
|
identifier: Identifier
|
|
21
21
|
label: Lay-out Naam
|
|
@@ -41,6 +41,11 @@ nl:
|
|
|
41
41
|
identifier: Identifier
|
|
42
42
|
label: Label
|
|
43
43
|
content: Inhoud
|
|
44
|
+
comfy/cms/translation:
|
|
45
|
+
locale: Language
|
|
46
|
+
label: Label
|
|
47
|
+
layout_id: Layout
|
|
48
|
+
is_published: Published
|
|
44
49
|
|
|
45
50
|
comfy:
|
|
46
51
|
cms:
|
|
@@ -53,7 +58,7 @@ nl:
|
|
|
53
58
|
cms:
|
|
54
59
|
base:
|
|
55
60
|
site_not_found: Site niet gevonden
|
|
56
|
-
|
|
61
|
+
seeds_enabled: CMS Fixtures zijn ingeschakeld. Alle veranderingen die hier gedaan zijn worden weggegooid.
|
|
57
62
|
|
|
58
63
|
sites: Sites
|
|
59
64
|
layouts: Lay-outs
|
|
@@ -84,7 +89,6 @@ nl:
|
|
|
84
89
|
create: Site Aanmaken
|
|
85
90
|
cancel: Annuleren
|
|
86
91
|
update: Site Bijwerken
|
|
87
|
-
is_mirrored: Gespiegeld
|
|
88
92
|
|
|
89
93
|
layouts:
|
|
90
94
|
created: Lay-out aangemaakt
|
|
@@ -141,6 +145,10 @@ nl:
|
|
|
141
145
|
title: Nieuwe Pagina
|
|
142
146
|
edit:
|
|
143
147
|
title: Pagina Bewerken
|
|
148
|
+
translation:
|
|
149
|
+
create: Create Translation
|
|
150
|
+
delete: Delete
|
|
151
|
+
confirm: Are you sure?
|
|
144
152
|
revision:
|
|
145
153
|
<<: *revision
|
|
146
154
|
form:
|
|
@@ -149,12 +157,31 @@ nl:
|
|
|
149
157
|
create: Pagina Aanmaken
|
|
150
158
|
cancel: Annuleren
|
|
151
159
|
update: Pagina Bijwerken
|
|
152
|
-
is_published: Gepubliceerd
|
|
153
160
|
choose_link: Select page...
|
|
154
161
|
form_blocks:
|
|
155
162
|
no_tags: |-
|
|
156
163
|
Lay-out heeft geen inhoud-tags gedefinieerd.<br/>
|
|
157
|
-
Bewerk de inhoud van de lay-out om een inhoud-tag toe te voegen. Bijvoorbeeld: <code>{{cms:
|
|
164
|
+
Bewerk de inhoud van de lay-out om een inhoud-tag toe te voegen. Bijvoorbeeld: <code>{{cms:fragment content}}</code>
|
|
165
|
+
|
|
166
|
+
translations:
|
|
167
|
+
created: Translation created
|
|
168
|
+
creation_failure: Failed to create translation
|
|
169
|
+
updated: Translation updated
|
|
170
|
+
update_failure: Failed to update translation
|
|
171
|
+
deleted: Translation deleted
|
|
172
|
+
not_found: Translation not found
|
|
173
|
+
|
|
174
|
+
new:
|
|
175
|
+
title: New Translation
|
|
176
|
+
edit:
|
|
177
|
+
title: Editing Translation
|
|
178
|
+
revision:
|
|
179
|
+
<<: *revision
|
|
180
|
+
form:
|
|
181
|
+
preview: Preview
|
|
182
|
+
create: Create
|
|
183
|
+
update: Update
|
|
184
|
+
cancel: Return to Page
|
|
158
185
|
|
|
159
186
|
snippets:
|
|
160
187
|
created: Snippet aangemaakt
|
|
@@ -189,9 +216,8 @@ nl:
|
|
|
189
216
|
show:
|
|
190
217
|
title: Revisies van
|
|
191
218
|
revision: Revisie
|
|
192
|
-
full_path: Volledig Pad
|
|
193
|
-
slug: Slug
|
|
194
219
|
update: Zet terug naar deze Revisie
|
|
220
|
+
cancel: Annuleren
|
|
195
221
|
content: Content
|
|
196
222
|
changes: Changes
|
|
197
223
|
previous: Previous
|