diff --git a/intranet/templates/impression.tmpl b/intranet/templates/impression.tmpl
index a1ee060f..564bc6c5 100644
--- a/intranet/templates/impression.tmpl
+++ b/intranet/templates/impression.tmpl
@@ -1,69 +1,78 @@
-<a href="javascript:Impression.popup.popupError('pas bien, c\'est cassé');">dd</a>
-<a href="javascript:Impression.popup.popupImpression('123DE432');">dd</a>
-<a href="javascript:Impression.popup.popupSolde();">dd</a>
+#import crans.impression
+
 <div id="globalDiv">
 
 <form id="form_impression" name="form_impression"  onsubmit="Impression.popup();return false;">
-    <fieldset><legend>Mise en page</legend>
+    <fieldset><legend>Options d'impression</legend>
         <div id="leftColumn">              
             <div id="preview" onclick="Impression.settings.init();"></div>
-
+	        <div class="clear prix_impression" id="prix_placeholder"></div>
         </div>
         
         <div id="rightColumn">
             <fieldset><legend>Type d'impression</legend>
-              <label for="type_impression_couleur" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_couleur" class="inputRadio" value="couleur" checked="checked" onClick="Impression.settings.fieldChanges(this);" /> Couleurs</label>
-              <label for="type_impression_nb" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_nb" class="inputRadio" value="b&w" onClick="Impression.settings.fieldChanges(this);" />Noir et blanc</label>
+              <label for="type_impression_couleur" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_couleur" class="inputRadio" value="$crans.impression.IMPRESSION_COULEUR" checked="checked" onClick="Impression.settings.update(this);" /> Couleurs</label>
+              <label for="type_impression_nb" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_nb" class="inputRadio" value="$crans.impression.IMPRESSION_NB" onClick="Impression.settings.update(this);" />Noir et blanc</label>
             </fieldset>
 
             <fieldset><legend>Copies et papier</legend>
 
             <label for="type_papier" class="labelInput">Papier:</label>
-            <select name="type_papier" id="type_papier" class="selectOne" onChange="Impression.settings.fieldChanges(this);">
-                <option value="A4" selected="selected"> A4</option>
-                <option value="A4tr">A4 transparent</option>
-                <option value="A3">A3</option>
+            <select name="type_papier" id="type_papier" class="selectOne" onChange="Impression.settings.update(this);">
+                #for type_papier in $crans.impression.PAPIER_VALEURS_POSSIBLES
+		     <option value="$type_papier">$crans.impression.LABELS[type_papier]</option>
+		#end for
             </select>
             
             <br />
 
             <label for="agrafes" class="labelInput">Agrafes:</label>
-            <select name="agrafes" id="agrafes" class="selectOne" onChange="Impression.settings.fieldChanges(this);">
-                <option value="non" selected="selected">Aucune agrafe</option>
                <option value="diagonale">1 agrafe en diagonale</option>
                <option value="haut">1 agrafe en haut</option>
                <option value="reliure2">Reliure avec 2 agrafes</option>
                <option value="reliure3">Reliure avec 3 agrafes</option>
                <option value="stitching">Stitching (6 agrafes)</option>
            </select>
+            <select name="agrafes" id="agrafes" class="selectOne" onChange="Impression.settings.update(this);">
+                #for type_agrafes in $crans.impression.AGRAPHES_VALEURS_POSSIBLES
+		     <option value="$type_agrafes">$crans.impression.LABELS[type_agrafes]</option>
+		#end for
+	    </select>
 
             <br />
 
             <label for="nb_copies" class="labelInput">Copies:</label>
-            <input type="text" name="nb_copies" id="nb_copies" class="inputText" size="10" maxlength="50" value="1" />    
+            <input  onKeyUp="Impression.settings.update(this);" type="text" name="nb_copies" id="nb_copies" class="inputText" size="10" maxlength="50" value="1" />    
             </fieldset>
 
+            <fieldset><legend>Disposition</legend>
+              <label for="disposition_recto" class="labelRadio compact"><input type="radio" name="disposition" id="disposition_recto" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO" onClick="Impression.settings.update(this);" /> Recto</label>
+              <label for="disposition_recto_verso" class="labelRadio compact"><input type="radio" name="disposition" id="disposition_recto_verso" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO_VERSO" checked="checked" onClick="Impression.settings.update(this);" />Recto-verso</label>
+            </fieldset>
         </div>
-        <div class="clear bouttons">
-#if not $getVar('fileName',False)
-            <input type="reset" value="Reset" onclick="Impression.settings.reset();return false;" disabled />
-            <input type="submit" value="Devis" disabled />
-            <input type="submit" value="Imprimer" disabled />
-#else
+        
+	    <div class="clear bouttons">
             <input type="reset" value="Reset" onclick="Impression.settings.reset();return false;" />
-            <input type="submit" value="Devis" />
-            <input type="submit" value="Imprimer" />
-#end if
+            <input type="button" value="Devis" onclick="window.open('devis')" />
+            <input type="button" value="Imprimer" onclick="Impression.AJAX.lancerImpression();"/>
         </div>
     </fieldset>
 </form>
+
+
 <ul id="actionMenu">
-#if $getVar('fileName',False)
-	<li><div id="fileName"><span>$fileName</span></div></li>
-#end if
-	<li><a href="index">Nouvelle impression</a></li>
-	<li><a href="historique">Historique</a></li>
+    #if $getVar('fileName',False)
+	    <li><div id="fileName"><span>$fileName</span></div></li>
+    #end if
+	<li><span style="font-weight:bold;">pages: </span><span
+id="fileNbPages"></span></li>
+<!--	<li><a href="index">Nouvelle impression</a></li> -->
+<!--	<li><a href="historique">Historique</a></li> -->
 </ul>
 
 #if not $getVar('fileName',False)
 	<div id="popupFichiers">
 	    <h1>Impression - Choix fichier</h1>
 		<div id="insideDiv">
-			<form method="post" action="./">
+    	    #if $getVar('openError',False)
+                <div style="text-align:center;width:40%;border:2px solid red;margin:5px auto;padding:5px 10px;">$openError</div>
+            #end if
+
+			<form method="post" action="./" enctype="multipart/form-data">
 				<h2>Mes fichiers</h2>
 				<select name="fileList" id="fileList" 
     					size="5">
@@ -72,12 +81,12 @@
     				#end for
     			</select>
     			<div class="buttons">
-					<input type="submit" class="button" name="submit" id="submit_chose" value="Choisir">
+					<button name="submit" class="button" value="submit_chose">Choisir</button>
 				</div>
 				
 				<h2>Envoyer un fichier</h2>
 				<input type="file" name="newFile" classe="file">
-					<input type="submit" class="button" name="submit" id="submit_send" value="Envoyer">
+				       <button name="submit" value="submit_send" class="button">Envoyer</button>
 			</form>
 			<div class="clear"></div>
 		</div>
@@ -90,8 +99,20 @@
 #end if
 
 </div>
-<script type="text/javascript">
-Impression.settings.preloadAllImages();
-Impression.settings.init();
-</script>
 
+#if $getVar('fileName',False)
+    <script type="text/javascript">
+    <!--
+        Impression.settings.init();
+        Impression.AJAX.usefile('$fileName');
+        Impression.settings.preloadAllImages();        
+    //-->
+    </script>
+#else
+    <script type="text/javascript">
+    <!--
+        Impression.settings.init();
+        Impression.settings.disableForm(true);
+    //-->
+    </script>
+#end if