chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

grid fix student course list

Browse Source
pull/2487/head
Alex Aragon 9 years ago
parent b24321a231
commit e473bd26e3
4 changed files with 64 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      app/Resources/public/css/base.css
  2. 4
      main/auth/courses_categories.php
  3. 3
      main/inc/lib/course.lib.php
  4. 73
      main/template/default/user_portal/grid_courses_without_category.tpl

42
app/Resources/public/css/base.css
Unescape View File

@ -4796,13 +4796,23 @@ div#chat-remote-video video {
border-radius: 5px; border-radius: 5px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.grid-courses .items.my-courses{
min-height: 320px;
box-shadow: 2px 4px 15px 0 rgba(46,61,73,.1);
transition: box-shadow .3s ease , border .3s ease;
}
.grid-courses .items.my-courses .title{
font-size: 14px;
}
.grid-courses .items.items-courses{ .grid-courses .items.items-courses{
min-height: 425px; min-height: 425px;
width: 310px; width: 310px;
box-shadow: 2px 4px 15px 0 rgba(46,61,73,.1); box-shadow: 2px 4px 15px 0 rgba(46,61,73,.1);
transition: box-shadow .3s ease , border .3s ease; transition: box-shadow .3s ease , border .3s ease;
} }
.grid-courses .items.items-courses:hover{ .grid-courses .items.items-courses:hover,
.grid-courses .items.my-courses:hover,
.grid-courses .items.items-hotcourse:hover{
box-shadow: 4px 5px 20px 0 rgba(46,61,73,.15); box-shadow: 4px 5px 20px 0 rgba(46,61,73,.15);
transition: box-shadow .3s ease , border .3s ease; transition: box-shadow .3s ease , border .3s ease;
} }
@ -4811,10 +4821,6 @@ div#chat-remote-video video {
box-shadow: 2px 4px 15px 0 rgba(46,61,73,.1); box-shadow: 2px 4px 15px 0 rgba(46,61,73,.1);
transition: box-shadow .3s ease , border .3s ease; transition: box-shadow .3s ease , border .3s ease;
} }
.grid-courses .items.items-hotcourse:hover{
box-shadow: 4px 5px 20px 0 rgba(46,61,73,.15);
transition: box-shadow .3s ease , border .3s ease;
}
.grid-courses .items .block-title{ .grid-courses .items .block-title{
margin: 15px 10px 10px 10px; margin: 15px 10px 10px 10px;
} }
@ -4860,32 +4866,18 @@ div#chat-remote-video video {
font-size: 10px; font-size: 10px;
margin: 10px; margin: 10px;
} }
.grid-courses .items .image .black-shadow{
top: 0px;
left: 0px;
width: 100%;
height: 100%;
padding-top: 40px;
opacity: 0;
box-sizing: border-box;
position: absolute;
background: rgba(0, 0, 0, 0.7) none repeat scroll 0% 0%;
padding: 10px;
}
.grid-courses .items .image .hovered-course{
opacity: 1;
transition: all 0.3s ease 0s;
}
.grid-courses .items .notifications{ .grid-courses .items .notifications{
padding-top: 5px; padding-top: 5px;
text-align: center; text-align: center;
} }
.grid-courses .items .admin-actions, .grid-courses .items .user-actions{ .grid-courses .items .admin-actions,
.grid-courses .items .user-actions{
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
} }
.grid-courses .items .admin-actions .btn-sm,.grid-courses .items .user-actions .btn-sm{ .grid-courses .items .admin-actions .btn-sm,
.grid-courses .items .user-actions .btn-sm{
border-radius: 0; border-radius: 0;
border: none; border: none;
} }
@ -4945,7 +4937,6 @@ div#chat-remote-video video {
.grid-courses .items .author-card .teachers-details h5 a{ .grid-courses .items .author-card .teachers-details h5 a{
color: #fff; color: #fff;
} }
/*---- */ /*---- */
.grid-courses .items .block-author{ .grid-courses .items .block-author{
display: flex; display: flex;
@ -6337,6 +6328,9 @@ ul#toolnavbox-two li a.btn{
.navbar-nav{ .navbar-nav{
margin: -2.5px -15px; margin: -2.5px -15px;
} }
.grid-courses .items.my-courses{
width: 310px;
}
} }
@media (min-width:320px) and (max-width: 479px){ @media (min-width:320px) and (max-width: 479px){
footer { footer {

4
main/auth/courses_categories.php
Unescape View File

@ -221,7 +221,7 @@ if ($showCourses && $action != 'display_sessions') {
$html .= '<div class="right">'; $html .= '<div class="right">';
$html .= '<div class="btn-group">'; $html .= '<div class="btn-group">';
// if user registered as student // if user registered as student
if ($user_registerd_in_course_as_student) { if ($userRegisterdInCourse) {
$html .= return_already_registered_label('student'); $html .= return_already_registered_label('student');
if (!$course_closed) { if (!$course_closed) {
@ -229,7 +229,7 @@ if ($showCourses && $action != 'display_sessions') {
$html .= return_unregister_button($course, $stok, $search_term, $code); $html .= return_unregister_button($course, $stok, $search_term, $code);
} }
} }
} elseif ($user_registerd_in_course_as_teacher) { } elseif ($userRegisterdInCourseAsTeacher) {
// if user registered as teacher // if user registered as teacher
if ($course_unsubscribe_allowed) { if ($course_unsubscribe_allowed) {
$html .= return_unregister_button($course, $stok, $search_term, $code); $html .= return_unregister_button($course, $stok, $search_term, $code);

3
main/inc/lib/course.lib.php
Unescape View File

@ -3673,7 +3673,7 @@ class CourseManager
if ($coursesNotCategory) { if ($coursesNotCategory) {
$listItems['not_category'] = $coursesNotCategory; $listItems['not_category'] = $coursesNotCategory;
} }
return $listItems; return $listItems;
} }
@ -3818,6 +3818,7 @@ class CourseManager
$params['thumbnails'] = $thumbnails; $params['thumbnails'] = $thumbnails;
$params['image'] = $image; $params['image'] = $image;
$params['title'] = $course_info['title']; $params['title'] = $course_info['title'];
$params['title_cut'] = cut($course_info['title'],45);
$params['category'] = $course_info['categoryName']; $params['category'] = $course_info['categoryName'];
$params['teachers'] = $teachers; $params['teachers'] = $teachers;

73
main/template/default/user_portal/grid_courses_without_category.tpl
Unescape View File

@ -3,38 +3,23 @@
<div class="row"> <div class="row">
{% for item in courses %} {% for item in courses %}
<div class="col-xs-12 col-sm-6 col-md-4"> <div class="col-xs-12 col-sm-6 col-md-4">
<div class="items"> <div class="items my-courses">
<div class="image"> <div class="image">
{% if item.is_special_course %} {% if item.is_special_course %}
<div class="pin">{{ item.icon }}</div> <div class="pin">{{ item.icon }}</div>
{% endif %} {% endif %}
{% if item.visibility == constant('COURSE_VISIBILITY_CLOSED') and not item.current_user_is_teacher %}
<img src="{{ item.image }}" class="img-responsive"> <img src="{{ item.image }}" class="img-responsive">
{% else %}
<a title="{{ item.title }}" href="{{ item.link }}">
<img src="{{ item.image }}" alt="{{ item.title }}" class="img-responsive">
</a>
{% endif %}
{% if item.category != '' %} {% if item.category != '' %}
<span class="category">{{ item.category }}</span> <span class="category">{{ item.category }}</span>
<div class="cribbon"></div> <div class="cribbon"></div>
{% endif %} {% endif %}
<div class="black-shadow">
<div class="author-card">
{% for teacher in item.teachers %}
{% set counter = counter + 1 %}
{% if counter <= 3 %}
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img src="{{ teacher.avatar }}"/>
</a>
<div class="teachers-details">
<h5>
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
{{ teacher.firstname }} {{ teacher.lastname }}
</a>
</h5>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% if item.edit_actions != '' %} {% if item.edit_actions != '' %}
<div class="admin-actions"> <div class="admin-actions">
{% if item.document == '' %} {% if item.document == '' %}
@ -53,13 +38,39 @@
{% endif %} {% endif %}
</div> </div>
<div class="description"> <div class="description">
<h4 class="title"> <div class="block-title">
{% if item.visibility == constant('COURSE_VISIBILITY_CLOSED') and not item.current_user_is_teacher %} <h4 class="title" title="{{ item.title }}">
{{ item.title }} {{ item.code_course }} {% if item.visibility == constant('COURSE_VISIBILITY_CLOSED') and not item.current_user_is_teacher %}
{% else %} {{ item.title_cut }} {{ item.code_course }}
<a href="{{ item.link }}">{{ item.title }} {{ item.code_course }}</a> {% else %}
{% endif %} <a title="{{ item.title }}" href="{{ item.link }}">{{ item.title_cut }} {{ item.code_course }}</a>
</h4> {% endif %}
</h4>
</div>
<div class="block-author">
{% 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 }}"/>
</a>
{% else %}
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
<img src="{{ teacher.avatar }}"/>
</a>
<div class="teachers-details">
<h5>
<a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
{{ teacher.firstname }} {{ teacher.lastname }}
</a>
</h5>
<p>{{ 'Teacher' | get_lang }}</p>
</div>
{% endif %}
{% endfor %}
</div>
<div class="notifications">{{ item.notifications }}</div> <div class="notifications">{{ item.notifications }}</div>
{% if item.student_info %} {% if item.student_info %}

Write Preview
Loading…
Cancel
Save