From 12973dbdb4cc501ccaf8eb595c241f5cbfcc1289 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Jun 2013 22:06:28 +0200 Subject: [PATCH] Look: Minor enhancement Fix: Option to fix bug to send email on by default. --- htdocs/admin/mails.php | 2 +- htdocs/admin/sms.php | 2 +- htdocs/install/mysql/data/llx_const.sql | 10 ++------ htdocs/theme/eldy/style.css.php | 33 ++++++++++++++----------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index de0f9f6ed08..fc47a6b607e 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -599,7 +599,7 @@ else print ''; - if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') + if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) { print '
'; /* diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index fc7f4e25c68..a91b8aa2ebd 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -217,7 +217,7 @@ else { $var=true; - if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; + if (! count($listofmethods)) print '
'.$langs->trans("NoSmsEngine",'DoliStore').'
'; print ''; print ''; diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index e7ac32687cf..1669d49c216 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -51,7 +51,6 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M -- -- IHM -- - insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0); @@ -62,7 +61,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT -- --- Delai tolerance +-- Warning delays -- insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_ACTIONS_TODO','7','chaine','Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_ORDERS_TO_PROCESS','2','chaine','Tolérance de retard avant alerte (en jours) sur commandes clients non traitées',0); @@ -77,13 +76,8 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_MEM insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE','62','chaine','Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire',0); --- --- Tiers --- -insert into llx_const (name, value, type, note, visible, entity) values ('SOCIETE_NOLIST_COURRIER','1','yesno','Liste les fichiers du repertoire courrier',0,0); - - -- -- Mail Mailing -- +insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux ike system',1); insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','dolibarr@domain.com','chaine','EMail emmetteur pour les envois d emailings',0); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 02e871c20f6..a311080a73d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -919,19 +919,20 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks margin: 1px 0px 8px 2px; - background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 8px); - background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 8px); -/* background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); */ - background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 8px); - background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 8px); - background-image: linear-gradient(bottom, rgb() 0px, rgb() 8px); + + background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 3px); + background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: url(); background-position:top; background-repeat:repeat-x; border-left: 1px solid #CCCCCC; - border-right: 1px solid #DDDDDD; + border-right: 1px solid #D0D0D0; border-bottom: 1px solid #DDDDDD; border-top: 1px solid #DDDDDD; border-radius: 5px; @@ -1874,19 +1875,20 @@ div.ok { } div.warning { - color: #997711; - padding: 0.2em 0.2em 0.2em 0.2em; + color: #504020; + padding: 0.3em 0.3em 0.3em 0.3em; margin: 0.5em 0em 0.5em 0em; - border: 1px solid #e0e0d0; + border: 1px solid #e0d0b0; -moz-border-radius:6px; -webkit-border-radius: 6px; border-radius: 6px; - background: #efefd4; + background: #FFEF9A; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } div.error { color: #550000; font-weight: bold; - padding: 0.2em 0.2em 0.2em 0.2em; + padding: 0.3em 0.3em 0.3em 0.3em; margin: 0.5em 0em 0.5em 0em; border: 1px solid #DC9CAB; -moz-border-radius:6px; @@ -1897,14 +1899,15 @@ div.error { /* Info admin */ div.info { - color: #807050; + color: #302010; padding: 0.4em 0.4em 0.4em 0.4em; margin: 0.5em 0em 0.5em 0em; - border: 1px solid #DFDFA0; + border: 1px solid #DFBF9A; -moz-border-radius:6px; -webkit-border-radius: 6px; border-radius:6px; - background: #EFEFBA; + background: #EFCFAA; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); }
'.$langs->trans("Parameter").''.$langs->trans("Value").'