From 2d55481225f084e36be6ec709473d0aa46de90e3 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 17 Dec 2018 11:35:31 +0100 Subject: [PATCH] Minor - Format code, update docs, update tpls, remove comment --- CONTRIBUTING.md | 2 +- main/admin/settings.lib.php | 1 - .../Resources/views/FlashMessage/render.html.twig | 12 +++++++----- .../Resources/views/News/slider.html.twig | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5e347a6009..594e6a1ff8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ root@docker$ cd /var/www root@docker$ rm -rf html root@docker$ git clone --single-branch -b 1.10.0-beta https://github.com/chamilo/chamilo-lms.git html root@docker$ cd html -root@docker$ chmod -R 0777 app/ vendor/ main/lang/ main/default_course_document/images/ web/ +root@docker$ chmod -R 0777 var/ vendor/ main/lang/ public/ root@docker$ vim /etc/php5/apache2/php.ini ``` Look for timezone and modify it to the best timezone that suits you: diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 1c6d4cb302..b7fc5d74e9 100755 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -1096,7 +1096,6 @@ function searchImageFilter($image) function addEditTemplate() { $em = Database::getManager(); - // Initialize the object. $id = isset($_GET['id']) ? (int) $_GET['id'] : 0; /** @var SystemTemplate $template */ diff --git a/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig b/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig index 980e434c5c..effb561b70 100644 --- a/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig +++ b/src/ThemeBundle/Resources/views/FlashMessage/render.html.twig @@ -7,14 +7,16 @@ {% for type in sonata_flashmessages_types() %} {% set domain = domain is defined ? domain : null %} {% for message in sonata_flashmessages_get(type, domain) %} - {% if type != 'no_layout' %}
- + {{ message|raw }}
- {% else %} - {{ message|raw }} - {% endif %} {% endfor %} {% endfor %} diff --git a/src/ThemeBundle/Resources/views/News/slider.html.twig b/src/ThemeBundle/Resources/views/News/slider.html.twig index 3ac86d1126..7259af6cdc 100644 --- a/src/ThemeBundle/Resources/views/News/slider.html.twig +++ b/src/ThemeBundle/Resources/views/News/slider.html.twig @@ -9,7 +9,7 @@ {% endif %} {% endset %} {% set content %} - {{ macro.box_header("SystemAnnouncements" | trans, buttons) }} + {{ macro.box_header("System announcements" | trans, buttons) }}