pull/3173/head
Alex Aragón 7 years ago
parent 0b58bbe52c
commit 94b6743da0
  1. 14
      app/Resources/public/css/base.css
  2. 8
      main/auth/courses_categories.php
  3. 15
      main/inc/lib/userportal.lib.php
  4. 2
      main/template/default/skill/issued.tpl
  5. 15
      main/template/default/skill/issued_all.tpl
  6. 10
      main/template/default/user_portal/grid_courses_without_category.tpl

@ -10142,7 +10142,19 @@ ul.dropdown-menu.inner > li > a {
display: inline-block;
font-weight: bold;
}
.badge-username{
font-weight: bold;
}
.badge-item{
padding-top: 10px;
padding-bottom: 10px;
}
.badge-item .msg{
border: 1px solid #cdcdcd;
padding: 10px;
border-radius: 5px;
background-color: #f3f3f3;
}
@media (min-width: 768px) {
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
clear: left;

@ -380,9 +380,9 @@ function return_teacher($courseInfo)
$name = $value['firstname'].' '.$value['lastname'];
$html .= '<div class="popover-teacher">';
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
$html .= '<div class="teachers-details"><h5>
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">'
.$name.'</a></h5></div>';
$html .= '</div>';
}
@ -392,10 +392,10 @@ function return_teacher($courseInfo)
$name = $value['firstname'].' '.$value['lastname'];
if ($length > 2) {
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
} else {
$html .= '<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'" title="'.$name.'">
<img src="'.$value['avatar'].'" alt="'.get_lang('UserPicture').'"/></a>';
<img src="'.$value['avatar'].'" title="'.$name.'" alt="'.get_lang('UserPicture').'"/></a>';
$html .= '<div class="teachers-details"><h5>
<a href="'.$value['url'].'" class="ajax" data-title="'.$name.'">'
.$name.'</a></h5><p>'.get_lang('Teacher').'</p></div>';

@ -1046,12 +1046,15 @@ class IndexManager
}
// Sort courses
$items[] = [
'class' => 'order-course',
'icon' => Display::return_icon('order-course.png', get_lang('SortMyCourses')),
'link' => api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses',
'title' => get_lang('SortMyCourses'),
];
if(api_get_configuration_value('view_grid_courses') != true ) {
$items[] = [
'class' => 'order-course',
'icon' => Display::return_icon('order-course.png', get_lang('SortMyCourses')),
'link' => api_get_path(WEB_CODE_PATH) . 'auth/courses.php?action=sortmycourses',
'title' => get_lang('SortMyCourses'),
];
}
// Session history
if (isset($_GET['history']) && intval($_GET['history']) == 1) {

@ -51,7 +51,7 @@
{% endif %}
</div>
<div class="col-md-7">
<h3>{{ 'RecipientDetails'|get_lang }}</h3>
<h5>{{ 'RecipientDetails'|get_lang }}</h5>
<p class="lead">{{ issue_info.user_complete_name }}</p>
<h4>{{ 'SkillAcquiredAt'|get_lang }}</h4>
<ul class="fa-ul">

@ -52,21 +52,22 @@
{% endif %}
</div>
<div class="col-md-7">
<h3>{{ 'RecipientDetails'|get_lang }}</h3>
<h5>{{ 'RecipientDetails'|get_lang }}</h5>
<p class="lead">{{ badge.issue_info.user_complete_name }}</p>
<h4>{{ 'SkillAcquiredAt'|get_lang }}</h4>
<h4 class="bage-username">{{ 'SkillAcquiredAt'|get_lang }}</h4>
<ul class="fa-ul">
<li>
<li class="badge-item">
{% if badge.issue_info.source_name %}
<em class="fa-li fa fa-clock-o fa-fw"></em> {{ 'TimeXThroughCourseY'|get_lang|format(badge.issue_info.datetime, badge.issue_info.source_name) }}
<em class="fa fa-clock-o fa-fw"></em> {{ 'TimeXThroughCourseY'|get_lang|format(badge.issue_info.datetime, badge.issue_info.source_name) }}
{% else %}
<em class="fa-li fa fa-clock-o fa-fw"></em> {{ badge.issue_info.datetime }}
<em class="fa fa-clock-o fa-fw"></em> {{ badge.issue_info.datetime }}
{% endif %}
{% if badge.issue_info.argumentation %}
{% if badge.issue_info.argumentation %}
<b><p style="font-style: italic;">{{ 'UserXIndicated'|get_lang|format(badge.issue_info.argumentation_author_name) }} </p></b>
<br>
<p>{{ 'UserXIndicated'|get_lang|format(badge.issue_info.argumentation_author_name) }} </p>
{% endif %}
<p>{{ badge.issue_info.argumentation }}</p>
<p class="msg">{{ badge.issue_info.argumentation }}</p>
{% endif %}
</li>
</ul>

@ -58,8 +58,8 @@
{% for teacher in item.teachers %}
<div class="popover-teacher">
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img src="{{ teacher.avatar }}"/>
data-title="{{ teacher.firstname }} {{ teacher.lastname }}" >
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
</a>
<div class="teachers-details">
<h5>
@ -76,8 +76,8 @@
{% for teacher in item.teachers %}
{% if item.teachers | length <= 2 %}
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img src="{{ teacher.avatar }}"/>
data-title="{{ teacher.firstname }} {{ teacher.lastname }}" title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
</a>
<div class="teachers-details">
<h5>
@ -91,7 +91,7 @@
{% elseif item.teachers | length <= 6 %}
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img src="{{ teacher.avatar }}"/>
<img title="{{ teacher.firstname }} {{ teacher.lastname }}" src="{{ teacher.avatar }}"/>
</a>
{% endif %}
{% endfor %}

Loading…
Cancel
Save