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

Fixing jquery-ui calls

Browse Source
skala
Julio Montoya 14 years ago
parent f1331e98e8
commit fc775bd90c
3 changed files with 66 additions and 65 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. 4
      main/exercice/exercice_submit.php
  2. 61
      main/inc/lib/main_api.lib.php
  3. 66
      main/session/index.php

4
main/exercice/exercice_submit.php
Unescape View File

@ -59,10 +59,6 @@ if (api_get_setting('show_glossary_in_extra_tools') == 'true') {
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js" type="text/javascript" language="javascript"></script>';
}
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/cupertino/jquery-ui-1.8.7.custom.css" type="text/css">';
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-1.4.4.min.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/cupertino/jquery-ui-1.8.7.custom.min.js" type="text/javascript" language="javascript"></script>'; //jQuery
//@todo we should only enable this when there is a time control
//This library is necessary for the time control feature

61
main/inc/lib/main_api.lib.php
Unescape View File

@ -4752,30 +4752,56 @@ function api_check_browscap(){
}
}
/**
* Returns the js header to include the jquery library
*/
function api_get_jquery_js() {
return '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-1.4.4.min.js" type="text/javascript" language="javascript"></script>';
}
/**
* Returns the jquery-ui library js headers
* @param bool add the jqgrid library
* @return string html tags
*
*/
function api_get_jquery_ui_js($include_jqgrid = false) {
$libraries[]='jquery-ui';
if ($include_jqgrid) {
$libraries[]='jqgrid';
}
return api_get_jquery_libraries_js($libraries, true);
}
/**
* Returns the jquery library js headers
* @param array list of jquery libraries supported jquery-ui, jqgrid
* @param bool add the jquery library
* @return string html tags
*
*/
function api_get_jquery_ui_js($include_jqgrid = false, $include_jquery = true) {
$js = '';
$theme = 'smoothness'; // Current themes: cupertino, smoothness, ui-lightness. Find the themes folder in main/inc/lib/javascript/jquery-ui
$languaje = 'en';
$platform_isocode = strtolower(api_get_language_isocode());
function api_get_jquery_libraries_js($libraries, $include_jquery = true) {
$js = '';
$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
if ($include_jquery) {
//Jquery
$js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-1.4.4.min.js" type="text/javascript" language="javascript"></script>'; //jQuery
$js .= api_get_jquery_js();
}
if (in_array('jquery-ui',$libraries)) {
//Jquery ui
$theme = 'smoothness'; // Current themes: cupertino, smoothness, ui-lightness. Find the themes folder in main/inc/lib/javascript/jquery-ui
$js .= '<link rel="stylesheet" href="'.$js_path.'jquery-ui/'.$theme.'/jquery-ui-1.8.7.custom.css" type="text/css">';
$js .= '<script src="'.$js_path.'jquery-ui/'.$theme.'/jquery-ui-1.8.7.custom.min.js" type="text/javascript" language="javascript"></script>';
}
//Jquery ui
$js .= '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/'.$theme.'/jquery-ui-1.8.7.custom.css" type="text/css">';
$js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/'.$theme.'/jquery-ui-1.8.7.custom.min.js" type="text/javascript" language="javascript"></script>';
//Grid js
if ($include_jqgrid) {
if (in_array('jqgrid',$libraries)) {
$languaje = 'en';
$platform_isocode = strtolower(api_get_language_isocode());
//languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
$jqgrid_langs = array('bg', 'bg1251', 'cat','cn','cs','da','de','el','en','es','fa','fi','fr','gl','he','hu','is','it','ja','nl','no','pl','pt-br','pt','ro','ru','sk','sr','sv','tr','ua');
@ -4783,13 +4809,16 @@ function api_get_jquery_ui_js($include_jqgrid = false, $include_jquery = true) {
$languaje = $platform_isocode;
}
$js .= '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/css/ui.jqgrid.css" type="text/css">';
$js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/js/i18n/grid.locale-'.$languaje.'.js" type="text/javascript" language="javascript"></script>';
$js .= '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript" language="javascript"></script>';
$js .= '<link rel="stylesheet" href="'.$js_path.'jqgrid/css/ui.jqgrid.css" type="text/css">';
$js .= '<script src="'.$js_path.'jqgrid/js/i18n/grid.locale-'.$languaje.'.js" type="text/javascript" language="javascript"></script>';
$js .= '<script src="'.$js_path.'jqgrid/js/jquery.jqGrid.min.js" type="text/javascript" language="javascript"></script>';
}
//Adding default CSS changes for Chamilo in order to preserve the neutral layout
$js .= '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/default.css" type="text/css">';
if (in_array('jquery-ui',$libraries)) {
//Adding default CSS changes of the jquery-ui themes for Chamilo in order to preserve the original jquery-ui css
$js .= '<link rel="stylesheet" href="'.$js_path.'jquery-ui/default.css" type="text/css">';
}
return $js;
}

66
main/session/index.php
Unescape View File

@ -19,27 +19,15 @@ require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php';
api_block_anonymous_users(); // Only users who are logged in can proceed.
$this_section = SECTION_COURSES;
//Tab js
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/cupertino/jquery-ui-1.8.7.custom.css" type="text/css">';
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-1.4.4.min.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery-ui/cupertino/jquery-ui-1.8.7.custom.min.js" type="text/javascript" language="javascript"></script>';
//Grid js
$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/css/ui.jqgrid.css" type="text/css">';
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/js/i18n/grid.locale-en.js" type="text/javascript" language="javascript"></script>';
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript" language="javascript"></script>';
$htmlHeadXtra[] = api_get_jquery_ui_js(true);
Display :: display_header($nameTools);
$session_id = intval($_GET['session_id']);
$session_info = SessionManager::fetch($session_id);
$session_list = SessionManager::get_sessions_by_coach(api_get_user_id());
$course_list = SessionManager::get_course_list_by_session_id($session_id);
$course_select = array();
@ -47,10 +35,7 @@ $session_select = array();
foreach ($session_list as $item) {
$session_select[$item['id']] = $item['name'];
}
/*
foreach ($course_list as $course_item) {
$course_select[$course_item['id']] = $course_item['title'];
}*/
// Session list form
if (count($session_select) > 1) {
@ -59,34 +44,28 @@ if (count($session_select) > 1) {
$defaults['session_id'] = $session_id;
$form->setDefaults($defaults);
$form->display();
if ($form->validate()) {
}
//if ($form->validate()) {}
}
echo Display::tag('h1', $session_info['name']);
//Listing LPs from all courses
/*
$lps = array();
foreach ($course_list as $item) {
$list = new LearnpathList(api_get_user_id(),$item['code']);
$flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list;
foreach ($flat_list as $item) {
//var_dump(get_week_from_day($item['publicated_on']));
}
}
if (!empty($course_list)) {
foreach ($course_list as $item) {
$list = new LearnpathList(api_get_user_id(),$item['code']);
$flat_list = $list->get_flat_list();
$lps[$item['code']] = $flat_list;
foreach ($flat_list as $item) {
//var_dump(get_week_from_day($item['publicated_on']));
}
}
}*/
//Getting all sessions where I'm subscribed
$new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
//echo '<pre>';
$my_session_list = array();
$final_array = array();
@ -209,17 +188,14 @@ $column_model = array(array('name'=>'date', 'index'=>'date', 'width'=>'80',
$extra_params['autowidth'] = 'true'; //use the width of the parent
//$extra_params['forceFit'] = 'true'; //use the width of the parent
//$extra_params['altRows'] = 'true'; //zebra style
//Per course grid settings
$url_course = api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=session_courses_lp_by_course&session_id='.$session_id;
$extra_params_course['grouping'] = 'true';
$extra_params_course['groupingView'] = array('groupField'=>array('course'),
'groupColumnShow'=>array('false'),
'groupText' => array('<b>Course {0} - {1} Item(s)</b>'));
$extra_params_course['groupingView'] = array('groupField' => array('course'),
'groupColumnShow' => array('false'),
'groupText' => array('<b>Course {0} - {1} Item(s)</b>'));
$extra_params_course['autowidth'] = 'true'; //use the width of the parent
//Per Week grid
@ -266,10 +242,10 @@ $(function() {
$( "#sub_tab" ).tabs();
<?php
echo Display::grid_js('list_default', $url, $columns,$column_model,$extra_params);
echo Display::grid_js('list_course', $url_course, $columns,$column_model,$extra_params_course);
echo Display::grid_js('list_week', $url_week, $column_week,$column_week_model, $extra_params_week);
echo Display::grid_js('exercises', '', $column_exercise,$column_exercise_model, $extra_params_exercise, $my_real_array);
echo Display::grid_js('list_default', $url, $columns, $column_model,$extra_params);
echo Display::grid_js('list_course', $url_course, $columns, $column_model,$extra_params_course);
echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week);
echo Display::grid_js('exercises', '', $column_exercise,$column_exercise_model, $extra_params_exercise, $my_real_array);
?>
});

Write Preview
Loading…
Cancel
Save