Merge

main/chat/chat_banner.php

@@ -32,6 +32,7 @@
 
 $language_file = array ('chat');
 include('../inc/global.inc.php');
+$this_section=SECTION_COURSES;
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 
 //$interbreadcrumb[] = array ("url" => "chat.php", "name" => get_lang("Chat"));

main/dropbox/dropbox_functions.inc.php

@@ -12,6 +12,8 @@ require_once '../inc/global.inc.php';
 -----------------------------------------------------------
 */
 
+$this_section=SECTION_COURSES;
+
 $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript">
 function setFocus(){

main/group/group_space.php

@@ -58,7 +58,7 @@ $current_group = GroupManager :: get_group_properties($_SESSION['_gid']);
 if (!is_array($current_group) ) {
 //display some error message
 }
-
+$this_section=SECTION_COURSES;
 $nameTools = get_lang("GroupSpace");
 $interbreadcrumb[] = array ("url" => "group.php", "name" => get_lang("Groups"));
 

main/inc/tool_navigation_menu.inc.php

@@ -189,7 +189,7 @@ function show_navigation_menu()
 			if (strpos($navigation_item['link'],'chat')!==false && api_get_course_setting('allow_open_chat_window',$course_id)==true) {
 				echo '<a href="javascript: void(0);" onclick="window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+380+\', width=\'+625+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="' . $navigation_item['target'] . '"';
 			} else {
-				echo '<a href="'.$navigation_item['link'].'" target="_self" ';
+				echo '<a href="'.$navigation_item['link'].'" target="_top" ';
 			}
 
 			if (stristr($url_item['path'],$url_current['path']))
@@ -245,7 +245,7 @@ function show_navigation_tool_shortcuts($orientation = SHORTCUTS_HORIZONTAL)
 		if (strpos(api_get_self(), $navigation_item['link']) !== false) {
 			echo ' id="here"';
 		}
-		echo ' target="_self" title="'.$navigation_item['name'].'">';
+		echo ' target="_top" title="'.$navigation_item['name'].'">';
 		echo '<img src="'.api_get_path(WEB_IMG_PATH).$navigation_item['image'].'" alt="'.$navigation_item['name'].'"/>';
 		echo '</a>';
 		if($orientation == SHORTCUTS_VERTICAL){

main/lang/english/trad4all.inc.php

@@ -786,4 +786,6 @@ $ChamiloInstallation = "Chamilo installation";
 $ThereAreNotExtrafieldsAvailable = "There are not extra fields available";
 $StartToType = "Start to type, then click on this bar to validate tag";
 $StartToType = "Start to type, then click on this bar to validate tag";
+$InstallChamilo = "Install Chamilo";
+$ChamiloURL = "Chamilo URL";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -786,4 +786,6 @@ $ChamiloInstallation = "Instalaci
 $ThereAreNotExtrafieldsAvailable = "No hay campos extras disponibles";
 $StartToType = "Comience a escribir, a continuación, haga clic en esta barra para validar la etiqueta";
 $StartToType = "Comience a escribir, a continuación, haga clic en esta barra para validar la etiqueta";
+$InstallChamilo = "Instalar Chamilo";
+$ChamiloURL = "URL de Chamilo";
 ?>