Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 1 addition & 37 deletions cms/contents/page/translations/sfs_cms_contents.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,6 @@ admin_page:
confirm_message_title: "Unpublish page"
confirm_message_raw: "<p>Are you sure to unpublish this page?</p><p>It will show a 404 error to the users</p>"

import:
meta.title: "Import page"
title: "Import page"
breadcrumb: "Import page"
actions:
import.button: "Import page"
cancel.button: "Cancel"
form:
file.label: "Import content file"
failed_flash: "An error has been produced during the page import<br/><small>%exception%</small>"
duplicated_flash: "An error has been produced during the page import, the page already exists in the database, try to import it as a version<br/><small>%exception%</small>"
success_flash: "Page has been imported"

import_version:
meta.title: "Import version"
title: "Import version"
breadcrumb: "Import version"
actions:
import.button: "Import version"
cancel.button: "Cancel"
form:
file.label: "Import content file"

read:
meta.title: "General"
title: "%name%"
Expand Down Expand Up @@ -135,8 +112,6 @@ admin_page:
origin:
"null": ""
1: "edited"
2: "fixture"
3: "imported"
4: "translated"
5: "seo"
6: "duplicated"
Expand All @@ -145,12 +120,10 @@ admin_page:
actions:
edit.link: "Edit"
preview.link: "Preview"
export.link: "Export"
publish.link: "Publish"
unpublish:
link: "Unpublish"
confirm: "Are you sure you want to unpublish this page? It will show a 404 error to the users."
import_version.link: "Import version"
cleanup_versions:
link: "Cleanup versions"
confirm: "Are you sure to cleanup versions? This action will delete all versions except the published one, the last one and the ones marked to keep."
Expand Down Expand Up @@ -200,7 +173,6 @@ admin_page:
offer_backup: 'If you want, you can backup this content published version before deleting'
index_warnings_raw: '<p><strong>Do not lose links and index!</strong></p>'
actions:
export.button: Export
delete.button: "Delete definitely"
cancel.button: "Cancel"
form:
Expand Down Expand Up @@ -251,7 +223,6 @@ admin_page:
breadcrumb: "Pages"
actions:
create.link: "New page"
import.link: "Import page"
details.link: "View"
content.link: "Content"
preview.link: "Preview"
Expand All @@ -267,7 +238,7 @@ admin_page:
status.label: "Status"
publishedVersionContent.label: "Published version content (case sensitive)"
empty:
create_first_content_raw: '<a href="%create_link%">Create</a> or <a href="%import_link%">import</a> your first page!'
create_first_content_raw: '<a href="%create_link%">Create</a> your first page!'
can_not_create_content: "You can not create a new page"
go_to_doc_raw: 'If you need help go to <a href="https://github.com/softspring/cms-bundle" target="_blank">documentation</a>'
clean_filters: 'Your query has no results, try to <a href="%url%">clean filters</a>'
Expand Down Expand Up @@ -323,13 +294,6 @@ admin_page:
success_unlocked_flash: "Version has been unlocked"
failed_flash: "An error has been produced during the version lock/unlock<br/><small>%exception%</small>"

version_export:
failed_flash: "An error has been produced during the version export<br/><small>%exception%</small>"

version_import:
success_flash: "Version has been imported"
failed_flash: "An error has been produced during the version import<br/><small>%exception%</small>"

version_cleanup:
success_flash: "Versions cleanup has been done correctly"

Expand Down
39 changes: 1 addition & 38 deletions cms/contents/page/translations/sfs_cms_contents.es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,6 @@ admin_page:
confirm_message_title: "Despublicar página"
confirm_message_raw: "<p>¿Estás seguro de despublicar esta página?</p><p>Mostrará un error 404 a los usuarios</p>"

import:
meta.title: "Importar página"
title: "Importar página"
breadcrumb: "Importar página"
actions:
import.button: "Importar página"
cancel.button: "Cancelar"
form:
file.label: "Fichero a importar"
failed_flash: "Se ha producido un error al importar la página<br/><small>%exception%</small>"
duplicated_flash: "Se ha producido un error al importar la página, la página ya existe en la base de datos, intenta importarla como versión<br/><small>%exception%</small>"
success_flash: "La página se ha importado"

import_version:
meta.title: "Importar versión"
title: "Importar versión"
breadcrumb: "Importar versión"
actions:
import.button: "Importar versión"
cancel.button: "Cancelar"
form:
file.label: "Fichero a importar"

read:
meta.title: "General"
title: "%name%"
Expand Down Expand Up @@ -135,8 +112,6 @@ admin_page:
origin:
"null": ""
1: "editado"
2: "fixture"
3: "cargada"
4: "traducida"
5: "seo"
6: "duplicada"
Expand All @@ -145,12 +120,10 @@ admin_page:
actions:
edit.link: "Editar"
preview.link: "Previsualizar"
export.link: "Exportar"
publish.link: "Publicar"
unpublish:
link: "Despublicar"
confirm: "¿Estás seguro de despublicar esta versión? Mostrará un error 404 a los usuarios."
import_version.link: "Importar versión"
cleanup_versions:
link: "Limpiar versiones"
confirm: "¿Estás seguro de limpiar las versiones? Esta acción eliminará todas las versiones excepto la publicada, la última y las marcadas para mantener."
Expand Down Expand Up @@ -200,7 +173,6 @@ admin_page:
offer_backup: 'Si quieres puedes hacer un backup de la versión publicada de este contenido antes'
index_warnings_raw: '<p><strong>¡No pierdas los enlaces e indexación!</strong></p>'
actions:
export.button: "Exportar"
delete.button: "Eliminar definitivamente"
cancel.button: "Cancelar"
form:
Expand Down Expand Up @@ -251,7 +223,6 @@ admin_page:
breadcrumb: "Páginas"
actions:
create.link: "Nueva página"
import.link: "Importar página"
details.link: "Ver"
content.link: "Contenido"
preview.link: "Previsualizar"
Expand All @@ -267,7 +238,7 @@ admin_page:
status.label: "Estado"
publishedVersionContent.label: "Contenido publicado (distingue mayúsculas y minúsculas)"
empty:
create_first_content_raw: '<a href="%create_link%">Crea</a> o <a href="%import_link%">importa</a> tu primera página!'
create_first_content_raw: '<a href="%create_link%">Crea</a> tu primera página!'
can_not_create_content: "No puedes crear páginas"
go_to_doc_raw: 'Si necesitas ayuda visita la <a href="https://github.com/softspring/cms-bundle" target="_blank">documentación</a>'
clean_filters: 'No se han encontrado páginas con tu búsqueda, <a href="%url%">limpia los filtros</a> para ver todas las páginas'
Expand Down Expand Up @@ -323,13 +294,6 @@ admin_page:
success_unlocked_flash: "La versión se ha desbloqueado"
failed_flash: "Se ha producido un error al bloquear/desbloquear la versión<br/><small>%exception%</small>"

version_export:
failed_flash: "Se ha producido un error al exportar la versión<br/><small>%exception%</small>"

version_import:
success_flash: "La versión se ha importado"
failed_flash: "Se ha producido un error al importar la versión<br/><small>%exception%</small>"

version_cleanup:
success_flash: "Se ha realizado la limpieza de versiones correctamente"

Expand Down Expand Up @@ -396,7 +360,6 @@ admin_page:
main_warnings_raw: '<p>¿Estás seguro de eliminar esta versión v%versionNumber%?</p><p>Esta acción no se podrá deshacer.</p>'
offer_backup: 'Si quieres puedes hacer un backup de la versión antes de eliminarla'
actions:
export.button: "Exportar"
delete.button: "Eliminar definitivamente"
cancel.button: "Cancelar"
success_flash: "La versión se ha eliminado"
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
},
"suggest": {
"softspring/cms-blog-plugin": "Provides a blog for the CMS",
"softspring/cms-data-plugin": "Import/export and fixtures features are now in this plugin. Provides features for the CMS",
"softspring/cms-module-coolection": "Provides a module collection for the CMS",
"softspring/cms-sections-plugin": "Provides editable sections for the CMS",
"softspring/cms-sylius-bundle": "Provides a Sylius integration for the CMS",
Expand Down
20 changes: 1 addition & 19 deletions config/routing/admin_content_type.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@ create:
controller: sfs_cms.admin.content.controller::create
path: /create

import:
controller: sfs_cms.admin.content.controller::create
path: /import
defaults:
configKey: 'import'

details:
controller: sfs_cms.admin.content.controller::read
path: /{content}
path: /{content}/details

update:
controller: sfs_cms.admin.content.controller::update
Expand Down Expand Up @@ -110,24 +104,12 @@ publish_version:
defaults:
configKey: 'version_publish'

export_version:
controller: sfs_cms.admin.content_version.controller::apply
path: /{content}/{version}/export
defaults:
configKey: 'version_export'

version_info:
controller: sfs_cms.admin.content_version.controller::update
path: /{content}/{version}/info
defaults:
configKey: 'version_info'

import_version:
controller: sfs_cms.admin.content_version.controller::create
path: /{content}/import
defaults:
configKey: 'version_import'

cleanup_versions:
controller: sfs_cms.admin.content_version.controller::apply
path: /{content}/versions-cleanup
Expand Down
14 changes: 1 addition & 13 deletions config/services/controller/admin_content.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@ services:
form_invalid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_CREATE_FORM_INVALID
view_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_CREATE_VIEW
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_CREATE_EXCEPTION
import:
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_INITIALIZE
create_entity_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_ENTITY
form_prepare_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_FORM_PREPARE
form_init_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_FORM_INIT
form_valid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_FORM_VALID
apply_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_APPLY
success_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_SUCCESS
failure_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_FAILURE
form_invalid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_FORM_INVALID
view_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_VIEW
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_IMPORT_EXCEPTION
read:
param_converter_key: 'id'
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_READ_INITIALIZE
Expand Down Expand Up @@ -143,4 +131,4 @@ services:
not_found_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_DIFF_NOT_FOUND
found_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_DIFF_FOUND
view_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_DIFF_VIEW
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_DIFF_EXCEPTION
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENTS_DIFF_EXCEPTION
22 changes: 0 additions & 22 deletions config/services/controller/admin_content_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,6 @@ services:
form_invalid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_CREATE_FORM_INVALID
view_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_CREATE_VIEW
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_CREATE_EXCEPTION
version_import:
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_INITIALIZE
create_entity_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_ENTITY
form_prepare_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_FORM_PREPARE
form_init_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_FORM_INIT
form_valid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_FORM_VALID
apply_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_APPLY
success_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_SUCCESS
failure_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_FAILURE
form_invalid_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_FORM_INVALID
view_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_VIEW
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_IMPORT_EXCEPTION
version_preview:
param_converter_key: 'id'
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_PREVIEW_INITIALIZE
Expand Down Expand Up @@ -83,16 +71,6 @@ services:
success_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_PUBLISH_SUCCESS
failure_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_PUBLISH_FAILURE
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_PUBLISH_EXCEPTION
version_export:
param_converter_key: 'id'
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_INITIALIZE
load_entity_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_LOAD_ENTITY
not_found_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_NOT_FOUND
found_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_FOUND
apply_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_APPLY
success_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_SUCCESS
failure_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_FAILURE
exception_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_EXPORT_EXCEPTION
version_list:
initialize_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_LIST_INITIALIZE
filter_form_prepare_event_name: !php/const Softspring\CmsBundle\SfsCmsEvents::ADMIN_CONTENT_VERSIONS_LIST_FILTER_FORM_PREPARE
Expand Down
14 changes: 0 additions & 14 deletions config/services/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ services:
$esi: '@?esi'
$siteConfig: '%sfs_cms.site_config%'
$profiler: '@?profiler'
$entityTransformers: !tagged_iterator { tag: sfs_cms.data.entity_transformer, default_priority_method: getPriority }
$fieldTransformers: !tagged_iterator { tag: sfs_cms.data.field_transformer, default_priority_method: getPriority }
$cmsLogger: '@?monolog.logger.cms'
$debug: '%kernel.debug%'
$defaultRestrictPatterns: '%sfs_cms.form_type.symfony_route.default_restrict_patterns%'
Expand All @@ -27,7 +25,6 @@ services:
$contentCacheType: '%sfs_cms.content.cache.type%'
$menuCacheType: '%sfs_cms.menu.cache.type%'
$blockCacheType: '%sfs_cms.block.cache.type%'
$mediaStoragePath: '%sfs_media.storage.filesystem.path%'
$compiledDataExpirationTtl: '%sfs_cms.compiled.expiration_ttl%'
$contentRecompileEnabled: '%sfs_cms.content.recompile_enabled%'
$registeredPlugins: '%sfs_cms.registered_plugins%'
Expand All @@ -49,14 +46,6 @@ services:
resource: '../../src/Controller/*'
tags: [ 'controller.service_arguments' ]

Softspring\CmsBundle\DataFixtures\:
resource: '../../src/DataFixtures/*'
tags: [ 'doctrine.fixtures.loader' ]

Softspring\CmsBundle\DataFixtures\Purger\CmsPurgerFactory:
tags:
- { name: 'doctrine.fixtures.purger_factory', alias: 'cms_purge' }

Softspring\CmsBundle\Form\Admin\:
resource: '../../src/Form/Admin/*'
tags: [ 'form.type' ]
Expand All @@ -77,9 +66,6 @@ services:

Softspring\CmsBundle\EventListener\ErrorPageListener: ~

Softspring\CmsBundle\Data\:
resource: '../../src/Data/*'

Softspring\CmsBundle\Helper\:
resource: '../../src/Helper/*'

Expand Down
3 changes: 0 additions & 3 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ parameters:
message: "#Class Softspring\\\\CmsBundle\\\\DataCollector\\\\TwigDataCollector extends @final class Symfony\\\\Bridge\\\\Twig\\\\DataCollector\\\\TwigDataCollector.#"
count: 1
path: src/DataCollector/TwigDataCollector.php
-
message: "##"
path: src/DataFixtures/Purger/CmsPurger.php
-
message: "#Function twig_template_from_string not found.#"
reportUnmatched: false
Expand Down
Loading
Loading