Feature #2484 change shared by users and provide visual consistency

main/document/document.inc.php

@@ -147,12 +147,12 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 
 	$tooltip_title_alt = $tooltip_title;
 	if ($tooltip_title == 'shared_folder') {
-		$tooltip_title_alt = get_lang('SharedFolder');
+		$tooltip_title_alt = get_lang('UserFolder');
 	}elseif(strstr($tooltip_title, 'shared_folder_session_')) {
-		$tooltip_title_alt = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
+		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
 	}elseif(strstr($tooltip_title, 'sf_user_')) {
 		$userinfo = Database::get_user_info_from_id(substr($tooltip_title, 8));
-		$tooltip_title_alt = get_lang('SharedFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
+		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
 	}
 
 	$current_session_id=api_get_session_id();
@@ -214,19 +214,19 @@ function build_document_icon_tag($type, $path) {
 		$icon = choose_image($basename);
 	} else {
 		if ($basename == 'shared_folder') {
-			$icon = 'shared_folder.gif';
+			$icon = 'user_folders.gif';
 			if ($is_allowed_to_edit) {
 				$basename = get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('SharedFolder');
+				$basename = get_lang('UserFolder');
 			}
 		}elseif(strstr($basename, 'shared_folder_session_')) {
 			if ($is_allowed_to_edit) {
 				$basename = '***('.api_get_session_name($current_session_id).')*** '.get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
+				$basename = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
 			}
-			$icon = 'shared_folder.gif';
+			$icon = 'user_folders.gif';
 		}elseif(strstr($basename, 'sf_user_')) {
 			$userinfo = Database::get_user_info_from_id(substr($basename, 8));
 			$image_path = UserManager::get_user_picture_path_by_id(substr($basename, 8), 'web', false, true);
@@ -237,7 +237,7 @@ function build_document_icon_tag($type, $path) {
 				$icon = '../upload/users/'.substr($basename, 8).'/'.$image_path['file'];
 			}
 
-			$basename = get_lang('SharedFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
+			$basename = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
 
 		} else {
 			if (($basename =='audio' || $basename =='flash' || $basename =='images' || $basename =='video') && api_is_allowed_to_edit()) {

main/group/group.php

@@ -189,7 +189,7 @@ foreach ($group_cats as $index => $category) {
 	$in_category = false;
 	if (api_get_setting('allow_group_categories') == 'true') {
 		if (isset ($_GET['show_all']) || (isset ($_GET['category']) && $_GET['category'] == $category['id'])) {
-			echo '<img src="../img/shared_folder.gif" alt=""/>';
+			echo '<img src="../img/group_category.gif" alt=""/>';
 			echo '<a href="group.php?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'">'.$category['title'].'</a>';
 			$in_category = true;
 		} else {

main/inc/banner.inc.php

@@ -416,11 +416,11 @@ if (isset($interbreadcrumb) && is_array($interbreadcrumb)) {
 		$navigation_item['title'] = $breadcrumb_step['name'];
 		// titles for shared folders
 		if ($breadcrumb_step['name'] == 'shared_folder') {
-			$navigation_item['title'] = get_lang('SharedFolder');
+			$navigation_item['title'] = get_lang('UserFolders');
 		}			
 		elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
 		
-			$navigation_item['title'] = get_lang('SharedFolder');
+			$navigation_item['title'] = get_lang('UserFolders');
 		}
 		elseif(strstr($breadcrumb_step['name'], 'sf_user_')) {			
 			$userinfo = Database::get_user_info_from_id(substr($breadcrumb_step['name'], 8));

main/inc/lib/add_course.lib.inc.php

@@ -2231,7 +2231,7 @@ function fill_Db_course($course_db_name, $course_repository, $language, $default
     $example_doc_id = Database :: insert_id();
     Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
 
-    Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/shared_folder','".get_lang('SharedDocumentsDirectory')."','folder','0')");
+    Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/shared_folder','".get_lang('UserFolders')."','folder','0')");
     $example_doc_id = Database :: insert_id();
     Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
 

main/lang/bulgarian/exercice.inc.php

@@ -8,7 +8,7 @@ $langDeactivate = "Дезактивиране";
 $langNoEx = "Засега няма тестове.";
 $langNewEx = "Нов тест";
 $langQuestion = "Въпрос";
-$langQuestions = "Въпроса";
+$langQuestions = "Въпроси";
 $langAnswers = "Отговори";
 $langTrue = "Вярно";
 $langAnswer = "Отговор";

main/lang/english/document.inc.php

@@ -227,4 +227,5 @@ $Draw = "Draw";
 $FileExistsChangeToSave = "This file name already exists, choose another to save your image.";
 $FileSavedAs = "File saved as";
 $FileExportAs = "File export as";
+$UserFolder = "User folder";
 ?>

main/lang/english/install.inc.php

@@ -5,7 +5,7 @@ for more information: see languages.txt in the lang folder.
 $langStatDB = "Tracking DB.";
 $langEnableTracking = "Enable Tracking";
 $langInstituteShortName = "Your company short name";
-$langWarningResponsible = "Use this script only after backup. Chamilo team is not responsible if you lost or corrupted data";
+$langWarningResponsible = "Use this script only after backup. The Chamilo team is not responsible for lost or corrupted data.";
 $langAllowSelfRegProf = "Allow self-registration as a trainer";
 $langEG = "ex.";
 $langDBHost = "Database Host";

main/lang/english/trad4all.inc.php

@@ -973,4 +973,5 @@ $FillWithExemplaryContent = "Fill with exemplary content";
 $ToolVideoconference = "Videoconference";
 $SelectSVGEditImage = "Select a picture";
 $OnlyAccessFromYourGroup = "Only accessible from your group";
+$UserFolders = "Folders of users";
 ?>

main/lang/spanish/document.inc.php

@@ -227,4 +227,5 @@ $Draw = "Dibujar";
 $FileExistsChangeToSave = "Este nombre de archivo ya existe, escoja otro para guardar su imagen.";
 $FileSavedAs = "Archivo guardado como";
 $FileExportAs = "Archivo exportado como";
+$UserFolder = "Carpeta del usuario";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -974,4 +974,5 @@ $FillWithExemplaryContent = "Rellenar con contenido de ejemplo";
 $ToolVideoconference = "Videoconferencia";
 $SelectSVGEditImage = "Selecciones una imagen (svg, png)";
 $OnlyAccessFromYourGroup = "Sólo accesible desde su grupo";
+$UserFolders = "Carpetas de los usuarios";
 ?>