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

fix bootstrap 3 badges and hot course

Browse Source
1.10.x
aragonc 10 years ago
parent 657453d444
commit 76d9932db1
6 changed files with 22 additions and 203 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. 186
      app/Resources/public/css/base.css
  2. 6
      main/auth/my_progress.php
  3. 2
      main/inc/lib/userportal.lib.php
  4. 1
      main/template/default/layout/head.tpl
  5. 28
      main/template/default/layout/hot_course_item.tpl
  6. 2
      main/template/default/skill/badge.tpl

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

@ -280,60 +280,6 @@ ul#navigation .report a {
.session-group .items-session li{ .session-group .items-session li{
padding-bottom: 5px; padding-bottom: 5px;
} }
#main .nav .dropdown {
width:150px;
text-align: right;
}
#main .nav .dropdown:nth-child(n) {
width:auto;
}
.course-items .title{
margin-top: 0px;
}
label, input, button, select, textarea, p {
font-size: inherit;
}
.badge-group {
width: 200px;
position: relative;
}
.badge-group .badge {
float:left;
position:relative;
}
.badge-group > :first-child {
z-index: 1000;
}
.badge-group > :nth-child(2) {
z-index: 900;
}
.badge-group > :nth-child(3) {
z-index: 800;
}
.badge-group > :nth-child(4) {
z-index: 700;
}
.badge-group > :nth-child(5) {
z-index: 600;
}
.badge-group .badge:not(:first-child) {
margin-left: -13px;
padding-left: 15px;
}
/* fixes the * */
span.form_required {
padding-right:5px;
}
form .formw {
margin-left: 170px;
}
form .form-button-login{
margin-top: 5px;
}
form .formw input {
float:left;
}
.formw input[type="checkbox"], .formw input[type="radio"] { .formw input[type="checkbox"], .formw input[type="radio"] {
margin-right: 5px; margin-right: 5px;
margin-top: 2px; margin-top: 2px;
@ -401,134 +347,6 @@ form .formw input {
.actions fieldset { .actions fieldset {
margin-top:0px; margin-top:0px;
} }
#friend-container .thumbnail {
min-height: 140px;
}
#friend-container .thumbnail img {
max-height: 100px;
}
[dir=rtl] #friends > .thumbnails > li {
float: right;
}
.show-grid [class*="span"] {
background-color: #EEEEEE;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
line-height: 30px;
min-height: 30px;
text-align: center;
}
a.tag {
background-color: #E0EAF1;
border-bottom: 1px solid #3E6D8E;
border-right: 1px solid #7F9FB6;
color: #3E6D8E;
font-size: 90%;
line-height: 2.4;
margin: 2px 2px 2px 0;
padding: 3px 4px;
text-decoration: none;
white-space: nowrap;
}
/* User portal */
#settings h4 {
margin-bottom:10px;
}
/* Admin index.php */
#settings .span6 {
min-height: 340px;
width: 47%;
}
#settings .span6 .well_border{
min-height: 300px;
}
#settings .form-search .span3 {
float: left;
}
/* user_portal course status icon */
.coursestatusicons {
border: 0px solid #000;
float: left;
padding-right: 5px;
width: auto;
}
/* user_portal course list */
.courses {
list-style-type: none;
margin-bottom: 5px;
height: 30px;
}
/* user_portal session list */
.session_course_item .courses {
margin-bottom: 5px;
height:35px;
}
.session_course_item {
/* padding: 0px; */
margin: 0px;
margin-bottom:15px;
font-size:135%;
}
.userportal-course-item {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color:#F9F9F9;
/*padding:5px 10px 5px 10px;
margin:0px 0px 10px 0px; */
}
#course_category li,
#hot_courses h5,
.course_item h5,
.categories-course-description h5,
.course-box h5 {
font-size: 12px;
overflow-y : auto;
max-height:70px;
padding: 5px;
}
.session_box_title {
margin-bottom: 7px;
}
.session_course_item .item_closed, .userportal-course-item-title .item_closed {
font-size:80%;
}
#maincontent .courseslist li {
margin-bottom:8px;
}
.independent_course_item a {
font-size:135%;
}
.userportal-session-item {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color:#F9F9F9;
padding:5px 10px 10px 6px;
margin:10px 0px;
}
.userportal-session-category-item {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
background-color:#F9F9F9;
padding:5px 10px 10px 16px;
/* height:40px; */
/*background-color:#f9f9f9; border:1px solid #dddddd; padding:5px 10px 5px 10px; margin-top: 10px; */
}
/***************************************************** /*****************************************************
* AGENDA * * AGENDA *
*****************************************************/ *****************************************************/
@ -3799,11 +3617,7 @@ a:active{
#my_timeline { #my_timeline {
background: url("dot.gif") repeat-x scroll left 45px; background: url("dot.gif") repeat-x scroll left 45px;
height: 350px;
margin: 0px auto; margin: 0px auto;
overflow: hidden;
position: relative;
width: 600px;
} }
#dates { #dates {

6
main/auth/my_progress.php
Unescape View File

@ -69,9 +69,9 @@ if (!empty($course_user_list)) {
$dates .= '<li><a href="#'.$login.'">'.api_get_utc_datetime($login).'</a></li>'; $dates .= '<li><a href="#'.$login.'">'.api_get_utc_datetime($login).'</a></li>';
$issues .= '<li id ="'.$login.'"> $issues .= '<li id ="'.$login.'">
<div class="row"> <div class="row">
<div class="span2"><div class="thumbnail">'.$course_image.'</div> <div class="col-md-12"><div class="thumbnail">'.$course_image.'</div>
</div> </div>
<div class="span3">'.sprintf( <div class="col-md-3">'.sprintf(
get_lang('YouHaveEnteredTheCourseXInY'), get_lang('YouHaveEnteredTheCourseXInY'),
$courseInfo['code'], $courseInfo['code'],
api_convert_and_format_date($login, DATE_FORMAT_LONG) api_convert_and_format_date($login, DATE_FORMAT_LONG)
@ -88,7 +88,7 @@ if (!empty($dates)) {
if (!empty($content)) { if (!empty($content)) {
$content .= '<br /><br />'; $content .= '<br /><br />';
} }
$content .= '<div class="row"><div class="span12">'.Display::page_subheader(get_lang('Timeline')).'</div>'; $content .= '<div class="row"><div class="col-md-12">'.Display::page_subheader(get_lang('Timeline')).'</div>';
$content .= '<div id="my_timeline"> $content .= '<div id="my_timeline">
<div class="actions"> <div class="actions">
<a href="#" id="prev"></a> <!-- optional --> <a href="#" id="prev"></a> <!-- optional -->

2
main/inc/lib/userportal.lib.php
Unescape View File

@ -1325,7 +1325,7 @@ class IndexManager
*/ */
public function return_hot_courses() public function return_hot_courses()
{ {
return CourseManager::return_hot_courses(); return CourseManager::return_hot_courses(30,6);
} }
} }

1
main/template/default/layout/head.tpl
Unescape View File

@ -307,6 +307,7 @@ $(function() {
if($('#toolbar').length){ if($('#toolbar').length){
var heigthToolBar= $('#toolbar').height(); var heigthToolBar= $('#toolbar').height();
$('header').css('margin-top', heigthToolBar+'px'); $('header').css('margin-top', heigthToolBar+'px');
$('#page-back').css('padding-top', heigthToolBar+20+'px');
} }
// Removes the yellow input in Chrome // Removes the yellow input in Chrome

28
main/template/default/layout/hot_course_item.tpl
Unescape View File

@ -1,20 +1,24 @@
{% for hot_course in hot_courses %} {% for hot_course in hot_courses %}
{% if hot_course.extra_info.title %} {% if hot_course.extra_info.title %}
<div class="col-md-4"> <div class="col-md-4">
<div class="thumbnail"> <div class="items-course">
<img src="{{ hot_course.extra_info.course_image_large }}" alt="{{ hot_course.extra_info.title|e }}"/> <div class="items-course-image">
<img class="image-responsive" src="{{ hot_course.extra_info.course_image_large }}" alt="{{ hot_course.extra_info.title|e }}"/>
</div>
</div> </div>
<div class="categories-course-description"> <div class="items-course-info">
<div class="text-h3">{{ hot_course.extra_info.title}}</div> <h4 class="title">{{ hot_course.extra_info.title}}</h4>
<div class="text-h5">{{ hot_course.extra_info.teachers }}</div> <div class="teachers">{{ hot_course.extra_info.teachers }}</div>
{{ hot_course.extra_info.rating_html }} <div class="ranking">
{{ hot_course.extra_info.rating_html }}
</div>
<div class="toolbar">
{{ hot_course.extra_info.description_button }}
{{ hot_course.extra_info.go_to_course_button }}
{{ hot_course.extra_info.register_button }}
{{ hot_course.extra_info.unsubscribe_button }}
</div>
</div> </div>
<p>
{{ hot_course.extra_info.description_button }}
{{ hot_course.extra_info.go_to_course_button }}
{{ hot_course.extra_info.register_button }}
{{ hot_course.extra_info.unsubscribe_button }}
</p>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

2
main/template/default/skill/badge.tpl
Unescape View File

@ -23,7 +23,7 @@
</p> </p>
</div> </div>
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<img class="img-responsive" src="{{ 'openbadges.png' | icon() }}" width="22" height="22"> <img class="img-responsive" src="{{ 'openbadges.png' | icon() }}">
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save