From 78c4b7f9121fdcce0c8957b8de9cf98ed59a36e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Dec 2017 20:17:07 +0100 Subject: [PATCH] Fix look and feel v7 --- htdocs/core/class/html.formactions.class.php | 2 +- htdocs/core/lib/company.lib.php | 10 +++++----- htdocs/projet/info.php | 2 +- htdocs/societe/agenda.php | 2 +- htdocs/societe/notify/card.php | 8 +++++--- htdocs/societe/project.php | 15 +++++++-------- htdocs/societe/rib.php | 16 +++++++--------- htdocs/societe/website.php | 2 +- 8 files changed, 28 insertions(+), 29 deletions(-) diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index de3c600af11..5e2fb9b1b2b 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -196,7 +196,7 @@ class FormActions $buttontoaddnewevent.= ''; print ''."\n"; - print load_fiche_titre($title, $morehtmlright, '', 0, 0, '', $buttontoaddnewevent); + print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright); $page=0; $param=''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 02a11adeeac..fbb4356bb19 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -632,9 +632,10 @@ function isInEEC($object) * @param Object $object Third party object * @param string $backtopage Url to go once contact is created * @param int $nocreatelink 1=Hide create project link + * @param string $morehtmlright More html on right of title * @return void */ -function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0) +function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0, $morehtmlright='') { global $user; global $bc; @@ -655,7 +656,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin } print "\n"; - print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,''); + print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $buttoncreate.$morehtmlright, ''); print '
'; print "\n".''; @@ -803,16 +804,15 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') { $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); $buttoncreate=''.$addcontact; - if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($addcontact,'filenew'); $buttoncreate.=''."\n"; } print "\n"; $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany")); - print load_fiche_titre($title,$buttoncreate,''); + print load_fiche_titre($title, $buttoncreate,''); - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index 124371e299b..68f4b8b4cbb 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -180,7 +180,7 @@ if (!empty($object->id)) if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; - print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1); + print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1); // List of all actions $filters=array(); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index bc46b9eb4fd..efd0132b8d7 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -180,7 +180,7 @@ if ($socid > 0) if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; - print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1); + print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1); // List of all actions $filters=array(); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 5733ffa9568..31622c1b9d9 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2017 Laurent Destailleur * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2015 Marcos García * @@ -210,12 +210,14 @@ if ($result > 0) print "\n"; // Help - print '
'.$langs->trans("NotificationsDesc"); + print '
'; + print $langs->trans("NotificationsDesc"); print '
'.$langs->trans("NotificationsDescUser"); print '
'.$langs->trans("NotificationsDescContact"); print '
'.$langs->trans("NotificationsDescGlobal"); + print '
'; - print '


'."\n"; + print '

'."\n"; // Add notification form diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php index f4641a74938..08e2f593acb 100644 --- a/htdocs/societe/project.php +++ b/htdocs/societe/project.php @@ -124,28 +124,27 @@ if ($socid) * Barre d'action */ - print '
'; + /*print '
'; if (! empty($conf->projet->enabled)) { if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer)) - { - print ''.$langs->trans("AddProject").''; - } + {*/ + $addbutton = ''.$langs->trans("AddProject").''; + /* } else { print ''.$langs->trans("AddProject").''; } } - print '
'; - + print '
'; */ print '
'; - // Projects list - $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1); + // Projects list + $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton); } diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 914683d87d2..d4263cc0b21 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -455,11 +455,11 @@ if ($socid && $action != 'edit' && $action != "create") print '
'; - /* - * List of bank accounts - */ + // List of bank accounts - print load_fiche_titre($langs->trans("AllRIB"), '', ''); + $morehtmlright=''.$langs->trans("Add").''; + + print load_fiche_titre($langs->trans("AllRIB"), $morehtmlright, ''); $rib_list = $object->get_all_rib(); $var = false; @@ -654,12 +654,10 @@ if ($socid && $action != 'edit' && $action != "create") dol_fiche_end(); - + /* if ($socid && $action != 'edit' && $action != 'create') { - /* - * Barre d'actions - */ + // Barre d'actions print '
'; if ($user->rights->societe->creer) @@ -669,7 +667,7 @@ if ($socid && $action != 'edit' && $action != "create") print '
'; } - + */ diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index a67d842e281..ef990a7e4f0 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -325,7 +325,7 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton.' '.$morehtmlcenter, $num, $nbtotalofrecords, '', 0, '', '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $morehtmlcenter, '', $limit); $topicmail="Information"; $modelmail="websiteaccount";