From 7358413fc06b9b148b80d44c1ee2402769dcb54b Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 29 Feb 2012 15:12:18 +0100 Subject: [PATCH] Adding jquery-ui in the template + adding an option to show or hide text near the icons (a constant in the display class) I turn it on just for tests --- index.php | 1 - main/admin/career_dashboard.php | 2 +- main/admin/careers.php | 2 +- main/admin/index.php | 3 +- main/admin/promotions.php | 2 +- main/admin/session_list.php | 2 +- main/admin/skills.php | 2 +- main/admin/skills_gradebook.php | 2 +- main/admin/skills_profile.php | 1 - main/admin/user_list.php | 2 - main/admin/usergroups.php | 4 +- main/auth/courses.php | 2 - main/auth/my_progress.php | 1 - main/calendar/agenda.php | 1 - main/calendar/myagenda.php | 4 -- main/course_info/infocours.php | 2 - main/course_progress/index.php | 3 -- main/css/base.css | 62 ++++++++++++++++++++++++++- main/css/base_chamilo.css | 41 +----------------- main/document/document.inc.php | 29 ++----------- main/document/document.php | 6 +-- main/document/document_lite.php | 6 +-- main/exercice/admin.php | 4 -- main/exercice/exercice.php | 8 ++-- main/exercice/exercise_report.php | 2 +- main/exercice/exercise_submit.php | 2 - main/exercice/live_stats.php | 2 +- main/forum/index.php | 2 +- main/forum/viewforum.php | 2 +- main/forum/viewforumcategory.php | 2 +- main/inc/introductionSection.inc.php | 5 +-- main/inc/lib/banner.lib.php | 2 +- main/inc/lib/course.lib.php | 8 ++-- main/inc/lib/course_home.lib.php | 9 ++-- main/inc/lib/display.lib.php | 22 ++++++---- main/inc/lib/glossary.lib.php | 2 +- main/inc/lib/main_api.lib.php | 5 ++- main/inc/lib/social.lib.php | 62 +++++++++++++-------------- main/inc/lib/sortabletable.class.php | 2 +- main/inc/lib/template.lib.php | 21 +++++++-- main/inc/lib/userportal.lib.php | 11 ++--- main/mySpace/access_details.php | 2 - main/newscorm/lp_add_item.php | 2 - main/newscorm/lp_admin_view.php | 2 - main/newscorm/lp_list.php | 19 ++++---- main/newscorm/lp_view.php | 1 - main/session/index.php | 2 +- main/social/group_topics.php | 2 - main/social/groups.php | 6 +-- main/social/home.php | 2 +- main/social/skills_tree.php | 2 +- main/template/default/layout/head.tpl | 23 ++++++++-- main/work/work.lib.php | 2 +- user_portal.php | 2 - 54 files changed, 202 insertions(+), 218 deletions(-) diff --git a/index.php b/index.php index 2f57ba0b48..d00311b425 100644 --- a/index.php +++ b/index.php @@ -25,7 +25,6 @@ if (!api_is_anonymous()) { $header_title = " "; } -$htmlHeadXtra[] = api_get_jquery_ui_js(); $htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider')); $htmlHeadXtra[] =' '; $htmlHeadXtra[] = ''; -$htmlHeadXtra[] = api_get_jquery_ui_js(); $interbreadcrumb[] = array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); diff --git a/main/admin/user_list.php b/main/admin/user_list.php index 2eabada3c4..930cd38402 100644 --- a/main/admin/user_list.php +++ b/main/admin/user_list.php @@ -21,8 +21,6 @@ if (isset($_configuration['deny_delete_users']) && $_configuration['deny_delete $iam_a_global_admin = api_is_global_platform_admin(); -$htmlHeadXtra[] = api_get_jquery_ui_js(); - $htmlHeadXtra[] = '"; - - $htmlHeadXtra[] = "'; diff --git a/main/exercice/admin.php b/main/exercice/admin.php index 21dc5dd3d8..b80a7ef13b 100644 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -299,10 +299,6 @@ if($modifyIn == 'thisExercise') { $noPHP_SELF=true; } } - - -$htmlHeadXtra[] = api_get_jquery_ui_js(); - $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index a9d8d47d47..f585245ae6 100644 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -132,8 +132,6 @@ $(function() { }); }); '; - -$htmlHeadXtra[] = api_get_jquery_ui_js(); //jQuery /* Constants and variables */ diff --git a/main/newscorm/lp_admin_view.php b/main/newscorm/lp_admin_view.php index bbabe8e993..b8b8da8dd7 100644 --- a/main/newscorm/lp_admin_view.php +++ b/main/newscorm/lp_admin_view.php @@ -91,8 +91,6 @@ if (isset($_REQUEST['updateaudio'])) { $show_learn_path = true; $lp_theme_css = $_SESSION['oLP']->get_theme(); -$htmlHeadXtra[] = api_get_jquery_ui_js(); - Display::display_header(null, 'Path'); //api_display_tool_title($therow['name']); diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index 3d0220073d..46901e0189 100644 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -267,7 +267,7 @@ if (!empty($flat_list)) { } - $dsp_edit = ''; + $dsp_edit = ''; $dsp_edit_close = ''; if ($is_allowed_to_edit) { @@ -362,19 +362,18 @@ if (!empty($flat_list)) { */ if ($current_session == $details['lp_session']) { if ($details['seriousgame_mode'] == 1 && $details['lp_prevent_reinit'] == 1) { //seriousgame mode | next = single - $dsp_reinit = '' . - 'Prevent reinit' . - ' '; + $dsp_reinit = '' . + Display::return_icon('kaboodleloop.gif', get_lang('PreventMultipleAttempts'),'',ICON_SIZE_SMALL). + ''; } if ($details['seriousgame_mode'] == 0 && $details['lp_prevent_reinit'] == 1) { //single mode | next = multiple - $dsp_reinit = '' . - 'Allow reinit' . - ' '; + $dsp_reinit = '' . + Display::return_icon('kaboodleloop_gray.gif', get_lang('AllowMultipleAttempts'),'',ICON_SIZE_SMALL). + ''; } if ($details['seriousgame_mode'] == 0 && $details['lp_prevent_reinit'] == 0) { //multiple mode | next = seriousgame - $dsp_reinit = '' . - 'Serious game mode' . - ' '; + $dsp_reinit = '' .Display::return_icon('kaboodleloop.gif', get_lang('AllowMultipleAttempts'),'',ICON_SIZE_SMALL). + ''; } } else { $dsp_reinit = Display::return_icon('kaboodleloop_gray.png', get_lang('AllowMultipleAttempts'),'',ICON_SIZE_SMALL); diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index f81f43b4eb..7e4418fba3 100644 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -41,7 +41,6 @@ $user_id = api_get_user_id(); $platform_theme = api_get_setting('stylesheets'); // Plataform's css. $my_style = $platform_theme; -$htmlHeadXtra[] = api_get_jquery_ui_js(); $htmlHeadXtra[] = ''; if (api_get_setting('show_glossary_in_documents') == 'ismanual' || api_get_setting('show_glossary_in_documents') == 'isautomatic' ) { diff --git a/main/session/index.php b/main/session/index.php index 14beec4795..ca6e00df09 100644 --- a/main/session/index.php +++ b/main/session/index.php @@ -20,7 +20,7 @@ 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; -$htmlHeadXtra[] = api_get_jquery_ui_js(true); +$htmlHeadXtra[] = api_get_jqgrid_js(); if (empty($_GET['session_id'])) { api_not_allowed(); diff --git a/main/social/group_topics.php b/main/social/group_topics.php index 43ac6524c7..6f29634780 100644 --- a/main/social/group_topics.php +++ b/main/social/group_topics.php @@ -77,8 +77,6 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { } } - -$htmlHeadXtra[] = api_get_jquery_ui_js(); $htmlHeadXtra[] = ' {$header_extra_content} diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 6f97429140..0ea93a5b6d 100644 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -448,7 +448,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor $table_header[] = array(get_lang('Date'), true, 'style="width:200px"'); if ($is_allowed_to_edit) { - $table_header[] = array(get_lang('Actions'), false, 'style="width:90px"'); + $table_header[] = array(get_lang('Actions'), false, 'style="width:90px"', array('class'=>'td_actions')); $table_has_actions_column = true; } // the following column name seems both undefined and unused diff --git a/user_portal.php b/user_portal.php index f9db40768e..eb300e96f5 100644 --- a/user_portal.php +++ b/user_portal.php @@ -34,8 +34,6 @@ if (isset($_SESSION['this_section'])) require_once './main/inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'userportal.lib.php'; -$htmlHeadXtra[] = api_get_jquery_ui_js(); - api_block_anonymous_users(); // Only users who are logged in can proceed. /* Constants and CONFIGURATION parameters */