From 714eafb78166438964309ba705c8008d0d6196db Mon Sep 17 00:00:00 2001
From: gdetrez <none>
Date: Fri, 20 Oct 2006 10:55:25 +0200
Subject: [PATCH] correction du bug qui empechait les nom de fichier avec des
 espaces

darcs-hash:20061020085525-f46e9-34b58ef1d532f18fdc542ad3cd0796af16f5c0d0.gz
---
 intranet/pages/impression.py       |  6 +++---
 intranet/static/css/impression.css | 14 +++++++++++---
 intranet/templates/impression.tmpl | 11 ++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/intranet/pages/impression.py b/intranet/pages/impression.py
index 1a938b79..7638caac 100755
--- a/intranet/pages/impression.py
+++ b/intranet/pages/impression.py
@@ -51,10 +51,10 @@ class root:
     def useFile(self, fileName):
         try:
             filepath = os.path.join(os.path.join(FILE_UPLOAD_BASE_FOLDER,  cherrypy.session['uid']+"/"), fileName)
-            cherrypy.session['impression'] = crans.impression.impression(filepath, cherrypy.session['uid'])
+            cherrypy.session['impression'] = crans.impression.impression(filepath.replace(' ', '\ '), cherrypy.session['uid'])
             return {'nbPages': cherrypy.session['impression'].pages()}
-        except:
-            return {'erreur':'Fichier invalide'}
+        except Exception, e:
+            return {'erreur':str(e) }
     useFile.exposed= True
     
     
diff --git a/intranet/static/css/impression.css b/intranet/static/css/impression.css
index 6a74b008..5820abf5 100644
--- a/intranet/static/css/impression.css
+++ b/intranet/static/css/impression.css
@@ -19,19 +19,27 @@ ul#actionMenu li {
     clear:both;
 }
 /* ****************************************** *
- *   <!-- file name -->
+ *   <!-- file name, menu de gauche -->
  * ****************************************** */
 #fileName {
     width:150px;
     text-align:center;
-    float:left;
+    //float:left;
     padding:50px 5px 5px 5px;
     //eight:20px;
     background: url(../images/pdf-icon.png) center top no-repeat;
-    margin-top:-30px;
+    //margin-top:-30px;
     margin-bottom:10px;
     overflow:auto;
 }
+#actionNouvelleImpression {
+margin:1em 0;
+}
+#actionEtatImprimante {
+padding:0.4em;
+border: thin black solid;
+margin:1em 0;
+}
 
 /* ******************************************* *
  *  <!-- formulaire reglages impression -->
diff --git a/intranet/templates/impression.tmpl b/intranet/templates/impression.tmpl
index d01a0486..ace687b7 100644
--- a/intranet/templates/impression.tmpl
+++ b/intranet/templates/impression.tmpl
@@ -51,14 +51,15 @@
 
 
 <ul id="actionMenu">
-    #if $getVar('fileName',False)
+
+   #if $getVar('fileName',False)
     	    <li><div id="fileName"><span>$fileName</span></div></li>
 	    <li><span style="font-weight:bold;">pages: </span><span id="fileNbPages"></span></li>
-	    <li><a href="index">Nouvelle impression</a></li>
-    #end if
-	    <li><span style="font-weight:bold;">&Eacute;tat
-imprimante:</span><br /><span> $etatImprimante </span></li>
 
+    #end if
+	    <li id="actionEtatImprimante"><span style="font-weight:bold;">&Eacute;tat
+imprimante:</span><br /><span> $etatImprimante </span></li>
+	    <li id="actionNouvelleImpression"><a href="index">Nouvelle impression</a></li>
 
 <!--	<li><a href="historique">Historique</a></li> -->
 </ul>