Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

src/CoreBundle/Resources/views/Portfolio/comment_context.html.twig

@@ -1,16 +1,16 @@
-<div class="row">
-    <div class="col-sm-10 col-sm-offset-1">
+<div class="grid md:grid-cols-12 gap-4">
+    <div class="sm:col-span-10 sm:col-start-2">
         <h4>{{ 'ContextForCommentToBeGrade'|get_lang }}</h4>
 
         <strong>{{ 'PortfolioItemTitleXName'|get_lang|format(item.title) }}</strong>
 
         <p>{{ item.excerpt }}</p>
 
-        <div class="row">
+        <div class="grid md:grid-cols-12 gap-4">
             {% for node in comments_path %}
                 {% if loop.index != comments_path|length %}
-                    <div class="col-sm-{{ 12 - node.lvl }} col-sm-offset-{{ node.lvl }}">
-                        <strong>{{ 'PortfolioCommentFromXUser'|get_lang|format(node.author.completeName) }}</strong>
+                    <div class="sm:col-span-{{ 12 - node.lvl }} sm:col-start-{{ node.lvl + 1 }}">
+                        <strong>{{ 'Comment by %s'|get_lang|format(node.creator.fullName) }}</strong>
                         {{ node.content }}
                     </div>
                 {% endif %}

src/CoreBundle/Resources/views/Portfolio/list.html.twig

@@ -71,7 +71,7 @@
                         <article>
                             <footer class="fa-lg">
                                 <p>
-                                    {{ 'Comment by %s in %s'|get_lang|format(comment.author.completeName, commentItem.title) }}
+                                    {{ 'Comment by %s in %s'|get_lang|format(comment.resourceNode.creator.fullName, commentItem.title) }}
                                 </p>
                                 <p class="text-muted">
                                     <span class="fa fa-clock-o fa-fw" aria-hidden="true"></span>