From 31da25b1795f6f9dd17b13922861360bf36af52c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 4 May 2012 14:26:13 +0200 Subject: [PATCH 01/31] Minor - removing old code/comments --- main/newscorm/learnpath.class.php | 50 +++++++++---------------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 4ffa600b76..a1c53eae36 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -7363,9 +7363,7 @@ class learnpath { s1.addParam("flashvars","file=../../courses/' . $_course['path'] . '/document/audio/' . $row['audio'] . '&autostart=true"); s1.write("container"); '; - } - // Commented ":" for message in step. - //$return .= $lang.': '; + } $url = api_get_self() . '?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$item_id .'&lp_id='.$this->lp_id; $return .= Display::url(Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL), $url.'&action=edit_item&path_item=' . $row['path']); @@ -7376,18 +7374,6 @@ class learnpath { $return .= Display::url(Display::return_icon('accept.png', get_lang('Prerequisites'), array(), ICON_SIZE_SMALL), $url.'&action=edit_item_prereq'); } $return .= Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), $url.'&action=delete_item'); -/* - // Get the audiorecorder. Use of ob_* functions since there are echos in the file. - ob_start(); - $audio_recorder_studentview = 'false'; - $audio_recorder_item_id = $item_id; - if (api_get_setting('service_visio', 'active') == 'true') { - require_once 'audiorecorder.inc.php'; - } - $return .= ob_get_contents(); - ob_end_clean(); - // End of audiorecorder include - */ $return .= ''; return $return; } @@ -7724,10 +7710,8 @@ class learnpath { $res_quiz = Database::query($sql_quiz); $res_hot = Database::query($sql_hot); - $return = '
'; - - $return .= '
'; - //$return .= Display::return_icon('new_exercice.png', '', array(), 32); //''; + $return = '
'; + $return .= '
'; $return .= ''; $return .= '' . get_lang('NewExercise') . ''; $return .= '
'; @@ -7742,11 +7726,9 @@ class learnpath { while ($row_quiz = Database :: fetch_array($res_quiz)) { $return .= '
'; - $return .= ''; - //$return .= Display::return_icon('quiz.png', '', array(), 32); //''; + $return .= ''; $return .= '' . - Security :: remove_XSS(cut($row_quiz['title'], 80)).''; - //$return .= $row_quiz['title']; + Security :: remove_XSS(cut($row_quiz['title'], 80)).''; $return .= '
'; } @@ -7768,7 +7750,6 @@ class learnpath { $sql_link = "SELECT * FROM $tbl_link WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; $res_link = Database::query($sql_link); - //$return .= '
' . get_lang('Links') . '
'; $return = '
'; $return .= '
'; $return .= ''; @@ -7778,15 +7759,12 @@ class learnpath { while ($row_link = Database :: fetch_array($res_link)) { $return .= '
'; $return .= ''; - $return .= '' . $row_link['title'] . ''; + $return .= ''. + $row_link['title']. + ''; $return .= '
'; } - - /*if (Database :: num_rows($res_link) == 0) - $return .= '
' . get_lang('NoLinksAvailable') . '
'; - */ $return .= '
'; - return $return; } @@ -7795,12 +7773,12 @@ class learnpath { * @return unknown */ public function get_student_publications() { - $course_id = api_get_course_int_id(); - $tbl_student = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); - $session_id = api_get_session_id(); - $condition_session = api_get_session_condition($session_id); - $sql_student = "SELECT * FROM $tbl_student WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; - $res_student = Database::query($sql_student); + //$course_id = api_get_course_int_id(); + //$tbl_student = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); + //$session_id = api_get_session_id(); + //$condition_session = api_get_session_condition($session_id); + //$sql_student = "SELECT * FROM $tbl_student WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; + //$res_student = Database::query($sql_student); //$return .= '
' . get_lang('Student_publication') . '
'; $return = '
'; $return .= '
'; From 0485a24f01e97553636902ffc3c314d178d1e3a7 Mon Sep 17 00:00:00 2001 From: Hubert Borderiou Date: Fri, 4 May 2012 14:36:31 +0200 Subject: [PATCH 02/31] Minor change to CAS authentification and plugin. -ref#3940 --- main/auth/cas/authcas.php | 22 +++++++++++++++++++++- main/auth/cas/logincas.php | 16 +++++++++++----- plugin/add_cas_login_button/index.php | 7 +++++-- plugin/add_cas_login_button/template.tpl | 12 ++++++++++-- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/main/auth/cas/authcas.php b/main/auth/cas/authcas.php index adbaef1aff..f3dd47d715 100644 --- a/main/auth/cas/authcas.php +++ b/main/auth/cas/authcas.php @@ -9,18 +9,38 @@ require_once(api_get_path(SYS_PATH).'main/auth/cas/cas_var.inc.php'); require_once(api_get_path(SYS_PATH).'main/auth/external_login/ldap.inc.php'); require_once(api_get_path(SYS_PATH).'main/auth/external_login/functions.inc.php'); + + +/** +* @return true if cas is configured +* +**/ +function cas_configured() { + global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri; + $res = false; + if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) { + $res = true; + } + return $res; +} + + + /** * checks if the user already get a session * @return the user login if the user already has a session ,false otherwise **/ - function cas_is_authenticated() { global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri; global $PHPCAS_CLIENT; global $logout; + if (!cas_configured()) { + return; + } + if (!is_object($PHPCAS_CLIENT) ) { diff --git a/main/auth/cas/logincas.php b/main/auth/cas/logincas.php index 24672bf0e0..c0c7c8b284 100644 --- a/main/auth/cas/logincas.php +++ b/main/auth/cas/logincas.php @@ -16,9 +16,15 @@ require_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php'); require_once('authcas.php'); global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri; // phpCAS -if (!is_object($PHPCAS_CLIENT) ) { - phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri); - phpCAS::setNoCasServerValidation(); + +if (cas_configured()) { + if (!is_object($PHPCAS_CLIENT) ) { + phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri); + phpCAS::setNoCasServerValidation(); + } + phpCAS::forceAuthentication(); + header('Location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login')); +} +else { + header('Location: '.api_get_path(WEB_PATH)); } -phpCAS::forceAuthentication(); -header('Location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login')); diff --git a/plugin/add_cas_login_button/index.php b/plugin/add_cas_login_button/index.php index 52fa656f03..4445aafcb8 100644 --- a/plugin/add_cas_login_button/index.php +++ b/plugin/add_cas_login_button/index.php @@ -1,9 +1,12 @@  
{% endif %}
{{add_cas_login_button.comm_label}}
- + {% if add_cas_login_button.cas_activated %} + {% if add_cas_login_button.cas_configured %} + + {% else %} + CAS isn't configured. Go to Admin > Configuration > CAS.
+ {% endif %} + {% else %} + CAS isn't activated. Go to Admin > Configuration > CAS.
+ {% endif %}
{% endif %} From 453b325c13fbbea269fad1462cbbb2594965eea7 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 4 May 2012 14:39:25 +0200 Subject: [PATCH 03/31] Showing only visible links in the LP "add item" page --- main/newscorm/learnpath.class.php | 29 ++++++++++++++--------------- main/newscorm/lp_add_item.php | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index a1c53eae36..e66d8e3409 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -7509,12 +7509,7 @@ class learnpath { $return .= ''; $return .= ''; $return .= ''; - $return .= ''; - // It said these lines of code - see SVN#11724 and SVN#10770 - //$return .= ''; - //$return .= ''; - //$return .= ''; - //$return .= ''; + $return .= ''; $return .= ''; $return .= ''; $return .= ''; @@ -7747,22 +7742,26 @@ class learnpath { $session_id = api_get_session_id(); $condition_session = api_get_session_condition($session_id); - $sql_link = "SELECT * FROM $tbl_link WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; - $res_link = Database::query($sql_link); + $sql_link = "SELECT id, title FROM $tbl_link WHERE c_id = ".$course_id." $condition_session ORDER BY title ASC"; + $res_link = Database::query($sql_link); $return = '
'; $return .= '
'; $return .= ''; $return .= '' . get_lang('LinkAdd') . ''; $return .= '
'; - + $course_info = api_get_course_info(); + while ($row_link = Database :: fetch_array($res_link)) { - $return .= '
'; - $return .= ''; - $return .= ''. - $row_link['title']. - ''; - $return .= '
'; + $item_visibility = api_get_item_visibility($course_info, TOOL_LINK, $row_link['id'], $session_id); + if ($item_visibility != 2) { + $return .= '
'; + $return .= ''; + $return .= ''. + $row_link['title']. + ''; + $return .= '
'; + } } $return .= '
'; return $return; diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index 532af6eea2..e9bfee0fce 100644 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -271,7 +271,7 @@ if ($action == 'add_item' && $type == 'document' && !isset($_GET['file'])) { echo '
'; - if (isset($new_item_id) && is_numeric($new_item_id)) { + if (isset($new_item_id) && is_numeric($new_item_id)) { switch ($type) { case 'chapter': echo $_SESSION['oLP']->display_manipulate($new_item_id, $_POST['type']); From 3f4d0a0b081f9d43a7e0cbcab4469d6f7f6fb0c2 Mon Sep 17 00:00:00 2001 From: Hubert Borderiou Date: Fri, 4 May 2012 14:51:03 +0200 Subject: [PATCH 04/31] Add plugin : loggin button for Shibboleth authentification. --- plugin/add_shibboleth_login_button/css.css | 12 ++++++ plugin/add_shibboleth_login_button/index.php | 21 +++++++++ plugin/add_shibboleth_login_button/plugin.php | 43 +++++++++++++++++++ plugin/add_shibboleth_login_button/readme.txt | 6 +++ .../add_shibboleth_login_button/template.tpl | 15 +++++++ 5 files changed, 97 insertions(+) create mode 100644 plugin/add_shibboleth_login_button/css.css create mode 100644 plugin/add_shibboleth_login_button/index.php create mode 100644 plugin/add_shibboleth_login_button/plugin.php create mode 100644 plugin/add_shibboleth_login_button/readme.txt create mode 100644 plugin/add_shibboleth_login_button/template.tpl diff --git a/plugin/add_shibboleth_login_button/css.css b/plugin/add_shibboleth_login_button/css.css new file mode 100644 index 0000000000..e16f03c6ab --- /dev/null +++ b/plugin/add_shibboleth_login_button/css.css @@ -0,0 +1,12 @@ + .shibboleth_plugin_image { + float:left; + height:50px; + margin: 0px 5px 5px 0px; + } + .shibboleth_plugin_comm { + font-style:italic; + } + .shibboleth_plugin_clear { + clear:both; + height:1px; + } diff --git a/plugin/add_shibboleth_login_button/index.php b/plugin/add_shibboleth_login_button/index.php new file mode 100644 index 0000000000..3c627b268d --- /dev/null +++ b/plugin/add_shibboleth_login_button/index.php @@ -0,0 +1,21 @@ +Plugins) + * @package chamilo.plugin + * @author Julio Montoya + */ +/** + * Plugin details (must be present) + */ + + + +//the plugin title +$plugin_info['title'] = 'Add a button to login using Shibboleth'; + +//the comments that go with the plugin +$plugin_info['comment'] = "If Shibboleth is configured, this plugin add a text and a button on the login page to login with Shibboleth. Configure plugin to add title, comment and logo."; +//the plugin version +$plugin_info['version'] = '1.0'; +//the plugin author +$plugin_info['author'] = 'Hubert Borderiou'; + +//the plugin configuration +$form = new FormValidator('add_shibboleth_button_form'); +$form->addElement('text', 'shibboleth_button_label', 'shibboleth connexion title', ''); +$form->addElement('text', 'shibboleth_button_comment', 'shibboleth connexion description', ''); +$form->addElement('text', 'shibboleth_image_url', 'Logo URL if any (image, 50px height)'); +$form->addElement('style_submit_button', 'submit_button', get_lang('Save')); +//get default value for form +$tab_default_add_shibboleth_login_button_shibboleth_button_label = api_get_setting('add_shibboleth_login_button_shibboleth_button_label'); +$tab_default_add_shibboleth_login_button_shibboleth_button_comment = api_get_setting('add_shibboleth_login_button_shibboleth_button_comment'); +$tab_default_add_shibboleth_login_button_shibboleth_image_url = api_get_setting('add_shibboleth_login_button_shibboleth_image_url'); +$defaults = array(); +$defaults['shibboleth_button_label'] = $tab_default_add_shibboleth_login_button_shibboleth_button_label['add_shibboleth_login_button']; +$defaults['shibboleth_button_comment'] = $tab_default_add_shibboleth_login_button_shibboleth_button_comment['add_shibboleth_login_button']; +$defaults['shibboleth_image_url'] = $tab_default_add_shibboleth_login_button_shibboleth_image_url['add_shibboleth_login_button']; +$form->setDefaults($defaults); +//display form +$plugin_info['settings_form'] = $form; + +//set the templates that are going to be used +$plugin_info['templates'] = array('template.tpl'); diff --git a/plugin/add_shibboleth_login_button/readme.txt b/plugin/add_shibboleth_login_button/readme.txt new file mode 100644 index 0000000000..629363d5c5 --- /dev/null +++ b/plugin/add_shibboleth_login_button/readme.txt @@ -0,0 +1,6 @@ +README +

+This plugin add a button to allow user to login to Chamilo with Shibboleth authentification.

+You have to configure your Shibboleth connexion before use this plugin.
+To activate and configure Shibboleth, for your Chamilo platform, go to Administration > Configuration settings > Shibboleth
+This plugin has been done to be added in the login_top region, but you can put it where you want.
\ No newline at end of file diff --git a/plugin/add_shibboleth_login_button/template.tpl b/plugin/add_shibboleth_login_button/template.tpl new file mode 100644 index 0000000000..6a2764bad1 --- /dev/null +++ b/plugin/add_shibboleth_login_button/template.tpl @@ -0,0 +1,15 @@ + +{% if add_shibboleth_login_button.show_message %} + +
+ {% if add_shibboleth_login_button.url_label %} + + {% endif %} +

{{add_shibboleth_login_button.button_label}}

+ {% if add_shibboleth_login_button.url_label %} +
 
+ {% endif %} +
{{add_shibboleth_login_button.comm_label}}
+ +
+{% endif %} From 013bacae1dc879ef229b4c4c0ce4b563b2eaec12 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 4 May 2012 15:57:17 +0200 Subject: [PATCH 05/31] Cleaning/fixing lp_view page when rendering LP in a 1024px screen laos adding default values to the lp TOC --- main/css/academica/default.css | 10 +- main/css/academica/scorm.css | 2 - main/css/baby_orange/default.css | 12 +- main/css/baby_orange/scorm.css | 4 +- main/css/base.css | 176 ++++++++++++++++++++++- main/css/base_chamilo.css | 54 ------- main/css/blue_lagoon/default.css | 10 +- main/css/blue_lagoon/scorm.css | 8 +- main/css/chamilo/default.css | 2 +- main/css/chamilo/scorm.css | 38 ++--- main/css/chamilo_electric_blue/scorm.css | 6 +- main/css/chamilo_green/scorm.css | 6 +- main/css/chamilo_orange/scorm.css | 5 +- main/css/chamilo_red/scorm.css | 3 - main/css/chamilo_sport_red/scorm.css | 11 +- main/css/cool_blue/default.css | 10 +- main/css/cool_blue/scorm.css | 6 +- main/css/corporate/default.css | 10 +- main/css/corporate/scorm.css | 4 +- main/css/cosmic_campus/default.css | 10 +- main/css/cosmic_campus/scorm.css | 4 +- main/css/delicious_bordeaux/default.css | 12 +- main/css/delicious_bordeaux/scorm.css | 10 +- main/css/dokeos_blue/default.css | 10 +- main/css/dokeos_blue/scorm.css | 6 +- main/css/dokeos_classic/default.css | 14 +- main/css/dokeos_classic/scorm.css | 5 +- main/css/dokeos_classic_2D/default.css | 12 +- main/css/dokeos_classic_2D/scorm.css | 4 +- main/css/empire_green/default.css | 10 +- main/css/empire_green/scorm.css | 10 +- main/css/fruity_orange/default.css | 10 +- main/css/fruity_orange/scorm.css | 6 +- main/css/medical/default.css | 6 +- main/css/medical/scorm.css | 2 - main/css/public_admin/default.css | 10 +- main/css/public_admin/scorm.css | 4 - main/css/royal_purple/default.css | 10 +- main/css/royal_purple/scorm.css | 6 +- main/css/silver_line/default.css | 11 +- main/css/silver_line/scorm.css | 4 +- main/css/sober_brown/default.css | 12 +- main/css/sober_brown/scorm.css | 4 +- main/css/tasty_olive/default.css | 10 +- main/css/tasty_olive/scorm.css | 6 +- main/newscorm/learnpath.class.php | 2 +- main/newscorm/lp_view.php | 176 +++++++++++------------ 47 files changed, 308 insertions(+), 455 deletions(-) mode change 100755 => 100644 main/css/academica/scorm.css mode change 100755 => 100644 main/css/baby_orange/scorm.css mode change 100755 => 100644 main/css/blue_lagoon/scorm.css mode change 100755 => 100644 main/css/chamilo_electric_blue/scorm.css mode change 100755 => 100644 main/css/chamilo_green/scorm.css mode change 100755 => 100644 main/css/chamilo_orange/scorm.css mode change 100755 => 100644 main/css/chamilo_red/scorm.css mode change 100755 => 100644 main/css/cool_blue/scorm.css mode change 100755 => 100644 main/css/corporate/scorm.css mode change 100755 => 100644 main/css/cosmic_campus/scorm.css mode change 100755 => 100644 main/css/delicious_bordeaux/scorm.css mode change 100755 => 100644 main/css/dokeos_blue/scorm.css mode change 100755 => 100644 main/css/dokeos_classic/scorm.css mode change 100755 => 100644 main/css/dokeos_classic_2D/scorm.css mode change 100755 => 100644 main/css/empire_green/scorm.css mode change 100755 => 100644 main/css/fruity_orange/scorm.css mode change 100755 => 100644 main/css/medical/scorm.css mode change 100755 => 100644 main/css/public_admin/scorm.css mode change 100755 => 100644 main/css/royal_purple/scorm.css mode change 100755 => 100644 main/css/silver_line/scorm.css mode change 100755 => 100644 main/css/sober_brown/scorm.css mode change 100755 => 100644 main/css/tasty_olive/scorm.css diff --git a/main/css/academica/default.css b/main/css/academica/default.css index 67452119d6..73d2c8822f 100644 --- a/main/css/academica/default.css +++ b/main/css/academica/default.css @@ -326,19 +326,11 @@ form span.form_error { background:#F8F8F8; border-bottom:1px solid #4171b5; border-top:1px solid #4171b5; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/academica/scorm.css b/main/css/academica/scorm.css old mode 100755 new mode 100644 index a799035fe6..708a02880d --- a/main/css/academica/scorm.css +++ b/main/css/academica/scorm.css @@ -20,8 +20,6 @@ overflow: auto; background-color: white; height: 210px; - width: 94%; - border-left: 10px #FFF solid; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index 824960963b..72be7a145e 100644 --- a/main/css/baby_orange/default.css +++ b/main/css/baby_orange/default.css @@ -306,20 +306,12 @@ form span.form_error { background-color:#FDDEAA; border-bottom:1px solid #EE4C03; border-top:1px solid #EE4C03; - height:29px; - padding-left: -17px; - margin-bottom: 1px; - vertical-align:middle; - width: 90%; - margin-left:17px; + height:29px; + margin-bottom: 1px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/baby_orange/scorm.css b/main/css/baby_orange/scorm.css old mode 100755 new mode 100644 index 6fc1299652..1d02f56b4d --- a/main/css/baby_orange/scorm.css +++ b/main/css/baby_orange/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 96%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/base.css b/main/css/base.css index 956c53fad5..50503dee9d 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -3457,12 +3457,12 @@ a.forum_group_link { /* actions */ .actions_lp { - background:#F8F8F8; - height: 40px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + background:#F8F8F8; + margin: 0px; + padding:9px 0px 9px 0px; + width:100%; + text-align: center; + } .actions_lp .btn-group { margin-left: 25px; @@ -3644,7 +3644,169 @@ footer { background-image: -webkit-linear-gradient(top, #F5F5F5 0%, #EEEEEE 100%); /* Chrome 10+,Safari 5.1+ */ background-image: -ms-linear-gradient(top, #F5F5F5 0%,#EEEEEE 100%); /* IE10+ */ background-image: -o-linear-gradient(top, #F5F5F5 0%,#EEEEEE 100%); /* Opera 11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F5F5F5', endColorstr='#EEEEEE',GradientType=0 ); /* IE6-9 */ + /* Fixes bug in ie8 */ + /* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F5F5F5', endColorstr='#EEEEEE',GradientType=0 ); */ /* IE6-9 */ background-image: linear-gradient(top, #F5F5F5 0%, #EEEEEE 100%); /* W3C */ } + + +/* Default LP left column values */ + +#learning_path_left_zone { + float:left; + width:280px; + height:100%; + padding-left: 8px; + padding-right: 4px; +} + +#learning_path_left_zone #header { + font-size:14px; +} + +#author_icon { + float:left; +} + +#lp_navigation_elem { + float:left; +} + +#author_image { + border: 1px solid #CCCCCC; + float: left; + margin: 0; + padding: 8px; + position: relative; + width: 94%; +} +#author_name { + float: left; + text-align:center; + width: 100%; + font-size: 11px; + color: #888; + margin-top: 2px; +} + +#learning_path_toc { + font-size:9pt; + margin:0; +} + +#scorm_title { + background: none repeat scroll 0 0 #EEEEEE; + color: #444444; + font-size: 16px; + font-weight: bold; + padding: 1px 5px 3px 8px; +} + +.progresstext { + text-align: center; +} + +.inner_lp_toc { + overflow: auto; + background-color: white; + height: 210px; +} + +.inner_lp_toc .scorm_item a { + font-weight: bold; + font-size: 14px; + margin-right: 1px; + padding-bottom: 2px; + text-decoration: none; + color: #2F3E46; +} + +.inner_lp_toc .scorm_item a.chapter_module { + font-weight: normal; + margin-right: 10px; +} +.inner_lp_toc .scorm_item_highlight { + border: 1px solid #999; + background:#999; + font-weight:bold; + text-shadow:0 -1px 1px #666; + background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#999)); + background-image:-webkit-linear-gradient(top,#666,#999); + background-image:-moz-linear-gradient(top,#666,#999); + background-image:-ms-linear-gradient(top,#666,#999); + background-image:-o-linear-gradient(top,#666,#999); + background-image:linear-gradient(top,#666,#999); + margin-right: 0px; + padding: 10px 0px 10px 0px; + text-decoration: none; +} + +.inner_lp_toc .scorm_item_highlight a { + color:#fff; + margin-right: 1px; + text-decoration: none; + font-weight: bold; +} + +.inner_lp_toc .scorm_item_section { + border:1px solid #222; + background:#333; + font-weight:bold; + color:#fff; + text-shadow:0 -1px 1px #000; + background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333)); + background-image:-webkit-linear-gradient(top,#555,#333); + background-image:-moz-linear-gradient(top,#555,#333); + background-image:-ms-linear-gradient(top,#555,#333); + background-image:-o-linear-gradient(top,#555,#333); + background-image:linear-gradient(top,#555,#333); + margin-right: 1px; + padding: 10px 0px 10px 0px; + text-decoration: none; + +} + +.inner_lp_toc .scorm_item { + font-size: 16px; + margin-left: 10px; + margin-right:10px; + text-decoration: none; + border-color: rgba(255, 255, 255, 0.3); +} + +.inner_lp_toc .scorm_item_1 { + border-bottom: 1px solid #CCCCCC; + background:#eee; + font-weight:bold; + color:#444; + text-shadow:0 1px 1px #f6f6f6; + background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee)); + background-image:-webkit-linear-gradient(top,#fdfdfd,#eee); + background-image:-moz-linear-gradient(top,#fdfdfd,#eee); + background-image:-ms-linear-gradient(top,#fdfdfd,#eee); + background-image:-o-linear-gradient(top,#fdfdfd,#eee); + background-image:linear-gradient(top,#fdfdfd,#eee); + margin-right: 1px; + padding: 10px 0px 10px 0px; + text-decoration: none; + font-weight: normal; + /* background:#FDFDFD; */ +} + +.inner_lp_toc .scorm_item_2 { + background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee)); + background-image:-webkit-linear-gradient(top,#fdfdfd,#eee); + background-image:-moz-linear-gradient(top,#fdfdfd,#eee); + background-image:-ms-linear-gradient(top,#fdfdfd,#eee); + background-image:-o-linear-gradient(top,#fdfdfd,#eee); + background-image:linear-gradient(top,#fdfdfd,#eee); + border-bottom: 1px solid #CCCCCC; + color: #444444; + font-weight: bold; + text-shadow: 0 1px 1px #F6F6F6; + margin-right: 1px; + padding: 10px 0px 10px 0px; + text-decoration: none; + font-weight: normal; +} \ No newline at end of file diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 55835ca795..7ca00621af 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -186,56 +186,6 @@ a.invisible:link, a.invisible:visited { line-height: 0px; height: 0; } -input.link_alike { - background-color: #FFFFFF; - border-width: 0px; - color: #4171b5; - font-weight: bold; - text-align: left; - padding: 0px; - margin: 0px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - border:1px solid #E1E1E0; -} -input.link_alike:hover { - background-color: #FFFFFF; - border-width: 0px; - color: #f3840d; - font-weight: bold; - text-align: left; - padding: 0px; - margin: 0px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - border:1px solid #E1E1E0; -} - - - -/***************************************************** - * HEADER STYLES * - *****************************************************/ -#header { - -} -/******************************************************** - * HEADER 1: Title, portal, organisation, course title * - ********************************************************/ - -#header1 a { - font-size:12px; - font-weight:normal; - color: #666666; - text-decoration: none; -} -#header1 a:hover { - text-decoration: underline; -} #sitename { margin: 0; } @@ -1809,10 +1759,6 @@ span.form_required { cursor: pointer; } -.progresstext { - text-align:center; -} - /* tips Abbr-plugin for FCKeditor */ abbr { border-bottom: 1px dotted rgb(102, 102, 102); diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index d19e4b8b43..bd182afc00 100644 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2055,19 +2055,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/blue_lagoon/scorm.css b/main/css/blue_lagoon/scorm.css old mode 100755 new mode 100644 index 10b7d69313..39c8711465 --- a/main/css/blue_lagoon/scorm.css +++ b/main/css/blue_lagoon/scorm.css @@ -19,16 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; - margin-right:10px; - //it was 20px padding-bottom: 2px; - text-decoration: none; + margin-right:10px; } .inner_lp_toc .scorm_item A { font-size: 11px; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index d2d67973b0..da7441596d 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -60,7 +60,7 @@ a:active { /***************************************************** * FOOTER STYLES * *****************************************************/ -footer { +footer { background-color: #037fb2; background-image: url(images/bg-footer.gif); background-repeat:repeat-x; diff --git a/main/css/chamilo/scorm.css b/main/css/chamilo/scorm.css index 7a14d8f0e4..19c66edc0c 100644 --- a/main/css/chamilo/scorm.css +++ b/main/css/chamilo/scorm.css @@ -16,25 +16,23 @@ width: 99%; border-right: 1px none; } + .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 5px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item a { font-weight: bold; -/* text-shadow: 0 1px 1px #F6F6F6; */ - font-size: 14px; margin-right: 1px; padding-bottom: 2px; text-decoration: none; - font-family: Helvetica,Arial,sans-serif; - color: #2F3E46; + font-family: Helvetica,Arial,sans-serif; + color: #2F3E46; } + .inner_lp_toc .scorm_item a.chapter_module { font-weight: normal; margin-right: 10px; @@ -50,12 +48,12 @@ background-image:-moz-linear-gradient(top,#72b0d4,#4b88b6); background-image:-ms-linear-gradient(top,#72b0d4,#4b88b6); background-image:-o-linear-gradient(top,#72b0d4,#4b88b6); - background-image:linear-gradient(top,#72b0d4,#4b88b6) - - margin-right: 1px; + background-image:linear-gradient(top,#72b0d4,#4b88b6); + margin-right: 0px; padding: 10px 0px 10px 0px; text-decoration: none; } + .inner_lp_toc .scorm_item_highlight a { color:#fff; margin-right: 1px; @@ -76,7 +74,7 @@ background-image:-o-linear-gradient(top,#555,#333); background-image:linear-gradient(top,#555,#333); - margin-right: 1px; + margin-right: 1px; padding: 10px 0px 10px 0px; text-decoration: none; @@ -110,27 +108,23 @@ /* background:#FDFDFD; */ } -.inner_lp_toc .scorm_item_2 { - +.inner_lp_toc .scorm_item_2 { background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee)); background-image:-webkit-linear-gradient(top,#fdfdfd,#eee); background-image:-moz-linear-gradient(top,#fdfdfd,#eee); background-image:-ms-linear-gradient(top,#fdfdfd,#eee); background-image:-o-linear-gradient(top,#fdfdfd,#eee); - background-image:linear-gradient(top,#fdfdfd,#eee); - + background-image:linear-gradient(top,#fdfdfd,#eee); border-bottom: 1px solid #CCCCCC; color: #444444; font-weight: bold; text-shadow: 0 1px 1px #F6F6F6; - - margin-right: 1px; padding: 10px 0px 10px 0px; text-decoration: none; font-weight: normal; - } + .inner_lp_toc .scorm_title { font-weight: bold; background:#ccc; @@ -164,8 +158,6 @@ /*.scormpage .menu */ .lp_navigation_elem .progresstext { margin-top: -20px; -// margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { @@ -206,12 +198,6 @@ #image_preview { padding-left: 17px; } -#author_name { - padding-left: 5px; - padding-top: 5px; - font-size: 11px; - color:#888; -} #msg_div_id { padding-left: 17px; padding-top: 4px; diff --git a/main/css/chamilo_electric_blue/scorm.css b/main/css/chamilo_electric_blue/scorm.css old mode 100755 new mode 100644 index bc83ef12fa..cd0532696e --- a/main/css/chamilo_electric_blue/scorm.css +++ b/main/css/chamilo_electric_blue/scorm.css @@ -19,16 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; - text-decoration: none; } .inner_lp_toc .scorm_item A { font-size: 11px; diff --git a/main/css/chamilo_green/scorm.css b/main/css/chamilo_green/scorm.css old mode 100755 new mode 100644 index bc83ef12fa..cd0532696e --- a/main/css/chamilo_green/scorm.css +++ b/main/css/chamilo_green/scorm.css @@ -19,16 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; - text-decoration: none; } .inner_lp_toc .scorm_item A { font-size: 11px; diff --git a/main/css/chamilo_orange/scorm.css b/main/css/chamilo_orange/scorm.css old mode 100755 new mode 100644 index bc83ef12fa..9e712a1fc6 --- a/main/css/chamilo_orange/scorm.css +++ b/main/css/chamilo_orange/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { diff --git a/main/css/chamilo_red/scorm.css b/main/css/chamilo_red/scorm.css old mode 100755 new mode 100644 index bc83ef12fa..0c659c870f --- a/main/css/chamilo_red/scorm.css +++ b/main/css/chamilo_red/scorm.css @@ -20,14 +20,11 @@ overflow: auto; background-color: white; height: 210px; - width: 94%; - border-left: 10px #FFF solid; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { diff --git a/main/css/chamilo_sport_red/scorm.css b/main/css/chamilo_sport_red/scorm.css index bc83ef12fa..e48d334e14 100755 --- a/main/css/chamilo_sport_red/scorm.css +++ b/main/css/chamilo_sport_red/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -79,8 +76,6 @@ } .inner_lp_toc .scorm_title_text { margin-left: 10px; - //padding: 2px; - //cambiado no existe } .inner_lp_toc .scorm_status_img { margin:0px; @@ -105,9 +100,7 @@ } /*.scormpage .menu */ .lp_navigation_elem .progresstext { - margin-top: -20px; - //margin-left: 40%; -//em font-size: normal; + margin-top: -20px; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css index 4a25dba9af..751e135746 100644 --- a/main/css/cool_blue/default.css +++ b/main/css/cool_blue/default.css @@ -2003,19 +2003,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/cool_blue/scorm.css b/main/css/cool_blue/scorm.css old mode 100755 new mode 100644 index c78ee47abe..3aba483045 --- a/main/css/cool_blue/scorm.css +++ b/main/css/cool_blue/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -107,7 +104,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index 419dc84fa8..c6fe67deac 100644 --- a/main/css/corporate/default.css +++ b/main/css/corporate/default.css @@ -415,19 +415,11 @@ ul#navigation .help a{ /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/corporate/scorm.css b/main/css/corporate/scorm.css old mode 100755 new mode 100644 index 5a47887900..68672d9597 --- a/main/css/corporate/scorm.css +++ b/main/css/corporate/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css index db9a0e8a05..38da7d1ed1 100644 --- a/main/css/cosmic_campus/default.css +++ b/main/css/cosmic_campus/default.css @@ -352,19 +352,11 @@ form span.form_error { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/cosmic_campus/scorm.css b/main/css/cosmic_campus/scorm.css old mode 100755 new mode 100644 index a799035fe6..a769f687c1 --- a/main/css/cosmic_campus/scorm.css +++ b/main/css/cosmic_campus/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css index 0f862378be..672546ce07 100644 --- a/main/css/delicious_bordeaux/default.css +++ b/main/css/delicious_bordeaux/default.css @@ -16,8 +16,6 @@ body { background-color: #fff; height: 100%; /* stick */ } - - /* ----------------------------------------------------------------------------- Side-Menu Slider (JQuery) see banner.inc.php @@ -2017,19 +2015,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/delicious_bordeaux/scorm.css b/main/css/delicious_bordeaux/scorm.css old mode 100755 new mode 100644 index c78ee47abe..8874da901f --- a/main/css/delicious_bordeaux/scorm.css +++ b/main/css/delicious_bordeaux/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -78,9 +75,7 @@ color: #444; } .inner_lp_toc .scorm_title_text { - margin-left: 10px; - //padding: 2px; - //cambiado no existe + margin-left: 10px; } .inner_lp_toc .scorm_status_img { margin:0px; @@ -107,7 +102,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css index 2e2aebc7ee..eb93ff8d96 100644 --- a/main/css/dokeos_blue/default.css +++ b/main/css/dokeos_blue/default.css @@ -2025,19 +2025,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/dokeos_blue/scorm.css b/main/css/dokeos_blue/scorm.css old mode 100755 new mode 100644 index c78ee47abe..3aba483045 --- a/main/css/dokeos_blue/scorm.css +++ b/main/css/dokeos_blue/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -107,7 +104,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index d4378d7357..c9a05f07ef 100644 --- a/main/css/dokeos_classic/default.css +++ b/main/css/dokeos_classic/default.css @@ -1897,22 +1897,12 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} } /* actions */ .actions_lp { - background:#F8F8F8; - //border-bottom:1px solid #999999; - //border-top:1px solid #999999; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + background:#F8F8F8; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/dokeos_classic/scorm.css b/main/css/dokeos_classic/scorm.css old mode 100755 new mode 100644 index 6a13b420a4..38f6e722a0 --- a/main/css/dokeos_classic/scorm.css +++ b/main/css/dokeos_classic/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; @@ -105,7 +103,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index fddbce825e..15dfcb1372 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/main/css/dokeos_classic_2D/default.css @@ -2017,21 +2017,11 @@ input.forms { /* actions */ .actions_lp { background:#F8F8F8; - /*border-bottom:1px solid #999999; */ - /*border-top:1px solid #999999; */ - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/dokeos_classic_2D/scorm.css b/main/css/dokeos_classic_2D/scorm.css old mode 100755 new mode 100644 index 3ec13858a9..9d87d93837 --- a/main/css/dokeos_classic_2D/scorm.css +++ b/main/css/dokeos_classic_2D/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css index ba4de8be02..8574ab3b86 100644 --- a/main/css/empire_green/default.css +++ b/main/css/empire_green/default.css @@ -2013,19 +2013,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/empire_green/scorm.css b/main/css/empire_green/scorm.css old mode 100755 new mode 100644 index c78ee47abe..5835abd67d --- a/main/css/empire_green/scorm.css +++ b/main/css/empire_green/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -79,9 +76,7 @@ } .inner_lp_toc .scorm_title_text { margin-left: 10px; - //padding: 2px; - //cambiado no existe -} + } .inner_lp_toc .scorm_status_img { margin:0px; margin-left: -10px; @@ -107,7 +102,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css index 583720cd95..2d0c354563 100644 --- a/main/css/fruity_orange/default.css +++ b/main/css/fruity_orange/default.css @@ -2021,19 +2021,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/fruity_orange/scorm.css b/main/css/fruity_orange/scorm.css old mode 100755 new mode 100644 index c78ee47abe..3aba483045 --- a/main/css/fruity_orange/scorm.css +++ b/main/css/fruity_orange/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -107,7 +104,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/medical/default.css b/main/css/medical/default.css index eff2277d08..7d791fdf54 100644 --- a/main/css/medical/default.css +++ b/main/css/medical/default.css @@ -1970,11 +1970,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; diff --git a/main/css/medical/scorm.css b/main/css/medical/scorm.css old mode 100755 new mode 100644 index f01c6042b5..a18eeecf8f --- a/main/css/medical/scorm.css +++ b/main/css/medical/scorm.css @@ -20,8 +20,6 @@ overflow: auto; background-color: white; height: 210px; - width: 94%; - border-left: 10px #FFF solid; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index 6b3bb1b531..c420a5aa10 100644 --- a/main/css/public_admin/default.css +++ b/main/css/public_admin/default.css @@ -1746,19 +1746,11 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/public_admin/scorm.css b/main/css/public_admin/scorm.css old mode 100755 new mode 100644 index 5f3dd0147a..b89ba3f840 --- a/main/css/public_admin/scorm.css +++ b/main/css/public_admin/scorm.css @@ -20,14 +20,11 @@ overflow: auto; background-color: white; height: 210px; - width: 94%; - border-left: 10px #FFF solid; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -102,7 +99,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css index fc6e355a38..a80b503b15 100644 --- a/main/css/royal_purple/default.css +++ b/main/css/royal_purple/default.css @@ -1973,19 +1973,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/royal_purple/scorm.css b/main/css/royal_purple/scorm.css old mode 100755 new mode 100644 index c78ee47abe..3aba483045 --- a/main/css/royal_purple/scorm.css +++ b/main/css/royal_purple/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -107,7 +104,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index 7c1c8c7d2f..b9a571f915 100644 --- a/main/css/silver_line/default.css +++ b/main/css/silver_line/default.css @@ -1467,20 +1467,11 @@ div.system_announcement { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin-bottom: 1px; - vertical-align:middle; - width: 90%; - margin-left:17px; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/silver_line/scorm.css b/main/css/silver_line/scorm.css old mode 100755 new mode 100644 index 1a25ef629f..0defead0d1 --- a/main/css/silver_line/scorm.css +++ b/main/css/silver_line/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 6ee1cdc478..d49da6df44 100644 --- a/main/css/sober_brown/default.css +++ b/main/css/sober_brown/default.css @@ -1686,21 +1686,11 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} /* actions */ .actions_lp { background:#F8F8F8; - //border-bottom:1px solid #999999; - //border-top:1px solid #999999; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/sober_brown/scorm.css b/main/css/sober_brown/scorm.css old mode 100755 new mode 100644 index 4286daab64..f83131426a --- a/main/css/sober_brown/scorm.css +++ b/main/css/sober_brown/scorm.css @@ -19,9 +19,7 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index 1067eab73d..adba6bc627 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -1946,19 +1946,11 @@ div.comments { /* actions */ .actions_lp { background:#F8F8F8; - height:29px; - padding-left: -17px; - margin: 5px 2px 1px 12px; - vertical-align:middle; - width: 90%; + height:29px; } .actions_lp img { vertical-align:middle; } -.actions_lp a { - margin-right: 10px; - vertical-align:middle; -} .actions_lp span { margin-right: 10px; vertical-align:middle; diff --git a/main/css/tasty_olive/scorm.css b/main/css/tasty_olive/scorm.css old mode 100755 new mode 100644 index ed79935617..3aba483045 --- a/main/css/tasty_olive/scorm.css +++ b/main/css/tasty_olive/scorm.css @@ -19,15 +19,12 @@ .inner_lp_toc { overflow: auto; background-color: white; - height: 210px; - width: 94%; - border-left: 10px #FFF solid; + height: 210px; } .inner_lp_toc .scorm_item { font-size: 11px; margin-left: 10px; margin-right:10px; -//cambiado era 20 padding-bottom: 2px; text-decoration: none; } .inner_lp_toc .scorm_item A { @@ -107,7 +104,6 @@ .lp_navigation_elem .progresstext { margin-top: -20px; margin-left: 40%; -//em font-size: normal; } /*.scormpage .menu */ .lp_navigation_elem .buttons { diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index e66d8e3409..95cfdeccc8 100644 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2678,7 +2678,7 @@ class learnpath { //echo $this->current; //$parent = $this->items[$this->current]->get_parent(); //if (empty($parent)) { $parent = $this->ordered_items[$this->items[$this->current]->get_previous_index()]; } - $html = '
' . Security::remove_XSS($this->get_name()) . '
'; + $html = '
' . Security::remove_XSS($this->get_name()) . '
'; // Build, display. if ($is_allowed_to_edit) { $gradebook = Security :: remove_XSS($_GET['gradebook']); diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index a8a3ba8951..1548384a6b 100644 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -313,109 +313,97 @@ if (Database::num_rows($res_media) > 0) { ?> -
+
-
From a5b640151c402412f64c3f64d0e86b4626862ae4 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 13:22:45 +0200 Subject: [PATCH 12/31] Droping course tables during a new installation "can create attendance_sheet_log" bug --- main/inc/lib/add_course.lib.inc.php | 68 +++++++++-------------------- main/inc/lib/database.lib.php | 1 + main/install/db_main.sql | 2 +- main/install/index.php | 1 - main/install/install.lib.php | 1 - main/install/install_db.inc.php | 7 ++- 6 files changed, 27 insertions(+), 53 deletions(-) diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 113eb07041..b6f64c27bf 100644 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -74,21 +74,6 @@ function define_course_keys($wanted_code, $prefix_for_all = '', $prefix_for_base $try_new_fsc_id ++; $final_suffix['CourseId'] = substr(md5(uniqid(rand())), 0, 4); } - /* - if ($_configuration['single_database']) { - $query = "SHOW TABLES FROM ".$_configuration['main_database']." LIKE '".$_configuration['table_prefix'].$keys_course_db_name.$_configuration['db_glue']."%'"; - $result = Database::query($query); - } else { - $query = "SHOW DATABASES LIKE '$keys_course_db_name'"; - $result = Database::query($query); - } - - if (Database::num_rows($result)) { - $keys_are_unique = false; - $try_new_fsc_db ++; - $final_suffix['CourseDb'] = substr('_'.md5(uniqid(rand())), 0, 4); - }*/ - if (file_exists(api_get_path(SYS_COURSE_PATH).$keys_course_repository)) { $keys_are_unique = false; $try_new_fsc_dir ++; @@ -99,15 +84,9 @@ function define_course_keys($wanted_code, $prefix_for_all = '', $prefix_for_base return $keys; } } - /* - // Db name can't begin with a number. - if (stripos('abcdefghijklmnopqrstuvwxyz', $keys_course_db_name[0]) === false) { - $keys_course_db_name = $prefixAntiNumber . $keys_course_db_name; - }*/ - + $keys['currentCourseCode'] = $keys_course_code; $keys['currentCourseId'] = $keys_course_id; - //$keys['currentCourseDbName'] = $keys_course_db_name; $keys['currentCourseRepository'] = $keys_course_repository; return $keys; @@ -185,15 +164,11 @@ function get_course_tables() { $tables[]= 'tool'; $tables[]= 'tool_intro'; - - // Group tool $tables[]= 'group_info'; $tables[]= 'group_category'; $tables[]= 'group_rel_user'; $tables[]= 'group_rel_tutor'; - $tables[]= 'item_property'; - $tables[]= 'userinfo_content'; $tables[]= 'userinfo_def'; $tables[]= 'course_description'; @@ -264,7 +239,6 @@ function get_course_tables() { $tables[]= 'wiki_conf'; $tables[]= 'wiki_discuss'; $tables[]= 'wiki_mailcue'; - //$tables[]= 'audiorecorder'; $tables[]= 'course_setting'; $tables[]= 'glossary'; $tables[]= 'notebook'; @@ -276,18 +250,26 @@ function get_course_tables() { $tables[]= 'thematic'; $tables[]= 'thematic_plan'; $tables[]= 'thematic_advance'; + $tables[]= 'metadata'; - return $tables; - + return $tables; +} + +/* Executed only before create_course_tables() */ +function drop_course_tables() { + $list = get_course_tables(); + foreach ($list as $table) { + $sql = "DROP TABLE IF EXISTS ".DB_COURSE_PREFIX.$table; + Database::query($sql); + } } + /** * Creates all the necessary tables for a new course */ -function update_db_course($course_db_name = null) { - global $_configuration; - - $charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci'; - +function create_course_tables($course_db_name = null) { + global $_configuration; + $charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci'; $use_one_db = true; if ($use_one_db) { @@ -302,24 +284,19 @@ function update_db_course($course_db_name = null) { //@todo define the backticks inside those table names directly (instead of adding them afterwards) $tbl_course_homepage = $course_db_name . 'tool'; $TABLEINTROS = $course_db_name . 'tool_intro'; - - // Group tool $TABLEGROUPS = $course_db_name . 'group_info'; $TABLEGROUPCATEGORIES = $course_db_name . 'group_category'; $TABLEGROUPUSER = $course_db_name . 'group_rel_user'; $TABLEGROUPTUTOR = $course_db_name . 'group_rel_tutor'; - $TABLEITEMPROPERTY = $course_db_name . 'item_property'; - $TABLETOOLUSERINFOCONTENT = $course_db_name . 'userinfo_content'; $TABLETOOLUSERINFODEF = $course_db_name . 'userinfo_def'; - $TABLETOOLCOURSEDESC = $course_db_name . 'course_description'; $TABLETOOLAGENDA = $course_db_name . 'calendar_event'; $TABLETOOLAGENDAREPEAT = $course_db_name . 'calendar_event_repeat'; $TABLETOOLAGENDAREPEATNOT = $course_db_name . 'calendar_event_repeat_not'; $TABLETOOLAGENDAATTACHMENT = $course_db_name . 'calendar_event_attachment'; - + // Announcements $TABLETOOLANNOUNCEMENTS = $course_db_name . 'announcement'; $TABLETOOLANNOUNCEMENTSATTACHMENT = $course_db_name . 'announcement_attachment'; @@ -360,8 +337,7 @@ function update_db_course($course_db_name = null) { $TABLEQUIZQUESTION = $course_db_name . 'quiz_rel_question'; $TABLEQUIZQUESTIONLIST = $course_db_name . 'quiz_question'; $TABLEQUIZANSWERSLIST = $course_db_name . 'quiz_answer'; - $TABLEQUIZQUESTIONOPTION = $course_db_name . 'quiz_question_option'; - + $TABLEQUIZQUESTIONOPTION = $course_db_name . 'quiz_question_option'; $table_quiz_question_category = $course_db_name . 'quiz_question_category'; $table_quiz_question_rel_category = $course_db_name . 'quiz_question_rel_category'; @@ -415,9 +391,6 @@ function update_db_course($course_db_name = null) { $TABLEWIKIDISCUSS = $course_db_name . 'wiki_discuss'; $TABLEWIKIMAILCUE = $course_db_name . 'wiki_mailcue'; - // audiorecorder - //$TABLEAUDIORECORDER = $course_db_name . 'audiorecorder'; - // Course settings $TABLESETTING = $course_db_name . 'course_setting'; @@ -437,8 +410,7 @@ function update_db_course($course_db_name = null) { // Thematic $TBL_THEMATIC = $course_db_name . 'thematic'; $TBL_THEMATIC_PLAN = $course_db_name . 'thematic_plan'; - $TBL_THEMATIC_ADVANCE = $course_db_name . 'thematic_advance'; - + $TBL_THEMATIC_ADVANCE = $course_db_name . 'thematic_advance'; $TBL_METADATA = $course_db_name . 'metadata'; $add_to_all_tables = ' c_id INT NOT NULL, '; @@ -519,7 +491,7 @@ function update_db_course($course_db_name = null) { )" . $charset_clause; Database::query($sql); - /* Forum tool */ + /* Forum tool */ // Forum Category $sql = " diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php index f41fc9cc43..5eec8f7c56 100644 --- a/main/inc/lib/database.lib.php +++ b/main/inc/lib/database.lib.php @@ -696,6 +696,7 @@ class Database { if (strpos($query, 'c_')) { //Check if the table contains inner joins if ( + strpos($query, 'DROP TABLE IF EXISTS') === false && strpos($query, 'thematic_advance') === false && strpos($query, 'thematic_plan') === false && strpos($query, 'track_c_countries') === false && diff --git a/main/install/db_main.sql b/main/install/db_main.sql index de57c3a5fd..35f786d45f 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -1190,7 +1190,7 @@ VALUES ('cas_add_user_activate', 'extldap', 'casAddUserActivateLDAP'), ('update_user_info_cas_with_ldap', 'true', 'Yes'), ('update_user_info_cas_with_ldap', 'false', 'No'), -('teachers_can_change_score_settings', 'false', 'Yes'), +('teachers_can_change_score_settings', 'true', 'Yes'), ('teachers_can_change_score_settings', 'false', 'No'); diff --git a/main/install/index.php b/main/install/index.php index 7023998220..805ef00ceb 100644 --- a/main/install/index.php +++ b/main/install/index.php @@ -800,7 +800,6 @@ if ($_POST['step2']) { break; } } else { - set_file_folder_permissions(); database_server_connect(); diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 7b8a736532..304117c1cd 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -2053,5 +2053,4 @@ function locking_settings() { $sql = "UPDATE $table SET access_url_locked = 1 WHERE variable = '$setting'"; Database::query($sql); } - } \ No newline at end of file diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php index 3e60952942..3c767b2fe2 100644 --- a/main/install/install_db.inc.php +++ b/main/install/install_db.inc.php @@ -8,7 +8,8 @@ * @package chamilo.install */ -// This page can only be access through including from the install script. +/* This page is called only during a NEW chamilo installation */ +/* This page can only be access through including from the install script. */ if (!defined('SYSTEM_INSTALLATION')) { echo 'You are not allowed here!'; @@ -117,7 +118,9 @@ load_main_database($installation_settings); //Adds the c_XXX courses tables see #3910 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php'; -update_db_course(); + +drop_course_tables(); +create_course_tables(); load_database_script('db_stats.sql'); From 4bff54824ef40d21651da162514ba9c7c15c4d47 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 13:41:03 +0200 Subject: [PATCH 13/31] Removing variables that are already added: cas_add_user_activate, update_user_info_cas_with_ldap --- main/install/db_main.sql | 7 +------ main/install/migrate-db-1.8.8-1.9.0-pre.sql | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 35f786d45f..88cdc10050 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -852,7 +852,7 @@ VALUES ('allow_browser_sniffer', NULL, 'radio', 'Tuning', 'false', 'AllowBrowserSnifferTitle', 'AllowBrowserSnifferComment', NULL, NULL, 0), ('enable_wami_record',NULL,'radio','Tools','false','EnableWamiRecordTitle','EnableWamiRecordComment',NULL,NULL, 0), ('gradebook_default_weight', NULL, 'textfield', 'Gradebook', '100', 'GradebookDefaultWeightTitle', 'GradebookDefaultWeightComment', NULL, NULL, 0), -('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17748','DatabaseVersion','', NULL, NULL, 0); +('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17752','DatabaseVersion','', NULL, NULL, 0); /* ('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1), @@ -1187,13 +1187,8 @@ VALUES ('allow_browser_sniffer', 'false', 'No'), ('enable_wami_record', 'true', 'Yes'), ('enable_wami_record', 'false', 'No'), -('cas_add_user_activate', 'extldap', 'casAddUserActivateLDAP'), -('update_user_info_cas_with_ldap', 'true', 'Yes'), -('update_user_info_cas_with_ldap', 'false', 'No'), ('teachers_can_change_score_settings', 'true', 'Yes'), ('teachers_can_change_score_settings', 'false', 'No'); - - UNLOCK TABLES; /* ('activate_send_event_by_mail', 'true', 'Yes'), diff --git a/main/install/migrate-db-1.8.8-1.9.0-pre.sql b/main/install/migrate-db-1.8.8-1.9.0-pre.sql index 9912a0ef04..acad86c891 100755 --- a/main/install/migrate-db-1.8.8-1.9.0-pre.sql +++ b/main/install/migrate-db-1.8.8-1.9.0-pre.sql @@ -184,7 +184,7 @@ DELETE FROM settings_current WHERE variable = 'use_document_title'; DELETE FROM settings_options WHERE variable = 'use_document_title'; -- Do not move this query -UPDATE settings_current SET selected_value = '1.9.0.17748' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.9.0.17752' WHERE variable = 'chamilo_database_version'; -- xxSTATSxx ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; From 1e9d8619c31c88ec30d8cad3697171cba3c8630f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 13:41:38 +0200 Subject: [PATCH 14/31] Commenting error_log "Chamilo Notice: Could not find previous config file at ..." --- main/install/install.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 304117c1cd..f80f690df4 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -427,7 +427,7 @@ function get_config_param($param, $updatePath = '') { $updateFromConfigFile = 'claroline/inc/conf/claro_main.conf.php'; } else { // Give up recovering. - error_log('Chamilo Notice: Could not find previous config file at '.$updatePath.'main/inc/conf/configuration.php nor at '.$updatePath.'claroline/inc/conf/claro_main.conf.php in get_config_param(). Will start new config (in '.__FILE__.', line '.__LINE__.')', 0); + //error_log('Chamilo Notice: Could not find previous config file at '.$updatePath.'main/inc/conf/configuration.php nor at '.$updatePath.'claroline/inc/conf/claro_main.conf.php in get_config_param(). Will start new config (in '.__FILE__.', line '.__LINE__.')', 0); return null; } } From 44c32c9e69f79ff103f8a4457b24cdd70d93dbbc Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 13:42:18 +0200 Subject: [PATCH 15/31] Minor - cosmetic changes --- main/inc/global_error_message.inc.php | 6 ++---- main/install/install_db.inc.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index 649f12c7cd..892ffb0dc1 100644 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -120,13 +120,11 @@ if (is_int($global_error_code) && $global_error_code > 0) { $global_error_message['title'] = $InstallationTitle; if (($pos = strpos($InstallationDescription, '%s')) === false) { $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide'; - } - $click_to_install = substr($InstallationDescription, 0, $pos); + } $read_installation_guide = substr($InstallationDescription, $pos + 2); $InstallationDescription = '

- + '.$read_installation_guide.'

'; diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php index 3c767b2fe2..7d5ca30958 100644 --- a/main/install/install_db.inc.php +++ b/main/install/install_db.inc.php @@ -118,8 +118,8 @@ load_main_database($installation_settings); //Adds the c_XXX courses tables see #3910 require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php'; - drop_course_tables(); + create_course_tables(); load_database_script('db_stats.sql'); From 9113ede12baaa82f2892d6e644f5c57114ecceb0 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 14:38:22 +0200 Subject: [PATCH 16/31] Should fix bugs in gradebook due recent see #4685 --- main/gradebook/gradebook_edit_eval.php | 18 +++++--- main/gradebook/gradebook_edit_link.php | 15 +++++-- main/gradebook/lib/fe/evalform.class.php | 15 ++++--- .../gradebook/lib/fe/gradebooktable.class.php | 16 ++++--- .../lib/fe/linkaddeditform.class.php | 14 ++++--- .../gradebook/lib/gradebook_functions.inc.php | 42 ++++++++++--------- 6 files changed, 73 insertions(+), 47 deletions(-) diff --git a/main/gradebook/gradebook_edit_eval.php b/main/gradebook/gradebook_edit_eval.php index 6b75197a58..0d5e0ed974 100644 --- a/main/gradebook/gradebook_edit_eval.php +++ b/main/gradebook/gradebook_edit_eval.php @@ -27,13 +27,19 @@ if ($form->validate()) { $eval->set_user_id($values['hid_user_id']); $eval->set_course_code($values['hid_course_code']); $eval->set_category_id($values['hid_category_id']); - - $parent_cat = Category :: load($values['hid_category_id']); - $cat = Category :: load($parent_cat[0]->get_parent_id()); - $global_weight = $cat[0] -> get_weight(); - $values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight(); - $eval->set_weight($values['weight']); + $parent_cat = Category :: load($values['hid_category_id']); + + $final_weight = null; + if ($parent_cat[0]->get_parent_id() == 0) { + $final_weight = $values['weight_mask']; + } else { + $cat = Category :: load($parent_cat[0]->get_parent_id()); + $global_weight = $cat[0]->get_weight(); + $final_weight = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight(); + } + + $eval->set_weight($final_weight); $eval->set_max($values['max']); if (empty ($values['visible'])) { diff --git a/main/gradebook/gradebook_edit_link.php b/main/gradebook/gradebook_edit_link.php index b294409f4a..7c3e17c0e8 100644 --- a/main/gradebook/gradebook_edit_link.php +++ b/main/gradebook/gradebook_edit_link.php @@ -34,10 +34,17 @@ $form = new LinkAddEditForm(LinkAddEditForm :: TYPE_EDIT, $cats, null, $link, 'e if ($form->validate()) { $values = $form->exportValues(); $parent_cat = Category :: load($values['select_gradebook']); - $cat = Category :: load($parent_cat[0]->get_parent_id()); - $global_weight = $cat[0]->get_weight(); - $values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight(); - $link->set_weight($values['weight']); + + $final_weight = null; + if ($parent_cat[0]->get_parent_id() == 0) { + $final_weight = $values['weight_mask']; + } else { + $cat = Category :: load($parent_cat[0]->get_parent_id()); + $global_weight = $cat[0]->get_weight(); + $final_weight = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight(); + } + + $link->set_weight($final_weight); if (!empty($values['select_gradebook'])) { $link->set_category_id($values['select_gradebook']); diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php index c05e59ec91..7bff50bcd2 100644 --- a/main/gradebook/lib/fe/evalform.class.php +++ b/main/gradebook/lib/fe/evalform.class.php @@ -172,7 +172,7 @@ class EvalForm extends FormValidator } usort($results_and_users, array ('EvalForm', 'sort_by_user')); - $defaults= array (); + $defaults = array(); foreach ($results_and_users as $result_and_user) { $user = $result_and_user['user']; @@ -383,10 +383,13 @@ class EvalForm extends FormValidator */ protected function build_editing_form() { $parent_cat = Category :: load($this->evaluation_object->get_category_id()); - $cat = Category :: load($parent_cat[0]->get_parent_id()); - $global_weight = $cat[0]->get_weight(); - //$values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight(); - $weight_mask = $global_weight*$this->evaluation_object->get_weight()/$parent_cat[0]->get_weight() ; + if ($parent_cat[0]->get_parent_id() == 0) { + $weight_mask = $this->evaluation_object->get_weight(); + } else { + $cat = Category :: load($parent_cat[0]->get_parent_id()); + $global_weight = $cat[0]->get_weight(); + $weight_mask = $global_weight*$this->evaluation_object->get_weight()/$parent_cat[0]->get_weight() ; + } $this->setDefaults(array ( 'hid_id' => $this->evaluation_object->get_id(), 'name' => $this->evaluation_object->get_name(), @@ -434,7 +437,7 @@ class EvalForm extends FormValidator if (count($all_categories) == 1) { $this->addElement('hidden', 'hid_category_id', $cat_id); - } else { + } else { $select_gradebook = $this->addElement('select', 'hid_category_id', get_lang('SelectGradebook'), array(), array('id' => 'hid_category_id')); $this->addRule('hid_category_id', get_lang('ThisFieldIsRequired'), 'nonzero'); diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index ccfed6af15..bf3be39e6b 100644 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -215,13 +215,17 @@ class GradebookTable extends SortableTable { $row[] = $this->build_edit_column($item); } } else { - //students get the results and certificates columns - if (count($this->evals_links)>0 && $status_user!=1 ) { - $value_data = isset($data[4]) ? $data[4] : null; - if (!is_null($value_data)) { + //students get the results and certificates columns + if (count($this->evals_links) > 0 && $status_user != 1) { + $value_data = isset($data[4]) ? $data[4] : null; + if (!is_null($value_data)) { $row[] = Display::tag('h4', $value_data); - } - } + } else { + $row[] = $this->build_edit_column($item); + } + } else { + $row[] = $this->build_edit_column($item); + } } //Category added diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php index 2b789290c6..c52042f389 100644 --- a/main/gradebook/lib/fe/linkaddeditform.class.php +++ b/main/gradebook/lib/fe/linkaddeditform.class.php @@ -112,12 +112,16 @@ class LinkAddEditForm extends FormValidator $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric'); $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>='); if ($form_type == self :: TYPE_EDIT) { - $parent_cat = Category :: load($link->get_category_id()); - $cat = Category :: load($parent_cat[0]->get_parent_id()); - $global_weight = $cat[0]->get_weight(); + $parent_cat = Category :: load($link->get_category_id()); - $values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight; - //$defaults['weight'] = $link->get_weight(); + if ($parent_cat[0]->get_parent_id() == 0) { + $values['weight'] = $link->get_weight(); + } else { + $cat = Category :: load($parent_cat[0]->get_parent_id()); + $global_weight = $cat[0]->get_weight(); + $values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight; + } + $defaults['weight_mask'] = $values['weight'] ; $defaults['select_gradebook'] = $link->get_category_id(); diff --git a/main/gradebook/lib/gradebook_functions.inc.php b/main/gradebook/lib/gradebook_functions.inc.php index 5b92ddeb27..9c5f30343d 100644 --- a/main/gradebook/lib/gradebook_functions.inc.php +++ b/main/gradebook/lib/gradebook_functions.inc.php @@ -207,26 +207,27 @@ function build_edit_icons_cat($cat, $selectcat) { $modify_icons .= ''.Display::return_icon('view_more_stats.gif', get_lang('Show'),'',ICON_SIZE_SMALL).''; - if (empty($grade_model_id) || $grade_model_id == -1) { - $modify_icons .= ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; + if (api_is_allowed_to_edit(null, true)) { + if (empty($grade_model_id) || $grade_model_id == -1) { + $modify_icons .= ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; + } + + $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', get_lang('Visible'),'',ICON_SIZE_SMALL).''; + + //no move ability for root categories + if ($cat->is_movable()) { + /*$modify_icons .= '  + ';*/ + } else { + //$modify_icons .= ' '; + } + + if (empty($grade_model_id) || $grade_model_id == -1) { + /*$modify_icons .= ' '. + Display::return_icon('percentage.png', get_lang('EditAllWeights'),'',ICON_SIZE_SMALL).' '; */ + } + $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('DeleteAll'),'',ICON_SIZE_SMALL).''; } - - $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', get_lang('Visible'),'',ICON_SIZE_SMALL).''; - - //no move ability for root categories - if ($cat->is_movable()) { - /*$modify_icons .= '  - ';*/ - } else { - //$modify_icons .= ' '; - } - - if (empty($grade_model_id) || $grade_model_id == -1) { - /*$modify_icons .= ' '. - Display::return_icon('percentage.png', get_lang('EditAllWeights'),'',ICON_SIZE_SMALL).' '; */ - } - - $modify_icons .= ' '.Display::return_icon('delete.png', get_lang('DeleteAll'),'',ICON_SIZE_SMALL).''; return $modify_icons; } @@ -242,7 +243,8 @@ function build_edit_icons_eval($eval, $selectcat) { $eval->get_course_code(); $cat=new Category(); $message_eval=$cat->show_message_resource_delete($eval->get_course_code()); - if ($message_eval===false) { + + if ($message_eval===false && api_is_allowed_to_edit(null, true)) { $visibility_icon= ($eval->is_visible() == 0) ? 'invisible' : 'visible'; $visibility_command= ($eval->is_visible() == 0) ? 'set_visible' : 'set_invisible'; $modify_icons= ' From a251f5be3151751c30c8a6e68bd1322aa46b6524 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 14:38:43 +0200 Subject: [PATCH 17/31] Minor - removing comments --- main/admin/settings.lib.php | 10 ---------- main/admin/settings.php | 8 -------- 2 files changed, 18 deletions(-) diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 6c45adad06..9a019333dc 100644 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -1230,16 +1230,6 @@ function generate_settings_form($settings, $settings_by_access_list) { $form->addElement('select', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), call_user_func('select_'.$row['variable']), $hideme); $default_values[$row['variable']] = $row['selected_value']; break; - /*case 'gradebook_ranking': - $value = explode('::', $row['selected_value']); - - $form->addElement('text', 'gradebook_display['.$row['variable'].'][text]', array(get_lang($row['title']), get_lang($row['comment'])), array('class' => 'span1', 'value' => $value[0]), $hideme); - $form->addElement('text', 'gradebook_display['.$row['variable'].'][score]', array(get_lang($row['title']), get_lang($row['comment'])), array('class' => 'span3','value' => $value[1]), $hideme); - - $renderer = $form -> defaultRenderer(); - $renderer->setElementTemplate(' {label}
{element} %= ', 'gradebook_display['.$row['variable'].'][text]'); - $renderer->setElementTemplate(' {element}

', 'gradebook_display['.$row['variable'].'][score]'); - break;*/ case 'custom': break; } diff --git a/main/admin/settings.php b/main/admin/settings.php index 415f499d88..e41c299d76 100644 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -179,14 +179,6 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' foreach ($values as $key => $value) { if (in_array($key, $settings_to_avoid)) { continue; } - - /*//Gradebook fix - if ($key == 'gradebook_display') { - foreach ($value as $new_key => $item) { - $final_value = $item['text'].'::'.$item['score']; - $result = api_set_setting($new_key, $final_value, 'ranking', null, $_configuration['access_url']); - } - }*/ // // Treat gradebook values in separate function. //if (strpos($key, 'gradebook_score_display_custom_values') === false) { From 93cb0983e8c7b6a5064278cc466c8cd2a413dac2 Mon Sep 17 00:00:00 2001 From: Hubert Borderiou Date: Mon, 7 May 2012 15:28:38 +0200 Subject: [PATCH 18/31] Add Shibbolet and Facebook auth configuration details for Chamilo admin conf --- main/admin/settings.php | 2 ++ main/img/icons/32/facebook.png | Bin 0 -> 1138 bytes main/img/icons/32/shibboleth.png | Bin 0 -> 1253 bytes main/install/db_main.sql | 21 +++++++++++++++++++-- main/lang/english/admin.inc.php | 23 ++++++++++++++++------- main/lang/french/admin.inc.php | 23 ++++++++++++++--------- 6 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 main/img/icons/32/facebook.png create mode 100644 main/img/icons/32/shibboleth.png diff --git a/main/admin/settings.php b/main/admin/settings.php index e41c299d76..a838f3a5b8 100644 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -312,6 +312,8 @@ $action_images['search'] = 'search.png'; $action_images['stylesheets'] = 'stylesheets.png'; $action_images['templates'] = 'template.png'; $action_images['plugins'] = 'plugins.png'; +$action_images['shibboleth'] = 'shibboleth.png'; +$action_images['facebook'] = 'facebook.png'; // Grabbing the categories. $resultcategories = api_get_settings_categories(array('stylesheets', 'Plugins', 'Templates', 'Search')); diff --git a/main/img/icons/32/facebook.png b/main/img/icons/32/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c3731bc8d8c4b2fa474086dca6ff546d6e2f1d GIT binary patch literal 1138 zcmV-&1daQNP)eT#EAa_%uguCOT)k z%;q^wa#eDvJyCl~Vw01x<70!nNo=cvrs0yV+=`T{(k!n%2U} z)#&T-ft<^Zso6+rrfG@6b%B~XREmq4w}qwHP<6CJVxB)#eyXy>K~{lIYMoGRq===} zSZRu9b(BL{hJm2aEJS&aqRM-Wu|Qs#-s0*mLTcCC=a;hIHA;4spSFXd(lkzmvAN2H zkEM>R-ifH$iJ{U`XOb~Wf6UR_OJw2Z3UI#-c>iK3aS&N^G1fuYuKk;zYEj+V6N zhLo`&HDiyg+eT-kjHcF=q{T^VsVY8g|NsAnq|=L=zMrYWqp7+_Uyn*?qN%&u`uqI# z_xgvIxRj&6h^E;5{r&v?{!ezdNnC_lcdnwY%zclzG*py_p3aJ+)L(r?@PLOP4OOyP&@6JEmiZ9P>uAOY3Za}-z2{Le%;>pp;c*m78!=lMC;(4!#N z%@*iIDN4LsKIeHC&@bh3mpD70&o3)QdQl5XJg)1a$eq)O=li(GNj0R$9ff+(hT-=Q1_OT| zgZo2{7RmHH^5ViCzNd% zBjnDNC+6t8$j#c?ZM)r`w8&&`H5gdCxrsc_n|}ou08e-1N0m8l@Bjb+07*qoM6N<$ Ef<}xt7XSbN literal 0 HcmV?d00001 diff --git a/main/img/icons/32/shibboleth.png b/main/img/icons/32/shibboleth.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0ca2dfec294ee596c20da45030bc6917b6f592 GIT binary patch literal 1253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7#jk7LR^pRiTLv6>z<9i>tduXp7xoVDf!+&V``A}@87>) z+zgo5oAJ|AB|ppW`ODS+PKy4FRG8W6^&?YeMXA`brArPSJysYNdM#7x*mA8upVEI^ zReSmJ)vjGTS5KK*n3+}>AoaUb^v_e@4g-_9GlG7VOPxQJm7}fp_{o#ockcEE__sHd zESiyfvRUNkY{ApPa(AY3UTYSeJ9~OZYs+RIx$V-*Keq|Jtd=-4gFD1Px+qHHO{R>G zo}s6U^Rp>J=cH85nW;Zs!#Jf(V)BHxTwA3t3RCdjEg-z>Rd_43OTg_r7T z^*PIR)>w2mdT!Xf_44J*SC{ht-^tUIEdBeQ)vJDyd2Q_-rgHyR@jqQHtf8PfxmIt9 zrOf$@m+n7!`0m~NucuXGyquC$$-h|0`zv2&U2WsbliIW9E_!#?Xik^z+R3J;PM%u1(4{(2 z=U|sks<7;b4gW42r#mk|4ieAa@`Eg9WR1Is*e!zNd?0NX4y~$v?wyIS3pV zX7Zdeg=3?5b zQ^gZ$y&;h&HcbynRpc+>TfcqZX|G8SuJ4{$Q9nJ1xz#d%Z=AW!<3j=Yju9#PN~;() zSd|B>`?k%UYaZm#74U!UTCr874%0j*zqGhv`K()->4}<&*S2+er^J_i>0DaYcjeAB zo3^aRKdk3xU(#;7?6XlL;?BBlYz5aYJvFMAI)7nJb*w`~;^zR~1vj#`$lw1q=UulLOyw?l<{7Ejx?wQq;w5jX#)-*UHlr03_msw${YJaZ(s z=b_I2M-w9!Z``tiX+>$qoAZx;zqxs9XS>_G-tV5O3Uxd8>1^64A-9L`nSYqg1v{ST zbOsA4(*+wg|E`+7bKjk!+^akvjV0RT?>DCIKetb6o=lx{{V}1|Z55~0c#4e|G`)Po z9n$Ub=aIQ~QF&d){|HN+!aHv`O}>aoZJ#2qP#$e0#rEt(P4&*hPetb2tP;5EoFg%_ zM6xyUhC?2!W$LVuukQa=`1)w8^c~|et-hnY!ejG?M~N;^9ZYw~EuFGUQ{wzBF8isc zcLs!-PG58ISdNyf($vjOud+^kYCa!c=(osCWU}{8he+-dZ+FLa?)?3)(tc`^M(%0f o@QlunQ)_&Z7yNi1&&bBW84?@)>&U-Lz-++a>FVdQ&MBb@081W_H2?qr literal 0 HcmV?d00001 diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 88cdc10050..76905d60f3 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -852,7 +852,19 @@ VALUES ('allow_browser_sniffer', NULL, 'radio', 'Tuning', 'false', 'AllowBrowserSnifferTitle', 'AllowBrowserSnifferComment', NULL, NULL, 0), ('enable_wami_record',NULL,'radio','Tools','false','EnableWamiRecordTitle','EnableWamiRecordComment',NULL,NULL, 0), ('gradebook_default_weight', NULL, 'textfield', 'Gradebook', '100', 'GradebookDefaultWeightTitle', 'GradebookDefaultWeightComment', NULL, NULL, 0), -('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17752','DatabaseVersion','', NULL, NULL, 0); +('gradebook_ranking_1', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_2', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_3', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_4', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_5', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_6', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_7', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_8', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_9', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('gradebook_ranking_10', 'ranking', 'gradebook_ranking', 'Gradebook', '', '', '', NULL, NULL, 1), +('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17734','DatabaseVersion','', NULL, NULL, 0); +('shibboleth_description', NULL, 'radio', 'Shibboleth', 'false', 'ShibbolethMainActivateTitle', 'ShibbolethMainActivateComment', NULL, NULL, 0), +('facebook_description', NULL, 'radio', 'Facebook', 'false', 'FacebookMainActivateTitle', 'FacebookMainActivateComment', NULL, NULL, 0); /* ('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1), @@ -1187,8 +1199,13 @@ VALUES ('allow_browser_sniffer', 'false', 'No'), ('enable_wami_record', 'true', 'Yes'), ('enable_wami_record', 'false', 'No'), -('teachers_can_change_score_settings', 'true', 'Yes'), +('cas_add_user_activate', 'extldap', 'casAddUserActivateLDAP'), +('update_user_info_cas_with_ldap', 'true', 'Yes'), +('update_user_info_cas_with_ldap', 'false', 'No'), +('teachers_can_change_score_settings', 'false', 'Yes'), ('teachers_can_change_score_settings', 'false', 'No'); + + UNLOCK TABLES; /* ('activate_send_event_by_mail', 'true', 'Yes'), diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php index 6d5bd42976..71d8e161d4 100644 --- a/main/lang/english/admin.inc.php +++ b/main/lang/english/admin.inc.php @@ -2,7 +2,7 @@ /* for more information: see languages.txt in the lang folder. */ -$CasMainActivateComment = "Enabling CAS authentication will allow users to authenticate with their CAS credentials"; +$CasMainActivateComment = "Enabling CAS authentication will allow users to authenticate with their CAS credentials.
Go to Plugin to add a configurable 'CAS Login' button for your Chamilo campus."; $AdminBy = "Administration by"; $AdministrationTools = "Administration"; $State = "Portal status"; @@ -1304,7 +1304,7 @@ $EnabledImageMapsTitle = "Activate Image maps"; $EnabledImageMapsComment = "Activate the button to insert Image maps. This allows you to associate URLs to areas of an image, creating hotspots."; $CourseTool = "Course tool"; $BigBlueButtonEnableTitle = "BigBlueButton videoconference tool"; -$BigBlueButtonEnableComment = "Choose whether you want to enable the BigBlueButton videoconference tool. Once enabled, it will show as an additional course tool in all courses' homepage, and teachers will be able to launch a conference at any time. Students will not be able to launch a conference, only join one. If you don't have a BigBlueButton server, please set one up or ask the Chamilo official providers for a quote. +$BigBlueButtonEnableComment = "Choose whether you want to enable the BigBlueButton videoconference tool. Once enabled, it will show as an additional course tool in all courses' homepage, and teachers will be able to launch a conference at any time. Students will not be able to launch a conference, only join one. If you don't have a BigBlueButton server, please set one up or ask the Chamilo official providers for a quote. BigBlueButton is a free (as in freedom *and* beer), but its installation requires a set of technical skills that might not be immediately available to all. You can install it on your own or seek professional help to assist you or do it for you. This help, however, will generate a certain cost. In the pure logic of the free software, we offer you the tools to make your work easier and recommend professionals (the Chamilo Official Providers) that will be able to help you if this were too difficult."; $BigBlueButtonHostTitle = "BigBlueButton server host"; $BigBlueButtonHostComment = "This is the name of the server where your BigBlueButton server is running. Might be localhost, an IP address (e.g. 192.168.13.54) or a domain name (e.g. my.video.com)."; @@ -1329,8 +1329,8 @@ $IncludeAsciiMathMlComment = "Activate this setting if you want to show ASCIIMat $CourseHideToolsTitle = "Hide tools from teachers"; $CourseHideToolsComment = "Check the tools you want to hide from teachers. This will prohibit access to the tool."; $MoveUserStats = "Move users results from/to a session"; -$CompareUserResultsBetweenCoursesAndCoursesInASession = "This advanced tool allows you to manually improve the tracking of users results when moving from courses methodology to sessions methodology. In most cases, you won't need to use it.
-On this screen, you can compare results of users between the context of a standalone course, and the context of the same course inside a session.
+$CompareUserResultsBetweenCoursesAndCoursesInASession = "This advanced tool allows you to manually improve the tracking of users results when moving from courses methodology to sessions methodology. In most cases, you won't need to use it.
+On this screen, you can compare results of users between the context of a standalone course, and the context of the same course inside a session.
Once you are sure about what to do, you can choose to move the tracking data of the students (exercises results and learning paths tracking) from a course to a session."; $PDFExportWatermarkEnableTitle = "Enable watermark in PDF export"; $PDFExportWatermarkEnableComment = "By enabling this option, you can upload an image or a text that will be automatically added as watermark to all PDF exports of documents on the system."; @@ -1385,8 +1385,8 @@ $EnableAccessibilityFontResizeTitle = "Font resize accessibility feature"; $EnableAccessibilityFontResizeComment = "Enable this option to show a set of font resize options on the top-right side of your campus. This will allow visually impaired to read their course contents more easily."; $GlobalEvent = "Platform event"; $SearchEnabledTitle = "Fulltext search"; -$SearchEnabledComment = "This feature allows you to index most of the documents uploaded to your portal, then provide a search feature for users.
-This feature will not index documents that have already been uploaded, so it is important to enable (if wanted) at the beginning of your implementation.
+$SearchEnabledComment = "This feature allows you to index most of the documents uploaded to your portal, then provide a search feature for users.
+This feature will not index documents that have already been uploaded, so it is important to enable (if wanted) at the beginning of your implementation.
Once enabled, a search box will appear in the courses list of every user. Searching for a specific term will bring a list of corresponding documents, exercises or forum topics, filtered depending on the availability of these contents to the user."; $SpecificSearchFieldsAvailable = "Available custom search fields"; $XapianModuleInstalled = "Xapian module installed"; @@ -1535,7 +1535,16 @@ $EnableWamiRecordTitle = "Activate Wami-recorder"; $EnableWamiRecordComment = "Wami-recorder is a voice record tool on Flash"; $ChangeSharedSetting = "Change setting visibility for the other portals"; $AllowHRSkillsManagementTitle = "Allow HR skills management"; +$LdapDescriptionComment = "

  • LDAP authentication :
    See I. below to configure LDAP
    See II. below to activate LDAP authentication


  • Update user attributes, with LDAP data, after CAS authentication(see CAS configuration ) :
    See I. below to configure LDAP
    CAS manage user authentication, LDAP activation isn't required.


I. LDAP configuration

Edit file main/auth/external_login/ldap.conf.php
-> Edit values of array $extldap_config

Parameters are
  • base domain string (ex : 'base_dn' => 'DC=cblue,DC=be')
  • admin distinguished name (ex : 'admin_dn' =>'CN=admin,dc=cblue,dc=be')
  • admin password (ex : 'admin_password' => '123456')
  • ldap host (ex : 'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'))
  • filter (ex : 'filter' => '')
  • port (ex : 'port' => 389)
  • protocol version (2 or 3) (ex : 'protocol_version' => 3)
  • user_search (ex : 'user_search' => 'sAMAccountName=%username%')
  • encoding (ex : 'encoding' => 'UTF-8')
  • update_userinfo (ex : 'update_userinfo' => true)
-> To update correspondences between user and LDAP attributes, edit array $extldap_user_correspondance
Array values are <chamilo_field> => >ldap_field>
Array structure is explained in file main/auth/external_login/ldap.conf.php


II. Activate LDAP authentication

Edit file main/inc/conf/configuration.php
-> Uncomment lines
$extAuthSource["extldap"]["login"] =$_configuration['root_sys'].$_configuration['code_append']."auth/external_login/login.ldap.php";
$extAuthSource["extldap"]["newUser"] =$_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.ldap.php";

N.B. : LDAP users use same fields than platform users to login.
N.B. : LDAP activation adds a menu External authentication [LDAP] in "add or modify" user pages."; +$LdapDescriptionTitle = "

LDAP autentication

"; $AllowHRSkillsManagementComment = "Allows HR to manage skills"; $GradebookDefaultWeightTitle = "Default weight in Gradebook"; $GradebookDefaultWeightComment = "This weight will be use in all courses by default"; -?> \ No newline at end of file +$ActiveOnly = "Active only"; +$AuthenticationSource = "Authentication"; +$RegisteredDate = "Registered"; +$Zombies = "Zombies"; +$ShibbolethMainActivateTitle = "

Shibboleth authentication

"; +$ShibbolethMainActivateComment = "

First of all, you have to configure Shibboleth for your web server.

To configure it for Chamilo
edit file main/auth/shibboleth/config/aai.class.php

Modify object $result values with the name of your Shibboleth attributes

  • $result->unique_id = 'mail';
  • $result->firstname = 'cn';
  • $result->lastname = 'uid';
  • $result->email = 'mail';
  • $result->language = '-';
  • $result->gender = '-';
  • $result->address = '-';
  • $result->staff_category = '-';
  • $result->home_organization_type = '-';
  • $result->home_organization = '-';
  • $result->affiliation = '-';
  • $result->persistent_id = '-';
  • ...

Go to Plugin to add a configurable 'Shibboleth Login' button for your Chamilo campus."; +$FacebookMainActivateTitle = "

Facebook authentication

"; +$FacebookMainActivateComment = "

First of all, you have create a Facebook Application (see https://developers.facebook.com/apps) with your Facebook account. In the Facebook Apps parameters, the site URL value should have a GET parameter 'action=fbconnect' (e.g. http://mychamilo.com/?action=fbconnect).

Then,
edit file main/auth/external_login/facebook.conf.php
and enter 'appId' and 'secret' values for $facebook_config.
Go to Plugin to add a configurable 'Facebook Login' button for your Chamilo campus."; diff --git a/main/lang/french/admin.inc.php b/main/lang/french/admin.inc.php index 06f59d8f2e..a3e4a7710a 100644 --- a/main/lang/french/admin.inc.php +++ b/main/lang/french/admin.inc.php @@ -2,7 +2,7 @@ /* for more information: see languages.txt in the lang folder. */ -$CasMainActivateComment = "Activer l'authentification CAS permettra aux utilisateurs de s'identifier à l'aide de leur compte CAS"; +$CasMainActivateComment = "Activer l'authentification CAS permettra aux utilisateurs de s'identifier à l'aide de leur compte CAS
Vous trouverez dans les Plugin un bouton 'Login CAS', parametrable, qui s'ajoutera sur la page d'accueil de votre campus Chamilo."; $AdminBy = "Administration par"; $AdministrationTools = "Administration"; $State = "Etat du système"; @@ -1132,7 +1132,7 @@ $AssignCoursesToHumanResourcesManager = "Assigner des cours au directeur RH"; $TimezoneValueTitle = "Zone de temps"; $TimezoneValueComment = "Ceci est la zone de temps configurée pour ce portail. Si vous ne configurez pas de zone de temps, la zone de temps du serveur sera utilisée. Si vous configurez une zone de temps, tous les temps de cette plateforme seront basés sur cette zone de temps. Ce"; $UseUsersTimezoneTitle = "Utiliser les zones de temps utilisateurs"; -$UseUsersTimezoneComment = "Activer la possibilité pour les utilisateurs de sélectionner leur zone horaire. Le champ de zone horaire doit être rendu visible et modifiable dans les options de profiling du panneau d'administration avant que les utilisateurs ne puissent choisir leur propre zone. +$UseUsersTimezoneComment = "Activer la possibilité pour les utilisateurs de sélectionner leur zone horaire. Le champ de zone horaire doit être rendu visible et modifiable dans les options de profiling du panneau d'administration avant que les utilisateurs ne puissent choisir leur propre zone. Une fois configurée, les utilisateurs pourront voir toutes les heures du portail (heure de remise des travaux, évènements, etc) converties dans leur propre zone horaire."; $FieldTypeTimezone = "Zone horaire"; $AssignedSessionsHaveBeenUpdatedSuccessfully = "Les sessions assignées ont été mises à jour"; @@ -1304,9 +1304,9 @@ $EnabledImageMapsTitle = "Activer les cartes sur images"; $EnabledImageMapsComment = "Activer le bouton pour ajouter des cartes sur image. Ceci vous permettra d'associer des adresses URL à des zones d'une image, générant ainsi des zones interactives."; $CourseTool = "Outil de cours"; $BigBlueButtonEnableTitle = "Outil de vidéoconférence BigBlueButton"; -$BigBlueButtonEnableComment = "Choisissez si vous désirez activer l'outil de vidéoconférence BigBlueButton. Une fois activé, il apparaît comme un outil de cours additionnel dans toutes les pages d'accueil de cours, et les enseignants peuvent lancer une conférence à tout moment. Les étudiants ne peuvent pas lancer de conférence, seulement en rejoindre une. -Si vous n'avez pas de serveur BigBlueButton fonctionnel, veuillez en installer un ou vous adresser aux fournisseurs officiels de Chamilo pour pouvoir bénéficier de cette fonctionnalité. -BigBlueButton est un logiciel libre et gratuit. Son installation requiert des compétences techniques particulières, ce qui demande un travail considérable et peut résulter coûteux si vous ne disposez pas desdites compétences. +$BigBlueButtonEnableComment = "Choisissez si vous désirez activer l'outil de vidéoconférence BigBlueButton. Une fois activé, il apparaît comme un outil de cours additionnel dans toutes les pages d'accueil de cours, et les enseignants peuvent lancer une conférence à tout moment. Les étudiants ne peuvent pas lancer de conférence, seulement en rejoindre une. +Si vous n'avez pas de serveur BigBlueButton fonctionnel, veuillez en installer un ou vous adresser aux fournisseurs officiels de Chamilo pour pouvoir bénéficier de cette fonctionnalité. +BigBlueButton est un logiciel libre et gratuit. Son installation requiert des compétences techniques particulières, ce qui demande un travail considérable et peut résulter coûteux si vous ne disposez pas desdites compétences. Dans la logique du développement durable de notre projet, nous vous offrons la possibilité d'installer vous-même la solution ou de vous faire aider par des professionnels à l'expérience démontrée."; $BigBlueButtonHostTitle = "Adresse du serveur BigBlueButton"; $BigBlueButtonHostComment = "Veuillez indiquer l'adresse du serveur BigBlueButton. Ceci peut être localhost, une adresse IP (par exemple 192.168.13.54 ou un nom de domaine (par exemple my.video.com)."; @@ -1331,8 +1331,8 @@ $IncludeAsciiMathMlComment = "Activez ce paramètre si vous désirez pouvoir aff $CourseHideToolsTitle = "Cacher des outils par rapport aux enseignants"; $CourseHideToolsComment = "Sélectionnez les outils que vous désirez cacher des enseignants. Cette option interdira l'accès à l'outil."; $MoveUserStats = "Déplacer les résultats utilisateurs dans/vers une session"; -$CompareUserResultsBetweenCoursesAndCoursesInASession = "Cet outil avancé vous permet d'améliorer le suivi des résultats utilisateurs lorsque vous changez d'une méthodologie de purs cours ver une méthodologie de sessions (ou cycles de cours). Dans la plupart des cas, vous n'aurez pas besoin de cet outil.
-Sur cet écran, vous pouvez comparer les résultats des utilisateurs entre un contexte de cours isolé et un contexte de session.
+$CompareUserResultsBetweenCoursesAndCoursesInASession = "Cet outil avancé vous permet d'améliorer le suivi des résultats utilisateurs lorsque vous changez d'une méthodologie de purs cours ver une méthodologie de sessions (ou cycles de cours). Dans la plupart des cas, vous n'aurez pas besoin de cet outil.
+Sur cet écran, vous pouvez comparer les résultats des utilisateurs entre un contexte de cours isolé et un contexte de session.
Une fois que vous vous êtes décidé sur le meilleur contexte au sein duquel devrait exister le suivi des utilisateurs (score des exercices et suivi des parcours), vous pourrez déplacer ce suivi d'un cours vers une session."; $PDFExportWatermarkEnableTitle = "Activer les filigranes dans les exports PDF"; $PDFExportWatermarkEnableComment = "En activant cette fonctionnalité, vous pourrez utiliser une image ou un texte comme filigranne qui sera ajouté aux documents exportés en PDF."; @@ -1387,8 +1387,8 @@ $EnableAccessibilityFontResizeTitle = "Redimensionnement des caractères"; $EnableAccessibilityFontResizeComment = "Activer cette option montrera une série d'options de redimensionnement des caractères dans le coin supérieur-droit de votre campus. Celles-ci permettront aux personnes à déficience visuelle de lire leurs contenus de cours plus facilement."; $GlobalEvent = "Évènement global"; $SearchEnabledTitle = "Recherche full-text"; -$SearchEnabledComment = "Cette fonctionnalité vous permet d'indexer la plupart des documents envoyés sur votre portail, et ainsi fournir à vos utilisateurs une fonctionnalité complète de recherche de contenus.
-Cette fonctionnalité n'indexera pas les documents qui ont déjà été envoyés, c'est pourquoi il est important de l'activer au début d'une implémentarion.
+$SearchEnabledComment = "Cette fonctionnalité vous permet d'indexer la plupart des documents envoyés sur votre portail, et ainsi fournir à vos utilisateurs une fonctionnalité complète de recherche de contenus.
+Cette fonctionnalité n'indexera pas les documents qui ont déjà été envoyés, c'est pourquoi il est important de l'activer au début d'une implémentarion.
Une fois activée, une boîte de recherche apparaîtra dans la liste de cours des utilisateurs. La recherche sur un terme spécifique générera une liste des documents, exercices ou sujets de forum correspondants, filtrés selon la disponibilité de ces contenus pour les utilisateurs."; $SpecificSearchFieldsAvailable = "Champs de recherche personnalisables disponibles"; $XapianModuleInstalled = "Module Xapian installé"; @@ -1506,4 +1506,9 @@ $CasUserAddLastnameAttributeComment = "Enregistrer le nom de famille CAS de l'ut $ShowAdminToolbarTitle = "Afficher la barre d'administration"; $ShowAdminToolbarComment = "Affiche une barre d'outils globale au sommet de la page aux utilisateurs des rôles désignés. Cette barre d'outils, très similaire à celles de Wordpress et de Google, peut considérablement accélérer certaines opérations complexes et augmente l'espace disponible pour les contenus de cours, mais elle pourrait rendre certains utilisateurs confus."; $FirstLetterCourseTitle = "Première lettre (title)"; +$ShibbolethMainActivateTitle = "

Configuration de l'authentification Shibboleth

"; +$ShibbolethMainActivateComment = "

Vous devez, en premier lieu, configurer Shibboleth pour votre serveur web. Pour le configurer pour Chamilo.

éditez le fichier main/auth/shibboleth/config/aai.class.php

Modifiez les valeurs de l'objet $result avec les nom des attributs retourné par votre serveur Shibboleth.

Les valeurs à modifier sont
  • $result->unique_id = 'mail';
  • $result->firstname = 'cn';
  • $result->lastname = 'uid';
  • $result->email = 'mail';
  • $result->language = '-';
  • $result->gender = '-';
  • $result->address = '-';
  • $result->staff_category = '-';
  • $result->home_organization_type = '-';
  • $result->home_organization = '-';
  • $result->affiliation = '-';
  • $result->persistent_id = '-';
  • ...

Vous trouverez dans les Plugin un bouton 'Login Shibboleth', parametrable, qui s'ajoutera sur la page d'accueil de votre campus Chamilo."; +$FacebookMainActivateTitle = "

Configuration de l'authentification via Facebook

"; +$FacebookMainActivateComment = "

Vous devez, en premier lieu, créer une application Facebook (cf. https://developers.facebook.com/apps) avec votre compte Facebbok. Le paramètre de l'application Facebook 'URL du site' doit comporter 'action=fbconnect' comme paramètre en GET (exemple : http://mychamilo.com/?action=fbconnect)

Ensuite,
éditez le fichier main/auth/external_login/facebook.conf.php
et entrez les valeurs 'appId' et 'secret', fournies par Facebbok, pour la variable $facebook_config.
Vous trouverez dans les Plugin un bouton 'Login Facebook', parametrable, qui s'ajoutera à la page d'accueil de votre campus Chamilo."; + ?> \ No newline at end of file From 3b29811e524b585ba692cf892e780d2a1bf400d9 Mon Sep 17 00:00:00 2001 From: Hubert Borderiou Date: Mon, 7 May 2012 15:33:09 +0200 Subject: [PATCH 19/31] Minor : correct wrong merge in install/db_main --- main/install/db_main.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 76905d60f3..046918d328 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -1202,7 +1202,7 @@ VALUES ('cas_add_user_activate', 'extldap', 'casAddUserActivateLDAP'), ('update_user_info_cas_with_ldap', 'true', 'Yes'), ('update_user_info_cas_with_ldap', 'false', 'No'), -('teachers_can_change_score_settings', 'false', 'Yes'), +('teachers_can_change_score_settings', 'true', 'Yes'), ('teachers_can_change_score_settings', 'false', 'No'); From 165e005e6c3373ea8e8f975229c90a0f70a2d2c0 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 17:28:33 +0200 Subject: [PATCH 20/31] Adding new setting; teachers_can_change_grade_model_settings see BT#4080 --- main/gradebook/index.php | 2 +- main/gradebook/lib/fe/catform.class.php | 2 +- main/install/db_main.sql | 8 ++++++-- main/install/migrate-db-1.8.8-1.9.0-pre.sql | 6 +++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/main/gradebook/index.php b/main/gradebook/index.php index cabc0c8713..92f4cf8aa9 100644 --- a/main/gradebook/index.php +++ b/main/gradebook/index.php @@ -815,7 +815,7 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) { if (!empty($cats)) { - if (api_is_allowed_to_edit(null, true)) { + if (api_is_allowed_to_edit(null, true) && api_get_setting('teachers_can_change_grade_model_settings') == 'true') { //Getting grade models $obj = new GradeModel(); $grade_models = $obj->get_all(); diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php index 54535fee14..70d16dcae2 100644 --- a/main/gradebook/lib/fe/catform.class.php +++ b/main/gradebook/lib/fe/catform.class.php @@ -193,7 +193,7 @@ class CatForm extends FormValidator { $this->addElement('hidden','hid_parent_id'); $this->addElement('textarea', 'description', get_lang('Description'),array('class'=>'span3','cols' => '34')); - if (isset($this->category_object) && $this->category_object->get_parent_id() == 0) { + if (isset($this->category_object) && $this->category_object->get_parent_id() == 0 && api_get_setting('teachers_can_change_grade_model_settings') == 'true') { //Getting grade models $obj = new GradeModel(); $grade_models = $obj->get_all(); diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 88cdc10050..43a5c3e808 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -852,7 +852,9 @@ VALUES ('allow_browser_sniffer', NULL, 'radio', 'Tuning', 'false', 'AllowBrowserSnifferTitle', 'AllowBrowserSnifferComment', NULL, NULL, 0), ('enable_wami_record',NULL,'radio','Tools','false','EnableWamiRecordTitle','EnableWamiRecordComment',NULL,NULL, 0), ('gradebook_default_weight', NULL, 'textfield', 'Gradebook', '100', 'GradebookDefaultWeightTitle', 'GradebookDefaultWeightComment', NULL, NULL, 0), -('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17752','DatabaseVersion','', NULL, NULL, 0); +('teachers_can_change_score_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeScoreSettingsTitle', 'TeachersCanChangeScoreSettingsComment', NULL, NULL, 1), +('teachers_can_change_grade_model_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeGradeModelSettingsTitle', 'TeachersCanChangeGradeModelSettingsComment', NULL, NULL, 1), +('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17759','DatabaseVersion','', NULL, NULL, 0); /* ('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1), @@ -1188,7 +1190,9 @@ VALUES ('enable_wami_record', 'true', 'Yes'), ('enable_wami_record', 'false', 'No'), ('teachers_can_change_score_settings', 'true', 'Yes'), -('teachers_can_change_score_settings', 'false', 'No'); +('teachers_can_change_score_settings', 'false', 'No'), +('teachers_can_change_grade_model_settings', 'true', 'Yes'), +('teachers_can_change_grade_model_settings', 'false', 'No'); UNLOCK TABLES; /* ('activate_send_event_by_mail', 'true', 'Yes'), diff --git a/main/install/migrate-db-1.8.8-1.9.0-pre.sql b/main/install/migrate-db-1.8.8-1.9.0-pre.sql index acad86c891..1d89882058 100755 --- a/main/install/migrate-db-1.8.8-1.9.0-pre.sql +++ b/main/install/migrate-db-1.8.8-1.9.0-pre.sql @@ -96,6 +96,10 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value, INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_score_settings', 'true', 'Yes'); INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_score_settings', 'false', 'No'); +INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('teachers_can_change_grade_model_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeGradeModelSettingsTitle', 'TeachersCanChangeGradeModelSettingsComment', NULL, NULL, 1); +INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'true', 'Yes'); +INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'false', 'No'); + INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_users_to_change_email_with_no_password', NULL, 'radio', 'User', 'false', 'AllowUsersToChangeEmailWithNoPasswordTitle', 'AllowUsersToChangeEmailWithNoPasswordComment', NULL, NULL, 0); INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'true', 'Yes'); INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'false', 'No'); @@ -184,7 +188,7 @@ DELETE FROM settings_current WHERE variable = 'use_document_title'; DELETE FROM settings_options WHERE variable = 'use_document_title'; -- Do not move this query -UPDATE settings_current SET selected_value = '1.9.0.17752' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.9.0.17759' WHERE variable = 'chamilo_database_version'; -- xxSTATSxx ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; From 1e163bdb7649666872a9b507d59cfec187d84a18 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 7 May 2012 17:28:48 +0200 Subject: [PATCH 21/31] Moving PDF exporting in a function --- main/gradebook/gradebook_flatview.php | 149 +----------------- .../gradebook/lib/gradebook_functions.inc.php | 139 ++++++++++++++++ 2 files changed, 142 insertions(+), 146 deletions(-) diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php index 0e944716e5..1ffb6c5d62 100644 --- a/main/gradebook/gradebook_flatview.php +++ b/main/gradebook/gradebook_flatview.php @@ -107,152 +107,9 @@ if (isset($_GET['exportpdf'])) { $export_pdf_form = new DataForm(DataForm::TYPE_EXPORT_PDF, 'export_pdf_form', null, api_get_self().'?exportpdf=&offset='.intval($_GET['offset']).'&selectcat='.intval($_GET['selectcat']), '_blank', ''); - if ($export_pdf_form->validate()) { - - // Beginning of PDF report creation - - $printable_data = get_printable_data($cat[0], $users, $alleval, $alllinks); - $export = $export_pdf_form->exportValues(); - - // Reading report's CSS - - //$css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css'; - $css_file = api_get_path(SYS_CODE_PATH).'gradebook/print.css'; - $css = file_exists($css_file) ? @file_get_contents($css_file) : ''; - - // HTML report creation first - - $time = time(); - $course_code = trim($cat[0]->get_course_code()); - $organization = api_get_setting('Institution'); - - $displayscore = ScoreDisplay :: instance(); - $customdisplays = $displayscore->get_custom_score_display_settings(); - - if (is_array($customdisplays) && count(($customdisplays))) { - $total = array(); - foreach($customdisplays as $custom) { - $total[$custom['display']] = 0; - } - $user_results = $flatviewtable->datagen->get_data_to_graph2(); - foreach($user_results as $user_result) { - $total[$user_result[count($user_result)-1][1]]++; - } - } - - $html = ''; - - $img = api_get_path(SYS_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png'; - if (file_exists($img)) { - $img = api_get_path(WEB_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png'; - $html .= ""; - } else { - if (!empty($organization)) { - $html .= '

'.$organization.'

'; - } - } - $html .= '

'.get_lang('FlatView').'

'; - - $html .= ''; - - $html .= ''; - $html .= '
'; - - $html .= ''; - $session_name = api_get_session_name(api_get_session_id()); - $teacher_list = CourseManager::get_teacher_list_from_course_code_to_string($course_code); - if (!empty($session_name)) { - $html .= Display::tag('tr', Display::tag('td', get_lang('Session')).Display::tag('td', Display::tag('strong', $session_name))); - } - $html .= Display::tag('tr', Display::tag('td', get_lang('Course')).Display::tag('td', Display::tag('strong', $course_code))); - $html .= Display::tag('tr', Display::tag('td', get_lang('Date')).Display::tag('td', Display::tag('strong', api_convert_and_format_date(date('Y-m-d', time()), DATE_TIME_FORMAT_LONG)))); - $html .= Display::tag('tr', Display::tag('td', get_lang('Teacher')).Display::tag('td', Display::tag('strong', $teacher_list))); - $html .= '
'; - - if (!empty($total)) { - foreach($total as $label => $count) { - $total_custom_score = round($count/count($user_results), 2) *100; - $html .= Display::tag('tr', Display::tag('td', $label).': '.Display::tag('td', Display::tag('strong', $total_custom_score.' %'))); - } - } - $html .= '
'; - $headers = $printable_data[0]; - unset($headers[0]); - unset($headers[1]); - unset($headers[count($headers)+1]); - - foreach ($headers as $head) { - //$html .= Display::tag('tr', Display::tag('td', 'P1').Display::tag('td', Display::tag('strong', $head))); - $html .= Display::tag('tr', Display::tag('td', Display::tag('strong', $head))); - } - $html .= '

'; - - $columns = count($printable_data[0]); - $has_data = is_array($printable_data[1]) && count($printable_data[1]) > 0; - - if (api_is_western_name_order()) { - // Choosing the right person name order according to the current language. - list($printable_data[0][0], $printable_data[0][1]) = array($printable_data[0][1], $printable_data[0][0]); - if ($has_data) { - foreach ($printable_data[1] as &$printable_data_row) { - list($printable_data_row[0], $printable_data_row[1]) = array($printable_data_row[1], $printable_data_row[0]); - } - } - } - - $table = new HTML_Table(array('class' => 'data_table')); - $row = 0; - $column = 0; - foreach ($printable_data[0] as $printable_data_cell) { - $table->setHeaderContents($row, $column, $printable_data_cell); - $column++; - } - $row++; - if ($has_data) { - foreach ($printable_data[1] as &$printable_data_row) { - $column = 0; - foreach ($printable_data_row as &$printable_data_cell) { - $table->setCellContents($row, $column, $printable_data_cell); - $table->updateCellAttributes($row, $column, 'align="center"'); - $column++; - } - $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); - $row++; - } - } else { - $column = 0; - $table->setCellContents($row, $column, get_lang('NoResults')); - $table->updateCellAttributes($row, $column, 'colspan="'.$columns.'" align="center" class="row_odd"'); - } - - $html .= $table->toHtml(); - - //echo $html;exit; - // Memory release - - unset($printable_data); - unset($table); - - // Conversion of the created HTML report to a PDF report - - $html = api_utf8_encode($html); - //@todo this is really a must? - $creator_pdf = api_utf8_encode($creator); - $title_pdf = api_utf8_encode($report_name); - $subject_pdf = api_utf8_encode(get_lang('FlatView')); - $keywods_pdf = api_utf8_encode($course_code); - - $page_format = $export['orientation'] == 'landscape' ? 'A4-L' : 'A4'; - $pdf = new PDF($page_format, $export['orientation']); - - // Sending the created PDF report to the client - $file_name = date('YmdHi_', $time); - if (!empty($course_code)) { - $file_name .= $course_code.'_'; - } - $file_name .= get_lang('FlatView').'.pdf'; - $pdf->content_to_pdf($html, $css, $file_name, api_get_course_id()); - exit; + if ($export_pdf_form->validate()) { + $params = $export_pdf_form->exportValues(); + export_pdf_flatview($cat, $users, $alleval, $alllinks, $params); } else { Display :: display_header(get_lang('ExportPDF')); } diff --git a/main/gradebook/lib/gradebook_functions.inc.php b/main/gradebook/lib/gradebook_functions.inc.php index 9c5f30343d..2f20d5ca05 100644 --- a/main/gradebook/lib/gradebook_functions.inc.php +++ b/main/gradebook/lib/gradebook_functions.inc.php @@ -208,6 +208,10 @@ function build_edit_icons_cat($cat, $selectcat) { $modify_icons .= ''.Display::return_icon('view_more_stats.gif', get_lang('Show'),'',ICON_SIZE_SMALL).''; if (api_is_allowed_to_edit(null, true)) { + + //PDF + $modify_icons .= ' '.Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_SMALL).''; + if (empty($grade_model_id) || $grade_model_id == -1) { $modify_icons .= ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } @@ -605,3 +609,138 @@ function get_user_certificate_content($user_id, $course_code, $is_preview = fals $new_content_html = $new_content[0].$print.''.$new_content_html; return array('content' => $new_content_html, 'variables'=>$content_html['variables']); } + + +function export_pdf_flatview($cat, $users, $alleval, $alllinks, $params = array()) { + // Beginning of PDF report creation + + $printable_data = get_printable_data($cat[0], $users, $alleval, $alllinks); + + // Reading report's CSS + $css_file = api_get_path(SYS_CODE_PATH).'gradebook/print.css'; + $css = file_exists($css_file) ? @file_get_contents($css_file) : ''; + + // HTML report creation first + $time = time(); + $course_code = trim($cat[0]->get_course_code()); + $organization = api_get_setting('Institution'); + + $displayscore = ScoreDisplay :: instance(); + $customdisplays = $displayscore->get_custom_score_display_settings(); + + $total = array(); + if (is_array($customdisplays) && count(($customdisplays))) { + foreach($customdisplays as $custom) { + $total[$custom['display']] = 0; + } + $user_results = $flatviewtable->datagen->get_data_to_graph2(); + foreach($user_results as $user_result) { + $total[$user_result[count($user_result)-1][1]]++; + } + } + + $html = ''; + + $img = api_get_path(SYS_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png'; + + if (file_exists($img)) { + $img = api_get_path(WEB_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png'; + $html .= ""; + } else { + if (!empty($organization)) { + $html .= '

'.$organization.'

'; + } + } + + $html .= '

'.get_lang('FlatView').'

'; + $html .= ''; + + $html .= ''; + $html .= '
'; + + $html .= ''; + $session_name = api_get_session_name(api_get_session_id()); + $teacher_list = CourseManager::get_teacher_list_from_course_code_to_string($course_code); + if (!empty($session_name)) { + $html .= Display::tag('tr', Display::tag('td', get_lang('Session')).Display::tag('td', Display::tag('strong', $session_name))); + } + $html .= Display::tag('tr', Display::tag('td', get_lang('Course')).Display::tag('td', Display::tag('strong', $course_code))); + $html .= Display::tag('tr', Display::tag('td', get_lang('Date')).Display::tag('td', Display::tag('strong', api_convert_and_format_date(date('Y-m-d', time()), DATE_TIME_FORMAT_LONG)))); + $html .= Display::tag('tr', Display::tag('td', get_lang('Teacher')).Display::tag('td', Display::tag('strong', $teacher_list))); + $html .= '
'; + + if (!empty($total)) { + foreach($total as $label => $count) { + $total_custom_score = round($count/count($user_results), 2) *100; + $html .= Display::tag('tr', Display::tag('td', $label).': '.Display::tag('td', Display::tag('strong', $total_custom_score.' %'))); + } + } + $html .= '
'; + $headers = $printable_data[0]; + unset($headers[0]); + unset($headers[1]); + unset($headers[count($headers)+1]); + + foreach ($headers as $head) { + $html .= Display::tag('tr', Display::tag('td', Display::tag('strong', $head))); + } + $html .= '

'; + + $columns = count($printable_data[0]); + $has_data = is_array($printable_data[1]) && count($printable_data[1]) > 0; + + if (api_is_western_name_order()) { + // Choosing the right person name order according to the current language. + list($printable_data[0][0], $printable_data[0][1]) = array($printable_data[0][1], $printable_data[0][0]); + if ($has_data) { + foreach ($printable_data[1] as &$printable_data_row) { + list($printable_data_row[0], $printable_data_row[1]) = array($printable_data_row[1], $printable_data_row[0]); + } + } + } + + $table = new HTML_Table(array('class' => 'data_table')); + $row = 0; + $column = 0; + foreach ($printable_data[0] as $printable_data_cell) { + $table->setHeaderContents($row, $column, $printable_data_cell); + $column++; + } + $row++; + if ($has_data) { + foreach ($printable_data[1] as &$printable_data_row) { + $column = 0; + foreach ($printable_data_row as &$printable_data_cell) { + $table->setCellContents($row, $column, $printable_data_cell); + $table->updateCellAttributes($row, $column, 'align="center"'); + $column++; + } + $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true); + $row++; + } + } else { + $column = 0; + $table->setCellContents($row, $column, get_lang('NoResults')); + $table->updateCellAttributes($row, $column, 'colspan="'.$columns.'" align="center" class="row_odd"'); + } + + $html .= $table->toHtml(); + + unset($printable_data); + unset($table); + + // Conversion of the created HTML report to a PDF report + + $html = api_utf8_encode($html); + $page_format = $params['orientation'] == 'landscape' ? 'A4-L' : 'A4'; + $pdf = new PDF($page_format, $params['orientation']); + + // Sending the created PDF report to the client + $file_name = date('YmdHi_', $time); + if (!empty($course_code)) { + $file_name .= $course_code.'_'; + } + $file_name .= get_lang('FlatView').'.pdf'; + $pdf->content_to_pdf($html, $css, $file_name, api_get_course_id()); + exit; +} \ No newline at end of file From d1841c6795df6e701aad5e00ab088fdf81538949 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 7 May 2012 16:54:26 -0500 Subject: [PATCH 22/31] Languages update + Bengali + Somali --- main/lang/bengali/accessibility.inc.php | 5 ++ main/lang/bengali/admin.inc.php | 5 ++ main/lang/bengali/agenda.inc.php | 5 ++ main/lang/bengali/announcements.inc.php | 5 ++ main/lang/bengali/blog.inc.php | 5 ++ main/lang/bengali/chat.inc.php | 5 ++ main/lang/bengali/course_description.inc.php | 5 ++ main/lang/bengali/course_home.inc.php | 5 ++ main/lang/bengali/course_info.inc.php | 5 ++ main/lang/bengali/coursebackup.inc.php | 5 ++ main/lang/bengali/courses.inc.php | 5 ++ main/lang/bengali/create_course.inc.php | 5 ++ main/lang/bengali/document.inc.php | 5 ++ main/lang/bengali/dropbox.inc.php | 5 ++ main/lang/bengali/exercice.inc.php | 5 ++ main/lang/bengali/external_module.inc.php | 5 ++ main/lang/bengali/forum.inc.php | 5 ++ main/lang/bengali/glossary.inc.php | 5 ++ main/lang/bengali/gradebook.inc.php | 5 ++ main/lang/bengali/group.inc.php | 5 ++ main/lang/bengali/help.inc.php | 5 ++ main/lang/bengali/hotspot.inc.php | 5 ++ main/lang/bengali/import.inc.php | 5 ++ main/lang/bengali/index.inc.php | 5 ++ main/lang/bengali/install.inc.php | 5 ++ main/lang/bengali/learnpath.inc.php | 5 ++ main/lang/bengali/link.inc.php | 5 ++ main/lang/bengali/md_document.inc.php | 5 ++ main/lang/bengali/md_link.inc.php | 5 ++ main/lang/bengali/md_mix.inc.php | 5 ++ main/lang/bengali/md_scorm.inc.php | 5 ++ main/lang/bengali/messages.inc.php | 5 ++ main/lang/bengali/myagenda.inc.php | 5 ++ main/lang/bengali/notebook.inc.php | 5 ++ main/lang/bengali/notification.inc.php | 5 ++ main/lang/bengali/pedaSuggest.inc.php | 5 ++ main/lang/bengali/registration.inc.php | 5 ++ main/lang/bengali/reservation.inc.php | 5 ++ main/lang/bengali/resourcelinker.inc.php | 5 ++ main/lang/bengali/scorm.inc.php | 5 ++ main/lang/bengali/scormbuilder.inc.php | 5 ++ main/lang/bengali/scormdocument.inc.php | 5 ++ main/lang/bengali/slideshow.inc.php | 5 ++ main/lang/bengali/survey.inc.php | 5 ++ main/lang/bengali/tracking.inc.php | 5 ++ main/lang/bengali/trad4all.inc.php | 5 ++ main/lang/bengali/userInfo.inc.php | 5 ++ main/lang/bengali/videoconf.inc.php | 5 ++ main/lang/bengali/wiki.inc.php | 5 ++ main/lang/bengali/work.inc.php | 5 ++ main/lang/brazilian/trad4all.inc.php | 1 - main/lang/english/admin.inc.php | 25 ++---- main/lang/finnish/exercice.inc.php | 1 + main/lang/finnish/trad4all.inc.php | 1 - main/lang/french/admin.inc.php | 23 ++--- main/lang/french/trad4all.inc.php | 1 - main/lang/galician/trad4all.inc.php | 1 - main/lang/indonesian/admin.inc.php | 88 +++++++++++++++++++ main/lang/italian/trad4all.inc.php | 1 - main/lang/latvian/trad4all.inc.php | 1 - main/lang/slovenian/admin.inc.php | 35 ++++++++ .../lang/slovenian/course_description.inc.php | 1 + main/lang/slovenian/courses.inc.php | 14 +-- main/lang/slovenian/document.inc.php | 1 + main/lang/slovenian/exercice.inc.php | 12 ++- main/lang/slovenian/gradebook.inc.php | 4 + main/lang/slovenian/index.inc.php | 26 +++--- main/lang/slovenian/registration.inc.php | 6 +- main/lang/slovenian/tracking.inc.php | 3 + main/lang/slovenian/trad4all.inc.php | 55 ++++++++++-- main/lang/slovenian/wiki.inc.php | 17 ++++ main/lang/slovenian/work.inc.php | 4 +- main/lang/somali/accessibility.inc.php | 5 ++ main/lang/somali/admin.inc.php | 5 ++ main/lang/somali/agenda.inc.php | 5 ++ main/lang/somali/announcements.inc.php | 5 ++ main/lang/somali/blog.inc.php | 5 ++ main/lang/somali/chat.inc.php | 5 ++ main/lang/somali/course_description.inc.php | 5 ++ main/lang/somali/course_home.inc.php | 5 ++ main/lang/somali/course_info.inc.php | 5 ++ main/lang/somali/coursebackup.inc.php | 5 ++ main/lang/somali/courses.inc.php | 5 ++ main/lang/somali/create_course.inc.php | 5 ++ main/lang/somali/document.inc.php | 5 ++ main/lang/somali/dropbox.inc.php | 5 ++ main/lang/somali/exercice.inc.php | 5 ++ main/lang/somali/external_module.inc.php | 5 ++ main/lang/somali/forum.inc.php | 5 ++ main/lang/somali/glossary.inc.php | 5 ++ main/lang/somali/gradebook.inc.php | 5 ++ main/lang/somali/group.inc.php | 5 ++ main/lang/somali/help.inc.php | 5 ++ main/lang/somali/hotspot.inc.php | 5 ++ main/lang/somali/import.inc.php | 5 ++ main/lang/somali/index.inc.php | 5 ++ main/lang/somali/install.inc.php | 5 ++ main/lang/somali/learnpath.inc.php | 5 ++ main/lang/somali/link.inc.php | 5 ++ main/lang/somali/md_document.inc.php | 5 ++ main/lang/somali/md_link.inc.php | 5 ++ main/lang/somali/md_mix.inc.php | 5 ++ main/lang/somali/md_scorm.inc.php | 5 ++ main/lang/somali/messages.inc.php | 5 ++ main/lang/somali/myagenda.inc.php | 5 ++ main/lang/somali/notebook.inc.php | 5 ++ main/lang/somali/notification.inc.php | 5 ++ main/lang/somali/pedaSuggest.inc.php | 5 ++ main/lang/somali/registration.inc.php | 5 ++ main/lang/somali/reservation.inc.php | 5 ++ main/lang/somali/resourcelinker.inc.php | 5 ++ main/lang/somali/scorm.inc.php | 5 ++ main/lang/somali/scormbuilder.inc.php | 5 ++ main/lang/somali/scormdocument.inc.php | 5 ++ main/lang/somali/slideshow.inc.php | 5 ++ main/lang/somali/survey.inc.php | 5 ++ main/lang/somali/tracking.inc.php | 5 ++ main/lang/somali/trad4all.inc.php | 5 ++ main/lang/somali/userInfo.inc.php | 5 ++ main/lang/somali/videoconf.inc.php | 5 ++ main/lang/somali/wiki.inc.php | 5 ++ main/lang/somali/work.inc.php | 5 ++ main/lang/turkce/admin.inc.php | 4 +- main/lang/turkce/import.inc.php | 1 - main/lang/turkce/trad4all.inc.php | 1 - 125 files changed, 753 insertions(+), 74 deletions(-) create mode 100644 main/lang/bengali/accessibility.inc.php create mode 100644 main/lang/bengali/admin.inc.php create mode 100644 main/lang/bengali/agenda.inc.php create mode 100644 main/lang/bengali/announcements.inc.php create mode 100644 main/lang/bengali/blog.inc.php create mode 100644 main/lang/bengali/chat.inc.php create mode 100644 main/lang/bengali/course_description.inc.php create mode 100644 main/lang/bengali/course_home.inc.php create mode 100644 main/lang/bengali/course_info.inc.php create mode 100644 main/lang/bengali/coursebackup.inc.php create mode 100644 main/lang/bengali/courses.inc.php create mode 100644 main/lang/bengali/create_course.inc.php create mode 100644 main/lang/bengali/document.inc.php create mode 100644 main/lang/bengali/dropbox.inc.php create mode 100644 main/lang/bengali/exercice.inc.php create mode 100644 main/lang/bengali/external_module.inc.php create mode 100644 main/lang/bengali/forum.inc.php create mode 100644 main/lang/bengali/glossary.inc.php create mode 100644 main/lang/bengali/gradebook.inc.php create mode 100644 main/lang/bengali/group.inc.php create mode 100644 main/lang/bengali/help.inc.php create mode 100644 main/lang/bengali/hotspot.inc.php create mode 100644 main/lang/bengali/import.inc.php create mode 100644 main/lang/bengali/index.inc.php create mode 100644 main/lang/bengali/install.inc.php create mode 100644 main/lang/bengali/learnpath.inc.php create mode 100644 main/lang/bengali/link.inc.php create mode 100644 main/lang/bengali/md_document.inc.php create mode 100644 main/lang/bengali/md_link.inc.php create mode 100644 main/lang/bengali/md_mix.inc.php create mode 100644 main/lang/bengali/md_scorm.inc.php create mode 100644 main/lang/bengali/messages.inc.php create mode 100644 main/lang/bengali/myagenda.inc.php create mode 100644 main/lang/bengali/notebook.inc.php create mode 100644 main/lang/bengali/notification.inc.php create mode 100644 main/lang/bengali/pedaSuggest.inc.php create mode 100644 main/lang/bengali/registration.inc.php create mode 100644 main/lang/bengali/reservation.inc.php create mode 100644 main/lang/bengali/resourcelinker.inc.php create mode 100644 main/lang/bengali/scorm.inc.php create mode 100644 main/lang/bengali/scormbuilder.inc.php create mode 100644 main/lang/bengali/scormdocument.inc.php create mode 100644 main/lang/bengali/slideshow.inc.php create mode 100644 main/lang/bengali/survey.inc.php create mode 100644 main/lang/bengali/tracking.inc.php create mode 100644 main/lang/bengali/trad4all.inc.php create mode 100644 main/lang/bengali/userInfo.inc.php create mode 100644 main/lang/bengali/videoconf.inc.php create mode 100644 main/lang/bengali/wiki.inc.php create mode 100644 main/lang/bengali/work.inc.php create mode 100644 main/lang/somali/accessibility.inc.php create mode 100644 main/lang/somali/admin.inc.php create mode 100644 main/lang/somali/agenda.inc.php create mode 100644 main/lang/somali/announcements.inc.php create mode 100644 main/lang/somali/blog.inc.php create mode 100644 main/lang/somali/chat.inc.php create mode 100644 main/lang/somali/course_description.inc.php create mode 100644 main/lang/somali/course_home.inc.php create mode 100644 main/lang/somali/course_info.inc.php create mode 100644 main/lang/somali/coursebackup.inc.php create mode 100644 main/lang/somali/courses.inc.php create mode 100644 main/lang/somali/create_course.inc.php create mode 100644 main/lang/somali/document.inc.php create mode 100644 main/lang/somali/dropbox.inc.php create mode 100644 main/lang/somali/exercice.inc.php create mode 100644 main/lang/somali/external_module.inc.php create mode 100644 main/lang/somali/forum.inc.php create mode 100644 main/lang/somali/glossary.inc.php create mode 100644 main/lang/somali/gradebook.inc.php create mode 100644 main/lang/somali/group.inc.php create mode 100644 main/lang/somali/help.inc.php create mode 100644 main/lang/somali/hotspot.inc.php create mode 100644 main/lang/somali/import.inc.php create mode 100644 main/lang/somali/index.inc.php create mode 100644 main/lang/somali/install.inc.php create mode 100644 main/lang/somali/learnpath.inc.php create mode 100644 main/lang/somali/link.inc.php create mode 100644 main/lang/somali/md_document.inc.php create mode 100644 main/lang/somali/md_link.inc.php create mode 100644 main/lang/somali/md_mix.inc.php create mode 100644 main/lang/somali/md_scorm.inc.php create mode 100644 main/lang/somali/messages.inc.php create mode 100644 main/lang/somali/myagenda.inc.php create mode 100644 main/lang/somali/notebook.inc.php create mode 100644 main/lang/somali/notification.inc.php create mode 100644 main/lang/somali/pedaSuggest.inc.php create mode 100644 main/lang/somali/registration.inc.php create mode 100644 main/lang/somali/reservation.inc.php create mode 100644 main/lang/somali/resourcelinker.inc.php create mode 100644 main/lang/somali/scorm.inc.php create mode 100644 main/lang/somali/scormbuilder.inc.php create mode 100644 main/lang/somali/scormdocument.inc.php create mode 100644 main/lang/somali/slideshow.inc.php create mode 100644 main/lang/somali/survey.inc.php create mode 100644 main/lang/somali/tracking.inc.php create mode 100644 main/lang/somali/trad4all.inc.php create mode 100644 main/lang/somali/userInfo.inc.php create mode 100644 main/lang/somali/videoconf.inc.php create mode 100644 main/lang/somali/wiki.inc.php create mode 100644 main/lang/somali/work.inc.php diff --git a/main/lang/bengali/accessibility.inc.php b/main/lang/bengali/accessibility.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/accessibility.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/admin.inc.php b/main/lang/bengali/admin.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/admin.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/agenda.inc.php b/main/lang/bengali/agenda.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/agenda.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/announcements.inc.php b/main/lang/bengali/announcements.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/announcements.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/blog.inc.php b/main/lang/bengali/blog.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/blog.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/chat.inc.php b/main/lang/bengali/chat.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/chat.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/course_description.inc.php b/main/lang/bengali/course_description.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/course_description.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/course_home.inc.php b/main/lang/bengali/course_home.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/course_home.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/course_info.inc.php b/main/lang/bengali/course_info.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/course_info.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/coursebackup.inc.php b/main/lang/bengali/coursebackup.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/coursebackup.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/courses.inc.php b/main/lang/bengali/courses.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/courses.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/create_course.inc.php b/main/lang/bengali/create_course.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/create_course.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/document.inc.php b/main/lang/bengali/document.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/document.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/dropbox.inc.php b/main/lang/bengali/dropbox.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/dropbox.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/exercice.inc.php b/main/lang/bengali/exercice.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/exercice.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/external_module.inc.php b/main/lang/bengali/external_module.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/external_module.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/forum.inc.php b/main/lang/bengali/forum.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/forum.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/glossary.inc.php b/main/lang/bengali/glossary.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/glossary.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/gradebook.inc.php b/main/lang/bengali/gradebook.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/gradebook.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/group.inc.php b/main/lang/bengali/group.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/group.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/help.inc.php b/main/lang/bengali/help.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/help.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/hotspot.inc.php b/main/lang/bengali/hotspot.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/hotspot.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/import.inc.php b/main/lang/bengali/import.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/import.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/index.inc.php b/main/lang/bengali/index.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/index.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/install.inc.php b/main/lang/bengali/install.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/install.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/learnpath.inc.php b/main/lang/bengali/learnpath.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/learnpath.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/link.inc.php b/main/lang/bengali/link.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/link.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/md_document.inc.php b/main/lang/bengali/md_document.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/md_document.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/md_link.inc.php b/main/lang/bengali/md_link.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/md_link.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/md_mix.inc.php b/main/lang/bengali/md_mix.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/md_mix.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/md_scorm.inc.php b/main/lang/bengali/md_scorm.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/md_scorm.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/messages.inc.php b/main/lang/bengali/messages.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/messages.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/myagenda.inc.php b/main/lang/bengali/myagenda.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/myagenda.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/notebook.inc.php b/main/lang/bengali/notebook.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/notebook.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/notification.inc.php b/main/lang/bengali/notification.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/notification.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/pedaSuggest.inc.php b/main/lang/bengali/pedaSuggest.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/pedaSuggest.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/registration.inc.php b/main/lang/bengali/registration.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/registration.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/reservation.inc.php b/main/lang/bengali/reservation.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/reservation.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/resourcelinker.inc.php b/main/lang/bengali/resourcelinker.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/resourcelinker.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/scorm.inc.php b/main/lang/bengali/scorm.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/scorm.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/scormbuilder.inc.php b/main/lang/bengali/scormbuilder.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/scormbuilder.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/scormdocument.inc.php b/main/lang/bengali/scormdocument.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/scormdocument.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/slideshow.inc.php b/main/lang/bengali/slideshow.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/slideshow.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/survey.inc.php b/main/lang/bengali/survey.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/survey.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/tracking.inc.php b/main/lang/bengali/tracking.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/tracking.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/trad4all.inc.php b/main/lang/bengali/trad4all.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/trad4all.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/userInfo.inc.php b/main/lang/bengali/userInfo.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/userInfo.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/videoconf.inc.php b/main/lang/bengali/videoconf.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/videoconf.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/wiki.inc.php b/main/lang/bengali/wiki.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/wiki.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/bengali/work.inc.php b/main/lang/bengali/work.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/bengali/work.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/brazilian/trad4all.inc.php b/main/lang/brazilian/trad4all.inc.php index dab8af199a..809ed41bec 100644 --- a/main/lang/brazilian/trad4all.inc.php +++ b/main/lang/brazilian/trad4all.inc.php @@ -1059,7 +1059,6 @@ $CourseCodeAlreadyExistExplained = "Quando o código do curso é duplicado, o si $CantDeleteReadonlyFiles = "Não é possível excluir os arquivos que estão configurados no modo somente-leitura."; $Uploaded = "Atualizado."; $Saved = "Salvo."; -$GotoCourse = "Ir para o curso"; $EmailSentFromDokeos = "E-mail enviado a partir da plataforma"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informações sobre a última etapa concluída e a próxima inacabaca."; $LatexCode = "Código LaTeX"; diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php index 71d8e161d4..28784639b6 100644 --- a/main/lang/english/admin.inc.php +++ b/main/lang/english/admin.inc.php @@ -2,7 +2,7 @@ /* for more information: see languages.txt in the lang folder. */ -$CasMainActivateComment = "Enabling CAS authentication will allow users to authenticate with their CAS credentials.
Go to Plugin to add a configurable 'CAS Login' button for your Chamilo campus."; +$CasMainActivateComment = "Enabling CAS authentication will allow users to authenticate with their CAS credentials"; $AdminBy = "Administration by"; $AdministrationTools = "Administration"; $State = "Portal status"; @@ -1304,7 +1304,7 @@ $EnabledImageMapsTitle = "Activate Image maps"; $EnabledImageMapsComment = "Activate the button to insert Image maps. This allows you to associate URLs to areas of an image, creating hotspots."; $CourseTool = "Course tool"; $BigBlueButtonEnableTitle = "BigBlueButton videoconference tool"; -$BigBlueButtonEnableComment = "Choose whether you want to enable the BigBlueButton videoconference tool. Once enabled, it will show as an additional course tool in all courses' homepage, and teachers will be able to launch a conference at any time. Students will not be able to launch a conference, only join one. If you don't have a BigBlueButton server, please set one up or ask the Chamilo official providers for a quote. +$BigBlueButtonEnableComment = "Choose whether you want to enable the BigBlueButton videoconference tool. Once enabled, it will show as an additional course tool in all courses' homepage, and teachers will be able to launch a conference at any time. Students will not be able to launch a conference, only join one. If you don't have a BigBlueButton server, please set one up or ask the Chamilo official providers for a quote. BigBlueButton is a free (as in freedom *and* beer), but its installation requires a set of technical skills that might not be immediately available to all. You can install it on your own or seek professional help to assist you or do it for you. This help, however, will generate a certain cost. In the pure logic of the free software, we offer you the tools to make your work easier and recommend professionals (the Chamilo Official Providers) that will be able to help you if this were too difficult."; $BigBlueButtonHostTitle = "BigBlueButton server host"; $BigBlueButtonHostComment = "This is the name of the server where your BigBlueButton server is running. Might be localhost, an IP address (e.g. 192.168.13.54) or a domain name (e.g. my.video.com)."; @@ -1329,8 +1329,8 @@ $IncludeAsciiMathMlComment = "Activate this setting if you want to show ASCIIMat $CourseHideToolsTitle = "Hide tools from teachers"; $CourseHideToolsComment = "Check the tools you want to hide from teachers. This will prohibit access to the tool."; $MoveUserStats = "Move users results from/to a session"; -$CompareUserResultsBetweenCoursesAndCoursesInASession = "This advanced tool allows you to manually improve the tracking of users results when moving from courses methodology to sessions methodology. In most cases, you won't need to use it.
-On this screen, you can compare results of users between the context of a standalone course, and the context of the same course inside a session.
+$CompareUserResultsBetweenCoursesAndCoursesInASession = "This advanced tool allows you to manually improve the tracking of users results when moving from courses methodology to sessions methodology. In most cases, you won't need to use it.
+On this screen, you can compare results of users between the context of a standalone course, and the context of the same course inside a session.
Once you are sure about what to do, you can choose to move the tracking data of the students (exercises results and learning paths tracking) from a course to a session."; $PDFExportWatermarkEnableTitle = "Enable watermark in PDF export"; $PDFExportWatermarkEnableComment = "By enabling this option, you can upload an image or a text that will be automatically added as watermark to all PDF exports of documents on the system."; @@ -1385,8 +1385,8 @@ $EnableAccessibilityFontResizeTitle = "Font resize accessibility feature"; $EnableAccessibilityFontResizeComment = "Enable this option to show a set of font resize options on the top-right side of your campus. This will allow visually impaired to read their course contents more easily."; $GlobalEvent = "Platform event"; $SearchEnabledTitle = "Fulltext search"; -$SearchEnabledComment = "This feature allows you to index most of the documents uploaded to your portal, then provide a search feature for users.
-This feature will not index documents that have already been uploaded, so it is important to enable (if wanted) at the beginning of your implementation.
+$SearchEnabledComment = "This feature allows you to index most of the documents uploaded to your portal, then provide a search feature for users.
+This feature will not index documents that have already been uploaded, so it is important to enable (if wanted) at the beginning of your implementation.
Once enabled, a search box will appear in the courses list of every user. Searching for a specific term will bring a list of corresponding documents, exercises or forum topics, filtered depending on the availability of these contents to the user."; $SpecificSearchFieldsAvailable = "Available custom search fields"; $XapianModuleInstalled = "Xapian module installed"; @@ -1535,16 +1535,9 @@ $EnableWamiRecordTitle = "Activate Wami-recorder"; $EnableWamiRecordComment = "Wami-recorder is a voice record tool on Flash"; $ChangeSharedSetting = "Change setting visibility for the other portals"; $AllowHRSkillsManagementTitle = "Allow HR skills management"; -$LdapDescriptionComment = "

  • LDAP authentication :
    See I. below to configure LDAP
    See II. below to activate LDAP authentication


  • Update user attributes, with LDAP data, after CAS authentication(see CAS configuration ) :
    See I. below to configure LDAP
    CAS manage user authentication, LDAP activation isn't required.


I. LDAP configuration

Edit file main/auth/external_login/ldap.conf.php
-> Edit values of array $extldap_config

Parameters are
  • base domain string (ex : 'base_dn' => 'DC=cblue,DC=be')
  • admin distinguished name (ex : 'admin_dn' =>'CN=admin,dc=cblue,dc=be')
  • admin password (ex : 'admin_password' => '123456')
  • ldap host (ex : 'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'))
  • filter (ex : 'filter' => '')
  • port (ex : 'port' => 389)
  • protocol version (2 or 3) (ex : 'protocol_version' => 3)
  • user_search (ex : 'user_search' => 'sAMAccountName=%username%')
  • encoding (ex : 'encoding' => 'UTF-8')
  • update_userinfo (ex : 'update_userinfo' => true)
-> To update correspondences between user and LDAP attributes, edit array $extldap_user_correspondance
Array values are <chamilo_field> => >ldap_field>
Array structure is explained in file main/auth/external_login/ldap.conf.php


II. Activate LDAP authentication

Edit file main/inc/conf/configuration.php
-> Uncomment lines
$extAuthSource["extldap"]["login"] =$_configuration['root_sys'].$_configuration['code_append']."auth/external_login/login.ldap.php";
$extAuthSource["extldap"]["newUser"] =$_configuration['root_sys'].$_configuration['code_append']."auth/external_login/newUser.ldap.php";

N.B. : LDAP users use same fields than platform users to login.
N.B. : LDAP activation adds a menu External authentication [LDAP] in "add or modify" user pages."; -$LdapDescriptionTitle = "

LDAP autentication

"; $AllowHRSkillsManagementComment = "Allows HR to manage skills"; $GradebookDefaultWeightTitle = "Default weight in Gradebook"; $GradebookDefaultWeightComment = "This weight will be use in all courses by default"; -$ActiveOnly = "Active only"; -$AuthenticationSource = "Authentication"; -$RegisteredDate = "Registered"; -$Zombies = "Zombies"; -$ShibbolethMainActivateTitle = "

Shibboleth authentication

"; -$ShibbolethMainActivateComment = "

First of all, you have to configure Shibboleth for your web server.

To configure it for Chamilo
edit file main/auth/shibboleth/config/aai.class.php

Modify object $result values with the name of your Shibboleth attributes

  • $result->unique_id = 'mail';
  • $result->firstname = 'cn';
  • $result->lastname = 'uid';
  • $result->email = 'mail';
  • $result->language = '-';
  • $result->gender = '-';
  • $result->address = '-';
  • $result->staff_category = '-';
  • $result->home_organization_type = '-';
  • $result->home_organization = '-';
  • $result->affiliation = '-';
  • $result->persistent_id = '-';
  • ...

Go to Plugin to add a configurable 'Shibboleth Login' button for your Chamilo campus."; -$FacebookMainActivateTitle = "

Facebook authentication

"; -$FacebookMainActivateComment = "

First of all, you have create a Facebook Application (see https://developers.facebook.com/apps) with your Facebook account. In the Facebook Apps parameters, the site URL value should have a GET parameter 'action=fbconnect' (e.g. http://mychamilo.com/?action=fbconnect).

Then,
edit file main/auth/external_login/facebook.conf.php
and enter 'appId' and 'secret' values for $facebook_config.
Go to Plugin to add a configurable 'Facebook Login' button for your Chamilo campus."; +$TeachersCanChangeScoreSettingsTitle = "Teachers can change the Gradebook score settings"; +$TeachersCanChangeScoreSettingsComment = "When editing the Gradebook settings"; +?> \ No newline at end of file diff --git a/main/lang/finnish/exercice.inc.php b/main/lang/finnish/exercice.inc.php index 53ac52bb55..f424f2af85 100644 --- a/main/lang/finnish/exercice.inc.php +++ b/main/lang/finnish/exercice.inc.php @@ -209,6 +209,7 @@ $StudentEmail = "Sähköposti"; $CourseName = "Kurssin nimi"; $HotspotDescription = "Nyt klikkaa: (...)"; $ExamSheetVCC = "Tehtävä tarkistettu"; +$AttemptVCC = "Tehtäväsi on tarkistettu/kommentoitu."; $DearStudentEmailIntroduction = "Hyvä Opiskelija,"; $ExerciseFinished = "Harjoitus valmis"; $DisableResults = "Älä näytä tuloksia oppilaille"; diff --git a/main/lang/finnish/trad4all.inc.php b/main/lang/finnish/trad4all.inc.php index 8f99fddbe9..35160d69c8 100644 --- a/main/lang/finnish/trad4all.inc.php +++ b/main/lang/finnish/trad4all.inc.php @@ -830,7 +830,6 @@ $AllDone = "Kaikki tehty"; $Blogs = "Blogit"; $Postpone = "Lykkää"; $Saved = "Tallennettu"; -$GotoCourse = "Mene kurssille"; $NextBis = "Seuraava"; $Prev = "Edellinen"; $UserRoles = "Käyttäjä roolit"; diff --git a/main/lang/french/admin.inc.php b/main/lang/french/admin.inc.php index a3e4a7710a..06f59d8f2e 100644 --- a/main/lang/french/admin.inc.php +++ b/main/lang/french/admin.inc.php @@ -2,7 +2,7 @@ /* for more information: see languages.txt in the lang folder. */ -$CasMainActivateComment = "Activer l'authentification CAS permettra aux utilisateurs de s'identifier à l'aide de leur compte CAS
Vous trouverez dans les Plugin un bouton 'Login CAS', parametrable, qui s'ajoutera sur la page d'accueil de votre campus Chamilo."; +$CasMainActivateComment = "Activer l'authentification CAS permettra aux utilisateurs de s'identifier à l'aide de leur compte CAS"; $AdminBy = "Administration par"; $AdministrationTools = "Administration"; $State = "Etat du système"; @@ -1132,7 +1132,7 @@ $AssignCoursesToHumanResourcesManager = "Assigner des cours au directeur RH"; $TimezoneValueTitle = "Zone de temps"; $TimezoneValueComment = "Ceci est la zone de temps configurée pour ce portail. Si vous ne configurez pas de zone de temps, la zone de temps du serveur sera utilisée. Si vous configurez une zone de temps, tous les temps de cette plateforme seront basés sur cette zone de temps. Ce"; $UseUsersTimezoneTitle = "Utiliser les zones de temps utilisateurs"; -$UseUsersTimezoneComment = "Activer la possibilité pour les utilisateurs de sélectionner leur zone horaire. Le champ de zone horaire doit être rendu visible et modifiable dans les options de profiling du panneau d'administration avant que les utilisateurs ne puissent choisir leur propre zone. +$UseUsersTimezoneComment = "Activer la possibilité pour les utilisateurs de sélectionner leur zone horaire. Le champ de zone horaire doit être rendu visible et modifiable dans les options de profiling du panneau d'administration avant que les utilisateurs ne puissent choisir leur propre zone. Une fois configurée, les utilisateurs pourront voir toutes les heures du portail (heure de remise des travaux, évènements, etc) converties dans leur propre zone horaire."; $FieldTypeTimezone = "Zone horaire"; $AssignedSessionsHaveBeenUpdatedSuccessfully = "Les sessions assignées ont été mises à jour"; @@ -1304,9 +1304,9 @@ $EnabledImageMapsTitle = "Activer les cartes sur images"; $EnabledImageMapsComment = "Activer le bouton pour ajouter des cartes sur image. Ceci vous permettra d'associer des adresses URL à des zones d'une image, générant ainsi des zones interactives."; $CourseTool = "Outil de cours"; $BigBlueButtonEnableTitle = "Outil de vidéoconférence BigBlueButton"; -$BigBlueButtonEnableComment = "Choisissez si vous désirez activer l'outil de vidéoconférence BigBlueButton. Une fois activé, il apparaît comme un outil de cours additionnel dans toutes les pages d'accueil de cours, et les enseignants peuvent lancer une conférence à tout moment. Les étudiants ne peuvent pas lancer de conférence, seulement en rejoindre une. -Si vous n'avez pas de serveur BigBlueButton fonctionnel, veuillez en installer un ou vous adresser aux fournisseurs officiels de Chamilo pour pouvoir bénéficier de cette fonctionnalité. -BigBlueButton est un logiciel libre et gratuit. Son installation requiert des compétences techniques particulières, ce qui demande un travail considérable et peut résulter coûteux si vous ne disposez pas desdites compétences. +$BigBlueButtonEnableComment = "Choisissez si vous désirez activer l'outil de vidéoconférence BigBlueButton. Une fois activé, il apparaît comme un outil de cours additionnel dans toutes les pages d'accueil de cours, et les enseignants peuvent lancer une conférence à tout moment. Les étudiants ne peuvent pas lancer de conférence, seulement en rejoindre une. +Si vous n'avez pas de serveur BigBlueButton fonctionnel, veuillez en installer un ou vous adresser aux fournisseurs officiels de Chamilo pour pouvoir bénéficier de cette fonctionnalité. +BigBlueButton est un logiciel libre et gratuit. Son installation requiert des compétences techniques particulières, ce qui demande un travail considérable et peut résulter coûteux si vous ne disposez pas desdites compétences. Dans la logique du développement durable de notre projet, nous vous offrons la possibilité d'installer vous-même la solution ou de vous faire aider par des professionnels à l'expérience démontrée."; $BigBlueButtonHostTitle = "Adresse du serveur BigBlueButton"; $BigBlueButtonHostComment = "Veuillez indiquer l'adresse du serveur BigBlueButton. Ceci peut être localhost, une adresse IP (par exemple 192.168.13.54 ou un nom de domaine (par exemple my.video.com)."; @@ -1331,8 +1331,8 @@ $IncludeAsciiMathMlComment = "Activez ce paramètre si vous désirez pouvoir aff $CourseHideToolsTitle = "Cacher des outils par rapport aux enseignants"; $CourseHideToolsComment = "Sélectionnez les outils que vous désirez cacher des enseignants. Cette option interdira l'accès à l'outil."; $MoveUserStats = "Déplacer les résultats utilisateurs dans/vers une session"; -$CompareUserResultsBetweenCoursesAndCoursesInASession = "Cet outil avancé vous permet d'améliorer le suivi des résultats utilisateurs lorsque vous changez d'une méthodologie de purs cours ver une méthodologie de sessions (ou cycles de cours). Dans la plupart des cas, vous n'aurez pas besoin de cet outil.
-Sur cet écran, vous pouvez comparer les résultats des utilisateurs entre un contexte de cours isolé et un contexte de session.
+$CompareUserResultsBetweenCoursesAndCoursesInASession = "Cet outil avancé vous permet d'améliorer le suivi des résultats utilisateurs lorsque vous changez d'une méthodologie de purs cours ver une méthodologie de sessions (ou cycles de cours). Dans la plupart des cas, vous n'aurez pas besoin de cet outil.
+Sur cet écran, vous pouvez comparer les résultats des utilisateurs entre un contexte de cours isolé et un contexte de session.
Une fois que vous vous êtes décidé sur le meilleur contexte au sein duquel devrait exister le suivi des utilisateurs (score des exercices et suivi des parcours), vous pourrez déplacer ce suivi d'un cours vers une session."; $PDFExportWatermarkEnableTitle = "Activer les filigranes dans les exports PDF"; $PDFExportWatermarkEnableComment = "En activant cette fonctionnalité, vous pourrez utiliser une image ou un texte comme filigranne qui sera ajouté aux documents exportés en PDF."; @@ -1387,8 +1387,8 @@ $EnableAccessibilityFontResizeTitle = "Redimensionnement des caractères"; $EnableAccessibilityFontResizeComment = "Activer cette option montrera une série d'options de redimensionnement des caractères dans le coin supérieur-droit de votre campus. Celles-ci permettront aux personnes à déficience visuelle de lire leurs contenus de cours plus facilement."; $GlobalEvent = "Évènement global"; $SearchEnabledTitle = "Recherche full-text"; -$SearchEnabledComment = "Cette fonctionnalité vous permet d'indexer la plupart des documents envoyés sur votre portail, et ainsi fournir à vos utilisateurs une fonctionnalité complète de recherche de contenus.
-Cette fonctionnalité n'indexera pas les documents qui ont déjà été envoyés, c'est pourquoi il est important de l'activer au début d'une implémentarion.
+$SearchEnabledComment = "Cette fonctionnalité vous permet d'indexer la plupart des documents envoyés sur votre portail, et ainsi fournir à vos utilisateurs une fonctionnalité complète de recherche de contenus.
+Cette fonctionnalité n'indexera pas les documents qui ont déjà été envoyés, c'est pourquoi il est important de l'activer au début d'une implémentarion.
Une fois activée, une boîte de recherche apparaîtra dans la liste de cours des utilisateurs. La recherche sur un terme spécifique générera une liste des documents, exercices ou sujets de forum correspondants, filtrés selon la disponibilité de ces contenus pour les utilisateurs."; $SpecificSearchFieldsAvailable = "Champs de recherche personnalisables disponibles"; $XapianModuleInstalled = "Module Xapian installé"; @@ -1506,9 +1506,4 @@ $CasUserAddLastnameAttributeComment = "Enregistrer le nom de famille CAS de l'ut $ShowAdminToolbarTitle = "Afficher la barre d'administration"; $ShowAdminToolbarComment = "Affiche une barre d'outils globale au sommet de la page aux utilisateurs des rôles désignés. Cette barre d'outils, très similaire à celles de Wordpress et de Google, peut considérablement accélérer certaines opérations complexes et augmente l'espace disponible pour les contenus de cours, mais elle pourrait rendre certains utilisateurs confus."; $FirstLetterCourseTitle = "Première lettre (title)"; -$ShibbolethMainActivateTitle = "

Configuration de l'authentification Shibboleth

"; -$ShibbolethMainActivateComment = "

Vous devez, en premier lieu, configurer Shibboleth pour votre serveur web. Pour le configurer pour Chamilo.

éditez le fichier main/auth/shibboleth/config/aai.class.php

Modifiez les valeurs de l'objet $result avec les nom des attributs retourné par votre serveur Shibboleth.

Les valeurs à modifier sont
  • $result->unique_id = 'mail';
  • $result->firstname = 'cn';
  • $result->lastname = 'uid';
  • $result->email = 'mail';
  • $result->language = '-';
  • $result->gender = '-';
  • $result->address = '-';
  • $result->staff_category = '-';
  • $result->home_organization_type = '-';
  • $result->home_organization = '-';
  • $result->affiliation = '-';
  • $result->persistent_id = '-';
  • ...

Vous trouverez dans les Plugin un bouton 'Login Shibboleth', parametrable, qui s'ajoutera sur la page d'accueil de votre campus Chamilo."; -$FacebookMainActivateTitle = "

Configuration de l'authentification via Facebook

"; -$FacebookMainActivateComment = "

Vous devez, en premier lieu, créer une application Facebook (cf. https://developers.facebook.com/apps) avec votre compte Facebbok. Le paramètre de l'application Facebook 'URL du site' doit comporter 'action=fbconnect' comme paramètre en GET (exemple : http://mychamilo.com/?action=fbconnect)

Ensuite,
éditez le fichier main/auth/external_login/facebook.conf.php
et entrez les valeurs 'appId' et 'secret', fournies par Facebbok, pour la variable $facebook_config.
Vous trouverez dans les Plugin un bouton 'Login Facebook', parametrable, qui s'ajoutera à la page d'accueil de votre campus Chamilo."; - ?> \ No newline at end of file diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index b0d42f4ed2..7629d5c2af 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -1057,7 +1057,6 @@ $CourseCodeAlreadyExistExplained = "Lorsqu'un code de cours est dupliqué, le sy $CantDeleteReadonlyFiles = "Impossible de supprimer des fichiers qui sont en mode lecture seule."; $Uploaded = "Envoyé."; $Saved = "Sauvegardé."; -$GotoCourse = "Aller au cours"; $EmailSentFromDokeos = "E-mail envoyé depuis la plateforme"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Information au sujet de la dernière étape clôturée et de la suivante non clôturée."; $LatexCode = "Code LaTeX"; diff --git a/main/lang/galician/trad4all.inc.php b/main/lang/galician/trad4all.inc.php index 05b2b6c1f7..cdbd88f987 100644 --- a/main/lang/galician/trad4all.inc.php +++ b/main/lang/galician/trad4all.inc.php @@ -1063,7 +1063,6 @@ $CourseCodeAlreadyExistExplained = "Cando un código de curso se publica, o sist $CantDeleteReadonlyFiles = "Non se pode eliminar os arquivos que están configuraos en modo de só lectura."; $Uploaded = "Subido"; $Saved = "Gardado"; -$GotoCourse = "Ir ao curso"; $EmailSentFromDokeos = "Correo electrónico enviado desde a plataforma"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Información sobre o último paso terminado e o seguinte sen rematar."; $LatexCode = "Código LaTex"; diff --git a/main/lang/indonesian/admin.inc.php b/main/lang/indonesian/admin.inc.php index 574dbe8310..e4e0961cc3 100644 --- a/main/lang/indonesian/admin.inc.php +++ b/main/lang/indonesian/admin.inc.php @@ -416,3 +416,91 @@ $MakeAvailable = "Buat menjadi tersedia"; $MakeUnavailable = "Buat tidak tersedia"; $Stylesheets = "Style sheets"; $DefaultDokeosStyle = "Style Chamilo Default"; +$ShowIconsInNavigationsMenuComment = "Apakah menu navigasi menampilkan ikon tool yang berbeda?"; +$Plugin = "Plugin"; +$MainMenu = "Menu Utama"; +$MainMenuLogged = "Menu Utama setelah login"; +$Banner = "Banner"; +$ImageResizeTitle = "Resize gambar-gambar yang di-upload user"; +$ImageResizeComment = "Gambar-gambar user dapat di-resize pada saat di-upload jika PHP di-compiled dengan GD library. Jika GD tidak tersedia, setting ini akan diabaikan."; +$MaxImageWidthTitle = "Ukuran lebar maksimum gambar user"; +$MaxImageWidthComment = "Lebar maksimum dalam pixel gambarnya user. Setting ini berlaku jika gambar user di-set untuk di-resized pada saat di-upload."; +$MaxImageHeightTitle = "Ukuran tinggi maksimum gambar user"; +$MaxImageHeightComment = "Tinng maksimum (dalam pixel) ukuran gambarnya user. Setting ini berlaku jika gambar user di-set untuk di-resize pada saat di-upload."; +$YourVersionNotUpToDate = "Versi anda tidak up-to-date"; +$YourVersionIs = "Versi anda adalah"; +$PleaseVisitDokeos = "Silahkan kunjungi Chamilo"; +$VersionUpToDate = "Versi anda up-to-date"; +$ConnectSocketError = "Kesalahan koneksi soket"; +$SocketFunctionsDisabled = "Koneksi soket dimatikan"; +$ShowEmailAddresses = "Tampilkan alamat email"; +$ShowEmailAddressesComment = "Tampilkan alamat email ke user"; +$LatestVersionIs = "Versi terkini adalah"; +$langConfigureExtensions = "Konfigur layanan tersebut"; +$langActiveExtensions = "Aktivasi layanan ini"; +$langVisioconf = "Visio-conference"; +$langVisioconfDescription = "Chamilo Live Conferencing® merupakan alat standar untuk visioconfrence yang menawarkan: menampilkan diapos, whiteboard untuk menggambar dan menulis, audio/video duplex, dan chat. Ini membutuhkan Flash® player dan menyediakan 3 model : satu-ke-satu, satu-ke-banyak, dan banyak-ke-banyak."; +$langPpt2lp = "PowerPoint2LearningPath"; +$langPpt2lpDescription = "PowerPoint2LearningPath menyediakan alat transformasi presentasi Powerpoint ke suatu Learning Path dengan beberapa klik."; +$langBandWidthStatistics = "Statistik Bandwidth"; +$langBandWidthStatisticsDescription = "MRTG menyediakan statistik canggih tentang server selama 24 jam terakhir."; +$ServerStatistics = "Statistik server"; +$langServerStatisticsDescription = "AWStats menyediakan statistik platform anda: pengunjung, page views, referers ..."; +$SearchEngine = "Mesin Pencari Full Text"; +$langSearchEngineDescription = "Mesin Pencari Full Text menyediakan alat pencari kata ke dalam flatform. Peng-index-an konten harian akan menjamin kualitas pencarian."; +$langListSession = "Daftar Sesi"; +$AddSession = "Tambah sesi"; +$langImportSessionListXMLCSV = "Import sesi ke format XML/CSV"; +$ExportSessionListXMLCSV = "Eksport sesi dalam format XML/CSV"; +$SessionName = "Nama sesi"; +$langNbCourses = "Kode Mata Kuliah"; +$DateStart = "Tanggal Mulai"; +$DateEnd = "Tanggal Selesai"; +$CoachName = "Nama Pelatih"; +$SessionList = "Daftar Sesi"; +$SessionNameIsRequired = "Nama dibutuhkan untuk suatu sesi"; +$NextStep = "Langkah berikutnya"; +$keyword = "Kata Kunci"; +$Confirm = "Konfirmasi"; +$UnsubscribeUsersFromCourse = "Keluarkan user dari Mata Kuliah"; +$MissingClassName = "Nama klas hilang"; +$ClassNameExists = "Nama klas sudah ada"; +$ImportCSVFileLocation = "Lokasi impor file CSV"; +$ClassesCreated = "Klas telah dibuat"; +$ErrorsWhenImportingFile = "Error pada saat mengimport file"; +$ServiceActivated = "Layanan diaktivasi"; +$ActivateExtension = "Layanan aktif"; +$InvalidExtension = "Ektensi tidak syah"; +$VersionCheckExplanation = "Agar dimungkinkan pemeriksaan versi otomatis, anda harus mendaftarkan kampus anda ke chamilo.com. Informasi yang diperoleh dengan mengklik tombol ini adalah untuk penggunaan internal dan hnya data agregat yang tersedia bagi umum (jumlah total kampus, jumlah total mata kuliah chamilo, jumlah total siswa. ...) (Lihat http://www.chamilo.org/stats/. Jika mendaftar, maka institusi anda muncul dalam daftar dunia http://www.chamilo.org/community.php.. Jika institusi anda tidak ingin tampil dalam daftar anda dapat menconteng kotak cek di bawah ini. Pendaftaran mudah: anda hanya mengklik tombol ini
"; +$AfterApproval = "Setelah disetujui"; +$StudentViewEnabledTitle = "Bolehkan tampilan siswa"; +$StudentViewEnabledComment = "Bolehkan tampilan siswa yang memungkinkan pengajar atau admin melihat kuliah seperti yang dilihat siswa"; +$TimeLimitWhosonlineTitle = "Batas waktu di WhoIsOnline"; +$TimeLimitWhosonlineComment = "Batas waktu ini menentukan berapa lama (detik) setelah aksi terakhir pemakai akan dianggap *online*"; +$ExampleMaterialCourseCreationTitle = "Materi contoh tentang pembuatan kuliah"; +$ExampleMaterialCourseCreationComment = "Buat materi contoh otomatis saat membuat kuliah baru"; +$AccountValidDurationTitle = "Validitas akun"; +$AccountValidDurationComment = "Akun pemakai valid selama sekian hari ini setelah dibuat"; +$UseSessionModeTitle = "Gunakan mode sesi"; +$UseSessionModeComment = "Sesi memungkinkan cara penanganan kuliah yang berbeda; kuliah akan memiliki kreator, pelatih, dan siswa. Setiap pelatih memberikan kuliah selama jangka waktu tertentu, yang disebut *sesi*, kepada siswa"; +$HomepageViewActivity = "Tampilan aktivitas"; +$HomepageView2column = "Tampilan dua kolom"; +$HomepageView3column = "Tampilan tiga kolom"; +$AllowUserHeadings = "Bolehkan kop pemakai"; +$IconsOnly = "Ikon saja"; +$TextOnly = "Teks saja"; +$IconsText = "Ikon dan teks"; +$EnableToolIntroductionTitle = "Bolehkan memakai tool"; +$EnableToolIntroductionComment = "Bolehkan pengantar pada setiap laman tool"; +$BreadCrumbsCourseHomepageTitle = "Navigasi laman kuliah"; +$BreadCrumbsCourseHomepageComment = "Navigasi (breadcrumb) adalah sistem navigasi tautan horizontal yang biasanya muncul di kiri atas halaman Anda. Opsi ini memilih apa yang Anda inginkan muncul di breadcrumb pada laman kuliah"; +$Comment = "Komentar"; +$Version = "Versi"; +$LoginPageMainArea = "Area utama halaman login"; +$LoginPageMenu = "Menu halaman login"; +$CampusHomepageMainArea = "Area utama laman kampus"; +$CampusHomepageMenu = "Menu laman kampus"; +$MyCoursesMainArea = "Area utama kuliah"; +$MyCoursesMenu = "Menu kuliah"; +$Header = "Kop"; +?> \ No newline at end of file diff --git a/main/lang/italian/trad4all.inc.php b/main/lang/italian/trad4all.inc.php index 0b65e1db0c..3d370be62f 100644 --- a/main/lang/italian/trad4all.inc.php +++ b/main/lang/italian/trad4all.inc.php @@ -1064,7 +1064,6 @@ $CourseCodeAlreadyExistExplained = "I codici di corso duplicati saranno bloccati $CantDeleteReadonlyFiles = "I file marcati come di sola lettura non possono essere eliminati"; $Uploaded = "Caricato"; $Saved = "Salvato"; -$GotoCourse = "Vai al corso"; $EmailSentFromDokeos = "email inviata dalla piattaforma"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informazioni su passi completati e sul primo da completare"; $LatexCode = "Codice LaTeX"; diff --git a/main/lang/latvian/trad4all.inc.php b/main/lang/latvian/trad4all.inc.php index c42ef5cc56..ed36e9c71f 100644 --- a/main/lang/latvian/trad4all.inc.php +++ b/main/lang/latvian/trad4all.inc.php @@ -1062,7 +1062,6 @@ $CourseCodeAlreadyExistExplained = "Datu bāzes sistēma pārbauda kursa kodu, v $CantDeleteReadonlyFiles = "Nevar izdzēst failu, kas konfigurēts tikai lasīšanas režīmā"; $Uploaded = "Augšupielādēts"; $Saved = "Saglabāts"; -$GotoCourse = "Doties uz Kursu"; $EmailSentFromDokeos = "E - vēstule, no platformas ir nosūtīta"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informācija par pēdējo pabeigto soli un nākošo nepabeigto soli"; $LatexCode = "LaTEX kods"; diff --git a/main/lang/slovenian/admin.inc.php b/main/lang/slovenian/admin.inc.php index 9b7e1e17e6..c7606165fd 100644 --- a/main/lang/slovenian/admin.inc.php +++ b/main/lang/slovenian/admin.inc.php @@ -1471,6 +1471,8 @@ $AllowTeacherChangeGradebookGradingModelTitle = "Dovoli učitelju spremembo ocen $AllowTeacherChangeGradebookGradingModelComment = "Z dovoljenjem dovoljujete učitelju izbiro modela ocenjevanja, ki ga uporabi v svojem tečaju. Spremembe uveljavlja učitelj znotraj orodja redovalnice tečaja."; $NumberOfSubEvaluations = "Število pod-ocenjevanj"; $AddNewModel = "Dodaj nov model"; +$GroupParentship = "Starševstvo skupine"; +$NoParentship = "Brez starševstva"; $NoCertificate = "Ni certifikatov"; $ShowDocumentPreviewTitle = "Prikaži predogled dokumenta"; $ShowDocumentPreviewComment = "Prikaz predogleda dokumentov v orodju dokumentov omogoča vpogled v njegovo vsebino brez nalaganja nove strani. Uporaba predogleda lahko, pri majhnih zaslonskih resolucijah in pri uporabi starejših brskalnikov, rezultira v nestabilnemu delovanju."; @@ -1498,4 +1500,37 @@ $CasUserAddLastnameAttributeTitle = "Dodaj CAS priimek"; $CasUserAddLastnameAttributeComment = "Dodaj CAS priimek pri registracij novega uporabnika"; $ShowAdminToolbarTitle = "Prikaži administratorjevo orodno vrstico"; $ShowAdminToolbarComment = "Prikaže globalno orodno vrstico na vrhu strani za izbrane vloge uporabnikov.Ta orodna vrstica, podobna orodni vrstici, znani iz storitev Wordpress in Google, omogoča pohitritev dostopa za izvedbo določenih opravil in prihranek pri prostoru, sicer namenjenu učnim vsebinam."; +$AddInMenu = "Dodaj v meni"; +$AllowUsersToChangeEmailWithNoPasswordTitle = "Dovoli uporabnikom spremembo e-poštnega naslova brez uporabe gesla"; +$AllowUsersToChangeEmailWithNoPasswordComment = "V primeru spreminjanja informacije o uporabniškem računu"; +$EnableHelpLinkTitle = "Omogoči povezavo na pomoč"; +$EnableHelpLinkComment = "Povezava na pomoč se nahaja v desnem zgornjem robu zaslona"; +$BackToAdmin = "Nazaj na upravljanje"; +$AllowGlobalChatTitle = "Omogoči globalni klepet"; +$HeaderExtraContentTitle = "Dodatna vsebina v glavi strani"; +$HeaderExtraContentComment = "Dodate lahko lastno HTML kodo, kot so npr. meta oznake, ..."; +$FooterExtraContentTitle = "Dodatna vsebina v nogi strani"; +$AllowGlobalChatComment = "Klepet je omogočen za vse aktivne uporabnike platforme"; +$FooterExtraContentComment = "Dodate lahko lastno HTML kodo, kot so npr. meta oznake, ..."; +$CopyOnlySessionItems = "Kopiraj zgolj elemente seje"; +$FirstLetterCourseTitle = "Prva črka naziva tečaja"; +$UsersFoundInOtherPortals = "Uporabniki najdeni v drugih portalih"; +$AddUserToMyURL = "Dodaj uporabnika v moj portal"; +$UsersDeleted = "Uporabniki so bili odstranjeni"; +$UsersAdded = "Uporabniki so bili dodani"; +$PluginArea = "Vtiči"; +$NoConfigurationSettingsForThisPlugin = "Za ta vtič nastavitve niso na voljo"; +$Regions = "Regije"; +$CoursesDefaultCreationVisibilityTitle = "Privzeta vidnost tečajev"; +$CoursesDefaultCreationVisibilityComment = "Privzeta vidnost/dostopnost do tečaja pri kreiranju novega tečaja"; +$YouHaveEnteredTheCourseXInY = "Vstopil si v tečaj %s v %s"; +$LoginIsEmailTitle = "Uporabi e-poštni naslov kot uporabniško ime"; +$LoginIsEmailComment = "Omogoči uporabo e-poštnega naslova za prijavo v sistem"; +$AllowBrowserSnifferTitle = "Aktiviraj vohljača (sniffer) brskalnika"; +$AllowBrowserSnifferComment = "Možnost omogoči preiskavovalca zmožnosti brskalnikov, ki se povezujejo s Chamilo platformo. S tem omogoča izboljšavo uporabniške izkušnje s prilagoditvijo odziva vrsti brskalnika, vendar njegova uporaba upočasni začetno nalaganje strani vsakokrat, ko uporabnik vstopi v platformo."; +$EnableWamiRecordTitle = "Aktiviraj Wami-recorder"; +$EnableWamiRecordComment = "Wami-recorder je snemalnik zvoka, ki bazira na Flash tehnologiji"; +$ChangeSharedSetting = "Spremeni nastavitev vidnosti drugih portalov"; +$GradebookDefaultWeightTitle = "Privzeta utež v redovalnici"; +$GradebookDefaultWeightComment = "Ta utež bo uporabljena privzeto v vseh tečajih"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/course_description.inc.php b/main/lang/slovenian/course_description.inc.php index 414403c6e0..9b0cb4d2fc 100644 --- a/main/lang/slovenian/course_description.inc.php +++ b/main/lang/slovenian/course_description.inc.php @@ -17,4 +17,5 @@ $CourseDescriptionUpdated = "Opis tečaja je bil ažuriran"; $CourseDescriptionDeleted = "Opis tečaja je bil odstranjen"; $CourseDescriptionIntro = "Da bi opisali tečaj, kliknite na ustrezen naslov in vnesite želene podatke v vnosna polja.

Zaključite s klikom na OK, nato ponovite za naslednji želen naslov."; $langSaveDescription = "Shrani opis"; +$AddCourseDescription = "Dodaj opis tečaja"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/courses.inc.php b/main/lang/slovenian/courses.inc.php index 31a2ebb43f..08b030bf9d 100644 --- a/main/lang/slovenian/courses.inc.php +++ b/main/lang/slovenian/courses.inc.php @@ -4,20 +4,20 @@ for more information: see languages.txt in the lang folder. */ $lang_already_enrolled = "že vpisan"; $lang_my_personnal_course_list = "Osebni seznam tečajev"; -$lang_course_enrollment = "Uporabnikov tečaj"; +$lang_course_enrollment = "Uporabnik tečaja"; $lang_course_not_available = "Tečaj ni na voljo..."; $lang_enroll = "Vpis"; $lang_enroll_to_a_new_course = "Vpis v nov tečaj"; -$lang_my_present_course_list = "Seznam mojih trenutnih tečajev"; +$lang_my_present_course_list = "Moji tečaji"; $lang_no_course_to_enroll_in_this_category = "V tej kategoriji ni nobenega tečaja za vpis...\n"; $lang_or_search_from_the_course_code = " ali iskanje s pomočjo kode tečaja"; $lang_search = "Iskanje"; -$lang_select_course_among_categories = "Izberi tečaj izmed kategorij"; +$lang_select_course_among_categories = "Izberi tečaj v želeni kategoriji"; $lang_select_course_in = "Izberi tečaj v"; $lang_select_course_in_search_results = "Izberi tečaj iz rezultata iskanja"; $lang_unsubscribe = "Izpis"; $lang_back_to_my_home_page = "Povratek na mojo domačo stran"; -$lang_back_to_my_personnal_course_list = "Povratek na moj osebni seznam tečajev"; +$lang_back_to_my_personnal_course_list = "Povratek na seznam mojih tečajev"; $langTitular = "Vodja"; $langBackToListOfThisUser = "Povratek na seznam tečajev"; $langAdministrationTools = "Orodja upravitelja"; @@ -47,11 +47,11 @@ $langEnrollToCourseSuccessful = "Vpisan si v tečaj"; $langSubCat = "podkategorije"; $langUnsubscribeNotAllowed = "Izpis za ta tečaj ni dovoljen."; $langCourseAdminUnsubscribeNotAllowed = "Si upravitelj tega tečaja."; -$CourseManagement = "Upravljanje tečajev"; -$SortMyCourses = "Razvrsti moje tečaje"; +$CourseManagement = "Katalog tečajev"; +$SortMyCourses = "Razvrsti tečaje"; $SubscribeToCourse = "Vpiši se v tečaj"; $UnsubscribeFromCourse = "Izpiši se iz tečaja"; -$CreateCourseCategory = "Ustvari kategorijo tečaja"; +$CreateCourseCategory = "Ustvari osebno kategorijo tečajev"; $CourseCategoryAbout2bedeleted = "Si prepričan, da želiš odstraniti to kategorijo tečajev? Preostali tečaji te kategorije bodo prestavljeni izven obstoječih kategorij."; $CourseCategories = "Kategorije tečajev"; $CoursesInCategory = "Tečaji v kategoriji"; diff --git a/main/lang/slovenian/document.inc.php b/main/lang/slovenian/document.inc.php index f940bb2813..11f0a15a3e 100644 --- a/main/lang/slovenian/document.inc.php +++ b/main/lang/slovenian/document.inc.php @@ -267,4 +267,5 @@ $DirExists = "Operacija ni možna. Mapa z istim imenom že obstaja."; $DocMv = "Dokument je bil premaknjen"; $NoSVGImagesInImagesGalleryPath = "V vaši galeriji slik ni SVG slik"; $NoSVGImages = "Ni SVG slik"; +$WamiNeedFilename = "Pred aktivacijo snemanja je potrebno določiti ime datoteke."; ?> \ No newline at end of file diff --git a/main/lang/slovenian/exercice.inc.php b/main/lang/slovenian/exercice.inc.php index 733dc0bd25..2e349ddfee 100644 --- a/main/lang/slovenian/exercice.inc.php +++ b/main/lang/slovenian/exercice.inc.php @@ -468,7 +468,7 @@ $NumberOfStudentsWhoTryTheExercise = "Št. tečajnikov s poskusom testa"; $LowestScore = "Najnižji dosežen rezultat"; $HighestScore = "Najvišji dosežen rezultat"; $MaximumScore = "Največji možen rezultat"; -$NotRevised = "Nepregledani"; +$NotRevised = "Nepregledano"; $PreviousQuestion = "Predhodno vprašanje"; $Options = "Možnosti"; $RandomQuestionByCategory = "Naključna vprašanja po kategorijah"; @@ -477,7 +477,7 @@ $ReviewAnswers = "Preglej moje rezultate"; $TextWhenFinished = "Besedilo ob koncu testa"; $Validated = "Pregledan"; $NotValidated = "Ni pregledan"; -$Revised = "Pregledani"; +$Revised = "Pregledano"; $SelectAQuestionToReview = "Izberi vprašanje za pregled"; $ReviewQuestionLater = "Preglej vprašanje kasneje"; $NumberStudentWhoSelectedIt = "Št. tečajnikov, ki so ga izbrali"; @@ -485,4 +485,12 @@ $QuestionsAlreadyAnswered = "Vprašanje je že bilo odgovorjeno"; $StudentsWhoAreTakingTheExerciseRightNow = "Tečajniki, ki pravkar izvajajo test"; $ReportByQuestion = "Poročilo po vprašanjih"; $LiveResults = "Reultati v živo"; +$RecordAnswer = "Posnemi odgovor"; +$UseTheMessageBelowToAddSomeComments = "Uporabite spodnje sporočilo za dodajanje komentarja"; +$SendRecord = "Pošlji posnetek"; +$DownloadLatestRecord = "Prenesi posnetek"; +$OralExpression = "Ustno (govorno) izražanje"; +$CongratulationsYouPassedTheTest = "Čestitam. Tvoj test je bil uspešno zaključen."; +$YouDidNotReachTheMinimumScore = "Nisi dosegel minimalnega zahtevanega rezultata."; +$EndTest = "Končaj test"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/gradebook.inc.php b/main/lang/slovenian/gradebook.inc.php index 942c6fd514..e6b77d42dc 100644 --- a/main/lang/slovenian/gradebook.inc.php +++ b/main/lang/slovenian/gradebook.inc.php @@ -228,4 +228,8 @@ $SelectGradebook = "Izberi ocenjevanje"; $CheckYourGradingModelValues = "Preverite vrednosti modela ocenjevanja"; $SkillsAchievedWhenAchievingThisGradebook = "Spretnosti pridobljene s tem ocenjevanjem"; $AddGradebook = "Dodaj ocenjevanje"; +$SelectGradeModel = "Izberi model ocenjevanja"; +$AllMustWeight100 = "Vsota vseh vrednosti mora biti 100"; +$Components = "Komponente"; +$OnlyActiveWhenThereAreAnyComponents = "Ta možnost je omogočena v primeru, da imate kakršnokoli ocenjevanje ali kategorije"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/index.inc.php b/main/lang/slovenian/index.inc.php index d4ab8d2017..3104e74334 100644 --- a/main/lang/slovenian/index.inc.php +++ b/main/lang/slovenian/index.inc.php @@ -5,7 +5,7 @@ for more information: see languages.txt in the lang folder. $langInvalidId = "Vstop ni uspel. Napačno uporabniško ime ali geslo"; $langWelcome = "Dobrodošli !"; $langPass = "Geslo"; -$langEnter = "Povratek na seznam mojih tečajev"; +$langEnter = "Povratek na seznam tečajev"; $langReg = "Registracija"; $langMenu = "Menu"; $langAdvises = "Nasveti"; @@ -14,10 +14,10 @@ $langGetCourseFromOldPortal = "kliknite tukaj za prenos tečaja iz starega porta $langOtherCourses = "ostali tečaji"; $langSupportForum = "Forum podpore"; $langCategories = "kategorije"; -$langBackToHomePage = "Povratek na domačo stran"; +$langBackToHomePage = "Pregled kategorij"; $lang_No_course_publicly_available = "Trenutno ni javno dostopnih tečajev."; $langLostPassword = "Izgubljeno geslo"; -$lang_edit_my_course_list = "Uredi seznam mojih tečajev"; +$lang_edit_my_course_list = "Uredi seznam tečajev"; $langAgenda = "Agenda"; $langValvas = "Zadnja obvestila"; $langUp = "Gor"; @@ -31,22 +31,22 @@ $Intranet = "Intranet"; $Englin = "English"; $langInvalidForSelfRegistration = "Vstop ni uspel - če nisi registriran, lahko to storiš s pomočjo registracijskega obrazca"; $langSubCat = "podkategorije"; -$langMenuGeneral = "Splošno"; -$langMenuUser = "Uporabnik"; +$langMenuGeneral = "Pomoč"; +$langMenuUser = "Moj račun"; $langMenuAdmin = "Admin. portala"; $langUsersOnLineList = "Seznam aktivnih uporabnikov"; $langTotalOnLine = "Skupaj aktivnih"; $langRefresh = "Osveži"; -$langMe = "*"; +$langMe = "jaz"; $langSystemAnnouncements = "Obvestila sistema"; $langHelpMaj = "Pomoč"; $langNotRegistered = "Ni vpisan"; $langAdmin = "Admin platforme"; $Login = "Uporabniško ime"; -$langRegisterForCourse = "Vpis v nov tečaj"; -$langUnregisterForCourse = "Izpis iz tečajev"; +$langRegisterForCourse = "Vpis v tečaj"; +$langUnregisterForCourse = "Izpis iz tečaja"; $langCombinedCourse = "Združeni tečaji"; -$Platform = "Platforma"; +$Platform = "Portal"; $Refresh = "Osveži"; $TotalOnLine = "Skupaj aktivnih"; $langCourseClosed = "(tečaj je trenutno zaprt)"; @@ -63,16 +63,16 @@ $CourseView = "Prikaži popoln seznam tečajev"; $DropboxFileAdded = "V nabiralnik je bila dodana nova datoteka"; $NewMessageInForum = "Novo sporočilo je bilo objavljeno v forumu"; $FolderCreated = "Nova mapa je bila ustvarjena"; -$LinkAdded = "Povezava dodana"; +$LinkAdded = "Povezava je bila dodana"; $AnnouncementAdded = "Obvestilo je bilo dodano"; -$AgendaAdded = "Zapis agende je bil dodan"; +$AgendaAdded = "Dogodek je bil dodan"; $LoginEnter = "Prijava"; $Messages = "Sporočila"; $Inbox = "Prejeto"; -$Comppose = "Sestavi novo"; +$Comppose = "Sestavi"; $PendingInvitations = "Čakajoča povabila"; $YouDoNotHaveAnySessionInItsHistory = "V zgodovini nimate beležene nobene seje tečaja"; -$PortalHomepageDefaultIntroduction = "

Čestitke! Vaš portal je uspešno nameščen!

Namestitev lahko sedaj zaključite z izvedbo naslednjih treh korakov:

  1. Prilagodite ali spremenite nastavitve portala v upraviteljevem področju; izberite Portal -> Configuration settings.
  2. Dodajte nekaj življenja vašemu portalu s tem, da ustvarite nekaj uporabnikov in/ali nekaj tečajev. To lahko izvedete z vabilom izbranim osebam, kjer jih pozovete k registraciji v portal, ali pa uporabniške račune zanje kreirate sami preko upraviteljevega razdelka Uporabniki oz. tečaje preko razdelka Tečaji.
  3. Uredite in spremenite to stran preko Nastavitev domače strani portala.

Vedno in ob vsakem času lahko več informacij o tej programski opremi najdete na naši spletni strani: http://www.chamilo.org.

Želimo vam veliko uspeha, in ne oklevajte se pridružiti naši skupnosti in/ali nam posredovati povratne informacije preko našega foruma.

"; +$PortalHomepageDefaultIntroduction = "

Čestitke! Vaš portal je uspešno nameščen!

Namestitev lahko sedaj zaključite z izvedbo naslednjih treh korakov:

  1. Prilagodite ali spremenite nastavitve portala v upraviteljevem področju; izberite Portal -> Nastavitve Chamilo platforme.
  2. Dodajte nekaj življenja vašemu portalu s tem, da ustvarite nekaj uporabnikov in/ali nekaj tečajev. To lahko izvedete z vabilom izbranim osebam, kjer jih pozovete k registraciji v portal, ali pa uporabniške račune zanje kreirate sami preko upraviteljevega razdelka Uporabniki oz. tečaje preko razdelka Tečaji.
  3. Uredite in spremenite to stran preko Nastavitev domače strani portala.

Vedno in ob vsakem času lahko več informacij o tej programski opremi najdete na naši spletni strani: http://www.chamilo.org.

Želimo vam veliko uspeha, in ne oklevajte se pridružiti naši skupnosti in/ali nam posredovati povratne informacije preko našega foruma.

"; $Username = "Uporabniško ime"; $Profile = "Profil"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/registration.inc.php b/main/lang/slovenian/registration.inc.php index 04cf88aef0..af00245c22 100644 --- a/main/lang/slovenian/registration.inc.php +++ b/main/lang/slovenian/registration.inc.php @@ -133,10 +133,10 @@ $AccountExternalAuthSource = "Chamilo ne more te zahteve servisirati avtomatičn $AccountsExternalAuthSource = "Chamilo ne more servisirati te izjeme avtomatično, ker je vsaj eden od uporabniških računov avtoriziran preko zunanjega izvora. Izvedite odgovarjajoče mere za vse uporabniške račune (vključno s tistimi, ki jih avtorizira platforma) in ibvestite uporabnike."; $RequestSentToPlatformAdmin = "Chamilo ne more servisirati zahteve avtomatično za to vrsto uporabniškega računa. Vaša zahteva je bila posredovana upravitelju platforme, ki bo izvedel odgovarjajoče mere in vas naknadno obvestil o rezultatih izvedbe zahteve."; $langphone = "Telefonska št."; -$Unreg = "Odjavi"; -$MyProgress = "Moj napredek"; +$Unreg = "Izpiši"; +$MyProgress = "Napredek"; $ProgressIntroduction = "Prični z izbiro tečaja seje spodaj.
Napredek je viden za vsak tečaj v katerega je tečajnik vpisan."; -$Select = "Izberi"; +$Select = "Oceni"; $NeverExpires = "Nikoli ne poteče"; $On = "On"; $ExpirationDate = "Datum poteka"; diff --git a/main/lang/slovenian/tracking.inc.php b/main/lang/slovenian/tracking.inc.php index 4dcf6c85dc..9041d9276c 100644 --- a/main/lang/slovenian/tracking.inc.php +++ b/main/lang/slovenian/tracking.inc.php @@ -315,4 +315,7 @@ $NumberOfForumsInLearnpath = "Št. forumov v učni poti"; $NumberOfAssignmentsInLearnpath = "Št. nalog v učni poti"; $NumberOfAnnouncementsInCourse = "Št. obvestil v tečaju"; $CurrentCoursesReport = "Poročilo o trenutnih tečajih"; +$NumberOfPublishedExercises = "št. objavljenih vaj/testov"; +$NumberOfPublishedLps = "št. objavljenih učnih poti"; +$EventType = "Vrsta dogodka"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/trad4all.inc.php b/main/lang/slovenian/trad4all.inc.php index bc9d7c4bd9..a990dc3023 100644 --- a/main/lang/slovenian/trad4all.inc.php +++ b/main/lang/slovenian/trad4all.inc.php @@ -55,7 +55,7 @@ $langNoDescription = "Brez opisa"; $langOfficialCode = "Koda"; $FirstName = "Ime"; $LastName = "Priimek"; -$Status = "Profil"; +$Status = "Status"; $langEmail = "E-pošta"; $SlideshowConversion = "Pretvorba prosojnic"; $UploadFile = "Naloži datoteko"; @@ -513,7 +513,7 @@ $Directories = "mape"; $UserAge = "Starost"; $UserBirthday = "Rojstni datum"; $Course = "Tečaj"; -$FilesUpload = "Nalaganje datotek"; +$FilesUpload = "datotek"; $ExerciseFinished = "Test je bil dokončan"; $UserSex = "Spol"; $UserNativeLanguage = "Materni jezik"; @@ -535,7 +535,7 @@ $FieldMadeUnchangeable = "Polje je sedaj nespremenljivo: uporabniki ga ne morejo $CannotMakeFieldUnchangeable = "Polje ne more biti nespremenljivo"; $Folder = "Mapa"; $CloseOtherSession = "Klepet ni na voljo, ker je neka druga stran tečaja že odprta; poskusite ponovno naložiti to stran"; -$FileUploadSucces = "Datoteka je bila uspešno prenešena."; +$FileUploadSucces = "Datoteka je bila uspešno naložena."; $Yesterday = "Včeraj"; $Submit = "Uveljavi"; $Department = "Oddelek"; @@ -709,7 +709,7 @@ $Menu = "Meni"; $BackToUserList = "Nazaj na seznam uporabnikov"; $GraphicNotAvailable = "Slika ni na voljo"; $BackTo = "Nazaj na"; -$HistoryTrainingSessions = "Zgodovina poučevanja - seje"; +$HistoryTrainingSessions = "Zgodovina tečajev sej"; $ConversionFailled = "Pretvorba je bila neuspešna"; $AlreadyExists = "Že obstaja"; $TheNewWordHasBeenAdded = "Nova beseda je bila dodana"; @@ -1060,7 +1060,6 @@ $CourseCodeAlreadyExistExplained = "V primeru podvojitve kode tečaja sistem pre $CantDeleteReadonlyFiles = "Ne morem odstraniti datoteke, ki je opredeljena kot zgolj bralna."; $Uploaded = "Naloženo."; $Saved = "Shranjeno."; -$GotoCourse = "Pojdi v tečaj"; $EmailSentFromDokeos = "E-pošta poslana s platforme"; $InfoAboutLastDoneAdvanceAndNextAdvanceNotDone = "Informacija o zadnjem dokončanem in naslednjem nedokončanem koraku."; $LatexCode = "LaTeX koda"; @@ -1133,15 +1132,21 @@ $MyAverage = "Moje povprečje"; $AllAttempts = "Vsi poskusi"; $Attempt = "Poizkus"; $SaveForNow = "Shrani in nadaljuj kasneje"; +$NoQuicktime = "V vašem brskalniku ni nameščena QuickTime razširitev. Platformo lahko kljub temu uporabljate, vendar boste izgubili podporo za predvajanje naketerih multimedijskih formatov. Svetujemo, da brskalnikovo razširitev QuickTime namestite."; $NoJavaSun = "V vašem brskalniku ni nameščen Java vtič. Platformo lahko kljub temu uporabljate, vendar boste izgubili nekatere funkcionalnosti."; $NoJava = "Java ni podprta v vašem brskalniku"; $JavaSun24 = "Različica Java, ki jo uporabljate, ni podprta s tem orodjem. Da bi ga uporabili, morate namestiti Java SUN različico višjo od 24."; +$NoMessageAnywere = "V primeru, da tega obvestila med to sejo ne želite več videti, kliknite tule"; $Attempts = "Poizkusi"; $SeeResults = "Poglej rezultate"; $Loading = "Nalaganje"; $AreYouSureToRestore = "Ste prepričani, da želite povrniti ta element?"; $ThisIsAutomaticEmailNoReply = "To je avtomatično generirano e-poštno sporočilo. Prosimo, da nanj ne odgovarjate."; $PersonalCalendar = "Osebni koledar"; +$SkillsTree = "Kompetenčno drevo"; +$Skills = "Kompetence"; +$SkillsProfile = "Kompetenčni profil"; +$WithCertificate = "S certifikatom"; $AdminCalendar = "Koledar upravitelja"; $CourseCalendar = "Koledar tečaja"; $Reports = "Poročila"; @@ -1150,26 +1155,62 @@ $dateTimeFormatLong24H = "%d %B %Y ob %H:%M"; $GradingModelTitle = "Model ocenjevanja"; $Discussions = "Diskusije"; $GradeModel = "Model ocenjevanja"; +$ViewSkillsTree = "Poglej kompetenčno drevo"; +$MySkills = "Moje kompetence"; $SeeFile = "Poglej datoteko"; $UserList = "Seznam uporabnikov"; $SearchUsers = "Išči uporabnike"; $Administration = "Upravljanje"; +$SkillsAndGradebooks = "Kompetence in ocene"; +$AddSkill = "Dodaj kompetenco"; $AcceptLegal = "Sprejmi pogoje rabe"; $CourseLegalAgreement = "Pogoji rabe za ta tečaj"; +$SkillDoesNotExist = "Tu ni take kompetence"; +$SkillRootName = "ABsolutna kompetenca"; +$Option = "Opcija"; +$Updates = "Posodobitve"; $Teaching = "Poučevanje"; $CoursesReporting = "Poročila tečajev"; $AdminReports = "Upraviteljeva poročila"; $ExamsReporting = "Poročila preverjanj"; $MyReporting = "Moja poročila"; +$SearchSkills = "Išči kompetence"; $SaveThisSearch = "Shrani to iskanje"; +$SkillProfiles = "Shranjeni kompetenčni profili"; +$Matches = "Ustreza"; $WelcomeUserXToTheSiteX = "%s, dobrodošli k %s"; +$CheckUsersWithId = "Za vpis uporabnika uporabi uporabnikov ID iz datoteke"; +$MB = "MiB"; $SessionList = "Seznam sej"; $StudentList = "Seznam tečajnikov"; +$GroupReply = "Odgovor"; +$GroupReplies = "Odgovori"; +$SkillNotFound = "Kompetence ni mogoče najti"; +$IHaveThisSkill = "Jaz imam to kompetenco"; +$Me = "Jaz"; $Vote = "Glas"; $Votes = "Glasov"; $XStarsOutOf5 = "%s zvezdic od 5"; $Visit = "Obisk"; $Visits = "Obiskov"; -$YourVote = "Tvoje glasovanje"; -$HottestCourses = "Najbolj vroči"; +$YourVote = "Tvoja ocena"; +$HottestCourses = "Vroči tečaji"; +$SentAtX = "Poslano na: %s"; +$LoginToVote = "Za glasovanje se prijavi"; +$DoNotShow = "Ne prikaži"; +$ShowToAdminsOnly = "Prikaži zgolj upraviteljem"; +$ShowToAdminsAndTeachers = "Prikaži upraviteljem in učiteljem"; +$ShowToAllUsers = "Prikaži vsem uporabnikom"; +$SelectAnAction = "Izberi dejanje"; +$LoginX = "Št.uporabnikov: %s"; +$ChatConnected = "Klepet(povezan)"; +$ChatDisconnected = "Klepet(nepovezan)"; +$ThingsToDo = "Dejanja, ki jih je potrebno opraviti v nadaljevanju"; +$WamiFlashDialog = "Prikaže dialog, ki vas vpraša po dovoljenju za dostop do mikrofona. Odgovorite z da in zaprite dialog, V primeru, da obvestila ne želite več prikazovati, izberite pomnenje nastavitev pred zapiranjem dialoga."; +$WamiStartRecorder = "Prični s snemanjem s pritiskom na mikrofon in ustavi s ponovnim pritiskom nanj. Vsak pričetek snemanja bo generiral lastno datoteko."; +$InputNameHere = "Vpišite ime"; +$Reload = "Osveži"; +$TimeSpentLastXDays = "Porabljen čas v zadnjih %s dneh"; +$TimeSpentBetweenXAndY = "Čas porabljen med %s in %s"; +$GoToCourse = "Vstopi"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/wiki.inc.php b/main/lang/slovenian/wiki.inc.php index 7a694b4995..0cf31bb756 100644 --- a/main/lang/slovenian/wiki.inc.php +++ b/main/lang/slovenian/wiki.inc.php @@ -192,28 +192,45 @@ $MProgressPages = "Strani z najvišjim napredkom"; $MostDiscussUsers = "Največkrat diskutirani uporabniki"; $RandomPage = "Naključna stran"; $ProtectedPages = "Zaščitene strani"; +$IncludeAllVersions = "Išči tudi po starejših razzličicah vseh strani"; $TotalHiddenPages = "Skupaj skritih strani"; +$TotalPagesEditedAtThisTime = "Skupaj strani urejanih v tem trenutku"; +$TotalWikiUsers = "Skupno št. uporabnikov, ki sodelujejo v tem wiki-ju"; $StudentAddNewPages = "Tečajniki lahko dodajo stran v Wiki"; +$DateCreateOldestWikiPage = "Datum nastanka najstarejše wiki strani"; $DateEditLatestWikiVersion = "Datum najnovejšega urejanja v Wiki"; $AverageScoreAllPages = "Povprečna ocena vseh strani"; +$AverageMediaUserProgress = "Povprečna ocena napredka uporabnika na njegovih straneh"; +$TotalIpAdress = "Št. različnih IP naslovov prispevajočih v ta wiki"; $Pages = "Strani"; $Versions = "Različice"; $EmptyPages = "Skupaj praznih strani"; +$LockedDiscussPages = "Št. blokiranih diskusijskih strani"; +$HiddenDiscussPages = "Št. skritih diskusijskih strani"; +$TotalComments = "SKupno št. komentarjev v okviru različic istih strani"; +$TotalOnlyRatingByTeacher = "Skupno št. strani, ki jih lahko ocenjuje zgolj učitelj"; +$TotalRatingPeers = "Skupno št, strani, ki jih lahko ocenjujejo drugi tečajniki"; +$TotalTeacherAssignments = "Št. strani s strani učitelja podanih kot zadolžitev"; +$TotalStudentAssignments = "Št. strani, opredeljenih kot individualna zadolžitev tečajnika"; $TotalTask = "Število opravil"; $PortfolioMode = "Način portfelja"; $StandardMode = "Običajni opravilni način"; +$ContentPagesInfo = "Informacija o vsebini strani"; $InTheLastVersion = "V zadnji različici"; $InAllVersions = "V vseh različicah"; $NumContributions = "Število prispevkov"; $NumAccess = "Število obiskov"; $NumWords = "Število besed"; +$NumlinksHtmlImagMedia = "Št. vstavljenih zunanjih povezav(besedil, slik, ...)"; $NumWikilinks = "Število wiki povezav"; $NumImages = "Število vstavljenih slik"; $NumFlash = "Število vstavljenih flash datotek"; $NumMp3 = "Št. mp3 zvokovnih datotek"; $NumFlvVideo = "Št. vstavljenih FLV video datotek"; $NumYoutubeVideo = "Št. vključenih Youtube videov"; +$NumOtherAudioVideo = "Št. vstavljenih zvočnih in video datotek(razen mp3 in flv)"; $NumTables = "Število vstavljenih tabel"; +$Anchors = "Št. hiper-besedilnih povezav (anchors)"; $NumProtectedPages = "Število zaščitenih strani"; $WhoAndWhere = "Kdo in kje"; ?> \ No newline at end of file diff --git a/main/lang/slovenian/work.inc.php b/main/lang/slovenian/work.inc.php index dc9a5429c0..7141b47de1 100644 --- a/main/lang/slovenian/work.inc.php +++ b/main/lang/slovenian/work.inc.php @@ -36,7 +36,7 @@ $ValidateChanges = "Uveljavi spremembe"; $FolderUpdated = "Mapa je bila ažurirana"; $EndsAt = "Konča (popolnoma zaprta)"; $QualificationOfAssignment = "Ocenjevanje nalog/izdelkov"; -$MakeQualifiable = "Omogoči ocenjevanje"; +$MakeQualifiable = "Dodaj v redovalnico"; $QualificationNumberOver = "Ocena"; $WeightInTheGradebook = "Utež v kompetenčnem poročilu"; $DatesAvailables = "Razpoložljivi datumi"; @@ -97,5 +97,5 @@ $MaxWeightNeedToBeProvided = "Največja vrednost uteži mora biti podana"; $ContainsAfile = "Vsebuje datoteko"; $AllowTextAssignments = "Dovoli izdelku, da je upravljan preko spletnega urejevalnika"; $YouAlreadySentAPaperYouCantUpload = "Nalogo ste že odposlali. Ne morete naložiti nove."; -$CantUploadDeleteYourPaperFirst = "Te naloge ne morete naložiti. Najprej morate odstraniti predhodno naloženo nalogo."; +$CantUploadDeleteYourPaperFirst = "Ta naloga/izdelek je predhodno že bila oddana in je ne morete ponovno naložiti. Če to vseeno želite storiti, najprej odstranite že oddano nalogo."; ?> \ No newline at end of file diff --git a/main/lang/somali/accessibility.inc.php b/main/lang/somali/accessibility.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/accessibility.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/admin.inc.php b/main/lang/somali/admin.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/admin.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/agenda.inc.php b/main/lang/somali/agenda.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/agenda.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/announcements.inc.php b/main/lang/somali/announcements.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/announcements.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/blog.inc.php b/main/lang/somali/blog.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/blog.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/chat.inc.php b/main/lang/somali/chat.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/chat.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/course_description.inc.php b/main/lang/somali/course_description.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/course_description.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/course_home.inc.php b/main/lang/somali/course_home.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/course_home.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/course_info.inc.php b/main/lang/somali/course_info.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/course_info.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/coursebackup.inc.php b/main/lang/somali/coursebackup.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/coursebackup.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/courses.inc.php b/main/lang/somali/courses.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/courses.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/create_course.inc.php b/main/lang/somali/create_course.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/create_course.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/document.inc.php b/main/lang/somali/document.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/document.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/dropbox.inc.php b/main/lang/somali/dropbox.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/dropbox.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/exercice.inc.php b/main/lang/somali/exercice.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/exercice.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/external_module.inc.php b/main/lang/somali/external_module.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/external_module.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/forum.inc.php b/main/lang/somali/forum.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/forum.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/glossary.inc.php b/main/lang/somali/glossary.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/glossary.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/gradebook.inc.php b/main/lang/somali/gradebook.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/gradebook.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/group.inc.php b/main/lang/somali/group.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/group.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/help.inc.php b/main/lang/somali/help.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/help.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/hotspot.inc.php b/main/lang/somali/hotspot.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/hotspot.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/import.inc.php b/main/lang/somali/import.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/import.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/index.inc.php b/main/lang/somali/index.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/index.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/install.inc.php b/main/lang/somali/install.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/install.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/learnpath.inc.php b/main/lang/somali/learnpath.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/learnpath.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/link.inc.php b/main/lang/somali/link.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/link.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/md_document.inc.php b/main/lang/somali/md_document.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/md_document.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/md_link.inc.php b/main/lang/somali/md_link.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/md_link.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/md_mix.inc.php b/main/lang/somali/md_mix.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/md_mix.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/md_scorm.inc.php b/main/lang/somali/md_scorm.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/md_scorm.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/messages.inc.php b/main/lang/somali/messages.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/messages.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/myagenda.inc.php b/main/lang/somali/myagenda.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/myagenda.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/notebook.inc.php b/main/lang/somali/notebook.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/notebook.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/notification.inc.php b/main/lang/somali/notification.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/notification.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/pedaSuggest.inc.php b/main/lang/somali/pedaSuggest.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/pedaSuggest.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/registration.inc.php b/main/lang/somali/registration.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/registration.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/reservation.inc.php b/main/lang/somali/reservation.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/reservation.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/resourcelinker.inc.php b/main/lang/somali/resourcelinker.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/resourcelinker.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/scorm.inc.php b/main/lang/somali/scorm.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/scorm.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/scormbuilder.inc.php b/main/lang/somali/scormbuilder.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/scormbuilder.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/scormdocument.inc.php b/main/lang/somali/scormdocument.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/scormdocument.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/slideshow.inc.php b/main/lang/somali/slideshow.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/slideshow.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/survey.inc.php b/main/lang/somali/survey.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/survey.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/tracking.inc.php b/main/lang/somali/tracking.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/tracking.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/trad4all.inc.php b/main/lang/somali/trad4all.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/trad4all.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/userInfo.inc.php b/main/lang/somali/userInfo.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/userInfo.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/videoconf.inc.php b/main/lang/somali/videoconf.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/videoconf.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/wiki.inc.php b/main/lang/somali/wiki.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/wiki.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/somali/work.inc.php b/main/lang/somali/work.inc.php new file mode 100644 index 0000000000..fdfb06ff3d --- /dev/null +++ b/main/lang/somali/work.inc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/main/lang/turkce/admin.inc.php b/main/lang/turkce/admin.inc.php index 670ccf189d..6f529942a1 100644 --- a/main/lang/turkce/admin.inc.php +++ b/main/lang/turkce/admin.inc.php @@ -241,7 +241,7 @@ $OriginalName = "Orijinal adı"; $EnglishName = "İngilizce adı"; $DokeosFolder = "Chamilo klasörü"; $Properties = "Özellikler"; -$DokeosConfigSettings = "Sistem Ayarları"; +$PlatformConfigSettings = "Sistem Ayarları"; $SettingsStored = "Ayarlar kaydedildi."; $InstitutionTitle = "Sitenin ismi"; $InstitutionComment = "Üst başlıkta, sağ tarafta gözükecek olan site ismi"; @@ -663,7 +663,7 @@ $NoticeWillBeNotDisplayed = "İkazı başlangıç sayfasında görüntülenmeyec $LetThoseFieldsEmptyToHideTheNotice = "İkazı gizlemek için şu alanları boş bırakmasına izin ver"; $Ppt2lpVoiceRecordingNeedsRed5 = "Öğrenme düzenleyicisindeki ses kayıt özelliği Red5 akış sunucusuna bağlıdır. Bu sunucunun parametereleri mevcut sayfadaki videokonferans bölümünden yapılandırılabilir"; $PlatformCharsetTitle = "Karakter seti"; -$PlatformCharsetComment = "Karakter seti Chamilo ta kullanılan dillerin nasıl gösterileceğinin tanımlandığı yerdir. Örneğin Rus yada Japon harfleri kullanırsanız, bu seti değiştirmek isteyebilirsiniz. Tüm ingilizce, latince ve batı avrupa dilleri için ön tanımlı set iso-8859-15 olarak tanımlanabilir."; +$PlatformCharsetComment = "Karakter seti Chamilo ta kullanılan dillerin nasıl gösterileceğinin tanımlandığı yerdir. Örneğin Rus yada Japon harfleri kullanırsanız, bu seti değiştirmek isteyebilirsiniz. Tüm ingilizce, latince ve batı avrupa dilleri için ön tanımlı set UTF-8 olarak tanımlanabilir."; $ExtendedProfileRegistrationTitle = "Kayıtta genişletilmiş profil alanları"; $ExtendedProfileRegistrationComment = "Kullanıcı kayıt işleminde aşağıdaki genişletilmiş profil alanlarından hangilerinin bulunması zorunludur? Genişletilmiş profilin aktifleştirilmiş olmasını gerektirir (Yukarı bakınız)"; $ExtendedProfileRegistrationRequiredTitle = "Kayıtta gerekli genişletilmiş profil alanları"; diff --git a/main/lang/turkce/import.inc.php b/main/lang/turkce/import.inc.php index 516fd54a12..ca465592e5 100644 --- a/main/lang/turkce/import.inc.php +++ b/main/lang/turkce/import.inc.php @@ -6,7 +6,6 @@ $langPgTitle = "Sayfa ismi"; $langExplanation = "OK tıkladığınızda, Forum, Gündem, Belge Yönetimi vs. araçlarla birlikte bu dersin sitesi yaratılır. Kullanıcı adınız ve şifrenizle giriş yaparak siteyi isteğiniz şekilde düzenleyebilirsiniz."; $langTooBig = "Gönderilecek dosyayı seçmediniz veya dosya boyutu çok büyük"; $langCouldNot = "Dosya gönderilemedi"; -$langNotAllowed = "İzin verilmiyor"; $langAddPageToSite = "Siteye sayfa ekle"; $langCouldNotSendPage = "Bu sayfa HTML formatýnda deðil bu nedenle gönderilemez. Eðer HTML olmayan bir dosya göndermek istiyorsanýz (PDF, Word, Power Point, Video, etc.) Belge Araçlarýný kullanýnýz"; $langSendPage = "Gönderilecek sayfa"; diff --git a/main/lang/turkce/trad4all.inc.php b/main/lang/turkce/trad4all.inc.php index 1782b9cfce..d31340dab8 100644 --- a/main/lang/turkce/trad4all.inc.php +++ b/main/lang/turkce/trad4all.inc.php @@ -272,7 +272,6 @@ $DocumentAdded = "Belge eklendi"; $DocumentUpdated = "Belge güncellendi"; $DocumentInFolderUpdated = "Belgenin güncellendiği klasör"; $Course_description = "Ders açıklaması"; -$Calendar_event = "Ajanda"; $Document = "Belge"; $Learnpath = "Dersler"; $Link = "Bağlantı"; From 1d74184c9fac738f17e4fc97d2c420d8ddba7594 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 7 May 2012 17:03:14 -0500 Subject: [PATCH 23/31] Added Somali and Bengali to list of languages - although not yet useful --- main/install/db_main.sql | 6 ++++-- main/install/migrate-db-1.8.8-1.9.0-pre.sql | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main/install/db_main.sql b/main/install/db_main.sql index aba5a49b3a..d0e62e1ec4 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -374,6 +374,7 @@ LOCK TABLES language WRITE; INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES ('العربية','arabic','ar','arabic',0), ('Asturianu','asturian','ast','asturian',0), +('বাংলা','bengali','bn','bengali',0), ('Български','bulgarian','bg','bulgarian',1), ('Bosanski','bosnian','bs','bosnian',1), ('Català','catalan','ca','catalan',0), @@ -417,6 +418,7 @@ INSERT INTO language (original_name, english_name, isocode, dokeos_folder, avail ('Русский','russian','ru','russian',0), ('Slovenčina','slovak','sk','slovak',0), ('Slovenščina','slovenian','sl','slovenian',1), +('الصومالية','somali','so','somali',0), ('Srpski','serbian','sr','serbian',0), ('Suomi','finnish','fi','finnish',0), ('Svenska','swedish','sv','swedish',0), @@ -856,7 +858,7 @@ VALUES ('teachers_can_change_grade_model_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeGradeModelSettingsTitle', 'TeachersCanChangeGradeModelSettingsComment', NULL, NULL, 1), ('shibboleth_description', NULL, 'radio', 'Shibboleth', 'false', 'ShibbolethMainActivateTitle', 'ShibbolethMainActivateComment', NULL, NULL, 0), ('facebook_description', NULL, 'radio', 'Facebook', 'false', 'FacebookMainActivateTitle', 'FacebookMainActivateComment', NULL, NULL, 0), -('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17759','DatabaseVersion','', NULL, NULL, 0); +('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17763','DatabaseVersion','', NULL, NULL, 0); /* ('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1), @@ -2980,4 +2982,4 @@ CREATE TABLE grade_components ( PRIMARY KEY (id) ); -ALTER TABLE gradebook_category ADD COLUMN grade_model_id INT DEFAULT 0; \ No newline at end of file +ALTER TABLE gradebook_category ADD COLUMN grade_model_id INT DEFAULT 0; diff --git a/main/install/migrate-db-1.8.8-1.9.0-pre.sql b/main/install/migrate-db-1.8.8-1.9.0-pre.sql index 1d89882058..ed2ed2a3b9 100755 --- a/main/install/migrate-db-1.8.8-1.9.0-pre.sql +++ b/main/install/migrate-db-1.8.8-1.9.0-pre.sql @@ -152,6 +152,8 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('enable_wam INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('gradebook_default_weight', NULL, 'textfield', 'Gradebook', '100', 'GradebookDefaultWeightTitle', 'GradebookDefaultWeightComment', NULL, NULL, 1); +INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES ('বাংলা','bengali','bn','bengali',0), ('الصومالية','somali','so','somali',0); + -- Course ranking CREATE TABLE track_course_ranking (id int unsigned not null PRIMARY KEY AUTO_INCREMENT, c_id int unsigned not null, session_id int unsigned not null default 0, url_id int unsigned not null default 0, accesses int unsigned not null default 0, total_score int unsigned not null default 0, users int unsigned not null default 0, creation_date datetime not null); @@ -188,7 +190,7 @@ DELETE FROM settings_current WHERE variable = 'use_document_title'; DELETE FROM settings_options WHERE variable = 'use_document_title'; -- Do not move this query -UPDATE settings_current SET selected_value = '1.9.0.17759' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.9.0.17763' WHERE variable = 'chamilo_database_version'; -- xxSTATSxx ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; From ed346d247050a703645edceba913eb4391951bbc Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 11:14:47 +0200 Subject: [PATCH 24/31] Adding zoom_in zoom_out icons, should fix bug in #4689 --- main/img/icons/22/zoom_in.png | Bin 0 -> 1971 bytes main/img/icons/22/zoom_out.png | Bin 0 -> 1951 bytes main/img/icons/32/zoom_in.png | Bin 0 -> 1971 bytes main/img/icons/32/zoom_out.png | Bin 0 -> 1951 bytes main/mySpace/access_details.php | 2 +- main/mySpace/slider.css | 6 ++---- main/mySpace/slider.js | 4 ++-- 7 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 main/img/icons/22/zoom_in.png create mode 100644 main/img/icons/22/zoom_out.png create mode 100644 main/img/icons/32/zoom_in.png create mode 100644 main/img/icons/32/zoom_out.png diff --git a/main/img/icons/22/zoom_in.png b/main/img/icons/22/zoom_in.png new file mode 100644 index 0000000000000000000000000000000000000000..18e4383b3f05da224689b17829d1b579d32f8c23 GIT binary patch literal 1971 zcmV;k2Tb^hP)RUx6k5PybOkT zA8Z^qM3^|(IP!u?)P_);C`;QYO%N(-kQ!B0XecehK`DqECIDZaHWvcV<6x%<6$<>%$w!C*K?o8mO+3g3Q?bQXL)naxxe$>bI*Ch8HR!X z=f&OWx2-+fT4crY3ddm;fm)4OMjXc_>9s!|k8RqyW4n)T8Fvlfg|+M4b&Kkcx?GOM z?QLzS_12)k;kaSWWGsfyMtwLsJd8*rcK*`~pS17W`)2sd0&rWl_NH=!swK+_67jh#7##R)4dkqjN>z`|H=C zu&@Zx$s}Ida~PMR8VXCw;B=KhlsE_iM<6`nkqKNIzl;So4!>Q$63zlELZR#U{hl{5 zH28N}zbznQrJ1g65X&pqGZ^?F}@`l%`7?{3+Rm$vVP z&I?e6i1fQ#csF5Vz)vQ1!O3CL*yYV0%VCtwYLHTBNVWf1@pyxGT-?CD3sNfd8MTU zuVKWm!eX_fhW30iYf!Wlgd{;1B}j@w5i8IYiCoKYIuuwH5t1yRbbb-pCdo$@rZ4iz zeCLydyrJvR$dF#3C>Ar*V@!5^N_G}GTU@b_Pf^6KH{ORv>{*?|hVQKeuV#?Ras+3A zMq9ujn9p2*bDsj%4|HZg#*!qHd<2lvkuX^B3V2dLAO+asydcveoax)399AfLP19j; zI?a_#6?OWYZ;zQt5@w*0u|QE!ohJYdae~^u=>>Done4k>r^xBIO|PtCtV}Q@DSDA| zfvv}z3h2NWXmF-PG(C0o>Npu2XqaaOD|o(8n$CNc5;28fTtz66qQ!YrdbYTcvleJF zPl|;jDSWNeYWiTln9qCx^u*-kuv05CrMT=H_PHW65A7LRF7yScb_- z(XpK1c@C{DwP&19+jX&Cos5u~cW zwmw7ic^o@_f^tI8N6vqIf%(oy0aKC!}vrHfBs7^y1UnK_bqPx(T4~7x08i77XZ7oL_D6c z+w9|kK=A9{g$v;(h^3Aw9Ml05x()u66N$7Hv7`l|xQs$0i)LpO-`i7 zD5bqVtHpDad^|NHk;<`xQ>XulBS!{t@4fX@#vQaxNz~TW!-G?3|8;BXp^e9t+vNgx z(`P%4`9(#=wcmO6xi^Z7i>e=NYC?HM89W}(OmSg#A`l4R^UGIo`t)h2skB~RQO>i6 z7>Oz=FWT^E=MuQ(&w)=iWB4f0{_>GqLU6bE&T4oujRlJq)z`PRcfROwIF_-xJ{y3p zR4f)db>#4&-9F#w^`C6s(qCCq15t6|e&rlm<+p&&cR<~WAYLX2{gx27dn%T4YOv?B zA{vg|c1_P`B-A_*qY=vG(mg-kyltqhGKg+lFF0ywpbCl3eFP!h7J{4OaZSuAqTHgf zu%t-kjvAXgk4DXVuRStU@4SL4w@zJEobu4QHwUrNgovryLy!Gz@B|CwPTk7LB`1rL zJ>U6n8WXwSGP#J@J>TO!hdRzhYvGToNG7!@od(y^4EoTp3vDYD6g%Z()2*7v-MeNW zzSVP}<3zX-foSqZhz!Luh|lZ4;g`MS>BM|z+nOQPHK}~DW{ziG?O#s!S+59v zl>oCL%4if!|E;8PC8tvQs|J{cu;*&ablHzj*Mk2EFaW%tGd~88zJLG#002ovPDHLk FV1hoG#FGF3 literal 0 HcmV?d00001 diff --git a/main/img/icons/22/zoom_out.png b/main/img/icons/22/zoom_out.png new file mode 100644 index 0000000000000000000000000000000000000000..2bdc37ab3d75591e2cd3bf1940cfc2c8ca59002c GIT binary patch literal 1951 zcmV;Q2VnS#P)mRMODTR^I z1(7BM2oG&QVOnSx2PmY(aU4IceQn>z&Ua&Hp`yf9sdlB~Yv22wbAIRX{my63vMl^R zFYb2lwsmb^DJza&avUBepiXO+631}~`s`8F=u5kH?(owi>y80#+?**o=h0dQNlb*+;n_LYNQB^$E=a9e)8wX?9WsQbBRH=&@QzaLypa|JO2;E{FTEp2OG6Zq+- zjVLNAMkJQN&-Wa`m570&(sFnTN+C)d1c4(UJk;<6Zj4>U0vCrjH?4&y--%FY5`WmU z7X$qtd3z52bs`r4V&*P2FI(QZopl zGL96rRGOMlr?$}r9x0065_!mq09oQuu$JQdEg}pyeNVb*j*wm5xT|Wxu2{BuceXJIVy((29x`Lc5~g5~vOrM~&l3OxDuLSZ(lbG}?w7rXAZt zDAU9VDdL6{mC2y@pWo2nCJ@WKUFWH*>;uw7!=&Y1Hw5koRfyM$zHTt|>te?vo>*7G=iVu*S|FfU&C_!6_7 z3l-aG8u9<+Kng81`ay3yIWp1XT-(+eLS>e)dW##{i{WyDoAo#)CM3j~7S@hx14LISbW9f6xB zVBBjoFHWQNcdL{4Z9c&mF*WCbgd~q-esOV0-H)Dp>aCKJ;+kd6 z&8Vm>hu7vw zV&5%6aJTr)IJ|^p!J*$OoX2YUPeA*7#9ZWe_(cL?-V(%@or+cFO6@YWsQOok9<5ks(IYGYX-y*x(>7rO*J79N!$z~O);q&oBHf> z-Dv@bE*~WZt`}zSkHQ7+(DgGy3?pa08*{leClK^IeC@0C!{;edrmdR4;n+A{t lk(c3?EbXgVF8Hqi0{|13K^-xaz?uL6002ovPDHLkV1iEptQ!CT literal 0 HcmV?d00001 diff --git a/main/img/icons/32/zoom_in.png b/main/img/icons/32/zoom_in.png new file mode 100644 index 0000000000000000000000000000000000000000..18e4383b3f05da224689b17829d1b579d32f8c23 GIT binary patch literal 1971 zcmV;k2Tb^hP)RUx6k5PybOkT zA8Z^qM3^|(IP!u?)P_);C`;QYO%N(-kQ!B0XecehK`DqECIDZaHWvcV<6x%<6$<>%$w!C*K?o8mO+3g3Q?bQXL)naxxe$>bI*Ch8HR!X z=f&OWx2-+fT4crY3ddm;fm)4OMjXc_>9s!|k8RqyW4n)T8Fvlfg|+M4b&Kkcx?GOM z?QLzS_12)k;kaSWWGsfyMtwLsJd8*rcK*`~pS17W`)2sd0&rWl_NH=!swK+_67jh#7##R)4dkqjN>z`|H=C zu&@Zx$s}Ida~PMR8VXCw;B=KhlsE_iM<6`nkqKNIzl;So4!>Q$63zlELZR#U{hl{5 zH28N}zbznQrJ1g65X&pqGZ^?F}@`l%`7?{3+Rm$vVP z&I?e6i1fQ#csF5Vz)vQ1!O3CL*yYV0%VCtwYLHTBNVWf1@pyxGT-?CD3sNfd8MTU zuVKWm!eX_fhW30iYf!Wlgd{;1B}j@w5i8IYiCoKYIuuwH5t1yRbbb-pCdo$@rZ4iz zeCLydyrJvR$dF#3C>Ar*V@!5^N_G}GTU@b_Pf^6KH{ORv>{*?|hVQKeuV#?Ras+3A zMq9ujn9p2*bDsj%4|HZg#*!qHd<2lvkuX^B3V2dLAO+asydcveoax)399AfLP19j; zI?a_#6?OWYZ;zQt5@w*0u|QE!ohJYdae~^u=>>Done4k>r^xBIO|PtCtV}Q@DSDA| zfvv}z3h2NWXmF-PG(C0o>Npu2XqaaOD|o(8n$CNc5;28fTtz66qQ!YrdbYTcvleJF zPl|;jDSWNeYWiTln9qCx^u*-kuv05CrMT=H_PHW65A7LRF7yScb_- z(XpK1c@C{DwP&19+jX&Cos5u~cW zwmw7ic^o@_f^tI8N6vqIf%(oy0aKC!}vrHfBs7^y1UnK_bqPx(T4~7x08i77XZ7oL_D6c z+w9|kK=A9{g$v;(h^3Aw9Ml05x()u66N$7Hv7`l|xQs$0i)LpO-`i7 zD5bqVtHpDad^|NHk;<`xQ>XulBS!{t@4fX@#vQaxNz~TW!-G?3|8;BXp^e9t+vNgx z(`P%4`9(#=wcmO6xi^Z7i>e=NYC?HM89W}(OmSg#A`l4R^UGIo`t)h2skB~RQO>i6 z7>Oz=FWT^E=MuQ(&w)=iWB4f0{_>GqLU6bE&T4oujRlJq)z`PRcfROwIF_-xJ{y3p zR4f)db>#4&-9F#w^`C6s(qCCq15t6|e&rlm<+p&&cR<~WAYLX2{gx27dn%T4YOv?B zA{vg|c1_P`B-A_*qY=vG(mg-kyltqhGKg+lFF0ywpbCl3eFP!h7J{4OaZSuAqTHgf zu%t-kjvAXgk4DXVuRStU@4SL4w@zJEobu4QHwUrNgovryLy!Gz@B|CwPTk7LB`1rL zJ>U6n8WXwSGP#J@J>TO!hdRzhYvGToNG7!@od(y^4EoTp3vDYD6g%Z()2*7v-MeNW zzSVP}<3zX-foSqZhz!Luh|lZ4;g`MS>BM|z+nOQPHK}~DW{ziG?O#s!S+59v zl>oCL%4if!|E;8PC8tvQs|J{cu;*&ablHzj*Mk2EFaW%tGd~88zJLG#002ovPDHLk FV1hoG#FGF3 literal 0 HcmV?d00001 diff --git a/main/img/icons/32/zoom_out.png b/main/img/icons/32/zoom_out.png new file mode 100644 index 0000000000000000000000000000000000000000..2bdc37ab3d75591e2cd3bf1940cfc2c8ca59002c GIT binary patch literal 1951 zcmV;Q2VnS#P)mRMODTR^I z1(7BM2oG&QVOnSx2PmY(aU4IceQn>z&Ua&Hp`yf9sdlB~Yv22wbAIRX{my63vMl^R zFYb2lwsmb^DJza&avUBepiXO+631}~`s`8F=u5kH?(owi>y80#+?**o=h0dQNlb*+;n_LYNQB^$E=a9e)8wX?9WsQbBRH=&@QzaLypa|JO2;E{FTEp2OG6Zq+- zjVLNAMkJQN&-Wa`m570&(sFnTN+C)d1c4(UJk;<6Zj4>U0vCrjH?4&y--%FY5`WmU z7X$qtd3z52bs`r4V&*P2FI(QZopl zGL96rRGOMlr?$}r9x0065_!mq09oQuu$JQdEg}pyeNVb*j*wm5xT|Wxu2{BuceXJIVy((29x`Lc5~g5~vOrM~&l3OxDuLSZ(lbG}?w7rXAZt zDAU9VDdL6{mC2y@pWo2nCJ@WKUFWH*>;uw7!=&Y1Hw5koRfyM$zHTt|>te?vo>*7G=iVu*S|FfU&C_!6_7 z3l-aG8u9<+Kng81`ay3yIWp1XT-(+eLS>e)dW##{i{WyDoAo#)CM3j~7S@hx14LISbW9f6xB zVBBjoFHWQNcdL{4Z9c&mF*WCbgd~q-esOV0-H)Dp>aCKJ;+kd6 z&8Vm>hu7vw zV&5%6aJTr)IJ|^p!J*$OoX2YUPeA*7#9ZWe_(cL?-V(%@or+cFO6@YWsQOok9<5ks(IYGYX-y*x(>7rO*J79N!$z~O);q&oBHf> z-Dv@bE*~WZt`}zSkHQ7+(DgGy3?pa08*{leClK^IeC@0C!{;edrmdR4;n+A{t lk(c3?EbXgVF8Hqi0{|13K^-xaz?uL6002ovPDHLkV1iEptQ!CT literal 0 HcmV?d00001 diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php index 9b27cfaa4c..bc36b22b1c 100644 --- a/main/mySpace/access_details.php +++ b/main/mySpace/access_details.php @@ -216,7 +216,7 @@ $form->display();
- '.get_lang('More').' +
'; }?>
diff --git a/main/mySpace/slider.css b/main/mySpace/slider.css index 82d04f7136..d38663f79f 100644 --- a/main/mySpace/slider.css +++ b/main/mySpace/slider.css @@ -1,7 +1,5 @@ -div#cev_cont_results -{ - margin: 0; - padding-left:18px; +div#cev_cont_results { + margin: 0; padding-right:18px; } div#cev_cont_header diff --git a/main/mySpace/slider.js b/main/mySpace/slider.js index 2bec3e0f58..4ac0a6a40b 100644 --- a/main/mySpace/slider.js +++ b/main/mySpace/slider.js @@ -59,13 +59,13 @@ function sliderAction() { sliderOpen(); slider_state = "open" - $(".slider_menu").html('Cerrar'); + $(".slider_menu").html(''); } else if (slider_state == "open") { sliderClose(); slider_state = "close"; - $(".slider_menu").html('Más...'); + $(".slider_menu").html(''); } return false; From 7cb2d54497e28d7a85d8423923e1cebf8d29b931 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 12:08:32 +0200 Subject: [PATCH 25/31] Adding Twig options in order to improve performance see #4635 --- main/inc/lib/template.lib.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 8c2cf531f8..49bce70e52 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -42,13 +42,28 @@ class Template { $loader = new Twig_Loader_Filesystem($template_paths); - $this->twig = new Twig_Environment($loader, array( - //'cache' => api_get_path(SYS_ARCHIVE_PATH), //path to the cache folder - 'autoescape' => false, - //'debug' => true, - //'auto_reload' => true - //'optimizations' => 0 // turn on optimizations with -1 - )); + //Setting Twig options depending on the server see http://twig.sensiolabs.org/doc/api.html#environment-options + if (api_get_setting('server_type') == 'test') { + $options = array ( + //'cache' => api_get_path(SYS_ARCHIVE_PATH), //path to the cache folder + 'autoescape' => false, + 'debug' => true, + 'auto_reload' => true, + 'optimizations' => 0, // turn on optimizations with -1 + 'strict_variables' => true, //If set to false, Twig will silently ignore invalid variables + ); + } else { + $options = array ( + 'cache' => api_get_path(SYS_ARCHIVE_PATH), //path to the cache folder + 'autoescape' => false, + 'debug' => false, + 'auto_reload' => false, + 'optimizations' => -1, // turn on optimizations with -1 + 'strict_variables' => false //If set to false, Twig will silently ignore invalid variables + ); + } + + $this->twig = new Twig_Environment($loader, $options); $this->twig->addFilter('get_lang', new Twig_Filter_Function('get_lang')); $this->twig->addFilter('get_path', new Twig_Filter_Function('api_get_path')); From 9e3061fbd62dbbcf9f135a8f2d13d7998d16a022 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 16:56:44 +0200 Subject: [PATCH 26/31] Updating icons see #4689 --- main/img/icons/22/zoom_in.png | Bin 1971 -> 1501 bytes main/img/icons/22/zoom_out.png | Bin 1951 -> 1470 bytes main/img/icons/32/zoom_in.png | Bin 1971 -> 2391 bytes main/img/icons/32/zoom_out.png | Bin 1951 -> 2343 bytes main/img/icons/64/zoom_in.png | Bin 0 -> 6276 bytes main/img/icons/64/zoom_out.png | Bin 0 -> 6157 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 main/img/icons/64/zoom_in.png create mode 100644 main/img/icons/64/zoom_out.png diff --git a/main/img/icons/22/zoom_in.png b/main/img/icons/22/zoom_in.png index 18e4383b3f05da224689b17829d1b579d32f8c23..f7b05bc74692c6109b24135860d0504747e35910 100644 GIT binary patch literal 1501 zcmV<31tR*1P)5i1Jm7Hyk0X-rLPVoaA0 zn)I`2V{J^W*0iRm2rhu22xx0!ts;U*by#Gv>@&l>Vb-_YewkV;H0g)_lat(gZtgE9 z_x$gn;2GU_bV5!>9smHG_~{rMB^jeBiedqXs%qM7d0FKw06@#t%TThq6#h;0)0^g& zi;$C%2j3j|+ORk!_4AaJ)KXCp;}FJzrfK0|AmD7ddbxdidisl!)unwG8qUF{jhp8M zQ_m(^uU;-Pn`2tz7Q{zA8X8mwhK6;&FF-hs1*)p=Y$w1Vk&cymOU{qaGD5QA!Sk7x% zp2lQlElHz$dmTqMt}lCkzKU^8eGQbCmBYoR3)akx%;tx^4s`L3znzlOrbL602rR}N zOVJEXVT1+MPfXt4DRxLyA6ttG@>jgDYUSjqlhwDYs=kMsn)6S~u^{@|Fy@Nkp7v;OHm=PcO8H+}eT!E+Z+L7ex*m3@jFT z7Exk???#WiPvE&Ew?9VA#BUjXjP6LeZFl zu%f}*6{+MUg`}}8hT}~=;d|r3YaI@!Z&RMxFG1Xyfj1u@CRn$+}XO^>({Q| zn-7d5{>D!=7e#X1Q)esy@QEq5RU6j7a)8E&DJm)?Uawc~xZ9bJ|HJU7A|MI?bO2BR zKmh;^04T3#W@KX0*_xD`R5>y{Oxe@z{MhK|$@#z}0w9sgS_Bl1L@*NmNQAr|&!ore z>&jW0m3Qm*ow_rpYfr%cAOrvm00?GFToM3C06_lRUx6k5PybOkT zA8Z^qM3^|(IP!u?)P_);C`;QYO%N(-kQ!B0XecehK`DqECIDZaHWvcV<6x%<6$<>%$w!C*K?o8mO+3g3Q?bQXL)naxxe$>bI*Ch8HR!X z=f&OWx2-+fT4crY3ddm;fm)4OMjXc_>9s!|k8RqyW4n)T8Fvlfg|+M4b&Kkcx?GOM z?QLzS_12)k;kaSWWGsfyMtwLsJd8*rcK*`~pS17W`)2sd0&rWl_NH=!swK+_67jh#7##R)4dkqjN>z`|H=C zu&@Zx$s}Ida~PMR8VXCw;B=KhlsE_iM<6`nkqKNIzl;So4!>Q$63zlELZR#U{hl{5 zH28N}zbznQrJ1g65X&pqGZ^?F}@`l%`7?{3+Rm$vVP z&I?e6i1fQ#csF5Vz)vQ1!O3CL*yYV0%VCtwYLHTBNVWf1@pyxGT-?CD3sNfd8MTU zuVKWm!eX_fhW30iYf!Wlgd{;1B}j@w5i8IYiCoKYIuuwH5t1yRbbb-pCdo$@rZ4iz zeCLydyrJvR$dF#3C>Ar*V@!5^N_G}GTU@b_Pf^6KH{ORv>{*?|hVQKeuV#?Ras+3A zMq9ujn9p2*bDsj%4|HZg#*!qHd<2lvkuX^B3V2dLAO+asydcveoax)399AfLP19j; zI?a_#6?OWYZ;zQt5@w*0u|QE!ohJYdae~^u=>>Done4k>r^xBIO|PtCtV}Q@DSDA| zfvv}z3h2NWXmF-PG(C0o>Npu2XqaaOD|o(8n$CNc5;28fTtz66qQ!YrdbYTcvleJF zPl|;jDSWNeYWiTln9qCx^u*-kuv05CrMT=H_PHW65A7LRF7yScb_- z(XpK1c@C{DwP&19+jX&Cos5u~cW zwmw7ic^o@_f^tI8N6vqIf%(oy0aKC!}vrHfBs7^y1UnK_bqPx(T4~7x08i77XZ7oL_D6c z+w9|kK=A9{g$v;(h^3Aw9Ml05x()u66N$7Hv7`l|xQs$0i)LpO-`i7 zD5bqVtHpDad^|NHk;<`xQ>XulBS!{t@4fX@#vQaxNz~TW!-G?3|8;BXp^e9t+vNgx z(`P%4`9(#=wcmO6xi^Z7i>e=NYC?HM89W}(OmSg#A`l4R^UGIo`t)h2skB~RQO>i6 z7>Oz=FWT^E=MuQ(&w)=iWB4f0{_>GqLU6bE&T4oujRlJq)z`PRcfROwIF_-xJ{y3p zR4f)db>#4&-9F#w^`C6s(qCCq15t6|e&rlm<+p&&cR<~WAYLX2{gx27dn%T4YOv?B zA{vg|c1_P`B-A_*qY=vG(mg-kyltqhGKg+lFF0ywpbCl3eFP!h7J{4OaZSuAqTHgf zu%t-kjvAXgk4DXVuRStU@4SL4w@zJEobu4QHwUrNgovryLy!Gz@B|CwPTk7LB`1rL zJ>U6n8WXwSGP#J@J>TO!hdRzhYvGToNG7!@od(y^4EoTp3vDYD6g%Z()2*7v-MeNW zzSVP}<3zX-foSqZhz!Luh|lZ4;g`MS>BM|z+nOQPHK}~DW{ziG?O#s!S+59v zl>oCL%4if!|E;8PC8tvQs|J{cu;*&ablHzj*Mk2EFaW%tGd~88zJLG#002ovPDHLk FV1hoG#FGF3 diff --git a/main/img/icons/22/zoom_out.png b/main/img/icons/22/zoom_out.png index 2bdc37ab3d75591e2cd3bf1940cfc2c8ca59002c..f3c91a9c8cc4dcdd699f81a14935a9d53e962640 100644 GIT binary patch literal 1470 zcmV;v1ws0WP)W8eWvY9J2RcR_Z}Y@4a=DL;6M2u&N(^1 z|Ce*V{0Z)<%k39YkXr-*_~FNIgwy3tA%qA(nx?@0KoB+$58fUIsUEqor}if zhf$DQgst1Zbj;1l{wOOeyWG%?49b{pSyn6>iTID7Jk~NYGV)2;ljYa;AKHr-o_{eZ znB2Q@;^eW?)YNGwGN#XPUhlqPc6ImI;mL?pRe{XRnKaioR|$oJ=pX2N*FQM2<<-~T zkoEg&@KVLf`@wZ}b*QYY#F55>ug{-1e`nW?8#vwO?-+_WhioNn(t={zR-DlIxR$1d z(ii6_`T6s5ct=P3_UD&ZtV!mW)gG)xRYesJH|)>M%gt-N+R;uAp9{ATSI)5Ea7#nw zOcjI)g)%}lGb}x!j$zSlm^U*^ONt+TV##AeKkcqLyKC3CsIA@i513{Qb^!o%!`MAK z=GRVKinh9Dvu!ar5 zakt}d_c!93@3s{eG4&bsyN{au-IUQ!*~al&*4$Xe{;hWxfmoNfNn{QbI}_ zQV52f4Oe292BN3VxBDkwC`t{xT&~BH=2%Jy+qPv~QtLp=Xsa10m$2U z+lGwAr8O`biyk-^9&~Z264bJ7X(R;)0)gwADrnzmG~Des!ebNW%?;mohAE=}B}Ce= zO-stSW!sPv1OAwm>UMBxQkm}2T)my+SCWEB(umF(I_*n1YkpIN&IkT&KdwPiPA)nUY*S9+v zSSA26aoI|MVhKeP3MVub8Xq4T4^6ffEXXf9bN1YUpZC=Lfd8Q=00n@anw~KmfC~Ws Y3&G<=!^U9ECjbBd07*qoM6N<$g51=?#sB~S literal 1951 zcmV;Q2VnS#P)mRMODTR^I z1(7BM2oG&QVOnSx2PmY(aU4IceQn>z&Ua&Hp`yf9sdlB~Yv22wbAIRX{my63vMl^R zFYb2lwsmb^DJza&avUBepiXO+631}~`s`8F=u5kH?(owi>y80#+?**o=h0dQNlb*+;n_LYNQB^$E=a9e)8wX?9WsQbBRH=&@QzaLypa|JO2;E{FTEp2OG6Zq+- zjVLNAMkJQN&-Wa`m570&(sFnTN+C)d1c4(UJk;<6Zj4>U0vCrjH?4&y--%FY5`WmU z7X$qtd3z52bs`r4V&*P2FI(QZopl zGL96rRGOMlr?$}r9x0065_!mq09oQuu$JQdEg}pyeNVb*j*wm5xT|Wxu2{BuceXJIVy((29x`Lc5~g5~vOrM~&l3OxDuLSZ(lbG}?w7rXAZt zDAU9VDdL6{mC2y@pWo2nCJ@WKUFWH*>;uw7!=&Y1Hw5koRfyM$zHTt|>te?vo>*7G=iVu*S|FfU&C_!6_7 z3l-aG8u9<+Kng81`ay3yIWp1XT-(+eLS>e)dW##{i{WyDoAo#)CM3j~7S@hx14LISbW9f6xB zVBBjoFHWQNcdL{4Z9c&mF*WCbgd~q-esOV0-H)Dp>aCKJ;+kd6 z&8Vm>hu7vw zV&5%6aJTr)IJ|^p!J*$OoX2YUPeA*7#9ZWe_(cL?-V(%@or+cFO6@YWsQOok9<5ks(IYGYX-y*x(>7rO*J79N!$z~O);q&oBHf> z-Dv@bE*~WZt`}zSkHQ7+(DgGy3?pa08*{leClK^IeC@0C!{;edrmdR4;n+A{t lk(c3?EbXgVF8Hqi0{|13K^-xaz?uL6002ovPDHLkV1iEptQ!CT diff --git a/main/img/icons/32/zoom_in.png b/main/img/icons/32/zoom_in.png index 18e4383b3f05da224689b17829d1b579d32f8c23..0b1e42c533ff562419b7957c1109c40bf03b804a 100644 GIT binary patch delta 2380 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 y3oWqZ delta 1957 zcmV;W2U_^o60;AGB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000M7 zNkl%$w!C*K?o8 zmO+3g3Q?bQXL)naxxe$>bI*Ch8HR!X=f&OWx2-+fT4crY3ddm;fm)4OMjXc_>9s!| zk8RqyW4n)T8Fvlfg|+M4b&Kkcx?GOM?QLzS_12)k;kaSWWGsfyMtwLsJd8*rcK*`~ zpS17W`)2sd0)KE@w)U)+CFMZ(n$>7*T#}cQGiT0X|A9WFGpRK@e*RkD7g1w20Jr(4 zTe{uu!rl!pu7}IzGH)I}H-_GmpW)=Ep|G$B(a9uU+JAExm!cX9OUmGMl|Ym@2m(hS zJmQfFTpPcP1vU=9UB42}0xLqH>-hbiH!(E$cTa!c`xE&9h`D#E>A_`#T`M}w#lx{U zp83rOu(&I*qPY@XbxwGT6-3h-VrdTHnSerynFuRbAh=4c&0*SRn^YcHT5iKcJVT3XNYm8sZrP2Ow(o_`3x80_P^DauWe!!|a$Gkg44k=S`e448 z&shrJ5x^n}!Xs4`6=a;nz`p}6i1fQ#csF5Vz)vQ1!O3CL*yYV z0%VCtwYLHTBNVWf1@pyxGT-?CD3sNfd8MTUuVKWm!eX_fhW30iYf!Wlgd{;1B}j@w z5q~St6^UHSa5@xN6%mpwpmcr_*(S+H7N#%q$$aONguJ2a(8!QppePnI(_>6_eM)u~ zIa^$@kWW#>t~cI?M(kOg!-nsz1g~b0$#Mi|fks=vAehfwfODS$)(>=MK*o|JlY9h_ z(vdJ&@CtZRKp+L!;=CZ!BAn^lpd3~xdVfvRVQ@Oll}r_N`kZf%nMo36ppmgaQBa*H z01a`1+P>)pbI+OVyI!Zr>9tQSY`XFn|q$ondF8!mu;Id)f(XsrqNo#wg(s;8$*0D z_7AhD|hRI3Mv7F#}4y`SC{xR~Oo=X9B;BOxu3kHItCqFuctij{?x)hxT zJDq*WOfa@cnodP3nMOR3MoP^>&19+jX&Cos5u~cWwmw7ic^o@_f^tI8N6vqIf%(oy z0aK+!Q z6S@ulloN@x6|tlRp}34fBa3Ed6yKN^f+C5O1J|){-`i+f`T!n&cqObh2WlIdwjMgT zf9IVbrjH@(TET+{`+KR7@PDeB`ej#FCzdrWMMFUX4Ynwyy*{hObCi5MH6xMAv4T^l z|A`|<266Ab^;E_kv`tCW*44vdG@(Cii?Y? zA8cwuc|{pK9?wj1VRa%92;lR}S8)3DX{f2RUS3hovxgXoDk(48@PBCM61e5hfloGL z_$bi+@{wCYaJTr*YIre?1&bEd*SEEIzUXi`ma)1%8-T70KHuo|pKRXJ zUs+QFQE}mZh;CaiIDcwrpbCl3eFP!h7J{4OaZSuAqTHgfu%t-kjvAXgk4DXVuRStU z@4SL4w@zJEobu4QHwUrNgovryLy!Gz@B|CwPTk7LB`1rLJ>U6n8WXwSGP#J@J>TO! zhdRzhYvGToNG7!@od(y^4EoTp3vDYD6g%Z()2*7v-MeNWzJJwopyNci5rJs(Mu-f> zM14h@I+V7%4R8a*w|m|rh$ZlaMX0JaRSAX&!mzWlHd6xbHo#2~`#VOWUIZcuWK_DH zrIENsr-;w%zu}j?ihA diff --git a/main/img/icons/32/zoom_out.png b/main/img/icons/32/zoom_out.png index 2bdc37ab3d75591e2cd3bf1940cfc2c8ca59002c..8d213d4ca1b9407ef84a72987353ee63296083fa 100644 GIT binary patch delta 2332 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 Xmq8sdl)#z*015yANkvXXu0mjfw(YPh diff --git a/main/img/icons/64/zoom_in.png b/main/img/icons/64/zoom_in.png new file mode 100644 index 0000000000000000000000000000000000000000..b6a1ecb6d1ffd4e467f63d1143d9be302d7b6aea GIT binary patch literal 6276 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 Date: Tue, 8 May 2012 17:46:30 +0200 Subject: [PATCH 27/31] All databases (stat, user) are going to use the main DB see #3910 --- main/inc/lib/database.lib.php | 14 ++---------- main/install/update-db-1.8.8-1.9.0.inc.php | 25 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php index 5eec8f7c56..f2942eb063 100644 --- a/main/inc/lib/database.lib.php +++ b/main/inc/lib/database.lib.php @@ -43,17 +43,7 @@ class Database { */ public static function get_statistic_database() { global $_configuration; - return $_configuration['statistics_database']; - } - - /** - * Returns the name of the SCORM database. - * @todo use main_database - * @deprecated - */ - public static function get_scorm_database() { - global $_configuration; - return $_configuration['scorm_database']; + return $_configuration['main_database']; } /** @@ -62,7 +52,7 @@ class Database { */ public static function get_user_personal_database() { global $_configuration; - return $_configuration['user_personal_database']; + return $_configuration['main_database']; } /** diff --git a/main/install/update-db-1.8.8-1.9.0.inc.php b/main/install/update-db-1.8.8-1.9.0.inc.php index 0f982c14af..51eb5c5286 100755 --- a/main/install/update-db-1.8.8-1.9.0.inc.php +++ b/main/install/update-db-1.8.8-1.9.0.inc.php @@ -57,6 +57,7 @@ if (defined('SYSTEM_INSTALLATION')) { $only_test = false; $log = 0; if (defined('SYSTEM_INSTALLATION')) { + if ($singleDbForm) { $dbStatsForm = $dbNameForm; $dbScormForm = $dbNameForm; @@ -132,7 +133,7 @@ if (defined('SYSTEM_INSTALLATION')) { } } - //Moving Stats DB to the main database + //Moving Stats DB to the main DB $stats_table = array( "track_c_browsers", @@ -165,14 +166,30 @@ if (defined('SYSTEM_INSTALLATION')) { if ($dbNameForm != $dbStatsForm) { Database::select_db($dbStatsForm); - foreach($stats_table as $stat_table) { + foreach ($stats_table as $stat_table) { $sql = "ALTER TABLE $dbStatsForm.$stat_table RENAME $dbNameForm.$stat_table"; Database::query($sql); } Database::select_db($dbNameForm); } - - + + //Renaming user tables in the main DB + $user_tables = array( + 'personal_agenda', + 'personal_agenda_repeat', + 'personal_agenda_repeat_not', + 'user_course_category', + ); + + if ($dbNameForm != $dbUserForm) { + Database::select_db($dbUserForm); + foreach ($user_tables as $table) { + $sql = "ALTER TABLE $dbUserForm.$table RENAME $dbNameForm.$table"; + Database::query($sql); + } + Database::select_db($dbNameForm); + } + // Get the user queries list (u_q_list) $u_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql', 'user'); From be42ac122c5cc227d03dcbdc44e3cbefcc28779c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 17:47:25 +0200 Subject: [PATCH 28/31] Minor commenting unused code --- main/inc/lib/course.lib.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 19d6a55846..c880cbcf6c 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -434,7 +434,7 @@ class CourseManager { } $status = ($status == STUDENT || $status == COURSEMANAGER) ? $status : STUDENT; - $role_id = ($status == COURSEMANAGER) ? COURSE_ADMIN : NORMAL_COURSE_MEMBER; + //$role_id = ($status == COURSEMANAGER) ? COURSE_ADMIN : NORMAL_COURSE_MEMBER; // A preliminary check whether the user has bben already registered on the platform. if (Database::num_rows(@Database::query("SELECT status FROM ".Database::get_main_table(TABLE_MAIN_USER)." @@ -1661,10 +1661,8 @@ class CourseManager { $table_course = Database::get_main_table(TABLE_MAIN_COURSE); $table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); - $table_course_class = Database::get_main_table(TABLE_MAIN_COURSE_CLASS); - $user_role_table = Database::get_main_table(MAIN_USER_ROLE_TABLE); - $location_table = Database::get_main_table(MAIN_LOCATION_TABLE); - $role_right_location_table = Database::get_main_table(MAIN_ROLE_RIGHT_LOCATION_TABLE); + $table_course_class = Database::get_main_table(TABLE_MAIN_COURSE_CLASS); + $table_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE); $table_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $table_course_survey = Database::get_main_table(TABLE_MAIN_SHARED_SURVEY); @@ -1691,7 +1689,7 @@ class CourseManager { return; } $this_course = Database::fetch_array($res); - $db_name = $this_course['db_name']; + self::create_database_dump($code); if (!self::is_virtual_course_from_system_code($code)) { // If this is not a virtual course, look for virtual courses that depend on this one, if any @@ -1813,8 +1811,7 @@ class CourseManager { $sql = "DELETE FROM $table_stats_links WHERE links_cours_id = '".$code."'"; Database::query($sql); $sql = "DELETE FROM $table_stats_uploads WHERE upload_cours_id = '".$code."'"; - Database::query($sql); - + Database::query($sql); global $_configuration; if ($_configuration['multiple_access_urls']) { From 57c757dd3744981577829d5adb26c435c052d336 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 17:48:45 +0200 Subject: [PATCH 29/31] Adding gradebook_block platform setting + adding c_id in the track_e_default table see #4635 --- main/inc/lib/events.lib.inc.php | 77 ++++++++++++--------- main/install/db_main.sql | 7 +- main/install/db_stats.sql | 1 + main/install/migrate-db-1.8.8-1.9.0-pre.sql | 7 +- 4 files changed, 55 insertions(+), 37 deletions(-) diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php index 62c7c38592..33b94b6ff0 100644 --- a/main/inc/lib/events.lib.inc.php +++ b/main/inc/lib/events.lib.inc.php @@ -562,7 +562,7 @@ function exercise_attempt_hotspot($exe_id, $question_id, $answer_id, $correct, $ * @param integer User ID (defaults to null) * @param string Course code (defaults to null) */ -function event_system($event_type, $event_value_type, $event_value, $datetime = null, $user_id=null, $course_code=null) { +function event_system($event_type, $event_value_type, $event_value, $datetime = null, $user_id = null, $course_code = null) { global $_user; global $TABLETRACK_DEFAULT; @@ -579,18 +579,25 @@ function event_system($event_type, $event_value_type, $event_value, $datetime = unset($event_value['avatar']); unset($event_value['password']); unset($event_value['lastLogin']); - unset($event_value['picture_uri']); - + unset($event_value['picture_uri']); $event_value = serialize($event_value); } } + $event_value = Database::escape_string($event_value); $user_id = Database::escape_string($user_id); $course_code = Database::escape_string($course_code); + $course_info = api_get_course_info($course_code); + + $course_id = null; + if (!empty($course_info)) { + $course_id = $course_info['real_id']; + } if (!isset($datetime)) { $datetime = api_get_utc_datetime(); } + $datetime = Database::escape_string($datetime); if(!isset($user_id)) { @@ -599,17 +606,19 @@ function event_system($event_type, $event_value_type, $event_value, $datetime = if(!isset($course_code)) { $course_code = ''; } + $sql = "INSERT INTO $TABLETRACK_DEFAULT (default_user_id, default_cours_code, + c_id, default_date, default_event_type, default_value_type, default_value ) - VALUES - ('$user_id.', + VALUES('$user_id.', '$course_code', + '$course_id', '$datetime', '$event_type', '$event_value_type', @@ -617,37 +626,37 @@ function event_system($event_type, $event_value_type, $event_value, $datetime = $res = Database::query($sql); //Sending notifications to users - $send_event_setting = api_get_setting('activate_send_event_by_mail'); - if (!empty($send_event_setting) && $send_event_setting == 'true') { - global $language_file; - - //prepare message - list($message, $subject) = get_event_message_and_subject($event_type); - $mail_body=$message; - if ( is_array($notification_infos) ){ - foreach ($notification_infos as $variable => $value) { - $mail_body = str_replace('%'.$variable.'%',$value,$mail_body); - } - } + $send_event_setting = api_get_setting('activate_send_event_by_mail'); + if (!empty($send_event_setting) && $send_event_setting == 'true') { + global $language_file; + + //prepare message + list($message, $subject) = get_event_message_and_subject($event_type); + $mail_body=$message; + if (is_array($notification_infos)) { + foreach ($notification_infos as $variable => $value) { + $mail_body = str_replace('%'.$variable.'%',$value,$mail_body); + } + } - //prepare mail common variables - if(empty($subject)) { - $subject = $event_type; - } - $mail_subject = '['.api_get_setting('siteName').'] '.$subject; - $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); - $email_admin = api_get_setting('emailAdministrator'); - $emailfromaddr = api_get_setting('emailAdministrator'); - $emailfromname = api_get_setting('siteName'); - - //Send mail to all subscribed users - $users_arr = get_users_subscribed_to_event($event_type); - foreach ($users_arr as $user) { - $recipient_name = api_get_person_name($user['firstname'], $user['lastname']); - $email = $user['email']; - @api_mail($recipient_name, $email, $mail_subject, $mail_body, $sender_name, $email_admin); + //prepare mail common variables + if(empty($subject)) { + $subject = $event_type; + } + $mail_subject = '['.api_get_setting('siteName').'] '.$subject; + $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); + $email_admin = api_get_setting('emailAdministrator'); + $emailfromaddr = api_get_setting('emailAdministrator'); + $emailfromname = api_get_setting('siteName'); + + //Send mail to all subscribed users + $users_arr = get_users_subscribed_to_event($event_type); + foreach ($users_arr as $user) { + $recipient_name = api_get_person_name($user['firstname'], $user['lastname']); + $email = $user['email']; + @api_mail($recipient_name, $email, $mail_subject, $mail_body, $sender_name, $email_admin); + } } - } return true; } diff --git a/main/install/db_main.sql b/main/install/db_main.sql index d0e62e1ec4..a886e4f3a9 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -858,7 +858,8 @@ VALUES ('teachers_can_change_grade_model_settings', NULL, 'radio', 'Gradebook', 'true', 'TeachersCanChangeGradeModelSettingsTitle', 'TeachersCanChangeGradeModelSettingsComment', NULL, NULL, 1), ('shibboleth_description', NULL, 'radio', 'Shibboleth', 'false', 'ShibbolethMainActivateTitle', 'ShibbolethMainActivateComment', NULL, NULL, 0), ('facebook_description', NULL, 'radio', 'Facebook', 'false', 'FacebookMainActivateTitle', 'FacebookMainActivateComment', NULL, NULL, 0), -('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17763','DatabaseVersion','', NULL, NULL, 0); +('gradebook_locking_enabled', NULL, 'radio', 'Gradebook', 'false', 'GradebookEnableLockingTitle', 'GradebookEnableLockingComment', NULL, NULL, 0), +('chamilo_database_version',NULL,'textfield',NULL, '1.9.0.17769','DatabaseVersion','', NULL, NULL, 0); /* ('show_tabs', 'custom_tab_1', 'checkbox', 'Platform', 'true', 'ShowTabsTitle', 'ShowTabsComment', NULL, 'TabsCustom1', 1), @@ -1196,7 +1197,9 @@ VALUES ('teachers_can_change_score_settings', 'true', 'Yes'), ('teachers_can_change_score_settings', 'false', 'No'), ('teachers_can_change_grade_model_settings', 'true', 'Yes'), -('teachers_can_change_grade_model_settings', 'false', 'No'); +('teachers_can_change_grade_model_settings', 'false', 'No'), +('gradebook_locking_enabled', 'true', 'Yes'), +('gradebook_locking_enabled', 'false', 'No'); UNLOCK TABLES; /* ('activate_send_event_by_mail', 'true', 'Yes'), diff --git a/main/install/db_stats.sql b/main/install/db_stats.sql index bdbb9b9ee6..7a768b131f 100644 --- a/main/install/db_stats.sql +++ b/main/install/db_stats.sql @@ -85,6 +85,7 @@ CREATE TABLE track_e_default ( default_event_type varchar(20) NOT NULL default '', default_value_type varchar(20) NOT NULL default '', default_value text NOT NULL, + c_id int unsigned default NULL, PRIMARY KEY (default_id) ); diff --git a/main/install/migrate-db-1.8.8-1.9.0-pre.sql b/main/install/migrate-db-1.8.8-1.9.0-pre.sql index ed2ed2a3b9..57f6a43443 100755 --- a/main/install/migrate-db-1.8.8-1.9.0-pre.sql +++ b/main/install/migrate-db-1.8.8-1.9.0-pre.sql @@ -100,6 +100,10 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value, INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'true', 'Yes'); INSERT INTO settings_options (variable, value, display_text) VALUES ('teachers_can_change_grade_model_settings', 'false', 'No'); +INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('gradebook_locking_enabled', NULL, 'radio', 'Gradebook', 'false', 'GradebookEnableLockingTitle', 'GradebookEnableLockingComment', NULL, NULL, 0); +INSERT INTO settings_options (variable, value, display_text) VALUES ('gradebook_locking_enabled', 'true', 'Yes'); +INSERT INTO settings_options (variable, value, display_text) VALUES ('gradebook_locking_enabled', 'false', 'No'); + INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_users_to_change_email_with_no_password', NULL, 'radio', 'User', 'false', 'AllowUsersToChangeEmailWithNoPasswordTitle', 'AllowUsersToChangeEmailWithNoPasswordComment', NULL, NULL, 0); INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'true', 'Yes'); INSERT INTO settings_options (variable, value, display_text) VALUES ('allow_users_to_change_email_with_no_password', 'false', 'No'); @@ -190,7 +194,7 @@ DELETE FROM settings_current WHERE variable = 'use_document_title'; DELETE FROM settings_options WHERE variable = 'use_document_title'; -- Do not move this query -UPDATE settings_current SET selected_value = '1.9.0.17763' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.9.0.17769' WHERE variable = 'chamilo_database_version'; -- xxSTATSxx ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT ''; @@ -203,6 +207,7 @@ ALTER TABLE stored_values_stack ADD KEY (user_id, sco_id, course_id, sv_key, sta ALTER TABLE stored_values_stack ADD UNIQUE (user_id, sco_id, course_id, sv_key, stack_order); ALTER TABLE track_e_attempt ADD COLUMN filename VARCHAR(255) DEFAULT NULL; +ALTER TABLE track_e_default ADD COLUMN c_id INTEGER DEFAULT NULL; -- xxUSERxx From 905de2cfe6fb474069f31229efe01ec103653584 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 8 May 2012 18:56:02 +0200 Subject: [PATCH 30/31] Removing scorm calls. Leaving just the table definition (needed when migrating from 1.6 to 1.8). Removing removescormDir() unused function see #4716 --- main/inc/lib/database.constants.inc.php | 2 +- main/inc/lib/database.lib.php | 15 ++------------- main/inc/lib/database.mysqli.lib.php | 12 ------------ main/newscorm/scorm.lib.php | 3 ++- tests/main/inc/lib/database.lib.test.php | 9 +-------- 5 files changed, 6 insertions(+), 35 deletions(-) mode change 100755 => 100644 main/newscorm/scorm.lib.php diff --git a/main/inc/lib/database.constants.inc.php b/main/inc/lib/database.constants.inc.php index 4b30e1acb7..63e51a2ab5 100644 --- a/main/inc/lib/database.constants.inc.php +++ b/main/inc/lib/database.constants.inc.php @@ -143,7 +143,7 @@ define('TABLE_STATISTIC_TRACK_COURSE_RANKING', 'track_course_ranking'); define('TABLE_MAIN_USER_REL_COURSE_VOTE', 'user_rel_course_vote'); -// SCORM database tables +// SCORM database tables this is used only during the migration from 1.6 to 1.8 see update-db-scorm-1.6.x-1.8.0.inc define('TABLE_SCORM_MAIN', 'scorm_main'); define('TABLE_SCORM_SCO_DATA', 'scorm_sco_data'); diff --git a/main/inc/lib/database.lib.php b/main/inc/lib/database.lib.php index f2942eb063..566e25ea89 100644 --- a/main/inc/lib/database.lib.php +++ b/main/inc/lib/database.lib.php @@ -17,6 +17,7 @@ * Constants definition */ require_once 'database.constants.inc.php'; + /** * Database class definition * @package chamilo.database @@ -182,19 +183,7 @@ class Database { } /** - * This generic method returns the correct and complete name of any scorm - * table of which you pass the short name as a parameter. Please, define - * table names as constants in this library and use them instead of directly - * using magic words in your tool code. - * - * @param string $short_table_name, the name of the table - */ - public static function get_scorm_table($short_table_name) { - return self::format_table_name(self::get_scorm_database(), $short_table_name); - } - - /** - * This generic method returns the correct and complete name of any scorm + * This generic method returns the correct and complete name of any user * table of which you pass the short name as a parameter. Please, define * table names as constants in this library and use them instead of directly * using magic words in your tool code. diff --git a/main/inc/lib/database.mysqli.lib.php b/main/inc/lib/database.mysqli.lib.php index 0fce048713..4689b04699 100644 --- a/main/inc/lib/database.mysqli.lib.php +++ b/main/inc/lib/database.mysqli.lib.php @@ -180,18 +180,6 @@ class Database { return self::format_table_name(self::get_statistic_database(), $short_table_name); } - /** - * This generic method returns the correct and complete name of any scorm - * table of which you pass the short name as a parameter. Please, define - * table names as constants in this library and use them instead of directly - * using magic words in your tool code. - * - * @param string $short_table_name, the name of the table - */ - public static function get_scorm_table($short_table_name) { - return self::format_table_name(self::get_scorm_database(), $short_table_name); - } - /** * This generic method returns the correct and complete name of any scorm * table of which you pass the short name as a parameter. Please, define diff --git a/main/newscorm/scorm.lib.php b/main/newscorm/scorm.lib.php old mode 100755 new mode 100644 index 73fb6102db..54c117eedf --- a/main/newscorm/scorm.lib.php +++ b/main/newscorm/scorm.lib.php @@ -18,6 +18,7 @@ * @param string Dir path * @return boolean True on success, false otherwise */ +/* function removescormDir($dir) { global $_course; if(!@$opendir = opendir($dir)) { @@ -61,7 +62,7 @@ function removescormDir($dir) { return false; } return true; -} +}*/ /** * This function removes a directory if it exists diff --git a/tests/main/inc/lib/database.lib.test.php b/tests/main/inc/lib/database.lib.test.php index 4d8222f1d6..a7356d9389 100755 --- a/tests/main/inc/lib/database.lib.test.php +++ b/tests/main/inc/lib/database.lib.test.php @@ -209,14 +209,7 @@ class TestDatabase extends UnitTestCase { $res=$this->dbase->get_scorm_database(); $this->assertTrue(is_string($res)); } - - function testGetScorm_table() { - $short_table_name=''; - $res=$this->dbase->get_scorm_table($short_table_name); - $this->assertTrue(is_string($res)); - $this->assertTrue($res); - } - + function testGetStatisticDatabase() { global $_configuration; $res=$this->dbase->get_statistic_database($_configuration); From 2f86a682cfa0505e53a51c2253857bb34aafa9f7 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 8 May 2012 14:07:35 -0500 Subject: [PATCH 31/31] Updated license text to better match present reality - relocated a few contributors --- documentation/credits.html | 3 +++ license.txt | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) mode change 100755 => 100644 license.txt diff --git a/documentation/credits.html b/documentation/credits.html index 1c72acd4c5..54b55b79b2 100644 --- a/documentation/credits.html +++ b/documentation/credits.html @@ -592,6 +592,8 @@ There are too much translators to list them all. Please check http://translate.c
  • Erik Das (FKS), for bug reports to 1.8.8
  • Marc De Caluwé, for patches to 1.8.8.4
  • Alberto Montes, Contidos Dixitais, for CSS "sport_red" in 1.9
    • +
  • Bart Mollet, Hogeschool Gent, for patches in 1.6 & 1.8
    • +
  • Kristof Van Steenkiste & Sebastien Jacobs (initial Reservation plugin, 2007)
  • All the supporting parents, partners, children, friends, colleagues and sometimes students, of the very special geeks that we are, for their continous support and inspiration
    • @@ -626,6 +628,7 @@ These institutions and companies have either contributed to the Chamilo project
  • Table of contents
    now removed, replaced by learning path
    • +
  • Facultad de Matematicas, UADY (México) (original asynchronous Message plugin, was later dumped)

    • diff --git a/license.txt b/license.txt old mode 100755 new mode 100644 index c77167be32..622b3f7855 --- a/license.txt +++ b/license.txt @@ -1,15 +1,16 @@ -Chamilo - elearning and course management software +Chamilo LMS - elearning and course management software -Copyright (c) 2008-2010 Dokeos Latinoamérica SAC / BeezNest Latino SAC -Copyright (c) 2004-2009 Dokeos SPRL +Copyright (c) 2008-2012 BeezNest Latino SAC, Peru & BeezNest Belgium SPRL, Belgium +Copyright (c) 2012 Université de Genève, Switzerland +Copyright (c) 2010-2012 Université de Grenoble, France +Copyright (c) 2011-2012 CBlue SPRL, Belgium +Copyright (c) Juan Carlos Raña (independent), Spain +Copyright (c) 2004-2009 Dokeos SPRL, Belgium Copyright (c) 2003-2007 Ghent University (UGent) -Copyright (c) 2001 Universite catholique de Louvain (UCL) +Copyright (c) 2001-2004 Universite catholique de Louvain (UCL) Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB) Copyright (c) 2004-2008 Hoogeschool Gent (HoGent) -Copyright (c) Bart Mollet, Hogeschool Gent -Copyright (c) Facultad de Matematicas, UADY (México) (Message plugin) -Copyright (c) Kristof Van Steenkiste & Sebastien Jacobs (Reservation plugin) For a full list of contributors detaining copyrights over parts of the Chamilo software, see "documentation/credits.html".