From 7ec43e8b5955012afa77d2b0ad78de3ec10d842d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 24 Sep 2019 09:54:57 +0200 Subject: [PATCH 1/3] add missing translation --- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 2 +- htdocs/langs/en_US/propal.lang | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 77c41d01927..d7c57e83ccc 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -440,7 +440,7 @@ class pdf_azur extends ModelePDFPropales { $tmpuser=new User($this->db); $tmpuser->fetch($object->user_author_id); - $notetoshow.='Affaire suivi par '.$tmpuser->getFullName($langs); + $notetoshow.=$langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs); if ($tmpuser->email) $notetoshow.=', Mail: '.$tmpuser->email; if ($tmpuser->office_phone) $notetoshow.=', Tel: '.$tmpuser->office_phone; } diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 7fce5107356..b6a7df10aca 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -83,3 +83,4 @@ DefaultModelPropalToBill=Default template when closing a business proposal (to b DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) ProposalCustomerSignature=Written acceptance, company stamp, date and signature ProposalsStatisticsSuppliers=Vendor proposals statistics +CaseFollowedBy=Case followed by From 99ed34b6a44192a8882bb2ba591d136736155f29 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Sep 2019 11:39:02 +0200 Subject: [PATCH 2/3] Fix escape db --- htdocs/resource/class/dolresource.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 4cb115ef378..1b9a0290c53 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -849,7 +849,7 @@ class Dolresource extends CommonObject $sql.= ' FROM '.MAIN_DB_PREFIX.'element_resources'; $sql.= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'"; if($resource_type) - $sql.=" AND resource_type LIKE '%".$resource_type."%'"; + $sql.=" AND resource_type LIKE '%".$this->db->escape($resource_type)."%'"; $sql .= ' ORDER BY resource_type'; dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG); From f96c9c3bb5997e1d358b02bf0c3815ab5d77deb2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Sep 2019 11:51:34 +0200 Subject: [PATCH 3/3] FIX #11931 #11963 --- htdocs/admin/index.php | 2 +- htdocs/core/lib/functions.lib.php | 6 +----- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/md/style.css.php | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 0bf4c6bd235..a6336d11d8e 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -43,7 +43,7 @@ $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones' llxHeader('', $langs->trans("Setup"), $wikihelp); -print load_fiche_titre($langs->trans("SetupArea"), '', 'tools_title'); +print load_fiche_titre($langs->trans("SetupArea"), '', 'tools'); if (! empty($conf->global->MAIN_MOTD_SETUPPAGE)) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 61f07dc3e31..431d72035a7 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3015,7 +3015,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) if (empty($srconly) && in_array($pictowithoutext, array( 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', - 'note', 'setup', 'tools_title', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', + 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', 'jabber','skype','twitter','facebook','linkedin', 'chevron-left','chevron-right','chevron-down','chevron-top' ) @@ -3029,10 +3029,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-cog'; $fasize = '1.4em'; } - elseif ($pictowithoutext == 'tools_title') { - $fakey = 'fa-tools'; - $fasize = '2.4em'; - } elseif ($pictowithoutext == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor = '#999'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 14f13f4f97e..561da969cdd 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3500,7 +3500,7 @@ div.boximport { .fieldrequired { font-weight: bold; color: #000055; } -.widthpictotitle { width: 40px; text-align: ; } +.widthpictotitle { width: 40px; font-size: 1.5em; text-align: ; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { /* margin: 0px; */ } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4d0fbe1d09f..35bbdc9b3a5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3536,7 +3536,7 @@ div.boximport { .fieldrequired { font-weight: bold; color: #000055; } -.widthpictotitle { width: 40px; text-align: ; } +.widthpictotitle { width: 40px; font-size: 1.4em; text-align: ; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { /* margin: 0px; */ }