Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

app/Resources/public/css/base.css

@@ -9458,4 +9458,30 @@ ul.dropdown-menu.inner > li > a {
     margin: 16px 6px;
 }
 
-/* end document mp3 preview */
+/* end document mp3 preview */
+
+/* Fix grid with one row and multiples columns. Works for .col-sm-6.col-md-4.col-lg-3 */
+.row.clear-rows-6-4-3 {
+}
+@media (min-width: 768px) {
+    .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
+        clear: left;
+    }
+}
+@media (min-width: 992px) {
+    .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
+        clear: none;
+    }
+    .clear-rows-6-4-3 .col-sm-6:nth-child(3n+1) {
+        clear: left;
+    }
+}
+@media (min-width: 1200px) {
+    .clear-rows-6-4-3 .col-sm-6:nth-child(3n+1) {
+        clear: none;
+    }
+    .clear-rows-6-4-3 .col-sm-6:nth-child(4n+1) {
+        clear: left;
+    }
+}
+/*-------------------------------------------------------------------------------------*/

app/Resources/public/css/editor.css

@@ -263,6 +263,11 @@ blockquote p {
     vertical-align: text-bottom;
 }
 
+.text-center .img-responsive {
+    margin-left: auto;
+    margin-right: auto;
+}
+
 @media (max-width: 767px) {
     .img-responsive {
         display: block;

main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js

@@ -580,7 +580,8 @@
 					}
 
 					// Finally set display for figure.
-					if ( !alignClasses && el.is( 'figure' ) ) {
+					// if ( !alignClasses && el.is( 'figure' ) ) {
+					if ( el.is( 'figure' ) ) { // Force set display inline-block for figure regardless class
 						if ( newValue == 'center' )
 							el.setStyle( 'display', 'inline-block' );
 						else

main/inc/lib/template.lib.php

@@ -175,6 +175,10 @@ class Template
                 'name' => 'get_template',
                 'callable' => 'Template::findTemplateFilePath',
             ],
+            [
+                'name' => 'date_to_time_ago',
+                'callable' => 'Display::dateToStringAgoAndLongDate',
+            ],
         ];
 
         foreach ($filters as $filter) {

main/template/default/portfolio/items.html.twig

@@ -55,10 +55,10 @@
                     </div>
                 </div>
                 <div class="panel-footer">
-                    {{ 'CreationDate'|get_lang ~ ': ' ~ item.creationDate|api_convert_and_format_date(6) }}
+                    {{ 'CreationDate'|get_lang ~ ': ' ~ item.creationDate|date_to_time_ago }}
                     {% if item.creationDate != item.updateDate %}
                         &centerdot;
-                        {{ 'UpdateDate'|get_lang ~ ': ' ~ item.updateDate|api_convert_and_format_date(6) }}
+                        {{ 'UpdateDate'|get_lang ~ ': ' ~ item.updateDate|date_to_time_ago }}
                     {% endif %}
                 </div>
             </div>

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php

@@ -181,7 +181,7 @@ class Basic extends Toolbar
 
         $config['image2_chamilo_alignClasses'] = [
             'pull-left',
-            'block-center',
+            'text-center',
             'pull-right',
             'img-va-baseline',
             'img-va-top',