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

merge

Browse Source
skala
Hubert Borderiou 14 years ago
parent 844665ad57 58758902aa
commit 8666480d82
4 changed files with 34 additions and 23 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. 19
      main/css/base.css
  2. 6
      main/css/base_chamilo.css
  3. 24
      main/inc/ajax/course_home.ajax.php
  4. 8
      main/session/index.php

19
main/css/base.css
Unescape View File

@ -101,8 +101,8 @@ section {
}
audio, canvas, video {
display: inline-block;
*display: inline;
*zoom: 1;
display: inline;
zoom: 1;
}
audio:not([controls]) {
display: none;
@ -695,7 +695,7 @@ a.menu:after, .dropdown-toggle:after {
display: table;
content: "";
zoom: 1;
*display: inline;
display: inline;
}
.tabs:after, .pills:after {
clear: both;
@ -2097,7 +2097,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
cellspacing:0;
cellpadding:0;
background-color:#dbeaf5;
border=0;
border:0;
border-collapse: collapse;
width: 100%;
}
@ -2197,7 +2197,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
background-color:#F2F2F2;
width:600px;
border-bottom:1px solid #CCCCCC;
margin:left:5px;
margin-left:5px;
}
.message-bottom-title {
height:22px;
@ -3590,7 +3590,7 @@ div.row div.form_header {
}*/
span.form_required {
color: #f00;header2
color: #f00;
}
span.form_error {
color: #f00;
@ -3740,7 +3740,7 @@ form div.error input, form div.error textarea {
display: table;
content: "";
zoom: 1;
*display: inline;
display: inline;
}
.container:after {
clear: both;
@ -3755,7 +3755,7 @@ form div.error input, form div.error textarea {
display: table;
content: "";
zoom: 1;
*display: inline;
display: inline;
}
.container-fluid:after {
clear: both;
@ -3770,6 +3770,7 @@ form div.error input, form div.error textarea {
max-width: 1180px;
margin-left: 20px;
}
.hide {
display: none;
}
@ -4251,8 +4252,6 @@ a:active{
margin-right: 4px;
}
.hide_menu{
display:none;
}

6
main/css/base_chamilo.css
Unescape View File

@ -95,7 +95,7 @@ ul#navigation li a {
border:1px solid #AFAFAF;
-moz-border-radius:10px 0px 0px 10px;
-webkit-border-bottom-right-radius: 10px;
-webkit-border-top-right-radius: 10x;
-webkit-border-top-right-radius: 10px;
-khtml-border-bottom-right-radius: 10px;
-khtml-border-top-right-radius: 10px;
-moz-box-shadow: 0px 4px 3px #000;
@ -203,7 +203,7 @@ ul#navigation .student-connect a {
width: 60%;
float: left;
padding: 0 20px 0 20px;
//padding: 0px;
/* padding: 0px;*/
min-height: 333px;
margin-top:8px;
margin-bottom:30px;
@ -572,7 +572,7 @@ input.link_alike:hover {
font-weight: normal;
margin-bottom: 8px;
padding: 7px 10px 7px 15px;
//width: 205px;
/*width: 205px;*/
display:block;
}
.menulist {

24
main/inc/ajax/course_home.ajax.php
Unescape View File

@ -106,8 +106,7 @@ switch ($action) {
case 'session_courses_lp_default':
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$page = intval($_REQUEST['page']); //page
$limit = intval($_REQUEST['rows']); // quantity of rows
@ -143,12 +142,13 @@ switch ($action) {
if ($course_id != $item['id']) {
continue;
}
}
}
$list = new LearnpathList(api_get_user_id(), $item['code'], $session_id);
$flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list;
$course_url = api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id;
$item['title'] = Display::url($item['title'], $course_url, array('target'=>SESSION_LINK_TARGET));
foreach($flat_list as $lp_id => $lp_item) {
$temp[$count]['id']= $lp_id;
$lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
@ -186,10 +186,15 @@ switch ($action) {
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET)));
$temp[$count]['course'] = strip_tags($item['title']);
$temp[$count]['lp'] = $lp_item['lp_name'];
$temp[$count]['date'] = $lp_item['publicated_on'];
$count++;
}
}
$temp = msort($temp, $sidx, $sord);
$i =0;
$response = new stdClass();
foreach($temp as $key=>$row) {
@ -351,7 +356,7 @@ switch ($action) {
$page = intval($_REQUEST['page']); //page
$limit = intval($_REQUEST['rows']); // quantity of rows
$sidx = intval($_REQUEST['sidx']); //index to filter
$sidx = $_REQUEST['sidx']; //index to filter
$sord = $_REQUEST['sord']; //asc or desc
if (!in_array($sord, array('asc','desc'))) {
$sord = 'desc';
@ -424,10 +429,17 @@ switch ($action) {
continue;
}
}
$temp[$count]['cell']=array($date, $item['title'], Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET)));
$temp[$count]['cell'] = array($date, $item['title'], Display::url($icons.' '.$lp_item['lp_name'], $lp_url, array('target'=>SESSION_LINK_TARGET)));
$temp[$count]['course'] = strip_tags($item['title']);
$temp[$count]['lp'] = $lp_item['lp_name'];
$temp[$count]['date'] = $lp_item['publicated_on'];
$count++;
}
}
}
$temp = msort($temp, $sidx, $sord);
$response = new stdClass();
$i =0;
foreach($temp as $key=>$row) {

8
main/session/index.php
Unescape View File

@ -265,9 +265,9 @@ $extra_params_courses['autowidth'] = 'false'; //use the width of the parent
$url = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_default&session_id='.$session_id.'&course_id='.$course_id;
$columns = array(get_lang('PublicationDate'),get_lang('Course'), get_lang('LearningPaths'));
$column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'false'));
$column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'true'),
array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true'),
array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true'));
$extra_params = array();
//$extra_params['autowidth'] = 'true'; //use the width of the parent
//$extra_params['forceFit'] = 'true'; //use the width of the parent
@ -276,7 +276,7 @@ $extra_params = array();
//Per course grid settings
$url_by_course = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_by_course&session_id='.$session_id.'&course_id='.$course_id;
$extra_params_course['grouping'] = 'true';
$extra_params_course['groupingView'] = array('groupCollapse' => true,
$extra_params_course['groupingView'] = array('groupCollapse' => false,
'groupField' => array('course'),
'groupColumnShow' => array('false'),
'groupText' => array('<b>'.get_lang('Course').' {0}</b>'));

Write Preview
Loading…
Cancel
Save