From b3bdc76da302e42eb33beff03c5097c1ed59e3de Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Jun 2013 00:05:00 +0200 Subject: [PATCH 1/6] Trans: More complete examples --- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/el_GR/admin.lang | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/fr_FR/main.lang | 2 +- htdocs/langs/it_IT/admin.lang | 2 +- htdocs/langs/nb_NO/admin.lang | 2 +- htdocs/langs/nl_NL/admin.lang | 2 +- htdocs/langs/pt_BR/admin.lang | 2 +- htdocs/langs/pt_PT/admin.lang | 2 +- htdocs/langs/sl_SI/admin.lang | 2 +- htdocs/langs/tr_TR/admin.lang | 2 +- htdocs/langs/zh_TW/admin.lang | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 50a6ad497dd..1843cd985f2 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -283,7 +283,7 @@ GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canv GenericMaskCodes4a=Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007:
GenericMaskCodes4b=Exemple sobre un tercer creat el 31/03/2007:
GenericMaskCodes4c=Exemple en un producte/servei creat el 31/03/2007:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} donarà ABC0703-000099
{0000+100}-XXX/{dd}/YYY donarà 0199-XXX/31/YYY +GenericMaskCodes5=ABC{yy}{mm}-{000000} donarà ABC0703-000099
{0000+100@1}-XXX/{dd}/YYY donarà 0199-XXX/31/YYY GenericNumRefModelDesc=Retorna un nombre creat d'acord amb una màscara definida. ServerAvailableOnIPOrPort=Servidor disponible a l'adreça %s al port %s ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça %s al port %s diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index c52e1530095..bd709c7f8ac 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -147,7 +147,7 @@ GenericMaskCodes2={cccc} the client code
{cccc000} the client c GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
GenericMaskCodes4b=Example on third party created on 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX GenericNumRefModelDesc=Return a customizable number according to a defined mask. ServerAvailableOnIPOrPort=Server is available at address %s on port %s ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 944ee7da053..efe82f72bcc 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -290,7 +290,7 @@ GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
GenericMaskCodes4b=Example on third party created on 2007-03-01:
GenericMaskCodes4c=Example on product created on 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX GenericNumRefModelDesc=Returns a customizable number according to a defined mask. ServerAvailableOnIPOrPort=Server is available at address %s on port %s ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 883c316bdce..968ca417a49 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -285,7 +285,7 @@ GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambio GenericMaskCodes4a=Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007:
GenericMaskCodes4b=Ejemplo sobre un tercero creado el 31/03/2007:
GenericMaskCodes4c=Ejemplo en un producto/servicio creado el 31/03/2007:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100}-XXX/{dd}/YYY daráa 0199-XXX/31/YYY +GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100@1}-XXX/{dd}/YYY daráa 0199-XXX/31/YYY GenericNumRefModelDesc=Devuelve un número creado acorde a una máscara definida. ServerAvailableOnIPOrPort=Servidor disponible en la dirección %s en el puerto %s ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección %s en el puerto %s diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 2d9c4a329b8..dacaf21cdf2 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -285,7 +285,7 @@ GenericMaskCodes3= Tout autre caractère dans le masque sera laissé inchangé.< GenericMaskCodes4a= Exemple sur la 99eme %s du tiers LaCompanie faite le 31/03/2007:
GenericMaskCodes4b= Exemple sur un tiers créé le 31/03/2007:
GenericMaskCodes4c= Exemple sur un produit/service créé le 31/03/2007:
-GenericMaskCodes5= ABC{yy}{mm}-{000000} donnera ABC0703-000099
{0000+100}-XXX-{dd}-YYY donnera 0199-XXX-31-YYY +GenericMaskCodes5= ABC{yy}{mm}-{000000} donnera ABC0703-000099
{0000+100@1}-XXX-{dd}-YYY donnera 0199-XXX-31-YYY GenericNumRefModelDesc= Renvoie un numéro personnalisable selon un masque à définir. ServerAvailableOnIPOrPort= Serveur disponible à l'adresse %s sur le port %s ServerNotAvailableOnIPOrPort= Serveur non disponible à l'adresse %s sur le port %s diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 605df460347..13231a30d87 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -564,7 +564,7 @@ TotalWoman=Totale TotalMan=Total NeverReceived=Jamais reçu Canceled=Annulé -YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer ces valeurs depuis le menu accueil - configuration - dictionnaires +YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer les valeurs de cette liste depuis le menu accueil - configuration - dictionnaires Color=Couleur Documents=Fichiers joints DocumentsNb=Fichiers joints (%s) diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index f1af46ee050..5890cb952e4 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -335,7 +335,7 @@ GenericMaskCodes3 =Tutti gli altri caratteri nello schema rimarranno in GenericMaskCodes4a =Esempio sulla novantanovesima %s del terzo TheCompany fatta il 31/01/2007:
GenericMaskCodes4b=Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:
GenericMaskCodes4b =Esempio su un terzo created il 01/03/2007:
-GenericMaskCodes5 = ABC{yy}{mm}-{000000} darà ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX darà 0199-ZZZ/31/XXX +GenericMaskCodes5 = ABC{yy}{mm}-{000000} darà ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX darà 0199-ZZZ/31/XXX GenericMaskCodes =Puoi inserire uno schema di numerazione. In questo schema, possono essere utilizzati i seguenti tag :
{000000} Corrisponde a un numero che sarà incrementato ad ogni aggiunta di %s. Inserisci il numero di zeri equivalente alla lunghezza desiderata per il contatore. Verranno aggiunti zeri a sinistra fino alla lunghezza impostata per il contatore.
{000000+000} Come il precedente, ma con un offset corrispondente al numero a destra del segno + che viene applicato al primo inserimento %s.
{000000@x} Come sopra, ma il contatore viene reimpostato a zero quando si raggiunge il mese x (x compreso tra 1 e 12). Se viene utilizzata questa opzione e x è maggiore o uguale a 2, diventa obbligatorio inserire anche la sequenza {yy}{mm} o {yyyy}{mm}.
{dd} giorno (da 01 a 31).
{mm} mese (da 01 a 12).
{yy} , {yyyy} o {y} anno con 2, 4 o 1 cifra.
GenericNumRefModelDesc =Restituisce un numero personalizzabile in base allo schema definito dalla maschera. ##### GeoIPMaxmind ##### diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 16db48065be..0739dd70bba 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -205,7 +205,7 @@ SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den CurrentVersion=Dolibarr gjeldende versjon CallUpdatePage=Gå til siden som oppdaterer databasestruktur og data %s. LastStableVersion=Siste stabile versjon -GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:
{000000} tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde.
{000000+000} samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s.
{000000@x} samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også.
{dd} dag (01 til 31).
{mm} måned (01 til 12).
{yy}, {yyyy} eller {y} årstall over 2, 4 eller 1 siffer.
{cccc000} klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.

Alle andre tegn i malen vil forbli intakte.
Mellomrom er ikke tillatt.

Eksempel på den 99de %s av tredjeparten blir 31/01/2007:
ABC{yy}{mm}-{000000} vil gi ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX vil gi 0199-ZZZ/31/XXX
+GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:
{000000} tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde.
{000000+000} samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s.
{000000@x} samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også.
{dd} dag (01 til 31).
{mm} måned (01 til 12).
{yy}, {yyyy} eller {y} årstall over 2, 4 eller 1 siffer.
{cccc000} klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.

Alle andre tegn i malen vil forbli intakte.
Mellomrom er ikke tillatt.

Eksempel på den 99de %s av tredjeparten blir 31/01/2007:
ABC{yy}{mm}-{000000} vil gi ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX vil gi 0199-ZZZ/31/XXX
GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal. ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen %s på port %s ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen %s på port %s diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 3294dc855e7..f24eac0b403 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -261,7 +261,7 @@ GenericMaskCodes2 = {cccc} de afnermerscode
{cccc000} de afnerm GenericMaskCodes3 = Alle andere karakters in het masker zullen intact blijven.
Spaties zijn niet toegestaan.
GenericMaskCodes4a = Voorbeeld van de 99e %s van de Klant 'HetBedrijf' gedaan op 2007-01-31:
GenericMaskCodes4b = Voorbeeld van een Klant gecreëerd op 2007-03-01:
-GenericMaskCodes5 = ABC{jj}{mm}-{000000} zal ABC0701-000099 geven
{0000+100}-ZZZ/{dd}/XXX zal 0199-ZZZ/31/XXX geven +GenericMaskCodes5 = ABC{jj}{mm}-{000000} zal ABC0701-000099 geven
{0000+100@1}-ZZZ/{dd}/XXX zal 0199-ZZZ/31/XXX geven GenericNumRefModelDesc = Geeft een aanpasbaar nummer volgens een gedefinieerd masker. ServerAvailableOnIPOrPort = Server is beschikbaar op het IP-adres %s met poort %s ServerNotAvailableOnIPOrPort = Server is niet beschikbaar op het IP-adres %s met poort %s diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index d5539390ec5..56a14c62238 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -220,7 +220,7 @@ GenericMaskCodes2={cccc} o código de cliente em n� de caracteres
Não é permitido espaços
GenericMaskCodes4a=Exemplo em 99 � %s o Fornecedor a Empresa realizada em 31/03/2007:
GenericMaskCodes4b=Exemplo sobre um Fornecedor criado em 31/03/2007:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100}-XXX/{dd}/YYY dará 0199-XXX/31/YYY +GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100@1}-XXX/{dd}/YYY dará 0199-XXX/31/YYY GenericNumRefModelDesc=Devolve um número criado na linha em uma máscara definida. ServerAvailableOnIPOrPort=Servidor disponível não endereço %s na porta %s ServerNotAvailableOnIPOrPort=Servidor não disponível não endereço %s na Porta %s diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 9f76699ac02..1a1a0f03eaf 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -289,7 +289,7 @@ GenericMaskCodes2 = {cccc} o código de cliente em nº de caracteres
< GenericMaskCodes3 = Qualquer outro caractere na máscara fica sem alterações.
Não são permitidos espaços
GenericMaskCodes4a = Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007:
GenericMaskCodes4b = Exemplo sobre um Terceiro criado em 31/03/2007:
-GenericMaskCodes5 = ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100}-XXX/{dd}/YYY dará 0199-XXX/31/YYY +GenericMaskCodes5 = ABC{yy}{mm}-{000000} dará ABC0703-000099
{0000+100@1}-XXX/{dd}/YYY dará 0199-XXX/31/YYY GenericNumRefModelDesc = Devolve um número criado na linha numa máscara definida. GeoIPMaxmindSetup = MaxMind GeoIP instalação do módulo GlobalSetup = Geral diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 30a78c38f68..6b307bf2f09 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -269,7 +269,7 @@ GenericMaskCodes2 = {cccc} koda klienta
{cccc000} koda klienta GenericMaskCodes3 = Vsi ostali znaki v maski bodo ostali nedotaknjeni.
Presledki niso dovoljeni.
GenericMaskCodes4a = Primer 99-ega %s partnerja podjetja narejen 2007-01-31:
GenericMaskCodes4b = Primer partnerja 99, kreiranega 2007-03-01:
-GenericMaskCodes5 = ABC{yy}{mm}-{000000} bo dal rezultat ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX bo dal rezultat 0199-ZZZ/31/XXX +GenericMaskCodes5 = ABC{yy}{mm}-{000000} bo dal rezultat ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX bo dal rezultat 0199-ZZZ/31/XXX GenericNumRefModelDesc = Predlaga prilagodljivo številko glede na definirano masko. ServerAvailableOnIPOrPort = Strežnik je na voljo na naslovu %s na vratih %s ServerNotAvailableOnIPOrPort = Strežnik ni na voljo na naslovu %s na vratih %s diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 93dcdfaacb7..33e61b9e73d 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -290,7 +290,7 @@ GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.
Boşlu GenericMaskCodes4a=Üçüncü partinin 99 uncu %s örneği Firma 2007/01/31 de yapıldı:
GenericMaskCodes4b=2007/03/01 tarihinde oluşturulan üçüncü parti örneği:
GenericMaskCodes4c=2007-03-01 de oluşturulan ürün için örnek:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} ABC0701-000099 verecektir
{0000+100}-ZZZ/{dd}/XXX 0199-ZZZ/31/XXX verecektir +GenericMaskCodes5=ABC{yy}{mm}-{000000} ABC0701-000099 verecektir
{0000+100@1}-ZZZ/{dd}/XXX 0199-ZZZ/31/XXX verecektir GenericNumRefModelDesc=Tanımlı bir maskeye göre özelleştirilebilir bir sayı verir. ServerAvailableOnIPOrPort=Sunucu %s portundaki %s adresinde bulunur. ServerNotAvailableOnIPOrPort=Sunucu %s portundaki %s adresinde yoktur. diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index ac7930d134b..98026a5392a 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -258,7 +258,7 @@ GenericMaskCodes2=（）中交的客戶端代碼
（cccc000）n注意:不允許空白字元
GenericMaskCodes4a=例如: 第99筆 %s 資訊於 2007-01-31 建立完成：
GenericMaskCodes4b=例如: 於 2007-01-31 建立的客戶/供應商資訊:
-GenericMaskCodes5=參數:ABC{yy}{mm}-{000000} 編碼為 ABC0701-000099
參數:{0000+100}-ZZZ/{dd}/XXX 編碼為 0199-ZZZ/31/XXX +GenericMaskCodes5=參數:ABC{yy}{mm}-{000000} 編碼為 ABC0701-000099
參數:{0000+100@1}-ZZZ/{dd}/XXX 編碼為 0199-ZZZ/31/XXX GenericNumRefModelDesc=根據事先定義的遮罩值，回傳一個客制化的編號，詳細可參照說明。 ServerAvailableOnIPOrPort=服務器可在地址%s%s的連接埠上 From 8311b83861da364becb419aaa2a78affc6021a9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Jun 2013 11:40:29 +0200 Subject: [PATCH 2/6] Fix: css --- htdocs/theme/eldy/style.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 607d7d6e4f9..92bea0dcc73 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2703,11 +2703,12 @@ a.ui-link { background: #fff; } -div.ui-radio +div.ui-radio, div.ui-checkbox { display: inline-block; + border-bottom: 0px !important; } -.ui-radio input { +ui-checkbox input, .ui-radio input { height: auto; width: auto; margin: 0; From 9a5b55219a0bbe1bce438eacdb619844b8f27b49 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Jun 2013 14:38:56 +0200 Subject: [PATCH 3/6] Fix: CSS --- htdocs/core/class/html.form.class.php | 2 +- htdocs/theme/amarok/style.css.php | 8 ++++++-- htdocs/theme/auguria/style.css.php | 8 ++++++-- htdocs/theme/bureau2crea/style.css.php | 8 ++++++-- htdocs/theme/cameleo/style.css.php | 8 ++++++-- htdocs/theme/eldy/style.css.php | 8 ++++++-- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 2f1cf0b45fc..114a2356c6d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3421,7 +3421,7 @@ class Form // Year if ($empty || $set_time == -1) { - $retstring.=''; + $retstring.=''; } else { diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index b81ae3a090e..7dd45121a00 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -256,6 +256,10 @@ input:-webkit-autofill { background-image:none !important; -webkit-box-shadow: 0 0 0 50px inset; } +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } legend { margin-bottom: 8px; } @@ -2150,10 +2154,10 @@ div.ui-radio { display: inline-block; } -.ui-radio input { +.ui-checkbox input, .ui-radio input { height: auto; width: auto; - margin: 0; + margin: 4px; position: static; } .ui-mobile fieldset diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f61c8e9d3d0..e1aa84de0cb 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -148,6 +148,10 @@ input:-webkit-autofill { background-image:none !important; -webkit-box-shadow: 0 0 0 50px inset; } +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } legend { margin-bottom: 8px; } @@ -2334,10 +2338,10 @@ div.ui-radio { display: inline-block; } -.ui-radio input { +.ui-checkbox input, .ui-radio input { height: auto; width: auto; - margin: 0; + margin: 4px; position: static; } .ui-mobile fieldset diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 989d4988ec5..1c3ca899365 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -176,6 +176,10 @@ input.button[type=submit] { font-size: 10px; display: inline; } +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } legend { margin-bottom: 8px; } @@ -2548,10 +2552,10 @@ div.ui-radio { display: inline-block; } -.ui-radio input { +.ui-checkbox input, .ui-radio input { height: auto; width: auto; - margin: 0; + margin: 4px; position: static; } .ui-mobile fieldset diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 769d20dfee9..4225e7f822e 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -154,6 +154,10 @@ input.button[type=submit] { font-size: 11px; font-weight: bold; } +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } legend { margin-bottom: 8px; } @@ -2380,10 +2384,10 @@ div.ui-radio { display: inline-block; } -.ui-radio input { +.ui-checkbox input, .ui-radio input { height: auto; width: auto; - margin: 0; + margin: 4px; position: static; } .ui-mobile fieldset diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 92bea0dcc73..fdf48f71774 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -285,6 +285,10 @@ input:-webkit-autofill { background-image:none !important; -webkit-box-shadow: 0 0 0 50px inset; } +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } legend { margin-bottom: 8px; } @@ -2708,10 +2712,10 @@ div.ui-radio, div.ui-checkbox display: inline-block; border-bottom: 0px !important; } -ui-checkbox input, .ui-radio input { +.ui-checkbox input, .ui-radio input { height: auto; width: auto; - margin: 0; + margin: 4px; position: static; } .ui-mobile fieldset From b513bd7b84ac03cfc603e287011a3c4c46b38d9d Mon Sep 17 00:00:00 2001 From: jfefe Date: Thu, 27 Jun 2013 14:30:49 +0200 Subject: [PATCH 4/6] Fix : bad element type name for company extrafields into export --- htdocs/core/modules/modSociete.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 0f2e7ed5bb6..89bc88181df 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -254,7 +254,7 @@ class modSociete extends DolibarrModules $this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'Text'); $this->export_entities_array[$r]=array(); // We define here only fields that use another picto // Add extra fields - $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'company'"; + $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'"; $resql=$this->db->query($sql); if ($resql) // This can fail when class is used on old database (during migration for example) { From 469e70089524266277a939009399e6ee80f290ff Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Thu, 27 Jun 2013 14:35:41 +0200 Subject: [PATCH 5/6] Fix bug pgsql : add mail directly into mailling --- htdocs/core/modules/mailings/modules_mailings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 5dc82e85d63..28dc31fd7ee 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -169,7 +169,7 @@ class MailingTargets // This can't be abstract as it is used for some method $sql .= "'".$this->db->escape($cibles[$i]['email'])."',"; $sql .= "'".$this->db->escape($cibles[$i]['other'])."',"; $sql .= "'".$this->db->escape($cibles[$i]['source_url'])."',"; - $sql .= "'".$this->db->escape($cibles[$i]['source_id'])."',"; + $sql .= "".(empty($cibles[$i]['source_id']) ? 'null' : "'".$this->db->escape($cibles[$i]['source_id'])."'").","; if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) { $sql .= "'".$this->db->escape(md5($cibles[$i]['email'].';'.$cibles[$i]['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',"; } From 1223d7c3d01aa3f4e4e0b53814cc3962567ea57b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Jun 2013 18:37:09 +0200 Subject: [PATCH 6/6] Fix: Civility field must be blank if not defined. --- htdocs/adherents/class/adherent.class.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 733e8cfdf74..f6be9c02807 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1500,11 +1500,12 @@ class Adherent extends CommonObject */ function getCivilityLabel() { - global $langs; - $langs->load("dict"); - - $code=$this->civilite_id; - return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code); + global $langs; + $langs->load("dict"); + + $code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:'')); + if (empty($code)) return ''; + return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code); } /**