fix list teachers courses and sessions footer

pull/2487/head
Alex Aragon 9 years ago
parent fc15628be6
commit c3c0392dc6
  1. 15
      app/Resources/public/css/base.css
  2. 3
      bower.json
  3. 3
      main/inc/lib/template.lib.php
  4. 9
      main/template/default/layout/footer.js.tpl
  5. 9
      main/template/default/user_portal/classic_courses_without_category.tpl
  6. 2
      main/template/default/user_portal/classic_session.tpl

@ -21,10 +21,10 @@ body{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 120px;
} }
#content-section{ #content-section{
margin-bottom: 150px; margin-bottom: 230px;
} }
/* End Sticky footer style */ /* End Sticky footer style */
select { select {
@ -198,7 +198,6 @@ header{
.panelSliders .ui-slider-handle { .panelSliders .ui-slider-handle {
border-color: #000; border-color: #000;
} }
#panelSliders { #panelSliders {
width: 75%; width: 75%;
margin: 25px auto; margin: 25px auto;
@ -4669,15 +4668,9 @@ div#chat-remote-video video {
height: 100px; height: 100px;
} }
/* list courses classic*/ /* list courses classic*/
.classic-courses .teachers{ .classic-courses .list-teachers{
margin: 0;
padding: 0;
display: inline-block;
font-size: 12px; font-size: 12px;
} }
.classic-courses .teachers li{
display: inline-block;
}
/* list my course user*/ /* list my course user*/
.session .info-session{ .session .info-session{
margin-bottom: 10px; margin-bottom: 10px;
@ -4686,7 +4679,7 @@ div#chat-remote-video video {
.session .info-session span{ .session .info-session span{
margin-right: 10px; margin-right: 10px;
} }
.session .teachers{ .session .list-teachers{
font-size: 12px; font-size: 12px;
} }
.session .sessions-items .courses{ .session .sessions-items .courses{

@ -27,7 +27,8 @@
"cropper": "1.0.*", "cropper": "1.0.*",
"jquery.scrollbar": "0.2.*", "jquery.scrollbar": "0.2.*",
"jquery-file-upload": "*", "jquery-file-upload": "*",
"pwstrength-bootstrap": "*" "pwstrength-bootstrap": "*",
"readmore-js": "2.1.0"
}, },
"resolutions": { "resolutions": {
"jquery": "2.1.4" "jquery": "2.1.4"

@ -706,7 +706,8 @@ class Template
'mediaelement/build/mediaelement-and-player.min.js', 'mediaelement/build/mediaelement-and-player.min.js',
'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js', 'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
'image-map-resizer/js/imageMapResizer.min.js', 'image-map-resizer/js/imageMapResizer.min.js',
'jquery.scrollbar/jquery.scrollbar.min.js' 'jquery.scrollbar/jquery.scrollbar.min.js',
'readmore-js/readmore.min.js'
]; ];
if (CHAMILO_LOAD_WYSIWYG == true) { if (CHAMILO_LOAD_WYSIWYG == true) {
$bowerJsFiles[] = 'ckeditor/ckeditor.js'; $bowerJsFiles[] = 'ckeditor/ckeditor.js';

@ -92,5 +92,14 @@
placement: 'right' placement: 'right'
}; };
$('.boot-tooltip').tooltip(tip_options); $('.boot-tooltip').tooltip(tip_options);
var more = '{{ 'SeeMore' | get_lang }}';
var close = '{{ 'Close' | get_lang }}';
$('.list-teachers').readmore({
speed: 75,
moreLink: '<a href="#">' + more + '</a>',
lessLink: '<a href="#">' + close + '</a>',
collapsedHeight: 35,
blockCSS: 'display: block; width: 100%;'
});
}); });
</script> </script>

@ -45,19 +45,18 @@
{% endif %} {% endif %}
</h4> </h4>
<div class="course-items-session"> <div class="course-items-session">
{{ 'teacher.png' | img(16, 'Professor'|get_lang ) }}
<ul class="teachers"> <div class="list-teachers">
{{ 'teacher.png' | img(16, 'Professor'|get_lang ) }}
{% for teacher in item.teachers %} {% for teacher in item.teachers %}
<li>
{% set counter = counter + 1 %} {% set counter = counter + 1 %}
{% if counter > 1 %} | {% endif %} {% if counter > 1 %} | {% endif %}
<a href="{{ teacher.url }}" class="ajax" <a href="{{ teacher.url }}" class="ajax"
data-title="{{ teacher.firstname }} {{ teacher.lastname }}"> data-title="{{ teacher.firstname }} {{ teacher.lastname }}">
{{ teacher.firstname }} {{ teacher.lastname }} {{ teacher.firstname }} {{ teacher.lastname }}
</a> </a>
</li>
{% endfor %} {% endfor %}
</ul> </div>
</div> </div>
</div> </div>
</div> </div>

@ -100,7 +100,7 @@
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<h4>{{ item.title }}</h4> <h4>{{ item.title }}</h4>
<div class="teachers"> <div class="list-teachers">
{% if item.teachers|length > 0 %} {% if item.teachers|length > 0 %}
<img src="{{ 'teacher.png'|icon(16) }}" width="16" height="16"> <img src="{{ 'teacher.png'|icon(16) }}" width="16" height="16">
{% for coach in item.teachers %} {% for coach in item.teachers %}

Loading…
Cancel
Save