From 4a5fd35e1154131bc0794356ee007850389f2f48 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Jun 2018 22:57:41 +0200 Subject: [PATCH] Look and feel v8 --- htdocs/accountancy/admin/account.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 2 +- .../accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/adherents/agenda.php | 2 +- htdocs/adherents/list.php | 2 +- htdocs/adherents/subscription/list.php | 2 +- htdocs/adherents/type.php | 2 +- htdocs/bookmarks/list.php | 2 +- htdocs/comm/action/list.php | 2 +- htdocs/comm/mailing/list.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/list.php | 2 +- htdocs/compta/bank/various_payment/index.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/localtax/list.php | 2 +- htdocs/compta/paiement/cheque/list.php | 2 +- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/salaries/index.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/core/class/html.formactions.class.php | 2 +- htdocs/core/lib/company.lib.php | 6 ++--- htdocs/cron/list.php | 4 ++-- htdocs/don/list.php | 2 +- htdocs/expedition/list.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/langs/en_US/compta.lang | 1 + htdocs/loan/index.php | 2 +- .../modulebuilder/template/myobject_list.php | 2 +- htdocs/opensurvey/list.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/stock/list.php | 2 +- htdocs/projet/info.php | 4 +++- htdocs/projet/list.php | 2 +- htdocs/projet/tasks/list.php | 2 +- htdocs/resource/list.php | 2 +- htdocs/societe/agenda.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/supplier_proposal/list.php | 2 +- htdocs/theme/eldy/style.css.php | 23 ++++++++++++------- htdocs/ticket/list.php | 9 ++++---- htdocs/user/group/list.php | 2 +- htdocs/user/list.php | 2 +- htdocs/variants/list.php | 2 +- 50 files changed, 73 insertions(+), 62 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index baa9273e135..493c9e62717 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -226,7 +226,7 @@ if ($resql) print ''; print ''; - $newcardbutton = '' . $langs->trans("Addanaccount"); + $newcardbutton = '' . $langs->trans("Addanaccount").''; $newcardbutton.= ''; $newcardbutton.= ''; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 0e3d0df198b..b0a91f7ce36 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -439,7 +439,7 @@ $button.= ''; $groupby = ' ' . $langs->trans("GroupByAccountAccounting") . ''; -$newcardbutton = '' . $langs->trans("NewAccountingMvt"); +$newcardbutton = '' . $langs->trans("NewAccountingMvt").''; $newcardbutton.= ''; $newcardbutton.= ''; diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 02071b3963c..80a4f0db5e8 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -256,7 +256,7 @@ if ($action == 'delbookkeepingyear') { print '
'; $viewflat = ' ' . $langs->trans("ViewFlatList") . ''; -$newcardbutton = '' . $langs->trans("NewAccountingMvt"); +$newcardbutton = '' . $langs->trans("NewAccountingMvt").''; $newcardbutton.= ''; $newcardbutton.= ''; diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 41f45d54ebd..2b663ecf2bc 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -151,7 +151,7 @@ if ($object->id > 0) $newcardbutton = ''; if (! empty($conf->agenda->enabled)) { - $newcardbutton.=''.$langs->trans("AddAction"); + $newcardbutton.=''.$langs->trans("AddAction").''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 13d0cbd30c5..7b1d9416dc2 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -353,7 +353,7 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->adherent->creer) { - $newcardbutton=''.$langs->trans('NewMember'); + $newcardbutton=''.$langs->trans('NewMember').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index bf15230d47e..21ba01088e4 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -189,7 +189,7 @@ if ($result) $newcardbutton=''; if ($user->rights->adherent->cotisation->creer) { - $newcardbutton=''.$langs->trans('NewSubscription'); + $newcardbutton=''.$langs->trans('NewSubscription').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index b0b5eee67ed..56363599c10 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -231,7 +231,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') $newcardbutton=''; if ($user->rights->adherent->configurer) { - $newcardbutton=''.$langs->trans('NewMemberType'); + $newcardbutton=''.$langs->trans('NewMemberType').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index f96eb50c531..ac5a89c66f3 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -84,7 +84,7 @@ llxHeader('', $langs->trans("ListOfBookmarks")); $newcardbutton=''; if ($user->rights->bookmark->creer) { - $newcardbutton=''.$langs->trans('NewBookmark'); + $newcardbutton=''.$langs->trans('NewBookmark').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index eb2f6f112c7..2c11a1de977 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -415,7 +415,7 @@ if ($resql) //$param='month='.$monthshown.'&year='.$year; $hourminsec='100000'; - $newcardbutton = ''.$langs->trans("AddAction"); + $newcardbutton = ''.$langs->trans("AddAction").''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index a8432427ca8..87a390d4006 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -108,7 +108,7 @@ if ($result) $newcardbutton=''; if ($user->rights->mailing->creer) { - $newcardbutton=''.$langs->trans('NewMailing'); + $newcardbutton=''.$langs->trans('NewMailing').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 7dc5ad82263..08860bc3c08 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -461,7 +461,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->propal->creer) { - $newcardbutton=''.$langs->trans('NewPropal'); + $newcardbutton=''.$langs->trans('NewPropal').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 157ceb3734d..22d2e00a0c2 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -448,7 +448,7 @@ if ($resql) $newcardbutton=''; if ($contextpage == 'orderlist' && $user->rights->commande->creer) { - $newcardbutton=''.$langs->trans('NewOrder'); + $newcardbutton=''.$langs->trans('NewOrder').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 55fdcdd71d9..72f4bbbd988 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -732,7 +732,7 @@ 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 { diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 0f35413e23b..c425dd25b58 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -229,7 +229,7 @@ $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 36a7755e665..3cb843e45f2 100644 --- a/htdocs/compta/bank/various_payment/index.php +++ b/htdocs/compta/bank/various_payment/index.php @@ -157,7 +157,7 @@ if ($result) $newcardbutton=''; if ($user->rights->banque->modifier) { - $newcardbutton=''.$langs->trans('MenuNewVariousPayment'); + $newcardbutton=''.$langs->trans('MenuNewVariousPayment').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 3d65ef9311a..e572b2ffdbe 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -604,7 +604,7 @@ if ($resql) $newcardbutton=''; if($user->rights->facture->creer) { - $newcardbutton=''.$langs->trans('NewBill'); + $newcardbutton=''.$langs->trans('NewBill').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php index 3ea385def11..0e32a249f17 100644 --- a/htdocs/compta/localtax/list.php +++ b/htdocs/compta/localtax/list.php @@ -45,7 +45,7 @@ $localtax_static = new Localtax($db); $newcardbutton=''; if ($user->rights->tax->charges->creer) { - $newcardbutton=''.$langs->trans('NewVATPayment'); + $newcardbutton=''.$langs->trans('NewLocalTaxPayment', ($ltt+1)).''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index d626030bae0..c8762d06e7c 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -138,7 +138,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->banque->cheque) { - $newcardbutton = ''.$langs->trans('NewCheckDeposit'); + $newcardbutton = ''.$langs->trans('NewCheckDeposit').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 50a7c865d2c..0cbaa9ce55e 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -108,7 +108,7 @@ if ($result) $newcardbutton=''; if ($user->rights->prelevement->bons->creer) { - $newcardbutton = ''.$langs->trans('NewStandingOrder'); + $newcardbutton = ''.$langs->trans('NewStandingOrder').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index 5173c69a65b..8b8d732e9b8 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -151,7 +151,7 @@ if ($result) $newcardbutton=''; if ($user->rights->salaries->payment->write) { - $newcardbutton=''.$langs->trans('NewSalaryPayment'); + $newcardbutton=''.$langs->trans('NewSalaryPayment').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index d04fe23a224..7a5503d07ca 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -423,7 +423,7 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->societe->contact->creer) { - $newcardbutton=''.$langs->trans('NewContactAddress'); + $newcardbutton=''.$langs->trans('NewContactAddress').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index f4b4e010faf..8eeff2613f0 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -197,7 +197,7 @@ class FormActions $newcardbutton=''; if (! empty($conf->agenda->enabled)) { - $newcardbutton = ''.$langs->trans("AddEvent"); + $newcardbutton = ''.$langs->trans("AddEvent").''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index bf124a49ce4..20139450a1a 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -728,7 +728,7 @@ 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").''; $newcardbutton.= ''; $newcardbutton.= ''; } @@ -931,7 +931,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') if ($user->rights->societe->contact->creer) { $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); - $newcardbutton=''.$addcontact; + $newcardbutton=''.$addcontact.''; $newcardbutton.= ''; $newcardbutton.= ''; } @@ -1185,7 +1185,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='') $newcardbutton=''; if ($user->rights->societe->creer) { - $newcardbutton=''.$langs->trans("AddAddress"); + $newcardbutton=''.$langs->trans("AddAddress").''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 2197309ddcf..9d07ee2aa33 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -341,13 +341,13 @@ 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.= ''; } diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 334d1f219c2..6c1e3b7efbc 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -141,7 +141,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->don->creer) { - $newcardbutton=''.$langs->trans('NewDonation'); + $newcardbutton=''.$langs->trans('NewDonation').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 767000f1e96..99b44e72fc1 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -278,7 +278,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->expedition->creer) { - $newcardbutton=''.$langs->trans('NewSending'); + $newcardbutton=''.$langs->trans('NewSending').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 7df4bd9e67f..0caf115690d 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -471,7 +471,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->expensereport->creer) { - $newcardbutton=''.$langs->trans('NewTrip'); + $newcardbutton=''.$langs->trans('NewTrip').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 17a25071e68..9b054e66545 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -279,7 +279,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->ficheinter->creer) { - $newcardbutton=''.$langs->trans('NewIntervention'); + $newcardbutton=''.$langs->trans('NewIntervention').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 1ea820e09ad..f0e9793f9a1 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -644,7 +644,7 @@ if ($resql) $newcardbutton=''; if($user->rights->fournisseur->commande->creer) { - $newcardbutton=''.$langs->trans('NewOrder'); + $newcardbutton=''.$langs->trans('NewOrder').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 90240cf8688..8c77feb2187 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -479,7 +479,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->fournisseur->facture->creer) { - $newcardbutton=''.$langs->trans('NewBill'); + $newcardbutton=''.$langs->trans('NewBill').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 04fae6fbdab..070b735d09d 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -382,7 +382,7 @@ else $newcardbutton=''; if ($user->rights->holiday->write) { - $newcardbutton=''.$langs->trans('MenuAddCP'); + $newcardbutton=''.$langs->trans('MenuAddCP').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 6ac6f7b6f0c..ce70a9748a0 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -105,6 +105,7 @@ VATPayment=Sales tax payment VATPayments=Sales tax payments VATRefund=Sales tax refund NewVATPayment=New sales tax payment +NewLocalTaxPayment=New tax %s payment Refund=Refund SocialContributionsPayments=Social/fiscal taxes payments ShowVatPayment=Show VAT payment diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index fd9dfdb6b9f..03e3ab482f4 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -117,7 +117,7 @@ if ($resql) $newcardbutton=''; if ($user->rights->loan->write) { - $newcardbutton=''.$langs->trans('NewLoan'); + $newcardbutton=''.$langs->trans('NewLoan').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index b81fee8bbcb..b6e2b351494 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -352,7 +352,7 @@ print ''; $newcardbutton=''; //if ($user->rights->mymodule->creer) //{ - $newcardbutton=''.$langs->trans('New'); + $newcardbutton=''.$langs->trans('New').''; $newcardbutton.= ''; $newcardbutton.= ''; //} diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 900168cafb5..0471abcddb9 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -100,7 +100,7 @@ $fieldtosortuser=empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?'firstname': $newcardbutton=''; if (!$user->rights->opensurvey->creer) { - $newcardbutton=''.$langs->trans('NewSurvey'); + $newcardbutton=''.$langs->trans('NewSurvey').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 2d306a69ff4..de4051a933c 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -424,7 +424,7 @@ else { $label='NewProduct'; if($type == Product::TYPE_SERVICE) $label='NewService'; - $newcardbutton=''.$langs->trans($label); + $newcardbutton=''.$langs->trans($label).''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index c1b055bf5a9..6ec624bb281 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -134,7 +134,7 @@ if ($result) $newcardbutton=''; if ($user->rights->stock->creer) { - $newcardbutton=''.$langs->trans('MenuNewWarehouse'); + $newcardbutton=''.$langs->trans('MenuNewWarehouse').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index 4998d9f695f..64bc17aa749 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -163,7 +163,9 @@ if (! empty($conf->agenda->enabled)) { if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create)) { - $morehtmlcenter.=''.$langs->trans("AddAction").''; + $morehtmlcenter.=''.$langs->trans("AddAction").''; + $morehtmlcenter.=''; + $morehtmlcenter.=''; } else { diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 58b473a8b20..990e7bb3dde 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -448,7 +448,7 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->projet->creer) { - $newcardbutton = ''.$langs->trans('NewProject'); + $newcardbutton = ''.$langs->trans('NewProject').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 4e7599c1592..02549454e8e 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -400,7 +400,7 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->projet->creer) { - $newcardbutton = ''.$langs->trans('NewTask'); + $newcardbutton = ''.$langs->trans('NewTask').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index a291726c567..63ec3d6d6ff 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -195,7 +195,7 @@ if($ret == -1) { $newcardbutton=''; if ($user->rights->resource->write) { - $newcardbutton=''.$langs->trans('MenuResourceAdd'); + $newcardbutton=''.$langs->trans('MenuResourceAdd').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index f992206ef23..ebd35a6575c 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -164,7 +164,7 @@ if ($socid > 0) { if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create)) { - $newcardbutton.=''.$langs->trans("AddAction"); + $newcardbutton.=''.$langs->trans("AddAction").''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 32d86f4bcd4..ec31cefdd52 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -605,7 +605,7 @@ if ($user->rights->societe->creer) if($type == 'f') $label='NewSupplier'; } - $newcardbutton = ''.$langs->trans($label); + $newcardbutton = ''.$langs->trans($label).''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 97b31e09010..2ff40f83764 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -224,7 +224,7 @@ 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 { diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 13359e7b446..7ab88474bac 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -389,7 +389,7 @@ if ($resql) $newcardbutton=''; if($user->rights->supplier_proposal->creer) { - $newcardbutton=''.$langs->trans('NewAskPrice'); + $newcardbutton=''.$langs->trans('NewAskPrice').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4570ef493f5..3d2fa9ca7d7 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -117,7 +117,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_TEXT='0,0,0'; - $conf->global->THEME_ELDY_FONT_SIZE1='0.85em'; + $conf->global->THEME_ELDY_FONT_SIZE1='0.86em'; $conf->global->THEME_ELDY_FONT_SIZE2='0.75em'; } @@ -2387,10 +2387,12 @@ span.butAction, span.butActionDelete { .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { text-decoration: none; + text-transform: uppercase; + font-weight: bold; + margin: 0em em !important; padding: 0.6em em; font-family: ; - font-weight: normal; 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; @@ -2398,7 +2400,6 @@ span.butAction, span.butActionDelete { /* color: #fff; */ /* background: rgb(); */ color: #000; - /* text-transform: uppercase; */ border: 1px solid #aaa; border-top-right-radius: 0 !important; @@ -2408,10 +2409,12 @@ span.butAction, span.butActionDelete { } .butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { text-decoration: none; + text-transform: uppercase; + font-weight: normal; + margin: 0em 0.3em 0 0.3em !important; padding: 0.2em em 0.3em; font-family: ; - font-weight: normal; 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; @@ -2445,13 +2448,15 @@ a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-ci } .butActionRefused { - text-decoration: none !important; + text-decoration: none !important; + text-transform: uppercase; + font-weight: bold !important; + white-space: nowrap !important; cursor: not-allowed !important; margin: 0em em; padding: 0.6em em; font-family: !important; - font-weight: normal !important; display: inline-block; text-align: center; cursor: pointer; @@ -2459,13 +2464,15 @@ a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-ci border: 1px solid #bbb; } .butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active { - text-decoration: none !important; + text-decoration: none !important; + text-transform: uppercase; + font-weight: normal !important; + white-space: nowrap !important; cursor: not-allowed !important; margin: 0em em; padding: 0.2em em; font-family: !important; - font-weight: normal !important; display: inline-block; text-align: center; cursor: pointer; diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index a9e647eae1e..d654c763f9b 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -451,7 +451,7 @@ if ($projectid) print '' . $langs->trans('NewTicket'); + $newcardbutton = '' . $langs->trans('NewTicket').''; $newcardbutton.= ''; $newcardbutton.= ''; } @@ -474,14 +474,15 @@ if ($sall) print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall); } +print '
'; if ($search_fk_status == 'non_closed') { - print '
' . $langs->trans('TicketViewAllTickets') . '
'; + print '
' . $langs->trans('TicketViewAllTickets') . '
'; $param .= '&search_fk_status=non_closed'; } else { - print '
' . $langs->trans('TicketViewNonClosedOnly') . '
'; + print '
' . $langs->trans('TicketViewNonClosedOnly') . '
'; $param .= '&search_fk_status=-1'; } - +print '
'; $moreforfilter = ''; diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index a76d6efd457..b478f99bd59 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -142,7 +142,7 @@ if ($resql) $newcardbutton=''; if ($caneditperms) { - $newcardbutton=''.$langs->trans('NewGroup'); + $newcardbutton=''.$langs->trans('NewGroup').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 77e52f1f6a2..29a3d0fc647 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -276,7 +276,7 @@ $text = $langs->trans("ListOfUsers"); $newcardbutton=''; if ($canadduser) { - $newcardbutton=''.$langs->trans('NewUser'); + $newcardbutton=''.$langs->trans('NewUser').''; $newcardbutton.= ''; $newcardbutton.= ''; } diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index bb2ca6ef2f6..af859175946 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -60,7 +60,7 @@ llxHeader('', $title); $newcardbutton=''; if ($user->rights->produit->creer) { - $newcardbutton=''.$langs->trans('Create'); + $newcardbutton=''.$langs->trans('Create').''; $newcardbutton.= ''; $newcardbutton.= ''; }