From bbfc4a3e17109aa6f6c7803c084e7bcf5dfe0e82 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Apr 2018 03:26:15 +0200 Subject: [PATCH] NEW Look and feel v8 - Show Picto "+" on all links "Add record" --- htdocs/accountancy/admin/account.php | 4 ++- htdocs/accountancy/bookkeeping/list.php | 4 ++- .../accountancy/bookkeeping/listbyaccount.php | 4 ++- htdocs/adherents/agenda.php | 4 ++- htdocs/adherents/list.php | 4 ++- htdocs/adherents/subscription/list.php | 4 ++- htdocs/adherents/type.php | 4 ++- htdocs/bookmarks/list.php | 4 ++- htdocs/comm/action/list.php | 9 ++++--- htdocs/comm/mailing/list.php | 4 ++- htdocs/comm/propal/list.php | 4 ++- htdocs/commande/list.php | 4 ++- htdocs/compta/bank/bankentries_list.php | 20 ++++++++++---- htdocs/compta/bank/list.php | 4 ++- htdocs/compta/bank/various_payment/index.php | 4 ++- htdocs/compta/facture/list.php | 4 ++- htdocs/compta/localtax/list.php | 4 ++- htdocs/compta/paiement/cheque/list.php | 4 ++- htdocs/compta/prelevement/bons.php | 4 ++- htdocs/compta/salaries/index.php | 4 ++- htdocs/compta/sociales/index.php | 4 ++- htdocs/compta/tva/list.php | 4 ++- htdocs/contact/list.php | 4 ++- htdocs/contrat/card.php | 2 ++ htdocs/contrat/list.php | 4 ++- htdocs/core/class/html.formactions.class.php | 6 ++--- htdocs/core/lib/company.lib.php | 12 +++++---- htdocs/cron/list.php | 8 ++++-- htdocs/don/list.php | 8 +++--- htdocs/expedition/list.php | 4 ++- htdocs/expensereport/list.php | 4 ++- htdocs/fichinter/list.php | 4 ++- htdocs/fourn/commande/list.php | 4 ++- htdocs/fourn/facture/list.php | 4 ++- htdocs/holiday/list.php | 4 ++- htdocs/loan/index.php | 4 ++- .../modulebuilder/template/myobject_list.php | 4 ++- htdocs/opensurvey/list.php | 10 ++++--- htdocs/product/list.php | 4 ++- htdocs/product/stock/list.php | 4 ++- htdocs/projet/list.php | 4 ++- htdocs/projet/tasks/list.php | 4 ++- htdocs/resource/list.php | 4 ++- htdocs/societe/agenda.php | 8 +++--- htdocs/societe/list.php | 4 ++- htdocs/societe/website.php | 8 ++++-- htdocs/supplier_proposal/list.php | 4 ++- htdocs/theme/eldy/style.css.php | 18 ++++++------- htdocs/theme/md/style.css.php | 26 ++++++++----------- htdocs/ticketsup/list.php | 4 ++- htdocs/user/group/list.php | 4 ++- htdocs/user/list.php | 4 ++- htdocs/variants/list.php | 4 ++- 53 files changed, 204 insertions(+), 95 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index c8dfa078cff..58bbd09fdf2 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -225,7 +225,9 @@ if ($resql) print ''; print ''; - $newcardbutton = '' . $langs->trans("Addanaccount") . ''; + $newcardbutton = '' . $langs->trans("Addanaccount"); + $newcardbutton.= ''; + $newcardbutton.= ''; print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 8d090646024..d3bf948aaf7 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -439,7 +439,9 @@ $button.= ''; $groupby = ' ' . $langs->trans("GroupByAccountAccounting") . ''; -$newcardbutton = '' . $langs->trans("NewAccountingMvt") . ''; +$newcardbutton = '' . $langs->trans("NewAccountingMvt"); +$newcardbutton.= ''; +$newcardbutton.= ''; print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby.$newcardbutton, '', $limit); diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 5f021c04d59..15be2255830 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -256,7 +256,9 @@ if ($action == 'delbookkeepingyear') { print '
'; $viewflat = ' ' . $langs->trans("ViewFlatList") . ''; -$newcardbutton = '' . $langs->trans("NewAccountingMvt") . ''; +$newcardbutton = '' . $langs->trans("NewAccountingMvt"); +$newcardbutton.= ''; +$newcardbutton.= ''; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage); if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit); diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 7a39f6c5502..41f45d54ebd 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -151,7 +151,9 @@ if ($object->id > 0) $newcardbutton = ''; if (! empty($conf->agenda->enabled)) { - $newcardbutton.=''.$langs->trans("AddAction").''; + $newcardbutton.=''.$langs->trans("AddAction"); + $newcardbutton.= ''; + $newcardbutton.= ''; } if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 21ce7c9801c..7f4b0a92c1e 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -348,7 +348,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->adherent->creer) { - $newcardbutton=''.$langs->trans('NewMember').''; + $newcardbutton=''.$langs->trans('NewMember'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index a5fb8934503..43311a0b1e2 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -184,7 +184,9 @@ if ($result) $newcardbutton=''; if ($user->rights->adherent->cotisation->creer) { - $newcardbutton=''.$langs->trans('NewSubscription').''; + $newcardbutton=''.$langs->trans('NewSubscription'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 5962ec470b0..2ef18ca3ca8 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -231,7 +231,9 @@ if (! $rowid && $action != 'create' && $action != 'edit') $newcardbutton=''; if ($user->rights->adherent->configurer) { - $newcardbutton=''.$langs->trans('NewMemberType').''; + $newcardbutton=''.$langs->trans('NewMemberType'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 4774d4c82c2..0253efb3a3d 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -84,7 +84,9 @@ llxHeader('', $langs->trans("ListOfBookmarks")); $newcardbutton=''; if ($user->rights->bookmark->creer) { - $newcardbutton=''.$langs->trans('NewBookmark').''; + $newcardbutton=''.$langs->trans('NewBookmark'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($langs->trans("ListOfBookmarks"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', -1, '', 'title_generic.png', 0, $newcardbutton); diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 9221c7d2ede..deb81238c54 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -397,6 +397,7 @@ if ($resql) $s = $hookmanager->resPrint; } + $newcardbutton=''; if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) { $tmpforcreatebutton=dol_getdate(dol_now(), true); @@ -405,12 +406,12 @@ if ($resql) //$param='month='.$monthshown.'&year='.$year; $hourminsec='100000'; - $link = ''; - $link.= $langs->trans("AddAction"); - $link.= ''; + $newcardbutton = ''.$langs->trans("AddAction"); + $newcardbutton.= ''; + $newcardbutton.= ''; } - print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$link, '', $limit); + print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit); $moreforfilter=''; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 37a5b200d8a..c2e9510f6f0 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -107,7 +107,9 @@ if ($result) $newcardbutton=''; if ($user->rights->mailing->creer) { - $newcardbutton=''.$langs->trans('NewMailing').''; + $newcardbutton=''.$langs->trans('NewMailing'); + $newcardbutton.= ''; + $newcardbutton.= ''; } $i = 0; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 72751ff637c..71f15122021 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -397,7 +397,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->propal->creer) { - $newcardbutton=''.$langs->trans('NewPropal').''; + $newcardbutton=''.$langs->trans('NewPropal'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lignes des champs de filtre diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 2d07ab95ffe..19640dc0ec0 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -422,7 +422,9 @@ if ($resql) $newcardbutton=''; if ($contextpage == 'orderlist' && $user->rights->commande->creer) { - $newcardbutton=''.$langs->trans('NewOrder').''; + $newcardbutton=''.$langs->trans('NewOrder'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lines of title fields diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 205c891b5aa..462b410f6ff 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -730,23 +730,33 @@ if ($resql) if (! empty($conf->global->BANK_USE_VARIOUS_PAYMENT)) // If direct entries is done using miscellaneous payments { if ($user->rights->banque->modifier) { - $newcardbutton = ''.$langs->trans("AddBankRecord").''; + $newcardbutton = ''.$langs->trans("AddBankRecord"); + $newcardbutton.= ''; + $newcardbutton.= ''; } else { - $newcardbutton = ''.$langs->trans("AddBankRecord").''; + $newcardbutton = ''.$langs->trans("AddBankRecord"); + $newcardbutton.= ''; + $newcardbutton.= ''; } } else // If direct entries is not done using miscellaneous payments { if ($user->rights->banque->modifier) { - $newcardbutton = ''.$langs->trans("AddBankRecord").''; + $newcardbutton = ''.$langs->trans("AddBankRecord"); + $newcardbutton.= ''; + $newcardbutton.= ''; } else { - $newcardbutton = ''.$langs->trans("AddBankRecord").''; + $newcardbutton = ''.$langs->trans("AddBankRecord"); + $newcardbutton.= ''; + $newcardbutton.= ''; } } } else { - $newcardbutton = ''.$langs->trans("AddBankRecord").''; + $newcardbutton = ''.$langs->trans("AddBankRecord"); + $newcardbutton.= ''; + $newcardbutton.= ''; } } diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 6cb345745c5..b6130a0a2c5 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -230,7 +230,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->banque->configurer) { - $newcardbutton.=''.$langs->trans("NewFinancialAccount").''; + $newcardbutton.=''.$langs->trans("NewFinancialAccount"); + $newcardbutton.= ''; + $newcardbutton.= ''; } diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php index 0e16faef1a3..f87413cb7e7 100644 --- a/htdocs/compta/bank/various_payment/index.php +++ b/htdocs/compta/bank/various_payment/index.php @@ -156,7 +156,9 @@ if ($result) $newcardbutton=''; if ($user->rights->banque->modifier) { - $newcardbutton=''.$langs->trans('MenuNewVariousPayment').''; + $newcardbutton=''.$langs->trans('MenuNewVariousPayment'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index e245008ffc3..31daeef5cba 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -592,7 +592,9 @@ if ($resql) $newcardbutton=''; if($user->rights->facture->creer) { - $newcardbutton=''.$langs->trans('NewBill').''; + $newcardbutton=''.$langs->trans('NewBill'); + $newcardbutton.= ''; + $newcardbutton.= ''; } $i = 0; diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index af305c295f2..6a6d7e3a93b 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -44,7 +44,9 @@ $localtax_static = new Localtax($db); $newcardbutton=''; if ($user->rights->tax->charges->creer) { - $newcardbutton=''.$langs->trans('NewVATPayment').''; + $newcardbutton=''.$langs->trans('NewVATPayment'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code), $newcardbutton); diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 4969736071d..e31c9cd6e61 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -134,7 +134,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->banque->cheque) { - $newcardbutton = ''.$langs->trans('NewCheckDeposit').''; + $newcardbutton = ''.$langs->trans('NewCheckDeposit'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 1d911f24c4c..04f70471ee2 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -104,7 +104,9 @@ if ($result) $newcardbutton=''; if ($user->rights->prelevement->bons->creer) { - $newcardbutton = ''.$langs->trans('NewStandingOrder').''; + $newcardbutton = ''.$langs->trans('NewStandingOrder'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lines of title fields diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 45213851a64..317fb377b03 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -153,7 +153,9 @@ if ($result) $newcardbutton=''; if ($user->rights->salaries->payment->write) { - $newcardbutton=''.$langs->trans('NewSalaryPayment').''; + $newcardbutton=''.$langs->trans('NewSalaryPayment'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index d33b2cb0bdd..85560348289 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -149,7 +149,9 @@ if ($resql) $newcardbutton=''; if($user->rights->tax->charges->creer) { - $newcardbutton=''.$langs->trans('MenuNewSocialContribution').''; + $newcardbutton=''.$langs->trans('MenuNewSocialContribution'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 1cb623bb75e..36d37145e49 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -151,7 +151,9 @@ if ($result) $newcardbutton=''; if ($user->rights->tax->charges->creer) { - $newcardbutton=''.$langs->trans('NewVATPayment').''; + $newcardbutton=''.$langs->trans('NewVATPayment'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 7414cb43b1c..880a39d6ab8 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -415,7 +415,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->societe->contact->creer) { - $newcardbutton=''.$langs->trans('NewContactAddress').''; + $newcardbutton=''.$langs->trans('NewContactAddress'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 06e960d1775..c83cdcfb288 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1549,6 +1549,7 @@ else print ''; // Area with common detail of line + print '
'; print ''; $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,"; @@ -1813,6 +1814,7 @@ else } print "
"; + print '
'; print "
\n"; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 9fb4412d024..752e6210eca 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -372,7 +372,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->contrat->creer) { - $newcardbutton=''.$langs->trans('NewContractSubscription').''; + $newcardbutton=''.$langs->trans('NewContractSubscription'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print '
'; diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 27590366e6f..f4b4e010faf 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -197,9 +197,9 @@ class FormActions $newcardbutton=''; if (! empty($conf->agenda->enabled)) { - $newcardbutton = ''; - $newcardbutton.= $langs->trans("AddEvent"); - $newcardbutton.= ''; + $newcardbutton = ''.$langs->trans("AddEvent"); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''."\n"; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index ce8ce6e7387..4e0197a2fa4 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -727,10 +727,9 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin $newcardbutton=''; if (! empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) { - //$newcardbutton=''.$langs->trans("AddProject").''; $newcardbutton=''.$langs->trans("AddProject"); - if (empty($conf->dol_optimize_smallscreen)) $newcardbutton.=' '.img_picto($langs->trans("AddProject"),'filenew'); - $newcardbutton.=''."\n"; + $newcardbutton.= ''; + $newcardbutton.= ''; } print "\n"; @@ -926,7 +925,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') { $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); $newcardbutton=''.$addcontact; - $newcardbutton.=''."\n"; + $newcardbutton.= ''; + $newcardbutton.= ''; } print "\n"; @@ -1178,7 +1178,9 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='') $newcardbutton=''; if ($user->rights->societe->creer) { - $newcardbutton=''.$langs->trans("AddAddress").' '.img_picto($langs->trans("AddAddress"),'filenew').''."\n"; + $newcardbutton=''.$langs->trans("AddAddress"); + $newcardbutton.= ''; + $newcardbutton.= ''; } print "\n"; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index de0fd543572..8d448d5f514 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -335,11 +335,15 @@ print ''; $newcardbutton=''; if ($user->rights->cron->create) { - $newcardbutton.=''.$langs->trans("CronCreateJob").''; + $newcardbutton.=''.$langs->trans("CronCreateJob"); + $newcardbutton.= ''; + $newcardbutton.= ''; } else { - $newcardbutton.=''.$langs->trans("CronCreateJob").''; + $newcardbutton.=''.$langs->trans("CronCreateJob"); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $newcardbutton, '', $limit); diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 12cfa6a0757..392a9a53e9b 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2018 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * @@ -132,9 +132,11 @@ if ($resql) if ($optioncss != '') $param.='&optioncss='.$optioncss; $newcardbutton=''; - if ($user->rights->don->create) + if ($user->rights->don->creer) { - $newcardbutton=''.$langs->trans('NewDonation').''; + $newcardbutton=''.$langs->trans('NewDonation'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''."\n"; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 3f754d6b5f9..b98455a9b4c 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -268,7 +268,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->expedition->creer) { - $newcardbutton=''.$langs->trans('NewSending').''; + $newcardbutton=''.$langs->trans('NewSending'); + $newcardbutton.= ''; + $newcardbutton.= ''; } $i = 0; diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 23873d533d7..4947fa50212 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -465,7 +465,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->expensereport->creer) { - $newcardbutton=''.$langs->trans('NewTrip').''; + $newcardbutton=''.$langs->trans('NewTrip'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index f38ba21cb96..67527487a6c 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -274,7 +274,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->ficheinter->creer) { - $newcardbutton=''.$langs->trans('NewIntervention').''; + $newcardbutton=''.$langs->trans('NewIntervention'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lines of title fields diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index cbfbac36b41..c2d60a73ea3 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -646,7 +646,9 @@ if ($resql) $newcardbutton=''; if($user->rights->fournisseur->commande->creer) { - $newcardbutton=''.$langs->trans('NewOrder').''; + $newcardbutton=''.$langs->trans('NewOrder'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lignes des champs de filtre diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 6d1b3bc48b6..c352a658293 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -474,7 +474,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->fournisseur->facture->creer) { - $newcardbutton=''.$langs->trans('NewBill').''; + $newcardbutton=''.$langs->trans('NewBill'); + $newcardbutton.= ''; + $newcardbutton.= ''; } $i = 0; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index aa06459983a..c5ea7c868e0 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -381,7 +381,9 @@ else $newcardbutton=''; if ($user->rights->holiday->write) { - $newcardbutton=''.$langs->trans('MenuAddCP').''; + $newcardbutton=''.$langs->trans('MenuAddCP'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit); diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 3b07b7503d7..b08ada94709 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -114,7 +114,9 @@ if ($resql) $newcardbutton=''; if ($user->rights->loan->write) { - $newcardbutton=''.$langs->trans('NewLoan').''; + $newcardbutton=''.$langs->trans('NewLoan'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''."\n"; diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index f8ce7a0ce24..619ed1cdba7 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -353,7 +353,9 @@ print ''; $newcardbutton=''; //if ($user->rights->mymodule->creer) //{ - $newcardbutton=''.$langs->trans('New').''; + $newcardbutton=''.$langs->trans('New'); + $newcardbutton.= ''; + $newcardbutton.= ''; //} print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 0b0fa5c818c..eb7f827972e 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -97,13 +97,17 @@ $fieldtosortuser=empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?'firstname': $newcardbutton=''; -if (!$user->rights->opensurvey->read) +if (!$user->rights->opensurvey->creer) { - $newcardbutton=''.$langs->trans('NewSurvey').''; + $newcardbutton=''.$langs->trans('NewSurvey'); + $newcardbutton.= ''; + $newcardbutton.= ''; } else { - $newcardbutton=''.$langs->trans('NewSurvey').''; + $newcardbutton=''.$langs->trans('NewSurvey'); + $newcardbutton.= ''; + $newcardbutton.= ''; } diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 511a15ec1fc..cae788d0d7b 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -427,7 +427,9 @@ else { $label='NewProduct'; if($type == Product::TYPE_SERVICE) $label='NewService'; - $newcardbutton=''.$langs->trans($label).''; + $newcardbutton=''.$langs->trans($label); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index faf30ba066a..c973640006f 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -133,7 +133,9 @@ if ($result) $newcardbutton=''; if ($user->rights->stock->creer) { - $newcardbutton=''.$langs->trans('MenuNewWarehouse').''; + $newcardbutton=''.$langs->trans('MenuNewWarehouse'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 83d18f3e3b6..c5ffb69fbef 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -441,7 +441,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->projet->creer) { - $newcardbutton = ''.$langs->trans('NewProject').''; + $newcardbutton = ''.$langs->trans('NewProject'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index cc77e89ab77..2bf73da2cae 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -393,7 +393,9 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->projet->creer) { - $newcardbutton = ''.$langs->trans('NewTask').''; + $newcardbutton = ''.$langs->trans('NewTask'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 10ec58e9371..a49d8b6030e 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -199,7 +199,9 @@ if($ret == -1) { $newcardbutton=''; if ($user->rights->resource->write) { - $newcardbutton=''.$langs->trans('MenuResourceAdd').''; + $newcardbutton=''.$langs->trans('MenuResourceAdd'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $nbtotalofrecords,'title_generic.png', 0, $newcardbutton, '', $limit); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 63aa9873204..10a3221f546 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -159,12 +159,14 @@ if ($socid > 0) //print ''; - $buttoncreate=''; + $newcardbutton=''; if (! empty($conf->agenda->enabled)) { if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create)) { - $buttoncreate.=''.$langs->trans("AddAction").''; + $newcardbutton.=''.$langs->trans("AddAction"); + $newcardbutton.= ''; + $newcardbutton.= ''; } } @@ -176,7 +178,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 load_fiche_titre($langs->trans("ActionsOnCompany"), $buttoncreate, ''); + print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, ''); //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1); // List of all actions diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index f1996140cd2..41484e2ea87 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -594,7 +594,9 @@ if ($user->rights->societe->creer) if($type == 'f') $label='NewSupplier'; } - $newcardbutton = ''.$langs->trans($label).''; + $newcardbutton = ''.$langs->trans($label); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''; diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 41a4990d7bd..8df7c90aed9 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -223,9 +223,13 @@ dol_fiche_end(); $newcardbutton = ''; if (! empty($conf->website->enabled)) { if (! empty($user->rights->societe->lire)) { - $newcardbutton .= '' . $langs->trans("AddWebsiteAccount") . ''; + $newcardbutton .= '' . $langs->trans("AddWebsiteAccount"); + $newcardbutton.= ''; + $newcardbutton.= ''; } else { - $newcardbutton .= '' . $langs->trans("AddAction") . ''; + $newcardbutton .= '' . $langs->trans("AddAction"); + $newcardbutton.= ''; + $newcardbutton.= ''; } } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 3863f06d7c3..3fd7877dae9 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -389,7 +389,9 @@ if ($resql) $newcardbutton=''; if($user->rights->supplier_proposal->creer) { - $newcardbutton=''.$langs->trans('NewAskPrice').''; + $newcardbutton=''.$langs->trans('NewAskPrice'); + $newcardbutton.= ''; + $newcardbutton.= ''; } // Lignes des champs de filtre diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 47406666583..9a431c89fa8 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1411,6 +1411,7 @@ div.statusref img { padding-left: 8px; padding-right: 9px; vertical-align: text-bottom; + width: 18px; } div.statusrefbis { padding-left: 8px; @@ -2391,7 +2392,7 @@ span.butAction, span.butActionDelete { /* color: #fff; */ /* background: rgb(); */ color: #000; - text-transform: uppercase; + /* text-transform: uppercase; */ border: 1px solid #aaa; border-top-right-radius: 0 !important; @@ -2399,27 +2400,27 @@ span.butAction, span.butActionDelete { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; } -.butActionNew, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { +.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { text-decoration: none; margin: 0em 0.3em 0 0.3em !important; padding: 0.2em em 0.3em; font-family: ; font-weight: normal; - border-color: #c5c5c5; border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); display: inline-block; text-align: center; cursor: pointer; - color: #fff !important; + /*color: #fff !important; background: rgb(); - border: 1px solid rgb(); + border: 1px solid rgb();*/ border-top-right-radius: 0 !important; border-bottom-right-radius: 0 !important; border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; } -a.butActionNew>span.fa-plus-circle { padding-left: 6px; } +a.butActionNew>span.fa-plus-circle, a.butActionNew>span.fa-plus-circle:hover { padding-left: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none; } +a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-circle:hover { padding-left: 6px; font-size: 1.5em; border: none; box-shadow: none; webkit-box-shadow: none; } .butAction:hover, .butActionNew:hover { -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); @@ -2428,8 +2429,8 @@ a.butActionNew>span.fa-plus-circle { padding-left: 6px; } .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { /* background: #633; */ - border: 1px solid #733; - color: #733; + border: 1px solid #633; + color: #633; } .butActionDelete:hover { @@ -2463,7 +2464,6 @@ a.butActionNew>span.fa-plus-circle { padding-left: 6px; } text-align: center; cursor: pointer; color: #999 !important; - border: 1px solid #bbb; padding-top: 0.2em; box-shadow: none !important; -webkit-box-shadow: none !important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index b1c42b234de..f9b43f7c7db 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1413,6 +1413,7 @@ div.statusref img { padding-left: 8px; padding-right: 9px; vertical-align: text-bottom; + width: 18px; } div.statusrefbis { padding-left: 8px; @@ -2348,7 +2349,6 @@ span.butAction, span.butActionDelete { .button, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused { - border-color: #c5c5c5; border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); display: inline-block; padding: 0.4em em; @@ -2376,10 +2376,9 @@ span.butAction, span.butActionDelete { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } -.butActionNew, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { +.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { text-decoration: none; - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + /* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */ display: inline-block; padding: 0.2em em; margin: 0em em; @@ -2387,21 +2386,22 @@ span.butAction, span.butActionDelete { text-align: center; vertical-align: middle; cursor: pointer; - color: #ffffff !important; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + /* color: #ffffff !important; */ + /* text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); */ -webkit-border-radius: 2px; border-radius: 2px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #006dcc; + /* -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); */ + /* background-color: #006dcc; background-image: -moz-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; + background-repeat: repeat-x; */ } -a.butActionNew>span.fa { padding-right: 6px; } +a.butActionNew>span.fa-plus-circle { padding-left: 6px; font-size: 1.5em; } +a.butActionNewRefused>span.fa-plus-circle { padding-left: 6px; font-size: 1.5em; } .button, .butAction { color: #ffffff !important; @@ -2773,10 +2773,6 @@ div.pagination li.noborder a:hover { border: none; background-color: transparent; } -div.pagination li a, -div.pagination li span { - background-color: #fff; -} div.pagination li:first-child a, div.pagination li:first-child span { margin-left: 0; diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php index 583fe0e3189..a5552d854b1 100644 --- a/htdocs/ticketsup/list.php +++ b/htdocs/ticketsup/list.php @@ -451,7 +451,9 @@ if ($projectid) print '' . $langs->trans('NewTicket') . ''; + $newcardbutton = '' . $langs->trans('NewTicket'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index ae79b3cb220..c5dcb7a53bd 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -141,7 +141,9 @@ if ($resql) $newcardbutton=''; if ($caneditperms) { - $newcardbutton=''.$langs->trans('NewGroup').''; + $newcardbutton=''.$langs->trans('NewGroup'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''."\n"; diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 0c648d6ddeb..b3b0ff91ff8 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -277,7 +277,9 @@ $text = $langs->trans("ListOfUsers"); $newcardbutton=''; if ($canadduser) { - $newcardbutton=''.$langs->trans('NewUser').''; + $newcardbutton=''.$langs->trans('NewUser'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print ''."\n"; diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index c0d4373d6d4..bb2ca6ef2f6 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -60,7 +60,9 @@ llxHeader('', $title); $newcardbutton=''; if ($user->rights->produit->creer) { - $newcardbutton=''.$langs->trans('Create').''; + $newcardbutton=''.$langs->trans('Create'); + $newcardbutton.= ''; + $newcardbutton.= ''; } print load_fiche_titre($title, $newcardbutton, 'title_products');