diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 9e9c2cc9fc..720c800441 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -21,10 +21,10 @@ body{ position: absolute; bottom: 0; width: 100%; - height: 120px; + } #content-section{ - margin-bottom: 150px; + margin-bottom: 230px; } /* End Sticky footer style */ select { @@ -198,7 +198,6 @@ header{ .panelSliders .ui-slider-handle { border-color: #000; } - #panelSliders { width: 75%; margin: 25px auto; @@ -4669,15 +4668,9 @@ div#chat-remote-video video { height: 100px; } /* list courses classic*/ -.classic-courses .teachers{ - margin: 0; - padding: 0; - display: inline-block; +.classic-courses .list-teachers{ font-size: 12px; } -.classic-courses .teachers li{ - display: inline-block; -} /* list my course user*/ .session .info-session{ margin-bottom: 10px; @@ -4686,7 +4679,7 @@ div#chat-remote-video video { .session .info-session span{ margin-right: 10px; } -.session .teachers{ +.session .list-teachers{ font-size: 12px; } .session .sessions-items .courses{ diff --git a/bower.json b/bower.json index 58776a307e..4f8bb81838 100644 --- a/bower.json +++ b/bower.json @@ -27,7 +27,8 @@ "cropper": "1.0.*", "jquery.scrollbar": "0.2.*", "jquery-file-upload": "*", - "pwstrength-bootstrap": "*" + "pwstrength-bootstrap": "*", + "readmore-js": "2.1.0" }, "resolutions": { "jquery": "2.1.4" diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 2a4c6862dd..9f48d101b6 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -706,7 +706,8 @@ class Template 'mediaelement/build/mediaelement-and-player.min.js', 'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.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) { $bowerJsFiles[] = 'ckeditor/ckeditor.js'; diff --git a/main/template/default/layout/footer.js.tpl b/main/template/default/layout/footer.js.tpl index b93ba3f2ff..412ca0341d 100644 --- a/main/template/default/layout/footer.js.tpl +++ b/main/template/default/layout/footer.js.tpl @@ -92,5 +92,14 @@ placement: 'right' }; $('.boot-tooltip').tooltip(tip_options); + var more = '{{ 'SeeMore' | get_lang }}'; + var close = '{{ 'Close' | get_lang }}'; + $('.list-teachers').readmore({ + speed: 75, + moreLink: '' + more + '', + lessLink: '' + close + '', + collapsedHeight: 35, + blockCSS: 'display: block; width: 100%;' + }); }); diff --git a/main/template/default/user_portal/classic_courses_without_category.tpl b/main/template/default/user_portal/classic_courses_without_category.tpl index f5da2ef264..4dfdb2fa0f 100644 --- a/main/template/default/user_portal/classic_courses_without_category.tpl +++ b/main/template/default/user_portal/classic_courses_without_category.tpl @@ -45,19 +45,18 @@ {% endif %}
- {{ 'teacher.png' | img(16, 'Professor'|get_lang ) }} - +
diff --git a/main/template/default/user_portal/classic_session.tpl b/main/template/default/user_portal/classic_session.tpl index 1c062e0195..7879d9bc74 100644 --- a/main/template/default/user_portal/classic_session.tpl +++ b/main/template/default/user_portal/classic_session.tpl @@ -100,7 +100,7 @@

{{ item.title }}

-
+
{% if item.teachers|length > 0 %} {% for coach in item.teachers %}