From c804eb87ca70aaf5d2b9a6806ff0a1d7ec244abc Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 8 Jan 2018 11:30:10 +0100 Subject: [PATCH] Update --- .yamllint_config | 2 +- config/packages/ivory_ck_editor.yaml | 4 +- config/packages/sonata_media.yaml | 16 ++-- config/packages/sonata_page.yaml | 96 +++++++++++------------ src/CoreBundle/Resources/config/admin.yml | 18 ++--- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.yamllint_config b/.yamllint_config index ff27562296..807d7796b2 100644 --- a/.yamllint_config +++ b/.yamllint_config @@ -7,4 +7,4 @@ ignore: | extends: default rules: line-length: - max: 400 \ No newline at end of file + max: 500 \ No newline at end of file diff --git a/config/packages/ivory_ck_editor.yaml b/config/packages/ivory_ck_editor.yaml index d026135fd4..0d7812c5cc 100644 --- a/config/packages/ivory_ck_editor.yaml +++ b/config/packages/ivory_ck_editor.yaml @@ -10,8 +10,8 @@ ivory_ck_editor: default: # default toolbar plus Format button toolbar: - - [Bold, Italic, Underline, -, Cut, Copy, Paste, PasteText, PasteFromWord, -, Undo, Redo, -, NumberedList, BulletedList, -, Outdent, Indent, -, Blockquote, -, Image, Link, Unlink, Table] - - [Format, Maximize, Source] + - [Bold, Italic, Underline, -, Cut, Copy, Paste, PasteText, PasteFromWord, -, Undo, Redo, -, NumberedList, BulletedList, -, Outdent, Indent, -, Blockquote, -, Image, Link, Unlink, Table] + - [Format, Maximize, Source] filebrowserBrowseRoute: admin_chamilo_media_media_ckeditor_browser filebrowserImageBrowseRoute: admin_chamilo_media_media_ckeditor_browser diff --git a/config/packages/sonata_media.yaml b/config/packages/sonata_media.yaml index b66ef11099..a5c6ce1548 100644 --- a/config/packages/sonata_media.yaml +++ b/config/packages/sonata_media.yaml @@ -18,7 +18,7 @@ sonata_media: - sonata.media.provider.vimeo formats: small: {width: 100, quality: 100} - big: {width: 970 , quality: 100} + big: {width: 970, quality: 100} course: providers: - sonata.media.provider.dailymotion @@ -27,8 +27,8 @@ sonata_media: - sonata.media.provider.file - sonata.media.provider.vimeo formats: - small: {width: 100, quality: 100} - big: {width: 970 , quality: 100} + small: {width: 100, quality: 100} + big: {width: 970, quality: 100} news: providers: - sonata.media.provider.dailymotion @@ -41,24 +41,24 @@ sonata_media: sonata_collection: providers: - - sonata.media.provider.image + - sonata.media.provider.image formats: preview: {width: 100, quality: 100} wide: {width: 820, quality: 100} sonata_category: providers: - - sonata.media.provider.image + - sonata.media.provider.image formats: preview: {width: 100, quality: 100} wide: {width: 820, quality: 100} user: providers: - - sonata.media.provider.image + - sonata.media.provider.image formats: small: {width: 100, quality: 100} - big: {width: 970 , quality: 100} + big: {width: 970, quality: 100} cdn: # define the public base url for the uploaded media server: @@ -74,7 +74,7 @@ sonata_media: # the resizer must be set to false, otherwhise this can delete icon files from the fs resizer: false image: - thumbnail: sonata.media.thumbnail.format # default value + thumbnail: sonata.media.thumbnail.format # default value # thumbnail: sonata.media.thumbnail.consumer.format # can be used to dispatch the resize action to async task # thumbnail: sonata.media.thumbnail.liip_imagine # use the LiipImagineBundle to resize the image vimeo: diff --git a/config/packages/sonata_page.yaml b/config/packages/sonata_page.yaml index 45300699fe..9161f69277 100644 --- a/config/packages/sonata_page.yaml +++ b/config/packages/sonata_page.yaml @@ -76,7 +76,7 @@ sonata_page: - chamilo_core_user_user_mycourses - chamilo_page_page_getlatestpages cache_invalidation: - service: sonata.page.cache.invalidation.simple + service: sonata.page.cache.invalidation.simple recorder: sonata.page.cache.recorder # classes: # "Chamilo\PageBundle\Entity\Block": getId @@ -93,60 +93,60 @@ sonata_page: # path: '::layout.html.twig' name: 'default' containers: - header: - name: Header - content_top: - name: Top content - content: - name: Main content - content_bottom: - name: Bottom content - footer: - name: Footer + header: + name: Header + content_top: + name: Top content + content: + name: Main content + content_bottom: + name: Bottom content + footer: + name: Footer matrix: - layout: | - HHHHHHHH - TTTTTTTT - CCCCCCCC - BBBBBBBB - FFFFFFFF - mapping: - H: header - T: content_top - C: content - B: content_bottom - F: footer + layout: | + HHHHHHHH + TTTTTTTT + CCCCCCCC + BBBBBBBB + FFFFFFFF + mapping: + H: header + T: content_top + C: content + B: content_bottom + F: footer 2columns: path: 'ChamiloPageBundle::demo_2columns_layout.html.twig' # path: '::layout.html.twig' name: '2 columns layout' containers: - header: - name: Header - content_top: - name: Top content - left_col: - name: Left content - rigth_col: - name: Right content - content_bottom: - name: Bottom content - footer: - name: Footer + header: + name: Header + content_top: + name: Top content + left_col: + name: Left content + rigth_col: + name: Right content + content_bottom: + name: Bottom content + footer: + name: Footer matrix: - layout: | - HHHHHHHH - TTTTTTTT - LLLLRRRR - BBBBBBBB - FFFFFFFF - mapping: - H: header - T: content_top - L: left_col - R: rigth_col - B: content_bottom - F: footer + layout: | + HHHHHHHH + TTTTTTTT + LLLLRRRR + BBBBBBBB + FFFFFFFF + mapping: + H: header + T: content_top + L: left_col + R: rigth_col + B: content_bottom + F: footer page_defaults: homepage: {decorate: false, enabled: true} home: {decorate: false, enabled: true} diff --git a/src/CoreBundle/Resources/config/admin.yml b/src/CoreBundle/Resources/config/admin.yml index 1bde905d8e..47e874e1be 100644 --- a/src/CoreBundle/Resources/config/admin.yml +++ b/src/CoreBundle/Resources/config/admin.yml @@ -55,15 +55,15 @@ services: - [setTranslationDomain, [ChamiloCoreBundle]] sonata.admin.session_rel_user: - class: Chamilo\CoreBundle\Admin\SessionRelUserAdmin - tags: - - {name: sonata.admin, manager_type: orm, group: "LMS", label: "SessionRelUserAdmin"} - arguments: - - ~ - - Chamilo\CoreBundle\Entity\SessionRelUser - - ~ - calls: - - [setTranslationDomain, [ChamiloCoreBundle]] + class: Chamilo\CoreBundle\Admin\SessionRelUserAdmin + tags: + - {name: sonata.admin, manager_type: orm, group: "LMS", label: "SessionRelUserAdmin"} + arguments: + - ~ + - Chamilo\CoreBundle\Entity\SessionRelUser + - ~ + calls: + - [setTranslationDomain, [ChamiloCoreBundle]] sonata.admin.access_url: class: Chamilo\CoreBundle\Admin\AccessUrlAdmin