From 4249291d4b234388f02c1875984b2592825f0e2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Mar 2010 19:51:50 +0000 Subject: [PATCH] Fix: Minor change in look of project --- htdocs/langs/en_US/users.lang | 3 ++- htdocs/langs/fr_FR/users.lang | 3 ++- htdocs/lib/project.lib.php | 12 ++++++------ htdocs/projet/tasks/fiche.php | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 45cffd763c8..66babbcdf49 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -106,4 +106,5 @@ ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? LoginToCreate=Login to create -NameToCreate=Name of third party to create \ No newline at end of file +NameToCreate=Name of third party to create +YourRole=Your roles \ No newline at end of file diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 110ee3167ba..0cd85cacb6b 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -106,4 +106,5 @@ ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour c ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour cet adhérent ? ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour cet adhérent ? LoginToCreate=Login à créer -NameToCreate=Nom du tiers à créer \ No newline at end of file +NameToCreate=Nom du tiers à créer +YourRole=Vos rôles \ No newline at end of file diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index 0387f0e2f2f..9b24d630a37 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -52,12 +52,12 @@ function project_prepare_head($object) $head[$h][2] = 'element'; $h++; } - + $head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id; $head[$h][1] = $langs->trans("ProjectContact"); $head[$h][2] = 'contact'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); @@ -119,7 +119,7 @@ function task_prepare_head($object) $head[$h][1] = $langs->trans("TimeSpent"); $head[$h][2] = 'time'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); @@ -233,7 +233,7 @@ function PLinesb(&$inc, $parent, $lines, &$level, &$projectsrole) { global $user, $bc, $langs; global $form; - + $lastprojectid=0; $projectstatic = new Project($db); @@ -403,7 +403,7 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole print ''; if ($showlineingray) { - print ''.$lines[$i]->id.''; + print ''.img_object('','projecttask').' '.$lines[$i]->id.''; } else { @@ -426,7 +426,7 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole if ($showlineingray) print ''; else print ''; print "\n"; - + // Progress print ''; print $lines[$i]->progress.' %'; diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 50a6a41416d..50200c046b5 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -41,6 +41,8 @@ $result = restrictedArea($user, 'projet', $projectid); $userAccess=0; +$langs->load("users"); + /* * Actions