From 44304c9ada1c86921c7084d0510fd53adf1ce4af Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Fri, 16 Mar 2012 07:45:28 +0000
Subject: [PATCH] Agrandir la taille par defaut du texte dans le wrapper html
 des emails texte Reglages par defaut : pas de conversion iso ni de mise a
 plat des css en inline (feature bugguee)

---
 emails/texte.html           | 39 +++++++++++++++++++------------------
 facteur_administrations.php |  4 ++--
 paquet.xml                  |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/emails/texte.html b/emails/texte.html
index ce2979e..2ec7d94 100644
--- a/emails/texte.html
+++ b/emails/texte.html
@@ -21,7 +21,7 @@
 		}
 		img {
 			border: none;
-			font-size: 14px;
+			font-size: 16px;
 			font-weight: bold;
 			height: auto;
 			line-height: 100%;
@@ -44,7 +44,7 @@
 		h1, .h1 {
 			color: #202020;
 			display: block;
-			font-family: Arial;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
 			font-size: 34px;
 			font-weight: bold;
 			line-height: 100%;
@@ -54,7 +54,7 @@
 		h2, .h2 {
 			color: #202020;
 			display: block;
-			font-family: Arial;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
 			font-size: 30px;
 			font-weight: bold;
 			line-height: 100%;
@@ -64,7 +64,7 @@
 		h3, .h3 {
 			color: #202020;
 			display: block;
-			font-family: Arial;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
 			font-size: 26px;
 			font-weight: bold;
 			line-height: 100%;
@@ -74,7 +74,7 @@
 		h4, .h4 {
 			color: #202020;
 			display: block;
-			font-family: Arial;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
 			font-size: 22px;
 			font-weight: bold;
 			line-height: 100%;
@@ -86,8 +86,8 @@
 		}
 		.preheaderContent div {
 			color: #505050;
-			font-family: Arial;
-			font-size: 10px;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
+			font-size: 12px;
 			line-height: 100%;
 			text-align: left;
 		}
@@ -106,7 +106,7 @@
 		}
 		.headerContent {
 			color: #202020;
-			font-family: Arial;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
 			font-size: 34px;
 			font-weight: bold;
 			line-height: 100%;
@@ -128,8 +128,8 @@
 		}
 		.bodyContent div {
 			color: #505050;
-			font-family: Arial;
-			font-size: 14px;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
+			font-size: 16px;
 			line-height: 150%;
 			text-align: left;
 		}
@@ -148,8 +148,8 @@
 		}
 		.footerContent div {
 			color: #707070;
-			font-family: Arial;
-			font-size: 12px;
+			font-family: 'Helvetica Neue',Helvetica,Arial;
+			font-size: 14px;
 			line-height: 125%;
 			text-align: left;
 		}
@@ -194,7 +194,7 @@
 							<table border="0" cellpadding="10" cellspacing="0" width="100%">
 								<tr>
 									<td valign="top">
-										<div style="color: #505050;font-family: Arial;font-size: 10px;line-height: 100%;text-align: left;">
+										<div style="color: #505050;font-family: 'Helvetica Neue',Helvetica,Arial;font-size: 12px;line-height: 100%;text-align: left;">
 											<br>
 										</div>
 									</td>
@@ -220,7 +220,7 @@
 										<table border="0" cellpadding="10" cellspacing="0" width="100%">
 											<tr>
 												<td valign="top">
-													<div style="color: #505050;font-family: Arial;font-size: 14px;line-height: 150%;text-align: left;">
+													<div style="color: #505050;font-family: 'Helvetica Neue',Helvetica,Arial;font-size: 16px;line-height: 150%;text-align: left;">
 														[(#ENV*{html}|propre|replace{'<br />\s*<br />(\s*<br />)+?','<br /> <br />'})]
 														<br>
 														<br>
@@ -249,7 +249,7 @@
 												<td valign="top" width="370">
 													<br>
 
-													<div style="color: #707070;font-family: Arial;font-size: 12px;line-height: 125%;text-align: left;">
+													<div style="color: #707070;font-family: 'Helvetica Neue',Helvetica,Arial;font-size: 14px;line-height: 125%;text-align: left;">
 														<br>
 													</div>
 													<br>
@@ -257,7 +257,7 @@
 												<td valign="top" width="170" id="Rewards">
 													<br>
 
-													<div style="color: #707070;font-family: Arial;font-size: 12px;line-height: 125%;text-align: left;">
+													<div style="color: #707070;font-family: 'Helvetica Neue',Helvetica,Arial;font-size: 14px;line-height: 125%;text-align: left;">
 														<br>
 													</div>
 													<br>
@@ -266,7 +266,7 @@
 											<tr>
 												<td colspan="2" valign="middle" id="utility"
 														style="background-color: #FDFDFD;border-top: 1px solid #F5F5F5;">
-													<div style="color: #707070;font-family: Arial;font-size: 12px;line-height: 125%;text-align: center;">
+													<div style="color: #707070;font-family: 'Helvetica Neue',Helvetica,Arial;font-size: 14px;line-height: 125%;text-align: center;">
 														&nbsp;<br>
 													</div>
 												</td>
@@ -299,12 +299,13 @@
 				<table border="0" cellpadding="0" cellspacing="0" width="600" id="canspamBar">
 					<tr>
 						<td align="left" valign="top"
-								style="color:#505050 !important;font-family:Verdana,Arial,Sans !important;font-size:11px !important;font-weight:normal !important;font-style:normal !important;text-decoration:none !important;vertical-align:top !important;text-align:left !important;">
+								style="color:#505050 !important;font-family:Verdana,Arial,Sans !important;font-size:13px !important;font-weight:normal !important;font-style:normal !important;text-decoration:none !important;vertical-align:top !important;text-align:left !important;">
+							<a href="#URL_SITE_SPIP/">#NOM_SITE_SPIP</a>
 							<br/>
 							<br/>
 						</td>
 						<td align="left" valign="top">
-							#NOM_SITE_SPIP
+							
 						</td>
 					</tr>
 				</table>
diff --git a/facteur_administrations.php b/facteur_administrations.php
index 2f592f1..1b0467a 100755
--- a/facteur_administrations.php
+++ b/facteur_administrations.php
@@ -18,8 +18,8 @@ function facteur_upgrade($nom_meta_base_version, $version_cible){
 		array('ecrire_meta','facteur_smtp_secure', 'non'),
 		array('ecrire_meta','facteur_smtp_sender', ''),
 		array('ecrire_meta','facteur_filtre_images', 1),
-		array('ecrire_meta','facteur_filtre_css', 1),
-		array('ecrire_meta','facteur_filtre_iso_8859', 1),
+		array('ecrire_meta','facteur_filtre_css', 0),
+		array('ecrire_meta','facteur_filtre_iso_8859', 0),
 		array('ecrire_meta','facteur_adresse_envoi', 'non'),
 		array('facteur_vieil_upgrade'),
 	);
diff --git a/paquet.xml b/paquet.xml
index f202599..5826ded 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="facteur"
 	categorie="communication"
-	version="2.1.0"
+	version="2.1.1"
 	etat="stable"
 	compatibilite="[3.0.0-dev;3.0.*]"
 	logo="prive/themes/spip/images/facteur-32.png"