Skip to content

Commit

Permalink
User Portal: Improve layout for course_student_info - refs BT#18622
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC committed Apr 9, 2021
1 parent b17b552 commit e3263b6
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 200 deletions.
26 changes: 13 additions & 13 deletions app/Resources/public/css/base.css
Expand Up @@ -6487,13 +6487,6 @@ div#chat-remote-video video {
border-bottom: 1px solid #ECF0F1;
}

.grid-courses .items .course-student-info {
background-color: #d9edf7;
border: 1px solid #bce8f1;
padding: 5px;
border-radius: 5px;
}

.grid-courses .items .code-title {
font-size: 10px;
font-weight: bold;
Expand Down Expand Up @@ -6529,12 +6522,19 @@ div#chat-remote-video video {
transition: box-shadow .3s ease, border .3s ease;
}

.grid-courses .items.my-courses .course-student-info {
font-size: 10px;
text-align: center;
background: none;
border: none;
padding: 0;
.grid-courses .items .course-student-info {
padding-bottom: 10px;
font-size: 11px;
}
.grid-courses .items .course-student-info hr {
margin: 15px 0 10px;
}
.grid-courses .items .course-student-info .progress {
margin-bottom: 10px;
}
.course-student-info .progress-bar {
line-height: 15px;
vertical-align: middle;
}

.grid-courses .items.my-courses .title {
Expand Down
@@ -1,4 +1,4 @@
{% import 'default/macro/macro.tpl' as display %}
{% import 'macro/macro.tpl'|get_template as display %}

{% if not categories is empty %}
<div class="classic-courses">
Expand Down Expand Up @@ -69,37 +69,8 @@
{% endfor %}
{% endif %}
</div>
{% if item.student_info %}
{% if item.student_info.progress is not null or item.student_info.score is not null or item.student_info.certificate is not null %}
{% set one_column = item.student_info.score is null and item.student_info.certificate is null %}
<div class="course-student-info">
<div class="student-info">
<div class="row">
<div class="{{ one_column ? 'col-xs-12' : 'col-xs-8' }}">
{{ 'CourseProgress'|get_lang }}
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="{{ item.student_info.progress }}"
aria-valuemin="0" aria-valuemax="100" style="width: {{ item.student_info.progress }}%;">
{{ 'XPercent'|get_lang|format(item.student_info.progress) }}
</div>
</div>
</div>
<div class="{{ one_column ? '' : 'col-xs-4' }}">
{% if item.student_info.score is not null %}
<div>{{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}</div>
{% endif %}
{% if item.student_info.certificate is not null %}
<div title="{{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}">
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ item.student_info.certificate }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}

{% include 'user_portal/course_student_info.tpl'|get_template with { 'student_info': item.student_info } %}
</div>
</div>
</div>
Expand Down
Expand Up @@ -71,37 +71,8 @@
{% endfor %}
{% endif %}
</div>
{% if item.student_info %}
{% if item.student_info.progress is not null or item.student_info.score is not null or item.student_info.certificate is not null %}
{% set one_column = item.student_info.score is null and item.student_info.certificate is null %}
<div class="course-student-info">
<div class="student-info">
<div class="row">
<div class="{{ one_column ? 'col-xs-12' : 'col-xs-8' }}">
{{ 'CourseProgress'|get_lang }}
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="{{ item.student_info.progress }}"
aria-valuemin="0" aria-valuemax="100" style="width: {{ item.student_info.progress }}%;">
{{ 'XPercent'|get_lang|format(item.student_info.progress) }}
</div>
</div>
</div>
<div class="{{ one_column ? '' : 'col-xs-4' }}">
{% if item.student_info.score is not null %}
<div>{{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}</div>
{% endif %}
{% if item.student_info.certificate is not null %}
<div>
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}

{% include 'user_portal/course_student_info.tpl'|get_template with { 'student_info': item.student_info } %}
</div>
<div class="category">
{{ item.category }}
Expand Down
32 changes: 1 addition & 31 deletions main/template/default/user_portal/classic_session.tpl
Expand Up @@ -139,37 +139,7 @@
{% endif %}
</div>

{% if item.student_info %}
{% if item.student_info.progress is not null or item.student_info.score is not null or item.student_info.certificate is not null %}
{% set one_column = item.student_info.score is null and item.student_info.certificate is null %}
<div class="course-student-info">
<div class="student-info">
<div class="row">
<div class="{{ one_column ? 'col-xs-12' : 'col-xs-8' }}">
{{ 'CourseProgress'|get_lang }}
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="{{ item.student_info.progress }}"
aria-valuemin="0" aria-valuemax="100" style="width: {{ item.student_info.progress }}%;">
{{ 'XPercent'|get_lang|format(item.student_info.progress) }}
</div>
</div>
</div>
<div class="{{ one_column ? '' : 'col-xs-4' }}">
{% if item.student_info.score is not null %}
<div>{{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}</div>
{% endif %}
{% if item.student_info.certificate is not null %}
<div>
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}
{% include 'user_portal/course_student_info.tpl'|get_template with { 'student_info': item.student_info } %}
</div>
</div>
</div>
Expand Down
35 changes: 35 additions & 0 deletions main/template/default/user_portal/course_student_info.tpl
@@ -0,0 +1,35 @@
{% if student_info %}
{% if not student_info.progress is null or not student_info.score is null or not student_info.certificate is null %}
{% set num_columns = (student_info.progress is null ? 0 : 1) + (student_info.score is null ? 0 : 1) + (student_info.certificate is null ? 0 : 1) %}
<div class="course-student-info">
<div class="student-info">
<hr>
<div class="row">
{% if not student_info.progress is null %}
<div class="{{ num_columns == 1 ? 'col-xs-12' : (num_columns == 2 ? 'col-xs-9' : 'col-xs-6') }}">
<strong>{{ 'CourseAdvance'|get_lang }}</strong>
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar"
aria-valuenow="{{ student_info.progress }}" aria-valuemin="0" aria-valuemax="100"
style="width: {{ student_info.progress }}%;">
{{ 'XPercentCompleted'|get_lang|format(student_info.progress) }}
</div>
</div>
</div>
{% endif %}
{% if not student_info.score is null %}
<div class="col-xs-3">
<div>{{ "StudentCourseScoreX" | get_lang | format(student_info.score) }}</div>
</div>
{% endif %}
{% if not student_info.certificate is null %}
<div class="col-xs-3">
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ "StudentCourseCertificateX" | get_lang | format(student_info.certificate) }}
</div>
{% endif %}
</div>
</div>
</div>
{% endif %}
{% endif %}
34 changes: 34 additions & 0 deletions main/template/default/user_portal/grid_course_student_info.tpl
@@ -0,0 +1,34 @@
{% if student_info %}
{% if not student_info.progress is null or not student_info.score is null or not student_info.certificate is null %}
{% set num_columns = (student_info.progress is null ? 0 : 1) + (student_info.score is null ? 0 : 1) + (student_info.certificate is null ? 0 : 1) %}
<div class="course-student-info">
<div class="student-info">
<hr>
{% if not student_info.progress is null %}
<strong>{{ 'CourseAdvance'|get_lang }}</strong>
<div class="progress">
<div class="progress-bar progress-bar-success" role="progressbar"
aria-valuenow="{{ student_info.progress }}" aria-valuemin="0" aria-valuemax="100"
style="width: {{ student_info.progress }}%;">
{{ 'XPercentCompleted'|get_lang|format(student_info.progress) }}
</div>
</div>
{% endif %}

<div class="row">
{% if not student_info.score is null %}
<div class="col-xs-6">
{{ "StudentCourseScoreX" | get_lang | format(student_info.score) }}
</div>
{% endif %}
{% if not student_info.certificate is null %}
<div class="col-xs-6 {% if num_columns >= 2 %}text-right{% endif %}">
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ "StudentCourseCertificateX" | get_lang | format(student_info.certificate) }}
</div>
{% endif %}
</div>
</div>
</div>
{% endif %}
{% endif %}
33 changes: 2 additions & 31 deletions main/template/default/user_portal/grid_courses_with_category.tpl
Expand Up @@ -106,37 +106,8 @@
{% if item.notifications %}
<div class="notifications">{{ item.notifications }}</div>
{% endif %}
{% if item.student_info %}
{% if item.student_info.progress is not null or item.student_info.score is not null or item.student_info.certificate is not null %}
{% set one_column = item.student_info.score is null and item.student_info.certificate is null %}
<div class="course-student-info">
<div class="student-info">
<div class="row">
<div class="{{ one_column ? 'col-xs-12' : 'col-xs-8' }}">
{{ 'CourseProgress'|get_lang }}
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="{{ item.student_info.progress }}"
aria-valuemin="0" aria-valuemax="100" style="width: {{ item.student_info.progress }}%;">
{{ 'XPercent'|get_lang|format(item.student_info.progress) }}
</div>
</div>
</div>
<div class="{{ one_column ? '' : 'col-xs-4' }}">
{% if item.student_info.score is not null %}
<div>{{ "StudentCourseScoreX" | get_lang | format(item.student_info.score) }}</div>
{% endif %}
{% if item.student_info.certificate is not null %}
<div title="{{ "StudentCourseCertificateX" | get_lang | format(item.student_info.certificate) }}">
<i class="fa fa-certificate text-warning" aria-hidden="true"></i>
{{ item.student_info.certificate }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}

{% include 'user_portal/grid_course_student_info.tpl'|get_template with { 'student_info':item.student_info } %}
</div>
</div>
</div>
Expand Down

0 comments on commit e3263b6

Please sign in to comment.