diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 296bf4c12a4..d5caac4612e 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2012 Laurent Destailleur + * Copyright (C) 2005-2013 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -147,23 +147,23 @@ if ($action == 'create') print ''; - print ''; + print ''; - print ''; + print ''; print ''; + print ''; print ''; + print ''; // Position print ''; + print ''; print '
'.$langs->trans("BookmarkTitle").''.$langs->trans("SetHereATitleForLink").'
'.$langs->trans("BookmarkTitle").''.$langs->trans("SetHereATitleForLink").'
'.$langs->trans("UrlOrLink").''.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'
'.$langs->trans("UrlOrLink").''.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'
'.$langs->trans("BehaviourOnClick").''; $liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow")); print $form->selectarray('target',$liste,1); - print ''.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'
'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'
'.$langs->trans("Owner").''; $form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1); - print ' 
 
'.$langs->trans("Position").''; print 'position).'">'; - print ' 
 

'; diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 5bd159e2742..8a98ff44c01 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -184,23 +184,23 @@ if ($object->id) /* */ /* ************************************************************************** */ - print "\n
\n"; + print '
'."\n"; if ($action != 'ajout_photo' && $user->rights->categorie->creer) { if (! empty($conf->global->MAIN_UPLOAD_DOC)) { - print ''; + print ''; print $langs->trans("AddPhoto").''; } else { - print ''; + print ''; print $langs->trans("AddPhoto").''; } } - print "\n
\n"; + print '
'."\n"; /* * Ajouter une photo diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 4c85064e427..7f003b4503b 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -8,7 +8,7 @@ * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2013 Jean-Francois FERRY - * Copyright (C) 2013 Florian Henry + * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index f3e496b4c02..ad4d032d5a9 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -104,10 +104,10 @@ llxHeader("",$langs->trans("AccountancyTreasuryArea")); print_fiche_titre($langs->trans("AccountancyTreasuryArea")); -//print ''; -//print '
'; + print '
'; + $max=3; @@ -323,7 +323,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- } -//print '
'; print '
'; @@ -1032,9 +1031,10 @@ if ($resql) print "

"; } -//print ''; + print ''; + llxFooter(); $db->close(); diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 6ab525117a2..7c6268d30cd 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -100,7 +100,7 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob "> "> - % + % - % + % id)) print ''; print ''; print ''; - print '%'; + print '%'; print ''; print '
'; print '' . "\n"; @@ -1596,7 +1596,7 @@ elseif (! empty($object->id)) print ''; print ''; print ''; - print '%'; + print '%'; print ''; print ''; @@ -1653,7 +1653,7 @@ elseif (! empty($object->id)) print ''; print ''; - print '%'; + print '%'; print ''; print ''; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 24577bbf3f1..75c5aa67a29 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1746,7 +1746,7 @@ else print ''; - print '%'; + print '%'; print ' '; @@ -1891,7 +1891,7 @@ else print ''; print ''; print ''; - print '%'; + print '%'; print ' '; print ' '; print ''; @@ -1958,7 +1958,7 @@ else print ''; print ''; - print '%'; + print '%'; print ' '; print ' '; print ''; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 41cd8ce051e..f7b5fa76650 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -65,8 +65,9 @@ else else print $langs->trans("TasksPublicDesc").'

'; } -print ''; -print '
'; + +print '
'; + print_projecttasks_array($db,$socid,$projectsListId,$mine); @@ -180,7 +181,8 @@ print "
"; } -print ''; +print '
'; + // TODO Do not use week function to be compatible with all database if ($db->type != 'pgsql') @@ -326,7 +328,9 @@ else } print ""; -print ''; + +print '
'; + llxFooter(); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 40183c5a8de..d7eb62f927a 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -68,12 +68,16 @@ else else print $langs->trans("ProjectsPublicDesc").'

'; } -print ''; -print '
'; + + +print '
'; + print_projecttasks_array($db,$socid,$projectsListId); -print '
'; + +print '
'; + print ''; print ''; @@ -128,7 +132,9 @@ else } print "
"; -print '
'; + +print ''; + llxFooter();