Skip to content

Commit 38efd2f

Browse files
ywarnierywarnier
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents b7cb250 + 253a2de commit 38efd2f

File tree

6 files changed

+40
-27
lines changed

6 files changed

+40
-27
lines changed

‎app/Resources/public/css/base.css‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10124,7 +10124,6 @@ ul.dropdown-menu.inner > li > a {
1012410124
.summary-course .list-info .text-color{
1012510125
color: #0A649F;
1012610126
}
10127-
<<<<<<< HEAD
1012810127
.question-result h3{
1012910128
margin-top: 0;
1013010129
margin-bottom: 10px;
@@ -10143,9 +10142,19 @@ ul.dropdown-menu.inner > li > a {
1014310142
display: inline-block;
1014410143
font-weight: bold;
1014510144
}
10146-
=======
10147-
10148-
>>>>>>> 23bad83a744482179b36bc14365ed0c1bef45a2c
10145+
.badge-username{
10146+
font-weight: bold;
10147+
}
10148+
.badge-item{
10149+
padding-top: 10px;
10150+
padding-bottom: 10px;
10151+
}
10152+
.badge-item .msg{
10153+
border: 1px solid #cdcdcd;
10154+
padding: 10px;
10155+
border-radius: 5px;
10156+
background-color: #f3f3f3;
10157+
}
1014910158
@media (min-width: 768px) {
1015010159
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
1015110160
clear: left;

‎main/auth/courses_categories.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,9 @@ class="btn btn-default panel_popover"
380380
$name = $value['firstname'].' '.$value['lastname'];
381381
$html .= '<div class="popover-teacher">';
382382
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
383-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
383+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
384384
$html .= '<div class="teachers-details"><h5>
385-
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
385+
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">'
386386
.$name.'</a></h5></div>';
387387
$html .= '</div>';
388388
}
@@ -392,10 +392,10 @@ class="btn btn-default panel_popover"
392392
$name = $value['firstname'].' '.$value['lastname'];
393393
if ($length > 2) {
394394
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
395-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
395+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
396396
} else {
397397
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
398-
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
398+
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
399399
$html .= '<div class="teachers-details"><h5>
400400
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
401401
.$name.'</a></h5><p>'.get_lang('Teacher').'</p></div>';

‎main/inc/lib/userportal.lib.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,12 +1046,15 @@ public function return_course_block()
10461046
}
10471047

10481048
// Sort courses
1049-
$items[] = [
1050-
'class' => 'order-course',
1051-
'icon' => Display::return_icon('order-course.png', get_lang('SortMyCourses')),
1052-
'link' => api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses',
1053-
'title' => get_lang('SortMyCourses'),
1054-
];
1049+
if(api_get_configuration_value('view_grid_courses') != true ) {
1050+
$items[] = [
1051+
'class' => 'order-course',
1052+
'icon' => Display::return_icon('order-course.png', get_lang('SortMyCourses')),
1053+
'link' => api_get_path(WEB_CODE_PATH) . 'auth/courses.php?action=sortmycourses',
1054+
'title' => get_lang('SortMyCourses'),
1055+
];
1056+
}
1057+
10551058

10561059
// Session history
10571060
if (isset($_GET['history']) && intval($_GET['history']) == 1) {

‎main/template/default/skill/issued.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{% endif %}
5252
</div>
5353
<div class="col-md-7">
54-
<h3>{{ 'RecipientDetails'|get_lang }}</h3>
54+
<h5>{{ 'RecipientDetails'|get_lang }}</h5>
5555
<p class="lead">{{ issue_info.user_complete_name }}</p>
5656
<h4>{{ 'SkillAcquiredAt'|get_lang }}</h4>
5757
<ul class="fa-ul">

‎main/template/default/skill/issued_all.tpl‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,22 @@
5252
{% endif %}
5353
</div>
5454
<div class="col-md-7">
55-
<h3>{{ 'RecipientDetails'|get_lang }}</h3>
55+
<h5>{{ 'RecipientDetails'|get_lang }}</h5>
5656
<p class="lead">{{ badge.issue_info.user_complete_name }}</p>
57-
<h4>{{ 'SkillAcquiredAt'|get_lang }}</h4>
57+
<h4 class="bage-username">{{ 'SkillAcquiredAt'|get_lang }}</h4>
5858
<ul class="fa-ul">
59-
<li>
59+
<li class="badge-item">
6060
{% if badge.issue_info.source_name %}
61-
<em class="fa-li fa fa-clock-o fa-fw"></em> {{ 'TimeXThroughCourseY'|get_lang|format(badge.issue_info.datetime, badge.issue_info.source_name) }}
61+
<em class="fa fa-clock-o fa-fw"></em> {{ 'TimeXThroughCourseY'|get_lang|format(badge.issue_info.datetime, badge.issue_info.source_name) }}
6262
{% else %}
63-
<em class="fa-li fa fa-clock-o fa-fw"></em> {{ badge.issue_info.datetime }}
63+
<em class="fa fa-clock-o fa-fw"></em> {{ badge.issue_info.datetime }}
6464
{% endif %}
6565
{% if badge.issue_info.argumentation %}
6666
{% if badge.issue_info.argumentation %}
67-
<b><p style="font-style: italic;">{{ 'UserXIndicated'|get_lang|format(badge.issue_info.argumentation_author_name) }} </p></b>
67+
<br>
68+
<p>{{ 'UserXIndicated'|get_lang|format(badge.issue_info.argumentation_author_name) }} </p>
6869
{% endif %}
69-
<p>{{ badge.issue_info.argumentation }}</p>
70+
<p class="msg">{{ badge.issue_info.argumentation }}</p>
7071
{% endif %}
7172
</li>
7273
</ul>

‎main/template/default/user_portal/grid_courses_without_category.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
{% for teacher in item.teachers %}
5959
<div class="popover-teacher">
6060
<a href="{{ teacher.url }}" class="ajax"
61-
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
62-
<img src="{{ teacher.avatar }}"/>
61+
data-title="{{ teacher.firstname }} {{ teacher.lastname }}" >
62+
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
6363
</a>
6464
<div class="teachers-details">
6565
<h5>
@@ -76,8 +76,8 @@
7676
{% for teacher in item.teachers %}
7777
{% if item.teachers | length <= 2 %}
7878
<a href="{{ teacher.url }}" class="ajax"
79-
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
80-
<img src="{{ teacher.avatar }}"/>
79+
data-title="{{ teacher.firstname }} {{ teacher.lastname }}" title="{{ teacher.firstname }} {{ teacher.lastname }}">
80+
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
8181
</a>
8282
<div class="teachers-details">
8383
<h5>
@@ -91,7 +91,7 @@
9191
{% elseif item.teachers | length <= 6 %}
9292
<a href="{{ teacher.url }}" class="ajax"
9393
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
94-
<img src="{{ teacher.avatar }}"/>
94+
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
9595
</a>
9696
{% endif %}
9797
{% endfor %}

0 commit comments

Comments
 (0)