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 red social CT#7539

Browse Source
1.10.x
aragonc 11 years ago
parent df97c4e878
commit fa417350e7
6 changed files with 70 additions and 100 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. 100
      app/Resources/public/css/base.css
  2. 6
      main/admin/course_list.php
  3. 14
      main/inc/lib/sessionmanager.lib.php
  4. 2
      main/session/resume_session.php
  5. 15
      main/social/profile.php
  6. 33
      main/template/default/social/profile.tpl

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

@ -4063,7 +4063,6 @@ a.forum_group_link {
}
.announcement {
/* background: none repeat scroll 0 0 #F2F2F2;*/
border: 1px solid #D3D3D3;
color: #555555;
font-weight: normal;
@ -4239,67 +4238,9 @@ i.size-32.icon-new-glossary-term{
background-image: url('../../main/img/icons/32/new_glossary_term.png');
}
/*
* Notebook
*/
i.size-32.icon-new-note{
background-image: url('../../main/img/icons/32/new_note.png');
}
.notebook.entries li{
vertical-align: text-top;
}
.notebook.note{
display:inline-block;
width:49%;
margin-left:0px;
margin-right:1px;
padding:0;
}
.notebook.note{
background-color: #D2ECF5;
}
.notebook.note .title{
padding:1;
display:block;
margin-top:0;
margin-right:0;
margin-left:0;
padding-top:5px;
padding-bottom:12px;
vertical-align: baseline;
background-color: #028DC2 ;
color:#ffffff;
}
.notebook.note .footer{
text-align: right;
font-style:italic
}
#learning_path_main #control {
text-align: center;
background-image:-webkit-gradient(linear,left top,left bottom,from(#ececec),to(#fff));
background-image:-webkit-linear-gradient(top,#ececec,#fff);
background-image:-moz-linear-gradient(top,#ececec,#fff);
background-image:-ms-linear-gradient(top,#ececec,#fff);
background-image:-o-linear-gradient(top,#ececec,#fff);
background-image:linear-gradient(top,#ececec,#fff);
height:32px;
padding:8px 0px 8px 0px;
opacity:0.9;
bottom: 0px;
margin: auto;
width: 100%;
height: 34px;
position: absolute
}
/* Data table */
.dataTables_wrapper{
@ -4478,28 +4419,6 @@ i.size-32.icon-new-work{
.jqgrid_whitespace {
white-space: normal !important;
}
.text-h1 {
font-size: 24px;
}
.text-h2 {
font-size: 21px;
}
.text-h3 {
font-size: 16px;
}
.text-h4 {
font-size: 15px;
}
.text-h5 {
font-size: 12px;
font-weight: normal;
}
.chosen-container {
min-width: 100%;
}
@ -6352,7 +6271,9 @@ a.sessionView {
height: 32px;
margin-right: 5px;
}
#course-block .list-group .list-group-item{
#course-block .list-group .list-group-item,
#session-block .list-group .list-group-item
{
padding: 5px;
border:none;
font-size: 12px;
@ -6363,14 +6284,25 @@ a.sessionView {
float: left;
margin-right: 5px;
}
#course-block .list-group .list-group-item .img-course{
#course-block .list-group .list-group-item .img-course,
#session-block .list-group .list-group-item .img-session
{
width: 70px;
float: left;
margin-right: 5px;
}
#course-block .list-group .list-group-item .title{
#course-block .list-group .list-group-item .title,
#session-block .list-group .list-group-item .title{
display: block;
}
.data_table .title{
text-align: left;
padding-left: 10px;
}
#course-list.data_table .title{
width: 360px;
padding-left: 0;
}
/* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {

6
main/admin/course_list.php
Unescape View File

@ -408,7 +408,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data_by_session', 2);
} else {
// Create a sortable table with the course data
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2);
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2, 20, 'ASC', 'course-list');
}
$parameters=array();
@ -428,7 +428,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table->set_additional_parameters($parameters);
$table->set_header(0, '', false, 'width="8px"');
$table->set_header(1, get_lang('Title'), true, 'width="360px"');
$table->set_header(1, get_lang('Title'), true, null, array('class' => 'title'));
$table->set_header(2, get_lang('Code'));
$table->set_header(3, get_lang('Language'), false, 'width="70px"');
$table->set_header(4, get_lang('Category'));
@ -436,7 +436,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table->set_header(6, get_lang('UnsubscriptionAllowed'), false, 'width="50px"');
//$table->set_header(7, get_lang('Teacher'));
$table->set_header(7, get_lang('Action'), false, 'width="160px"', array('class'=>'td_actions'));
$table->set_header(7, get_lang('Action'), false, null, array('class'=>'td_actions'));
$table->set_column_filter(7, 'modify_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$content .= $table->return_table();

14
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -3083,9 +3083,23 @@ class SessionManager
}
$sessions = array();
$imagenSession = '';
if (Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result)) {
array_push ($row['image']);
$row['image'] = null;
$imagenSession = api_get_path(SYS_UPLOAD_PATH). 'sessions/'.'16_' .$row['id']. '.png';
if (is_file($imagenSession)) {
$imagenSession = api_get_path(WEB_UPLOAD_PATH). 'sessions/'.'16_' .$row['id']. '.png';
$row['image'] = $imagenSession;
} else {
$row['image'] = api_get_path(WEB_IMG_PATH). 'session_default_small.png';
}
$sessions[$row['id']] = $row;
}
}

2
main/session/resume_session.php
Unescape View File

@ -237,7 +237,7 @@ if ($sessionInfo['nbr_courses'] == 0) {
// of the course, that appeared in the default $interbreadcrumb
$courseItem .= '
<tr>
<td>'.Display::url(
<td class="title">'.Display::url(
$course->getTitle().' ('.$course->getVisualCode().')',
$courseUrl
).'</td>

15
main/social/profile.php
Unescape View File

@ -246,13 +246,7 @@ $social_menu_block = SocialManager::show_social_menu('shared_profile', null, $us
//Setting some session info
$user_info = api_get_user_info($my_user_id);
$sessionList = SessionManager::getSessionsFollowedByUser($my_user_id, $user_info['status']);
$htmlSessionList = null;
foreach ($sessionList as $session) {
$htmlSessionList .= '<div>';
$htmlSessionList .= Display::return_icon('session.png', get_lang('Session'));
$htmlSessionList .= $session['name'];
$htmlSessionList .= '</div>';
}
// My friends
$friend_html = SocialManager::listMyFriendsBlock(
@ -492,9 +486,10 @@ if ($show_full_profile) {
//Block Social Sessions
if (count($sessionList) > 0) {
$social_session_block = Display::panel($htmlSessionList, get_lang('MySessions'));
//$social_session_block = $htmlSessionList;
$social_session_block = $sessionList;
}
// Block Social User Feeds
$user_feeds = SocialManager::get_user_feeds($user_id);
@ -627,7 +622,7 @@ $tpl->assign('social_course_block', $social_course_block);
$tpl->assign('social_group_info_block', $social_group_info_block);
$tpl->assign('social_rss_block', $social_rss_block);
$tpl->assign('social_skill_block', SocialManager::getSkillBlock($my_user_id));
$tpl->assign('social_session_block', $social_session_block);
$tpl->assign('sessionList', $social_session_block);
$tpl->assign('social_right_information', $socialRightInformation);
$tpl->assign('social_auto_extend_link', $socialAutoExtendLink);

33
main/template/default/social/profile.tpl
Unescape View File

@ -35,6 +35,8 @@
</div>
{{ social_skill_block }}
{{ social_group_info_block }}
<!-- Block course list -->
{% if social_course_block != null %}
<div class="panel-group" id="course-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
@ -52,9 +54,36 @@
</div>
</div>
</div>
</div>
</div>
{% endif %}
<!-- Block session list -->
{% if sessionList != null %}
<div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#session-block" href="#sessionList" aria-expanded="true" aria-controls="sessionList">
{{ "MySessions" | get_lang }}
</a>
</h4>
</div>
<div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
<ul class="list-group">
{% for session in sessionList %}
<li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
<img class="img-session" src="{{ session.image }}"/>
<span class="title">{{ session.name }}</span>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
{{ social_session_block }}
{{ social_rss_block }}
{{ social_right_information }}
</div>

Write Preview
Loading…
Cancel
Save