From 2765cee005bcb9d913280c092e1e7a0aef88946b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Apr 2019 19:36:56 +0200 Subject: [PATCH] CSS --- htdocs/adherents/subscription/list.php | 2 +- htdocs/projet/index.php | 3 ++- htdocs/projet/list.php | 15 +++++++-------- htdocs/projet/tasks/list.php | 15 +++++++-------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 67d7e5d860e..2e46262398f 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -339,7 +339,7 @@ if (! empty($arrayfields['t.libelle']['checked'])) if (! empty($arrayfields['d.bank']['checked'])) { print ''; - print $form->select_comptes($search_account, 'search_account', 0, '', 1); + $form->select_comptes($search_account, 'search_account', 0, '', 1); print ''; } diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index a4389339e46..0e15403e9cf 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -87,13 +87,14 @@ $morehtml.=''; if ($mine) print $langs->trans("MyProjectsDesc").'

'; else { if (! empty($user->rights->projet->all->lire) && ! $socid) print $langs->trans("ProjectsDesc").'

'; else print $langs->trans("ProjectsPublicDesc").'

'; } - +print ''; // Get list of ponderated percent for each status $listofoppstatus=array(); $listofopplabel=array(); $listofoppcode=array(); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index c727913dc24..1a7fb9317e1 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -254,7 +254,6 @@ $formother = new FormOther($db); $formproject = new FormProjets($db); $title=$langs->trans("Projects"); -//if ($search_project_user == $user->id) $title=$langs->trans("MyProjects"); // Get list of project id allowed to user (in a string list separated by coma) @@ -467,17 +466,17 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit); - // Show description of content -print '
'; -if ($search_project_user == $user->id) print $langs->trans("MyProjectsDesc").'

'; +$texthelp=''; +if ($search_project_user == $user->id) $texthelp.=$langs->trans("MyProjectsDesc"); else { - if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'

'; - else print $langs->trans("ProjectsPublicDesc").'

'; + if ($user->rights->projet->all->lire && ! $socid) $texthelp.=$langs->trans("ProjectsDesc"); + else $texthelp.=$langs->trans("ProjectsPublicDesc"); } -print '
'; + +print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit); + $topicmail="Information"; $modelmail="project"; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index baf756628a6..1279a5191fd 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -441,17 +441,16 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit); - // Show description of content -print '
'; -if ($search_task_user == $user->id) print $langs->trans("MyTasksDesc").'

'; +$texthelp=''; +if ($search_task_user == $user->id) $texthelp.=$langs->trans("MyTasksDesc"); else { - if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("TasksOnProjectsDesc").'

'; - else print $langs->trans("TasksOnProjectsPublicDesc").'

'; + if ($user->rights->projet->all->lire && ! $socid) $texthelp.=$langs->trans("TasksOnProjectsDesc"); + else $texthelp.=$langs->trans("TasksOnProjectsPublicDesc"); } -print '
'; + +print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_project', 0, $newcardbutton, '', $limit); $topicmail="Information"; $modelmail="task"; @@ -506,7 +505,7 @@ if (! empty($moreforfilter)) if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1); print '
'; -print ''."\n"; +print '
'."\n"; print ''; if (! empty($arrayfields['t.ref']['checked']))