Juan Carlos Raña 14 years ago
parent
commit
53432bc02c
69 changed files with 334 additions and 2794 deletions
  1. 15 2
      main/admin/resume_session.php
  2. 1 7
      main/admin/statistics/index.php
  3. 10 17
      main/admin/user_list.php
  4. 0 97
      main/css/academica/jquery.tabs.css
  5. 0 98
      main/css/baby_orange/jquery.tabs.css
  6. 0 102
      main/css/blue_lagoon/jquery.tabs.css
  7. 1 1
      main/css/chamilo/default.css
  8. 0 96
      main/css/chamilo/jquery.tabs.css
  9. 1 1
      main/css/chamilo_electric_blue/default.css
  10. 0 96
      main/css/chamilo_electric_blue/jquery.tabs.css
  11. 1 1
      main/css/chamilo_green/default.css
  12. 0 96
      main/css/chamilo_green/jquery.tabs.css
  13. 1 1
      main/css/chamilo_orange/default.css
  14. 0 96
      main/css/chamilo_orange/jquery.tabs.css
  15. 1 1
      main/css/chamilo_red/default.css
  16. 0 96
      main/css/chamilo_red/jquery.tabs.css
  17. 0 99
      main/css/cool_blue/jquery.tabs.css
  18. 0 97
      main/css/corporate/jquery.tabs.css
  19. 0 97
      main/css/cosmic_campus/jquery.tabs.css
  20. 0 99
      main/css/delicious_bordeaux/jquery.tabs.css
  21. 0 99
      main/css/dokeos_blue/jquery.tabs.css
  22. 0 97
      main/css/dokeos_classic/jquery.tabs.css
  23. 0 97
      main/css/dokeos_classic_2D/jquery.tabs.css
  24. 0 99
      main/css/empire_green/jquery.tabs.css
  25. 0 99
      main/css/fruity_orange/jquery.tabs.css
  26. 0 97
      main/css/medical/jquery.tabs.css
  27. 0 96
      main/css/public_admin/jquery.tabs.css
  28. 0 99
      main/css/royal_purple/jquery.tabs.css
  29. 0 98
      main/css/silver_line/jquery.tabs.css
  30. 0 98
      main/css/sober_brown/jquery.tabs.css
  31. 0 99
      main/css/steel_grey/jquery.tabs.css
  32. 0 99
      main/css/tasty_olive/jquery.tabs.css
  33. 17 20
      main/document/document.php
  34. 25 10
      main/exercice/exercice.php
  35. 51 60
      main/exercice/mark_free_answer.php
  36. 1 6
      main/exercice/savescores.php
  37. 0 3
      main/gradebook/gradebook_flatview.php
  38. 1 2
      main/gradebook/gradebook_result.class.php
  39. 1 0
      main/gradebook/lib/be.inc.php
  40. 1 2
      main/gradebook/lib/be/studentpublicationlink.class.php
  41. 11 18
      main/gradebook/lib/fe/flatviewtable.class.php
  42. 5 5
      main/gradebook/lib/gradebook_functions.inc.php
  43. BIN
      main/img/close.png
  44. 1 1
      main/inc/global.inc.php
  45. 2 2
      main/inc/lib/course_home.lib.php
  46. 42 57
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_preview.php
  47. 6 7
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php
  48. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/next.gif
  49. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/prev.gif
  50. 0 29
      main/inc/lib/javascript/META.json
  51. BIN
      main/inc/lib/javascript/tab.png
  52. 46 29
      main/inc/lib/javascript/thickbox.css
  53. 12 6
      main/inc/lib/javascript/thickbox.js
  54. 6 3
      main/inc/lib/sessionmanager.lib.php
  55. 12 0
      main/inc/lib/urlmanager.lib.php
  56. 17 26
      main/inc/lib/usermanager.lib.php
  57. 11 18
      main/inc/local.inc.php
  58. 1 1
      main/newscorm/lp_ajax_save_item.php
  59. 1 1
      main/newscorm/lp_comm.server.php
  60. 4 17
      main/tracking/courseLogCSV.php
  61. 2 15
      main/tracking/course_access_details.php
  62. 1 8
      main/tracking/logins_details.php
  63. 6 18
      main/tracking/personnalLog.php
  64. 3 12
      main/tracking/toolaccess_details.php
  65. 1 6
      main/tracking/userLog.php
  66. 2 9
      main/tracking/userlogCSV.php
  67. 1 1
      main/user/user.php
  68. 7 19
      main/user/userInfo.php
  69. 6 6
      user_portal.php

+ 15 - 2
main/admin/resume_session.php

@@ -172,10 +172,23 @@ api_display_tool_title($tool_name);
 	</td>
 </tr>
 
+<?php 
+require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
+global $_configuration;
+if ($_configuration['multiple_access_urls']) {
+    echo '<tr><td>';   
+    echo get_lang('URL');    
+    echo '</td>';
+    echo '<td>';
+    $url_list = UrlManager::get_access_url_from_session($id_session);
+    foreach($url_list as $url_data) {
+        echo $url_data['url'].'<br />';
+    }        
+    echo '</td></tr>';
+}
+?>
 </table>
-
 <br />
-
 <!--List of courses -->
 <table class="data_table" width="100%">
 <tr>

+ 1 - 7
main/admin/statistics/index.php

@@ -18,13 +18,7 @@ $tool_name = get_lang('Statistics');
 Display::display_header($tool_name);
 api_display_tool_title($tool_name);
 
-if (!$_configuration['tracking_enabled']) {
-	Display::display_warning_message(get_lang('TrackingDisabled'));
-	Display::display_footer();
-	exit;
-}
-require_once ('statistics.lib.php');
-
+require_once 'statistics.lib.php';
 
 $strCourse      = get_lang('Courses');
 $strUsers       = get_lang('Users');

+ 10 - 17
main/admin/user_list.php

@@ -252,23 +252,16 @@ function login_user($user_id) {
 	$uidReset = false;
 
 	if ($user_id) { // a uid is given (log in succeeded)
-		if ($_configuration['tracking_enabled']) {
-			$sql_query = "SELECT user.*, a.user_id is_admin,
-				UNIX_TIMESTAMP(login.login_date) login_date
-				FROM $main_user_table
-				LEFT JOIN $main_admin_table a
-				ON user.user_id = a.user_id
-				LEFT JOIN $track_e_login_table login
-				ON user.user_id = login.login_user_id
-				WHERE user.user_id = '".$user_id."'
-				ORDER BY login.login_date DESC LIMIT 1";
-		} else {
-			$sql_query = "SELECT user.*, a.user_id is_admin
-				FROM $main_user_table
-				LEFT JOIN $main_admin_table a
-				ON user.user_id = a.user_id
-				WHERE user.user_id = '".$user_id."'";
-		}
+
+		$sql_query = "SELECT user.*, a.user_id is_admin,
+			UNIX_TIMESTAMP(login.login_date) login_date
+			FROM $main_user_table
+			LEFT JOIN $main_admin_table a
+			ON user.user_id = a.user_id
+			LEFT JOIN $track_e_login_table login
+			ON user.user_id = login.login_user_id
+			WHERE user.user_id = '".$user_id."'
+			ORDER BY login.login_date DESC LIMIT 1";		
 
 		$sql_result = Database::query($sql_query);
 

+ 0 - 97
main/css/academica/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 98
main/css/baby_orange/jquery.tabs.css

@@ -1,98 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#FDDEAA;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 102
main/css/blue_lagoon/jquery.tabs.css

@@ -1,102 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-	color: #A8A7A7;
-
-}

+ 1 - 1
main/css/chamilo/default.css

@@ -3815,7 +3815,7 @@ div.image-social-content center.friend {
     font-family:Verdana, Geneva, sans-serif;
     color:#000;
     font-weight:bold;
-    font-size:12px;
+    font-size:13px;
     vertical-align:bottom;
 }
 .social-menu-title-right {

+ 0 - 96
main/css/chamilo/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 1 - 1
main/css/chamilo_electric_blue/default.css

@@ -3971,7 +3971,7 @@ div.image-social-content center.friend {
     font-family:Verdana, Geneva, sans-serif;
     color:#000;
     font-weight:bold;
-    font-size:12px;
+    font-size:13px;
     vertical-align:bottom;
 }
 .social-menu-title-right {

+ 0 - 96
main/css/chamilo_electric_blue/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 1 - 1
main/css/chamilo_green/default.css

@@ -3986,7 +3986,7 @@ div.image-social-content center.friend {
     font-family:Verdana, Geneva, sans-serif;
     color:#000;
     font-weight:bold;
-    font-size:12px;
+    font-size:13px;
     vertical-align:bottom;
 }
 .social-menu-title-right {

+ 0 - 96
main/css/chamilo_green/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 1 - 1
main/css/chamilo_orange/default.css

@@ -3957,7 +3957,7 @@ div.image-social-content center.friend {
     font-family:Verdana, Geneva, sans-serif;
     color:#000;
     font-weight:bold;
-    font-size:12px;
+    font-size:13px;
     vertical-align:bottom;
 }
 .social-menu-title-right {

+ 0 - 96
main/css/chamilo_orange/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 1 - 1
main/css/chamilo_red/default.css

@@ -3970,7 +3970,7 @@ div.image-social-content center.friend {
     font-family:Verdana, Geneva, sans-serif;
     color:#000;
     font-weight:bold;
-    font-size:12px;
+    font-size:13px;
     vertical-align:bottom;
 }
 .social-menu-title-right {

+ 0 - 96
main/css/chamilo_red/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */    
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 99
main/css/cool_blue/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 97
main/css/corporate/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 97
main/css/cosmic_campus/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px ;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 99
main/css/delicious_bordeaux/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 99
main/css/dokeos_blue/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-	background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 97
main/css/dokeos_classic/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 97
main/css/dokeos_classic_2D/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 99
main/css/empire_green/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 99
main/css/fruity_orange/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 97
main/css/medical/jquery.tabs.css

@@ -1,97 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 96
main/css/public_admin/jquery.tabs.css

@@ -1,96 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-    /*border-top: 1px solid #97a5b0;*/
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 99
main/css/royal_purple/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 98
main/css/silver_line/jquery.tabs.css

@@ -1,98 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-    .tabs-hide {
-        display: none;
-    }
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-    .tabs-nav {
-        display: none;
-    }
-}
-
-/* Skin */
-.tabs-nav {
-    list-style: none;
-    margin: 0;
-    padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
-}
-.tabs-nav li {
-    float: left;
-    margin: 0 0 0 1px;
-    min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-    background-position: 100% -150px;
-    outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-    background-position: 100% -100px;
-}
-.tabs-nav a span {
-    width: 64px; /* IE 6 treats width as min-width */
-    min-width: 64px;
-    height: 18px; /* IE 6 treats height as min-height */
-    min-height: 18px;
-    padding-top: 6px;
-    padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-    width: auto;
-    height: auto;
-}
-.tabs-nav .tabs-selected a span {
-    padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-    background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-    background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-    cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-    cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-    opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 98
main/css/sober_brown/jquery.tabs.css

@@ -1,98 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-    .tabs-hide {
-        display: none;
-    }
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-    .tabs-nav {
-        display: none;
-    }
-}
-
-/* Skin */
-.tabs-nav {
-    list-style: none;
-    margin: 0;
-    padding: 0 0 0 4px;
-    border-bottom:0px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
-}
-.tabs-nav li {
-    float: left;
-    margin: 0 0 0 1px;
-    min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-    display: block;
-    padding: 0 10px;
-    /*background: url(images/tab.png) no-repeat;*/
-}
-.tabs-nav a {
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding-left: 0;
-    /*color: #fff;*/
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 2;
-    text-align: center;
-    text-decoration: none;
-    white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-    /*color: #fff;*/
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-    background-position: 100% -150px;
-    outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-    background-position: 100% -100px;
-}
-.tabs-nav a span {
-    width: 64px; /* IE 6 treats width as min-width */
-    min-width: 64px;
-    height: 18px; /* IE 6 treats height as min-height */
-    min-height: 18px;
-    padding-top: 6px;
-    padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-    width: auto;
-    height: auto;
-}
-.tabs-nav .tabs-selected a span {
-    padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-    background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-    background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-    cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-    cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-    opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    /*background: #fff; declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-    padding: 0 0 0 20px;
-    /*background: url(images/loading.gif) no-repeat 0 50%;*/
-}

+ 0 - 99
main/css/steel_grey/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 0 - 99
main/css/tasty_olive/jquery.tabs.css

@@ -1,99 +0,0 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-.tabs-hide {
-	display: none;
-}
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-.tabs-nav {
-	display: none;
-}
-}
-/* Skin */
-.tabs-nav {
-	list-style: none;
-	margin: 0;
-	padding: 0 0 0 4px;
-    background:#ffffff;
-    border-bottom:1px dotted #ffffff;
-    border-top:1px dotted #ffffff;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-	display: block;
-	clear: both;
-	content: " ";
-}
-.tabs-nav li {
-	float: left;
-	margin: 0 0 0 1px;
-	min-width: 84px; /* be nice to Opera */
-}
-.tabs-nav a, .tabs-nav a span {
-	display: block;
-	padding: 0 10px;
-	background: url(images/tab.png) no-repeat;
-}
-.tabs-nav a {
-	position: relative;
-	top: 1px;
-	z-index: 2;
-	padding-left: 0;
-	color: #fff;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 2;
-	text-align: center;
-	text-decoration: none;
-	white-space: nowrap; /* required in IE 6 */
-}
-.tabs-nav .tabs-selected a {
-	color: #fff;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-	background-position: 100% -150px;
-	outline: 0; /* prevent dotted border in Firefox */
-}
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-	background-position: 100% -100px;
-}
-.tabs-nav a span {
-	width: 64px; /* IE 6 treats width as min-width */
-	min-width: 64px;
-	height: 18px; /* IE 6 treats height as min-height */
-	min-height: 18px;
-	padding-top: 6px;
-	padding-right: 0;
-}
-*>.tabs-nav a span { /* hide from IE 6 */
-	width: auto;
-	height: auto;
-}
-.tabs-nav .tabs-selected a span {
-	padding-top: 7px;
-}
-.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span {
-	background-position: 0 -50px;
-}
-.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span {
-	background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited, .tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-	cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-	cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-	opacity: .4;
-}
-.tabs-container {
-	border-top: 1px solid #97a5b0;
-	padding: 1em 8px;
-	background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-.tabs-loading em {
-	padding: 0 0 0 20px;
-	background: url(images/loading.gif) no-repeat 0 50%;
-}

+ 17 - 20
main/document/document.php

@@ -751,8 +751,9 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && isse
 
 
 /*	GET ALL DOCUMENT DATA FOR CURDIRPATH */
-if(isset($_GET['keyword']) && !empty($_GET['keyword'])){
+if(isset($_GET['keyword']) && !empty($_GET['keyword'])) {
     $docs_and_folders = DocumentManager::get_all_document_data($_course, $curdirpath, $to_group_id, null, $is_allowed_to_edit || $group_member_with_upload_rights, $search=true);
+    
 }else{
     $docs_and_folders = DocumentManager::get_all_document_data($_course, $curdirpath, $to_group_id, null, $is_allowed_to_edit || $group_member_with_upload_rights, $search=false);
 }
@@ -803,43 +804,43 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
     $sortable_data = array();
 
     //while (list($key, $id) = each($docs_and_folders)) {
-    foreach($docs_and_folders as $key=>$id) {
+    foreach ($docs_and_folders as $key=>$id) {
         $row = array();
 
         // If the item is invisible, wrap it in a span with class invisible
-        $invisibility_span_open = ($id['visibility'] == 0) ? '<span class="invisible">' : '';
+        $invisibility_span_open  = ($id['visibility'] == 0) ? '<span class="invisible">' : '';
         $invisibility_span_close = ($id['visibility'] == 0) ? '</span>' : '';
         // Size (or total size of a directory)
         $size = $id['filetype'] == 'folder' ? get_total_folder_size($id['path'], $is_allowed_to_edit) : $id['size'];
-        /*
+        
         // Get the title or the basename depending on what we're using
         if ($use_document_title == 'true' && $id['title'] != '') {
             $document_name = $id['title'];
         } else {
             $document_name = basename($id['path']);
-        }*/
+        }
         // Data for checkbox
         if (($is_allowed_to_edit || $group_member_with_upload_rights) && count($docs_and_folders) > 1) {
             $row[] = $id['path'];
         }
 
         // Hide HotPotatoes Certificates and all css folders
-        if($id['path']=='/HotPotatoes_files' || $id['path']=='/certificates' || basename($id['path'])=='css'){
+        if ($id['path']=='/HotPotatoes_files' || $id['path']=='/certificates' || basename($id['path'])=='css'){
             continue;
         }
 
         //Admin setting for Hide/Show the folders of all users
-        if(api_get_setting('show_users_folders') == 'false' && ($id['path']=='/shared_folder' || strstr($id['path'], 'shared_folder_session_'))){
+        if (api_get_setting('show_users_folders') == 'false' && ($id['path']=='/shared_folder' || strstr($id['path'], 'shared_folder_session_'))){
             continue;
         }
 
         //Admin setting for Hide/Show Default folders to all users
-        if(api_get_setting('show_default_folders') == 'false' && ($id['path']=='/images' || $id['path']=='/flash' || $id['path']=='/audio' || $id['path']=='/video')){
+        if (api_get_setting('show_default_folders') == 'false' && ($id['path']=='/images' || $id['path']=='/flash' || $id['path']=='/audio' || $id['path']=='/video')){
             continue;
         }
 
         //Admin setting for Hide/Show chat history folder
-        if(api_get_setting('show_chat_folder') == 'false' && $id['path']=='/chat_files'){
+        if (api_get_setting('show_chat_folder') == 'false' && $id['path']=='/chat_files'){
             continue;
         }
 
@@ -889,8 +890,8 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
         $row[] = $last_edit_date;
         $row[] = $size;
         $total_size = $total_size + $size;
-        //@todo wtf is that?
-        if ((isset ($_GET['keyword']) && search_keyword($document_name, $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
+
+        if ((isset($_GET['keyword']) && search_keyword($document_name, $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {            
             $sortable_data[] = $row;
         }
     }
@@ -914,15 +915,13 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
         <?php
 
         // Create new draw
-        if (api_get_setting('enabled_support_svg') == 'true'){
-
-
-            if (api_browser_support('svg')){
+        if (api_get_setting('enabled_support_svg') == 'true') {
+            if (api_browser_support('svg')) {
             ?>
                 <a href="create_draw.php?<?php echo api_get_cidreq(); ?>&amp;dir=<?php echo $curdirpathurl.$req_gid; ?>">
-                    <?php Display::display_icon('new_draw.png', get_lang('Draw'),'','32'); ?></a>&nbsp;
+            <?php Display::display_icon('new_draw.png', get_lang('Draw'),'','32'); ?></a>&nbsp;
             <?php
-            }else{
+            } else {
                 Display::display_icon('new_draw_na.png', get_lang('BrowserDontSupportsSVG'),'','32');
             }
         }
@@ -957,8 +956,7 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
 	<a href="upload.php?<?php echo api_get_cidreq(); ?>&amp;curdirpath=<?php echo $curdirpathurl.$req_gid; ?>">
         <?php Display::display_icon('upload_certificate.png', get_lang('UploadCertificate'),'','32'); ?></a>
 <?php
-	}
-	else{
+	} else {
 ?>
     <a href="upload.php?<?php echo api_get_cidreq(); ?>&amp;curdirpath=<?php echo $curdirpathurl.$req_gid; ?>">
         <?php Display::display_icon('upload_file.png', get_lang('UplUploadDocument'),'','32'); ?></a>
@@ -983,7 +981,6 @@ if (!is_null($docs_and_folders)) {
         if (is_my_shared_folder(api_get_user_id(), $curdirpath, $current_session_id) && $curdirpath!='/' || api_is_allowed_to_edit() || api_is_platform_admin()) {
             echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=downloadfolder&amp;path='.$curdirpathurl.'">'.Display::return_icon('save_pack.png', get_lang('Save').' (ZIP)','','32').'</a>';
         }
-
     }
 }
 

+ 25 - 10
main/exercice/exercice.php

@@ -781,6 +781,23 @@ if ($show == 'test') {
                       
                 // Teacher only
                 if ($is_allowedToEdit) {
+                    
+                
+                    
+                    $show_quiz_edition = true;
+                
+                    $table_lp_item    = Database::get_course_table(TABLE_LP_ITEM);
+                    $sql="SELECT max_score FROM $table_lp_item
+                          WHERE item_type = '".TOOL_QUIZ."' AND path ='".Database::escape_string($row['id'])."'";
+                    $result = Database::query($sql);
+                    if (Database::num_rows($result) > 0) {
+                        $show_quiz_edition = false;
+                    }
+                    
+                    $lp_blocked = '';
+                    if (!$show_quiz_edition) {
+                        $lp_blocked = Display::tag('font', '<i>'.get_lang('AddedToALP').'</i>', array('style'=>'color:grey'));
+                    }                    
                                     
                     //Showing exercise title
                     $row['title']= text_filter($row['title']);
@@ -789,15 +806,16 @@ if ($show == 'test') {
                     if ($session_id == $row['session_id']) {
                         //Settings                                                                
                         //echo Display::url(Display::return_icon('settings.png',get_lang('Edit'), array('width'=>'22px'))." ".get_lang('Edit'), 'exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$row['id']);
-                    }                                  
+                    }       
+                                               
                     //echo '<p>';
                     //echo $session_img;
                     if ($row['active'] == 0) {
-                        $title = Display::tag('font', $row['title'],array('style'=>'color:grey'));
+                        $title = Display::tag('font', $row['title'], array('style'=>'color:grey'));
                     } else {
                         $title = $row['title'];
                     }
-                    $url = '<a href="exercice_submit.php?'.api_get_cidreq().$myorigin.$mylpid.$myllpitemid.'&exerciseId='.$row['id'].'"><img src="../img/quiz.gif" alt="HotPotatoes" /> '.$title.'</a>';                    
+                    $url = '<a href="exercice_submit.php?'.api_get_cidreq().$myorigin.$mylpid.$myllpitemid.'&exerciseId='.$row['id'].'"><img src="../img/quiz.gif" /> '.$title.' </a>'.$lp_blocked;                    
                     $item =  Display::tag('td', $url.' '.$session_img);  
                     $exid = $row['id'];
     
@@ -852,13 +870,10 @@ if ($show == 'test') {
                     //$item .=  Display::tag('td',$attempts);
                     $item .=  Display::tag('td', $number_of_questions);
                         
-                } else {
-                     
+                } else {                     
                     // --- Student only
+                    $row['title'] = text_filter($row['title']);    
                     
-                    
-                    $row['title'] = text_filter($row['title']);                 
-    
                     // if time is actived show link to exercise
                     if ($time_limits) {                 
                         if ($is_actived_time) {
@@ -874,7 +889,7 @@ if ($show == 'test') {
                     $item =  Display::tag('td',$url.' '.$session_img);  
                            
                     //count number exercise questions
-                    $sqlquery   = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = '" . $row['id'] . "'";
+                    $sqlquery   = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION WHERE exercice_id = ".$row['id'];
                     $sqlresult  = Database::query($sqlquery);
                     $rowi       = Database::result($sqlresult, 0);
                     
@@ -887,7 +902,7 @@ if ($show == 'test') {
                                         
                     //This query might be improved later on by ordering by the new "tms" field rather than by exe_id
                     $qry = "SELECT * FROM $TBL_TRACK_EXERCICES
-                            WHERE exe_exo_id = '" . $row['id'] . "' and exe_user_id = '" . api_get_user_id() . "' AND exe_cours_id = '" . api_get_course_id() . "' AND status <>'incomplete' AND orig_lp_id = 0 AND orig_lp_item_id = 0 AND session_id =  '" . api_get_session_id() . "'
+                            WHERE exe_exo_id = ".$row['id']." AND exe_user_id = " . api_get_user_id() . " AND exe_cours_id = '" . api_get_course_id() . "' AND status <>'incomplete' AND orig_lp_id = 0 AND orig_lp_item_id = 0 AND session_id =  '" . api_get_session_id() . "'
                             ORDER BY exe_id DESC";
                     $qryres = Database::query($qry);
                     $num    = Database :: num_rows($qryres);

+ 51 - 60
main/exercice/mark_free_answer.php

@@ -103,70 +103,61 @@ $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices')
 
 $my_msg = 'No change.';
 
-if($action == 'mark'){
-	if (!empty($_POST['score']) AND $_POST['score'] < $obj_question->selectWeighting() AND $_POST['score'] >= 0){
-
+if ($action == 'mark') {
+	if (!empty($_POST['score']) AND $_POST['score'] < $obj_question->selectWeighting() AND $_POST['score'] >= 0) {
 		//mark the user mark into the database using something similar to the following function:
-		global $_configuration;
-
-		if($_configuration['tracking_enabled'])
-		{
-			$exercise_table = Database::get_statistic_table('track_e_exercices');
-			#$tbl_learnpath_user = Database::get_course_table('learnpath_user');
-			#global $origin, $tbl_learnpath_user, $learnpath_id, $learnpath_item_id;
-			$sql = "SELECT * FROM $exercise_table
-				WHERE exe_user_id = '".Database::escape_string($my_usr)."' AND exe_cours_id = '".Database::escape_string($my_cid)."' AND exe_exo_id = '".Database::escape_string($my_exe)."'
-				ORDER BY exe_date DESC";
+
+		$exercise_table = Database::get_statistic_table('track_e_exercices');
+		#$tbl_learnpath_user = Database::get_course_table('learnpath_user');
+		#global $origin, $tbl_learnpath_user, $learnpath_id, $learnpath_item_id;
+		$sql = "SELECT * FROM $exercise_table
+			WHERE exe_user_id = '".Database::escape_string($my_usr)."' AND exe_cours_id = '".Database::escape_string($my_cid)."' AND exe_exo_id = '".Database::escape_string($my_exe)."'
+			ORDER BY exe_date DESC";
+		#echo $sql;
+		$res = Database::query($sql);
+		if(Database::num_rows($res)>0){
+			$row = Database::fetch_array($res);
+			//@todo Check that just summing past score and the new free answer mark doesn't come up
+			// with a score higher than the possible score for that exercise
+			$my_score = $row['exe_result'] + $_POST['score'];
+			$sql = "UPDATE $exercise_table SET exe_result = '$my_score'
+				WHERE exe_id = '".$row['exe_id']."'";
 			#echo $sql;
 			$res = Database::query($sql);
-			if(Database::num_rows($res)>0){
-				$row = Database::fetch_array($res);
-				//@todo Check that just summing past score and the new free answer mark doesn't come up
-				// with a score higher than the possible score for that exercise
-				$my_score = $row['exe_result'] + $_POST['score'];
-				$sql = "UPDATE $exercise_table SET exe_result = '$my_score'
-					WHERE exe_id = '".$row['exe_id']."'";
-				#echo $sql;
-				$res = Database::query($sql);
-				$my_msg = get_lang('MarkIsUpdated');
-			}else{
-				$my_score = $_POST['score'];
-				$reallyNow = time();
-				$sql = "INSERT INTO $exercise_table
-						  (
-						   exe_user_id,
-						   exe_cours_id,
-						   exe_exo_id,
-						   exe_result,
-						   exe_weighting,
-						   exe_date
-						  )
-
-						  VALUES
-						  (
-						   '".Database::escape_string($my_usr)."',
-						   '".Database::escape_string($my_cid)."',
-						   '".Database::escape_string($my_exe)."',
-						   '".Database::escape_string($my_score)."',
-						   '".Database::escape_string($obj_question->selectWeighting())."',
-						   FROM_UNIXTIME(".$reallyNow.")
-						  )";
-				#if ($origin == 'learnpath')
-				#{
-				#	if ($user_id == "NULL")
-				#	{
-				#		$user_id = '0';
-				#	}
-				#	$sql2 = "update $tbl_learnpath_user set score='$score' where (user_id=$user_id and learnpath_id='$learnpath_id' and learnpath_item_id='$learnpath_item_id')";
-				#	$res2 = Database::query($sql2);
-				#}
-				$res = Database::query($sql);
-				$my_msg = get_lang('MarkInserted');
-			}
-			//Database::query($sql);
-			//return 0;
+			$my_msg = get_lang('MarkIsUpdated');
+		}else{
+			$my_score = $_POST['score'];
+			$reallyNow = time();
+			$sql = "INSERT INTO $exercise_table (
+					   exe_user_id,
+					   exe_cours_id,
+					   exe_exo_id,
+					   exe_result,
+					   exe_weighting,
+					   exe_date
+					  ) VALUES (
+					   '".Database::escape_string($my_usr)."',
+					   '".Database::escape_string($my_cid)."',
+					   '".Database::escape_string($my_exe)."',
+					   '".Database::escape_string($my_score)."',
+					   '".Database::escape_string($obj_question->selectWeighting())."',
+					   FROM_UNIXTIME(".$reallyNow.")
+					  )";
+			#if ($origin == 'learnpath')
+			#{
+			#	if ($user_id == "NULL")
+			#	{
+			#		$user_id = '0';
+			#	}
+			#	$sql2 = "update $tbl_learnpath_user set score='$score' where (user_id=$user_id and learnpath_id='$learnpath_id' and learnpath_item_id='$learnpath_item_id')";
+			#	$res2 = Database::query($sql2);
+			#}
+			$res = Database::query($sql);
+			$my_msg = get_lang('MarkInserted');
 		}
-	}else{
+		//Database::query($sql);
+		//return 0;		
+	} else {
 		$my_msg .= get_lang('TotalScoreTooBig');
 	}
 }

+ 1 - 6
main/exercice/savescores.php

@@ -50,18 +50,13 @@ $jscript2run = '';
  * @return	void
  */
 function save_scores($file, $score) {
-	global $_configuration, $origin,
-		$_user, $_cid,
+	global $origin, $_user, $_cid,
 		$TABLETRACK_HOTPOTATOES;
 	// if tracking is disabled record nothing
 	$weighting = 100; // 100%
 	$reallyNow = time();
 	$date = date("Y-m-d H:i:s", $reallyNow);
 
-	if (!$_configuration['tracking_enabled']) {
-		return 0;
-	}
-
 	if ($_user['user_id']) {
 		$user_id = $_user['user_id'];
 	} else {

+ 0 - 3
main/gradebook/gradebook_flatview.php

@@ -230,9 +230,6 @@ if (!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report
 
 		require_once 'gradebook_result.class.php';
 		$printable_data = get_printable_data($users, $alleval, $alllinks);
-
-		//exit;
-
 		switch($_POST['export_format']) {
 			case 'xls':
 				$export = new GradeBookResult();

+ 1 - 2
main/gradebook/gradebook_result.class.php

@@ -3,9 +3,8 @@
 /**
 *	ExerciseResult class: This class allows to instantiate an object of type ExerciseResult
 *	which allows you to export exercises results in multiple presentation forms
-*	@package dokeos.exercise
+*	@package chamilo.gradebook
 * 	@author Yannick Warnier
-* 	@version $Id: $
 */
 
 

+ 1 - 0
main/gradebook/lib/be.inc.php

@@ -3,6 +3,7 @@
 // include this file to have access to all backend classes
 // @author Bert Steppé
 require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
+define ('LIMIT', 1000);
 require_once 'be/gradebookitem.class.php';
 require_once 'be/category.class.php';
 require_once 'be/evaluation.class.php';

+ 1 - 2
main/gradebook/lib/be/studentpublicationlink.class.php

@@ -101,9 +101,8 @@ class StudentPublicationLink extends AbstractLink
 
 		$sql = "SELECT id,url FROM $tbl_grade_links WHERE has_properties != '' AND filetype='folder' AND session_id = ".api_get_session_id()."";
 		$result = Database::query($sql);
-
 		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['url']);
+			$cats[] = array ($data['id'], basename($data['url']));
 		}
 		$cats=isset($cats) ? $cats : array();
 		return $cats;

+ 11 - 18
main/gradebook/lib/fe/flatviewtable.class.php

@@ -3,13 +3,12 @@
 require_once dirname(__FILE__).'/../../../inc/global.inc.php';
 require_once dirname(__FILE__).'/../be.inc.php';
 set_time_limit(0);
-define ('LIMIT',10);
 
 /**
  * Table to display flat view (all evaluations and links for all students)
  * @author Stijn Konings
- * @author Bert Steppé (refactored, optimised)
- * @author Julio Montoya Armas Gradebook Graphics
+ * @author Bert Steppé  - (refactored, optimised)
+ * @author Julio Montoya Armas - Gradebook Graphics
  */
 class FlatViewTable extends SortableTable
 {
@@ -400,45 +399,39 @@ class FlatViewTable extends SortableTable
 		}
 		if ($this->limit_enabled && $totalitems > LIMIT) {
 	      	$calcprevious = LIMIT;
-			$header .= '<div class="normal-message">'
-						.'<table style="width: 100%; text-align: left; margin-left: auto; margin-right: auto;" border="0" cellpadding="2">'
+			$header .= '<table style="width: 100%; text-align: right; margin-left: auto; margin-right: auto;" border="0" cellpadding="2">'
 						.'<tbody>'
 						.'<tr>';
 
 			// previous X
-	      	$header .= '<td style="width:40%;">';
+	      	$header .= '<td style="width:100%;">';
 	      	if ($this->offset >= LIMIT) {
 	      		$header .= '<a href="'.api_get_self()
 	      							.'?selectcat='.Security::remove_XSS($_GET['selectcat'])
 	      							.'&offset='.(($this->offset)-LIMIT)
 									.(isset($_GET['search'])?'&search='.Security::remove_XSS($_GET['search']):'').'">'
-	      					.'<img src="../img/lp_leftarrow.gif" alt="'.get_lang('Previous').'/" />'
-	      					.get_lang('Previous').' '.$calcprevious . ' ' . get_lang('Evaluations')
+	      					.Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)	      					
 	      					.'</a>';
 	      	} else {
-	      		$header .= '<img src="../img/lp_leftarrow.gif" alt="'.get_lang('Previous').' ' . get_lang('Evaluations').'/" />'.get_lang('Previous').' ' . get_lang('Evaluations');
+	      		$header .= Display::return_icon('action_prev_na.png', get_lang('PreviousPage'), array(), 32);
 	      	}
-	      	$header .= '</td>';
-	      	// 'glue'
-	      	$header .= '<td style="width:20%;"></td>';
+	      	$header .= ' ';
 			// next X
 	      	$calcnext = (($this->offset+(2*LIMIT)) > $totalitems) ?
 	      					($totalitems-(LIMIT+$this->offset)) : LIMIT;
-      		$header .= '<td style="text-align: right; width: 40%;">';
+      		
       		if ($calcnext > 0) {
 	      		$header .= '<a href="'.api_get_self()
 	      							.'?selectcat='.Security::remove_XSS($_GET['selectcat'])
 	      							.'&offset='.($this->offset+LIMIT)
 	      							.(isset($_GET['search'])?'&search='.Security::remove_XSS($_GET['search']):'').'">'
-	      					.get_lang('Next').' '.$calcnext . ' '.get_lang('Evaluations')
-	      					.'<img src="../img/lp_rightarrow.gif" alt="'.get_lang('Next').'/" />'
+	      					.Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
 	      					.'</a>';
       		} else {
-  				$header .= get_lang('Next').' '.get_lang('Evaluations').'<img src="../img/lp_rightarrow.gif" alt="'.get_lang('Next').'/" />';
-
+      		    $header .= Display::return_icon('action_next_na.png', get_lang('NextPage'), array(), 32);
       		}
       		$header .= '</td>';
-	      	$header .= '</tr></tbody></table></div>';
+	      	$header .= '</tbody></table>';
 			echo $header;
 		}
 

+ 5 - 5
main/gradebook/lib/gradebook_functions.inc.php

@@ -334,13 +334,13 @@ function get_table_type_course($type,$course) {
 	return Database::get_course_table($table_evaluated[$type][0],$_configuration['db_prefix'].$course);
 }
 
-function get_printable_data($users,$alleval, $alllinks) {
+function get_printable_data($users, $alleval, $alllinks) {
 	$datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
 	$offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
-	$offset = intval($offset);
-	$count = (($offset + 10) > $datagen->get_total_items_count()) ? ($datagen->get_total_items_count() - $offset) : 10;
-	$header_names = $datagen->get_header_names($offset, $count, true);
-	$data_array = $datagen->get_data(FlatViewDataGenerator :: FVDG_SORT_LASTNAME, 0, null, $offset, $count, true,true);
+	$offset = intval($offset);	
+	$count = (($offset + 10) > $datagen->get_total_items_count()) ? ($datagen->get_total_items_count() - $offset) : LIMIT;	
+	$header_names = $datagen->get_header_names($offset, $count, true);	
+	$data_array   = $datagen->get_data(FlatViewDataGenerator :: FVDG_SORT_LASTNAME, 0, null, $offset, $count, true,true);
 
 	$newarray = array();
 	foreach ($data_array as $data) {

BIN
main/img/close.png


+ 1 - 1
main/inc/global.inc.php

@@ -517,7 +517,7 @@ $text_dir = api_get_text_direction();
 
 //Update of the logout_date field in the table track_e_login (needed for the calculation of the total connection time)
 
-if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']) && isset($_user)) {
+if (!isset($_SESSION['login_as']) && isset($_user)) {
     // if $_SESSION['login_as'] is set, then the user is an admin logged as the user
 
     $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);

+ 2 - 2
main/inc/lib/course_home.lib.php

@@ -761,9 +761,9 @@ class CourseHome {
                     }                                  
                     echo '<td width="33%">';
                         $image = (substr($item['tool']['image'], 0, strpos($item['tool']['image'], '.'))).'.png';
-                        $image = Display::return_icon($image, $item['name'], array('id'=>'toolimage_'.$item['tool']['id']), 64);
+                        $image = Display::tag('center', Display::return_icon($image, $item['name'], array('id'=>'toolimage_'.$item['tool']['id']), 64));
                         $data .= Display::url($image , $item['url_params']['href'], $item['url_params']);
-                        $data .=Display::div($item['visibility'].$item['extra'].$item['link'], array('class'=>'content'));
+                        $data .= Display::tag('center', Display::div($item['visibility'].$item['extra'].$item['link'], array('class'=>'content')));
                         echo Display::div($data, array('class'=>'big_icon'));
                     echo '</td>';
                     

+ 42 - 57
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_preview.php

@@ -1,58 +1,43 @@
 <?php
-	/**
-	 * ajax preview
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/April/2007
-	 *
-	 */
-	include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
-	echo getRealPath($_GET['path']);
-	if(!empty($_GET['path']) && file_exists($_GET['path']) && is_file($_GET['path']))
-	{
-		
-		include_once(CLASS_MANAGER);
-		$manager = new manager($_GET['path'], false);
-		$fileTypes = $manager->getFileType(basename($_GET['path']));
-		if($fileTypes['preview'])
-		{
-			switch($fileTypes['fileType'])
-			{
-				case "image":
-					$imageInfo = @getimagesize($_GET['path']);
-					if(!empty($imageInfo[0]) && !empty($imageInfo[1]))
-					{
-						$thumInfo = getThumbWidthHeight($imageInfo[0], $imageInfo[1], 400, 135);
-						printf("<img src=\"%s\" width=\"%s\" height=\"%s\" />", getFileUrl($_GET['path']), $thumInfo['width'], $thumInfo['height']);
-													
-					}else 
-					{
-						echo PREVIEW_IMAGE_LOAD_FAILED;
-					}
-
-					break;
-				case "txt":
-					if(($fp = @fopen($_GET['path'], 'r')))
-					{
-						echo @fread($fp, @filesize($_GET['path']));
-						@fclose($fp);
-					}else 
-					{
-						echo PREVIEW_OPEN_FAILED . ".";
-					}
-					break;
-					
-				case "video":
-					break;
-			}
-		}else 
-		{
-			echo PREVIEW_NOT_PREVIEW . "..";
-		}		
-			
-	}else 
-	{
-		echo PREVIEW_NOT_PREVIEW . "...";
-	}
-
-?>
+/**
+ * AJAX preview
+ * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+ * @author Julio Montoya - adding support for chamilo
+ * @link www.phpletter.com
+ * @since 22/April/2007
+ *
+ */
+include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php";	
+api_block_anonymous_users();	
+if (!empty($_GET['path']) && file_exists($_GET['path']) && is_file($_GET['path'])) {		
+	include_once(CLASS_MANAGER);
+	$manager = new manager($_GET['path'], false);
+	$fileTypes = $manager->getFileType(basename($_GET['path']));
+	if ($fileTypes['preview']) {
+		switch($fileTypes['fileType']) {
+			case "image":
+				$imageInfo = @getimagesize($_GET['path']);
+				if(!empty($imageInfo[0]) && !empty($imageInfo[1])) {
+					$thumInfo = getThumbWidthHeight($imageInfo[0], $imageInfo[1], 400, 135);
+					printf("<img src=\"%s\" width=\"%s\" height=\"%s\" />", getFileUrl($_GET['path']), $thumInfo['width'], $thumInfo['height']);													
+				} else {
+					echo PREVIEW_IMAGE_LOAD_FAILED;
+				}
+				break;
+			case "txt":
+				if(($fp = @fopen($_GET['path'], 'r'))) {
+					echo @fread($fp, @filesize($_GET['path']));
+					@fclose($fp);
+				} else {
+					echo PREVIEW_OPEN_FAILED . ".";
+				}
+				break;					
+			case "video":
+				break;
+		}
+	} else {
+		echo PREVIEW_NOT_PREVIEW . "..";
+	}				
+} else {
+	echo PREVIEW_NOT_PREVIEW . "...";
+}

+ 6 - 7
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php

@@ -135,8 +135,8 @@
 	var counts = {'new_file':1};
 	var thickbox = {'width':'<?php echo CONFIG_THICKBOX_MAX_WIDTH; ?>', 
 									'height':'<?php echo CONFIG_THICKBOX_MAX_HEIGHT; ?>',
-									'next':'<img src="theme/default/images/next.gif" title="<?php echo THICKBOX_NEXT; ?>" style="float:right;">',
-									'previous':'<img src="theme/default/images/prev.gif" title="<?php echo THICKBOX_PREVIOUS; ?>" style="float:left">',
+									'next':'<img src="theme/default/images/next.png" title="<?php echo THICKBOX_NEXT; ?>" style="float:right;">',
+									'previous':'<img src="theme/default/images/prev.png" title="<?php echo THICKBOX_PREVIOUS; ?>" style="float:left">',
 									'close':'<img src="theme/default/images/flagno.png"title="<?php echo THICKBOX_CLOSE; ?>"><?php echo THICKBOX_CLOSE; ?>' 
 		
 	};
@@ -348,11 +348,10 @@ $(document).ready(
 					);
 				</script>
 				<?php
-			}else 
-			{
+			} else {
 				include_once(CONFIG_URL_LIST_LISTING);
 			}
-	      	 ?>
+	      	?>
       </div> 
       
       <div id="leftCol">
@@ -747,13 +746,13 @@ $(document).ready(
   </div>
   <div id="contextMenu" style="display:none">
   	<ul>
-  		<li><a href="#" class="contentMenuItem" id="menuSelect"><?php echo MENU_SELECT; ?></a></li>
+  		<li><a href="#" class="contentMenuItem"  id="menuSelect"><?php echo MENU_SELECT; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuPreview"><?php echo MENU_PREVIEW; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuDownload"><?php echo MENU_DOWNLOAD; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuRename"><?php echo MENU_RENAME; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuEdit"><?php echo MENU_EDIT; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuCut"><?php echo MENU_CUT; ?></a></li>
-  		<li><a href="#" class="contentMenuItem" id="menuCopy"><?php echo MENU_COPY; ?></a></li>
+  		<li><a href="#" class="contentMenuItem"  id="menuCopy"><?php echo MENU_COPY; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuPaste"><?php echo MENU_PASTE; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuDelete"><?php echo MENU_DELETE; ?></a></li>
   		<li><a href="#" class="contentMenuItem"  id="menuPlay"><?php echo MENU_PLAY; ?></a></li>

BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/next.gif


BIN
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/prev.gif


+ 0 - 29
main/inc/lib/javascript/META.json

@@ -1,29 +0,0 @@
-{
-	"name": "jQuery-Tabs",
-	"version": 2.7,
-	"author": [
-		"Klaus Hartl <klaus.hartl@stilbuero.de>"
-	],
-	"abstract": "jQuery plugin for accessible, unobtrusive tabs.",
-	"license": "mit, gpl",
-	"distribution_type": "plugin",
-	"requires": {
-		"jQuery": ">= 1.0.3, < 1.2"
-	},
-	"provides": {
-		"jQuery.Tabs": {
-			"version": 2.7,
-			"file": "jquery.tabs.js"
-		}
-	},
-	"keywords": [
-		"tabs",
-		"widget"
-	],
-	"stability": "Official",
-	"meta-spec": {
-		"version": 1.3,
-		"url": "http://module-build.sourceforge.net/META-spec-v1.3.html"
-	},
-	"generated_by": "Yehuda Katz"
-}

BIN
main/inc/lib/javascript/tab.png


+ 46 - 29
main/inc/lib/javascript/thickbox.css

@@ -31,47 +31,63 @@
 }
 .TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
 .TB_overlayBG {
-  background-color:#ccc;
-  filter:alpha(opacity=55);
-  -moz-opacity: 0.55;
-  opacity: 0.55;
+  background-color:#fff;
+  filter:alpha(opacity=45);
+  -moz-opacity: 0.45;
+  opacity: 0.45;
 }
 * html #TB_overlay { /* ie6 hack */
      position: absolute;
      height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
 }
 #TB_window {
-  position: fixed;
-  background: #ffffff;
-  z-index: 102;
-  color:#000000;
-  display:none;
-  border: 4px solid #525252;
-  text-align:left;
-  top:50%;
-  left:50%;
+	position: fixed;	
+	z-index: 102;
+	color:#000000;
+	display:none;	
+	text-align:left;  
+    background-color: #34393A;
+			
+	box-shadow:0 0 90px 5px #000;
+    -moz-box-shadow:0 0 90px 5px #000;
+    -webkit-box-shadow: 0 0 90px #000;  
+	
+	top:50%;
+	left:50%;
+	
+	-webkit-border-radius: 8px;
+    -opera-border-radius: 8px;
+    -moz-border-radius: 8px;
+    border-radius: 8px;
+	
 }
 * html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+	position: absolute;
+	margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
 }
 #TB_window img#TB_Image {
   display:block;
   margin: 15px 0 0 15px;
-  border-right: 1px solid #ccc;
+  /* border-right: 1px solid #ccc;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #666;
-  border-left: 1px solid #666;
+  border-left: 1px solid #666;*/
 }
 #TB_caption{
-  height:25px;
-  padding:7px 30px 10px 25px;
-  float:left;
+    height:25px;
+    padding:7px 30px 10px 25px;
+    float:left;
 }
 #TB_closeWindow{
-  height:25px;
-  padding:11px 25px 10px 0;
-  float:right;
+  
+
+  
+      height: 29px;
+    padding: 8px 10px 10px 0;
+    position: absolute;
+    right: -28px;
+    top: -28px;
+	
 }
 #TB_closeAjaxWindow{
   padding:7px 10px 5px 0;
@@ -88,12 +104,13 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d
   background-color:#e8e8e8;
   height:27px;
 }
-#TB_ajaxContent{
-  clear:both;
-  padding:2px 15px 15px 15px;
-  overflow:auto;
-  text-align:left;
-  line-height:1.4em;
+#TB_ajaxContent {
+	clear:both;
+	padding:2px 15px 15px 15px;
+	overflow:auto;
+	text-align:left;
+	line-height:1.4em;
+	background-color: #ccc;
 }
 #TB_ajaxContent.TB_modal{
   padding:15px;

+ 12 - 6
main/inc/lib/javascript/thickbox.js

@@ -12,6 +12,8 @@ var src=src[src.length-1].getAttribute('src');
 var src=src.substr(0,src.length-30);
 var tb_pathToImage = src+"img/loadingAnimation.gif";
 
+var close_image = src+"img/close.png";
+
 /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
 
 //on page load call tb_init
@@ -39,8 +41,8 @@ function tb_init(domChunk){
 	});
 }
 
-function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
-
+function tb_show(caption, url, imageGroup) {
+	//function called when the user clicks on a thickbox link
 	try {
 		if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
 			$("body","html").css({height: "100%", width: "100%"});
@@ -136,7 +138,11 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 
 			TB_WIDTH = imageWidth + 30;
 			TB_HEIGHT = imageHeight + 60;
-			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>X</a> / Esc</div>");
+			$("#TB_window").append("<div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton'><img src='"+close_image+"'/></a></div>");
+			
+			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>"); 
+			$("#TB_window").append("<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div>")
+			
 
 			$("#TB_closeWindowButton").click(tb_remove);
 
@@ -204,15 +210,15 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 					urlNoQuery = url.split('TB_');
 					$("#TB_iframeContent").remove();
 					if(params['modal'] != "true"){//iframe no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>X</a> / Esc</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
+						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'><img src='"+close_image+"'/></a></a></div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
 					}else{//iframe modal
 					$("#TB_overlay").unbind();
 						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
 					}
-			}else{// not an iframe, ajax
+			} else {// not an iframe, ajax
 					if($("#TB_window").css("display") != "block"){
 						if(params['modal'] != "true"){//ajax no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>X</a> / Esc</div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
+						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><img src='"+close_image+"'/></a></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
 						}else{//ajax modal
 						$("#TB_overlay").unbind();
 						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");

+ 6 - 3
main/inc/lib/sessionmanager.lib.php

@@ -302,16 +302,18 @@ class SessionManager {
 		$tbl_session_rel_course_rel_user=	Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 		$tbl_session_rel_user=				Database::get_main_table(TABLE_MAIN_SESSION_USER);
 		$tbl_user = 						Database::get_main_table(TABLE_MAIN_USER);
+		$tbl_url_session                  = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+		
 		global $_user;
 		if(is_array($id_checked)) {
-			$id_checked=Database::escape_string(implode(',',$id_checked));
+			$id_checked = Database::escape_string(implode(',',$id_checked));
 		} else {
-			$id_checked=intval($id_checked);
+			$id_checked = intval($id_checked);
 		}
 
 		if (!api_is_platform_admin() && !$from_ws) {
 			$sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_checked;
-			$rs = Database::query($sql);
+			$rs  = Database::query($sql);
 			if (Database::result($rs,0,0)!=$_user['user_id']) {
 				api_not_allowed(true);
 			}
@@ -320,6 +322,7 @@ class SessionManager {
 		Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session IN($id_checked)");
 		Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session IN($id_checked)");
 		Database::query("DELETE FROM $tbl_session_rel_user WHERE id_session IN($id_checked)");
+		Database::query("DELETE FROM $tbl_url_session WHERE session_id IN($id_checked)");
 
 		// delete extra session fields
 		$t_sf 		= Database::get_main_table(TABLE_MAIN_SESSION_FIELD);

+ 12 - 0
main/inc/lib/urlmanager.lib.php

@@ -603,6 +603,18 @@ class UrlManager
 		$url_list = Database::store_result($result);
 		return $url_list;
 	}
+	
+   public static function get_access_url_from_session($session_id) {
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url  = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $sql = "SELECT url, access_url_id FROM $table_url_rel_session url_rel_session INNER JOIN $table_url u
+                ON (url_rel_session.access_url_id = u.id)
+                WHERE session_id = ".Database::escape_string($session_id);
+        $result = Database::query($sql);
+        $url_list = Database::store_result($result);
+        return $url_list;
+    }
+    
 
 	/**
 	 *

+ 17 - 26
main/inc/lib/usermanager.lib.php

@@ -1994,23 +1994,23 @@ class UserManager
 	 * @param integer $user_id
 	 * @return array  list of statuses (session_id-course_code => status)
 	 */
-	public static function get_courses_list_by_session ($user_id, $session_id) {
+	public static function get_courses_list_by_session($user_id, $session_id) {
 		// Database Table Definitions
 		$tbl_session 				= Database :: get_main_table(TABLE_MAIN_SESSION);
 		$tbl_session_course 		= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
 		$tbl_session_course_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
-		$user_id = intval($user_id);
+		$user_id    = intval($user_id);
 		$session_id = intval($session_id);
 		//we filter the courses from the URL
 		$join_access_url=$where_access_url='';
 		global $_configuration;
 		if ($_configuration['multiple_access_urls']) {
 			$access_url_id = api_get_current_access_url_id();
-			if($access_url_id!=-1) {
-				$tbl_url_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-				$join_access_url= " ,  $tbl_url_course url_rel_course ";
-				$where_access_url=" AND access_url_id = $access_url_id AND  url_rel_course.course_code = scu.course_code";
+			if ($access_url_id != -1) {
+				$tbl_url_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+				$join_access_url= " ,  $tbl_url_session url_rel_session ";
+				$where_access_url=" AND access_url_id = $access_url_id AND url_rel_session.session_id = $session_id ";
 			}
 		}
 
@@ -2020,37 +2020,28 @@ class UserManager
 		$courses = array();
 
 		// this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not
-		$personal_course_list_sql = "SELECT distinct scu.course_code as code
-									FROM $tbl_session_course_user as scu
-									$join_access_url
-									WHERE scu.id_user = $user_id
-									AND scu.id_session = $session_id
-									$where_access_url
+		$personal_course_list_sql = "SELECT DISTINCT scu.course_code as code FROM $tbl_session_course_user as scu $join_access_url
+									WHERE scu.id_user = $user_id AND scu.id_session = $session_id $where_access_url
 									ORDER BY code";
+	
 		$course_list_sql_result = Database::query($personal_course_list_sql);
 
-		if (Database::num_rows($course_list_sql_result)>0) {
+		if (Database::num_rows($course_list_sql_result) > 0) {
 			while ($result_row = Database::fetch_array($course_list_sql_result)) {
 				$result_row['status'] = 5;
-				if (!in_array($result_row['code'],$courses)) {
+				if (!in_array($result_row['code'], $courses)) {
 					$personal_course_list[] = $result_row;
 					$courses[] = $result_row['code'];
 				}
 			}
-		}
+		}		
 
-		if(api_is_allowed_to_create_course()) {
-			$personal_course_list_sql = "SELECT DISTINCT scu.course_code as code
-										FROM $tbl_session_course_user as scu, $tbl_session as s
-										$join_access_url
-										WHERE s.id = $session_id
-										AND scu.id_session = s.id
-										AND ((scu.id_user=$user_id AND scu.status=2) OR s.id_coach=$user_id)
+		if (api_is_allowed_to_create_course()) {
+			$personal_course_list_sql = "SELECT DISTINCT scu.course_code as code FROM $tbl_session_course_user as scu, $tbl_session as s $join_access_url
+										WHERE s.id = $session_id AND scu.id_session = s.id AND ((scu.id_user=$user_id AND scu.status=2) OR s.id_coach = $user_id)
 										$where_access_url
-										ORDER BY code";
-
-
-				$course_list_sql_result = Database::query($personal_course_list_sql);
+										ORDER BY code";										  
+            $course_list_sql_result = Database::query($personal_course_list_sql);
 
 			if (Database::num_rows($course_list_sql_result)>0) {
 				while ($result_row = Database::fetch_array($course_list_sql_result)) {

+ 11 - 18
main/inc/local.inc.php

@@ -585,22 +585,15 @@ if (isset($uidReset) && $uidReset) {    // session data refresh requested
     {
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
         $admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
-        if ($_configuration['tracking_enabled']) {
-            $sql = "SELECT user.*, a.user_id is_admin, UNIX_TIMESTAMP(login.login_date) login_date
-                     FROM $user_table
-                     LEFT JOIN $admin_table a
-                     ON user.user_id = a.user_id
-                     LEFT JOIN ".$_configuration['statistics_database'].".track_e_login login
-                     ON user.user_id  = login.login_user_id
-                     WHERE user.user_id = '".$_user['user_id']."'
-                     ORDER BY login.login_date DESC LIMIT 1";
-        } else {
-            $sql = "SELECT user.*, a.user_id is_admin
-                    FROM $user_table
-                    LEFT JOIN $admin_table a
-                    ON user.user_id = a.user_id
-                    WHERE user.user_id = '".$_user['user_id']."'";
-        }
+       
+        $sql = "SELECT user.*, a.user_id is_admin, UNIX_TIMESTAMP(login.login_date) login_date
+                 FROM $user_table
+                 LEFT JOIN $admin_table a
+                 ON user.user_id = a.user_id
+                 LEFT JOIN ".$_configuration['statistics_database'].".track_e_login login
+                 ON user.user_id  = login.login_user_id
+                 WHERE user.user_id = '".$_user['user_id']."'
+                 ORDER BY login.login_date DESC LIMIT 1";    
 
         $result = Database::query($sql);
 
@@ -707,7 +700,7 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
                 }
             }
 
-            if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as'])) {
+            if (!isset($_SESSION['login_as'])) {
                 //We add a new record in the course tracking table
                 $course_tracking_table = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
                 $time = api_get_datetime();
@@ -760,7 +753,7 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
             list($_SESSION['session_name']) = Database::fetch_array($rs);
         }
 
-        if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as'])) {
+        if (!isset($_SESSION['login_as'])) {
 
             $course_tracking_table = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
                if (isset($_configuration['session_lifetime'])) {

+ 1 - 1
main/newscorm/lp_ajax_save_item.php

@@ -179,7 +179,7 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
         if ($debug > 1) { error_log('End of save_item()', 0); }
     }
 
-    if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as'])) {
+    if (!isset($_SESSION['login_as'])) {
         // If $_SESSION['login_as'] is set, then the user is an admin logged as the user.
 
         $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);

+ 1 - 1
main/newscorm/lp_comm.server.php

@@ -163,7 +163,7 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
         if ($debug > 1) { error_log('End of xajax_save_item()', 0); }
     }
 
-    if ($_configuration['tracking_enabled'] && !isset($_SESSION['login_as'])) {
+    if (!isset($_SESSION['login_as'])) {
         // If $_SESSION['login_as'] is set, then the user is an admin logged as the user.
 
         $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);

+ 4 - 17
main/tracking/courseLogCSV.php

@@ -72,8 +72,7 @@ $title[0]=get_lang('StatsOfCourse')." : ".$_course['official_code'];
 
 // check if uid is prof of this group
 
-if($is_allowedToTrack && $_configuration['tracking_enabled'])
-{
+if ($is_allowedToTrack) {
     // show all : view must be equal to the sum of all view values (1024+512+...+64)
     // show none : less than the tiniest value
     /*echo "<div>
@@ -463,18 +462,6 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
     echo api_html_entity_decode($title_line, ENT_COMPAT);
     echo api_html_entity_decode($line, ENT_COMPAT);
     exit;
-
-
-}
-// not allowed
-else
-{
-    if(!$_configuration['tracking_enabled'])
-    {
-        echo get_lang('TrackingDisabled');
-    }
-    else
-    {
-        api_not_allowed();
-    }
-}
+} else {
+    api_not_allowed();
+}

+ 2 - 15
main/tracking/course_access_details.php

@@ -58,7 +58,7 @@ $is_allowedToTrack = $is_courseAdmin;
 </h3>
 <table width="100%" cellpadding="2" cellspacing="3" border="0">
 <?php
-    if( $is_allowedToTrack && $_configuration['tracking_enabled'])
+    if ($is_allowedToTrack)
     {
         if( !isset($reqdate) || $reqdate < 0 || $reqdate > 2149372861 )
                 $reqdate = time();
@@ -210,22 +210,9 @@ $is_allowedToTrack = $is_courseAdmin;
     }
     else // not allowed to track
     {
-        if(!$_configuration['tracking_enabled'])
-        {
-            echo get_lang('TrackingDisabled');
-        }
-        else
-        {
             api_not_allowed();
-        }
     }
-
-
-
 ?>
-
 </table>
-
 <?php
-Display::display_footer();
-?>
+Display::display_footer();

+ 1 - 8
main/tracking/logins_details.php

@@ -76,7 +76,7 @@ $is_allowedToTrackEverybodyInCourse = $is_courseAdmin; // allowed to track all s
 <?php
 // check if uid is tutor of this group
 
-if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configuration['tracking_enabled'] )
+if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ))
 {
     if( $is_allowedToTrackEverybodyInCourse )
     {
@@ -246,14 +246,7 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
 // not allowed
 else
 {
-    if(!$_configuration['tracking_enabled'])
-    {
-        echo get_lang('TrackingDisabled');
-    }
-    else
-    {
         api_not_allowed();
-    }
 }
 ?>
 

+ 6 - 18
main/tracking/personnalLog.php

@@ -60,15 +60,10 @@ include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php");
 Display::display_header($nameTools,"Tracking");
 api_display_tool_title($nameTools);
 
-/*
-==============================================================================
-		MAIN SECTION
-==============================================================================
-*/
-if ( $_configuration['tracking_enabled'] )
-{
-        // show all : view must be equal to the sum of all view values (1024+512+...+64)
-        // show none : 0
+/*		MAIN SECTION */
+
+// show all : view must be equal to the sum of all view values (1024+512+...+64)
+// show none : 0
 
         echo "
 <table width=\"100%\" cellpadding=\"2\" cellspacing=\"0\" border=\"0\">
@@ -277,12 +272,5 @@ if ( $_configuration['tracking_enabled'] )
         ";
     }
     */
-    echo "\n</table>";
-}
-else
-{
-    echo get_lang('TrackingDisabled');
-}
-
-Display::display_footer();
-?>
+    echo "</table>";
+Display::display_footer();

+ 3 - 12
main/tracking/toolaccess_details.php

@@ -88,7 +88,7 @@ $reqdate=$_REQUEST['reqdate'];
         $is_allowedToTrack = $is_platformAdmin;
         $courseCodeEqualcidIfNeeded = "";
     }
-    if( $is_allowedToTrack && $_configuration['tracking_enabled'])
+    if( $is_allowedToTrack)
     {
         // list of all tools
         if (!isset($tool))
@@ -268,17 +268,8 @@ $reqdate=$_REQUEST['reqdate'];
                     break;
             }
         }
-    }
-    else // not allowed to track
-    {
-        if(!$_configuration['tracking_enabled'])
-        {
-            echo $langTrackingDisabled;
-        }
-        else
-        {
-            echo get_lang('NotAllowed');
-        }
+    } else { // not allowed to track
+        echo get_lang('NotAllowed');
     }
 echo '</table>';
 // footer

+ 1 - 6
main/tracking/userLog.php

@@ -134,7 +134,7 @@ $is_allowedToTrackEverybodyInCourse = $is_allowedToTrack; // allowed to track al
 <table width="100%" cellpadding="2" cellspacing="3" border="0">
 <?php
 // check if uid is tutor of this group
-if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configuration['tracking_enabled'] ) {
+if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse )) {
     if(!$uInfo && !isset($uInfo) ) {
         /*
         *		Display list of user of this group
@@ -387,12 +387,7 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
     }
 } else {
     // not allowed
-    if(!$_configuration['tracking_enabled'])
-    {
-        echo get_lang('TrackingDisabled');
-    } else {
         api_not_allowed();
-    }
 }
 ?>
 </table>

+ 2 - 9
main/tracking/userlogCSV.php

@@ -122,7 +122,7 @@ $line='';
 $title_line='';
 
 // check if uid is tutor of this group
-if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configuration['tracking_enabled'] )
+if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse))
 {
     if(!$uInfo && !isset($uInfo) )
     {
@@ -366,12 +366,5 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
 // not allowed
 else
 {
-    if(!$_configuration['tracking_enabled'])
-    {
-        echo get_lang('TrackingDisabled');
-    }
-    else
-    {
-        api_not_allowed();
-    }
+    api_not_allowed();
 }

+ 1 - 1
main/user/user.php

@@ -312,7 +312,7 @@ if (isset($message)) {
 //statistics
 event_access_tool(TOOL_USER);
 /*	Setting the permissions for this page */
-$is_allowed_to_track = ($is_courseAdmin || $is_courseTutor) && $_configuration['tracking_enabled'];
+$is_allowed_to_track = ($is_courseAdmin || $is_courseTutor);
 
 
 // Tool introduction

+ 7 - 19
main/user/userInfo.php

@@ -1,4 +1,4 @@
-<?php // $Id: userInfo.php 20951 2009-05-23 19:07:59Z ivantcholakov $
+<?php
 /* For licensing terms, see /license.txt	*/
 
 /**
@@ -56,13 +56,10 @@ if ($tool_info['visibility'] == 1 ) {
 	$interbreadcrumb[] = array ('url' => 'user.php', 'name' => get_lang('Users'));
 } 
 
-if ($origin != 'learnpath')
-{ //so we are not in learnpath tool
+if ($origin != 'learnpath') { //so we are not in learnpath tool
 	Display :: display_header($nameTools, "User");
 	$origin = Security::remove_XSS($_GET['origin']);
-}
-else
-{
+} else {
 ?> <link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CODE_PATH);?>css/default.css" /> <?php
 }
 
@@ -100,22 +97,14 @@ $userIdViewer = $_user['user_id']; // id fo the user currently online
 
 $allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin;
 $allowedToEditDef = api_is_allowed_to_edit(null, true);
-$is_allowedToTrack = api_is_allowed_to_edit(null, true) && $_configuration['tracking_enabled'];
+$is_allowedToTrack = api_is_allowed_to_edit(null, true);
 
 // Library connection
 require_once ("userInfoLib.php");
 
-/*
-==============================================================================
-	   FUNCTIONS
-==============================================================================
-*/
+/* 	   FUNCTIONS */
 
-/*
-==============================================================================
-	   COMMANDS SECTION
-==============================================================================
-*/
+/* 	   COMMANDS SECTION */
 
 $displayMode = "viewContentList";
 $removeDef =  Security::remove_XSS($_GET['removeDef']);
@@ -618,5 +607,4 @@ elseif ($displayMode == "viewContentEdit") {
 // Back button for each display mode (bottom)
 //echo "<div class=\"actions\"><a href=\"user.php?".api_get_cidreq()."&amp;origin=".$origin."\">".get_lang('BackUser')."</a></div>\n";
 /*		FOOTER	*/
-Display :: display_footer();
-?>
+Display :: display_footer();

+ 6 - 6
user_portal.php

@@ -91,7 +91,7 @@ define('CONFVAL_dateFormatForInfosFromCourses', get_lang('dateFormatLong'));
 define("CONFVAL_limitPreviewTo", SCRIPTVAL_NewEntriesOfTheDayOfLastLogin);
 
 // This is the main function to get the course list.
-$personal_course_list = UserManager::get_personal_session_course_list($_user['user_id']);
+$personal_course_list = UserManager::get_personal_session_course_list(api_get_user_id());
 
 // Check if a user is enrolled only in one course for going directly to the course after the login.
 if (api_get_setting('go_to_course_after_login') == 'true') {
@@ -230,7 +230,7 @@ $visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUD
 SystemAnnouncementManager :: display_announcements($visibility, $announcement);
 
 if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['include'])) {
-    include ('./home/'.$_GET['include']);
+    include './home/'.$_GET['include'];
     $pageIncluded = true;
 } else {
 
@@ -240,20 +240,20 @@ if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['in
     // for the current user.
 
     if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-        $courses_tree = UserManager::get_sessions_by_category($_user['user_id'], true, true);
+        $courses_tree = UserManager::get_sessions_by_category(api_get_user_id(), true, true);
     } else {
-        $courses_tree = UserManager::get_sessions_by_category($_user['user_id'], true);
+        $courses_tree = UserManager::get_sessions_by_category(api_get_user_id(), true);
     }
     foreach ($courses_tree as $cat => $sessions) {
         $courses_tree[$cat]['details'] = SessionManager::get_session_category($cat);
         if ($cat == 0) {
-            $courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id($_user['user_id'], false);
+            $courses_tree[$cat]['courses'] = CourseManager::get_courses_list_by_user_id(api_get_user_id(), false);
         }
         $courses_tree[$cat]['sessions'] = array_flip(array_flip($sessions));
         if (count($courses_tree[$cat]['sessions']) > 0) {
             foreach ($courses_tree[$cat]['sessions'] as $k => $s_id) {
                 $courses_tree[$cat]['sessions'][$k] = array('details' => SessionManager::fetch($s_id));
-                $courses_tree[$cat]['sessions'][$k]['courses'] = UserManager::get_courses_list_by_session($_user['user_id'], $s_id);
+                $courses_tree[$cat]['sessions'][$k]['courses'] = UserManager::get_courses_list_by_session(api_get_user_id(), $s_id);
             }
         }
     }