From cf23a4221318fdaf8f38d1823eb2c5337c1db650 Mon Sep 17 00:00:00 2001
From: gdetrez <none>
Date: Mon, 18 Sep 2006 23:12:19 +0200
Subject: [PATCH] modifications de presentation

darcs-hash:20060918211219-f46e9-edfd4ca7a04a6d2b3fc9ba1f5d9d8dad1d5c90e0.gz
---
 .../templates/MonCompteRechargePaypal2.tmpl   | 53 +++++++++++--------
 intranet/templates/info-diverses.tmpl         | 17 ++++++
 intranet/templates/login.tmpl                 | 21 ++++----
 3 files changed, 59 insertions(+), 32 deletions(-)
 create mode 100644 intranet/templates/info-diverses.tmpl
diff --git a/intranet/templates/MonCompteRechargePaypal2.tmpl b/intranet/templates/MonCompteRechargePaypal2.tmpl
index ee909117..ef98d4f0 100644
--- a/intranet/templates/MonCompteRechargePaypal2.tmpl
+++ b/intranet/templates/MonCompteRechargePaypal2.tmpl
@@ -1,6 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
-<head>
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+<head>
+
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title>Cr@nsIntranet</title>
     
@@ -11,26 +11,33 @@
     <script src="/static/MochiKit/MochiKit.js" type="text/javascript"></script>
     <script src="/static/MochiKit/New.js" type="text/javascript"></script>
     
-</head>
+</head>
 <body>
-<div id="popupInnerBody">
-<h2>&Eacute;tape 1 : Choisir le montant</h2>
+<div id="popupInnerBody">
+<h2>&Eacute;tape 1 : Choisir le montant</h2>
 #if $getVar('error',False)
-    <div class="errorMessage">$error</div>
-#end if
-<form method="post" action="rechargerCompteImpression" name="FormCombien">
-	<input type="hidden" name="etape" value="3" />
-	<label for="combien">Combien souhaites-tu mettre sur ton compte impression ?<br />
-	<input type="text" name="combien" value="$getVar('combien','')" /> &euro;
-	</label>
-	<p> ici, calcul des frais de transaction</p>
-<div class="liens" id="liens">
-    <a href="./">Annuler</a>
-    <script type="text/JavaScript">
-        <!--        appendChildNodes("liens", A({'href':'#', 'onclick':"javascript:window.document.FormCombien.submit(); return false;"}, "Continuer"));        //-->    </script>    <noscript>        <input type="submit" value="Continuer"/>    </noscript></div>
-    
-	
-</form>
+    <div class="errorMessage">$error</div>
+#end if
+<form method="post" action="rechargerCompteImpression" name="FormCombien">
+	<input type="hidden" name="etape" value="3" />
+	<label for="combien">Combien souhaites-tu mettre sur ton compte impression ?<br />
+	<input type="text" name="combien" value="$getVar('combien','')" /> &euro;
+	</label>
+	<p></p><!-- ici, calcul des frais de transaction -->
+<div class="liens" id="liens">
+    <a href="./">Annuler</a>
+    <script type="text/JavaScript">
+        <!--
+        appendChildNodes("liens", A({'href':'#','onclick':"javascript:window.document.FormCombien.submit(); return false;"}, "Continuer"));
+	//-->
+    </script>
+    <noscript>
+    	      <input type="submit" value="Continuer"/>
+    </noscript>
+</div>
+    
+	
+</form>
 </div>    
-
-</body></html>
\ No newline at end of file
+
+</body></html>
diff --git a/intranet/templates/info-diverses.tmpl b/intranet/templates/info-diverses.tmpl
new file mode 100644
index 00000000..82e8ee53
--- /dev/null
+++ b/intranet/templates/info-diverses.tmpl
@@ -0,0 +1,17 @@
+<div class="framed_gray">
+    <h1>Mots de passe Cr@ns</h1>
+    <h2>Pour les news</h2>
+    <dl>
+    	<dt>Utilisateur :</dt>
+    	<dd>Vivelapa</dd>
+    	<dt>Mot de passe : </dt>
+    	    <dd>ranoia!</dd>
+    </dl>
+    <h2>Pour le wiki</h2>
+    <dl>
+    	<dt>Utilisateur : </dt>
+    	<dd>ViveLe</dd>
+    	<dt>Mot de passe : </dt>
+    	<dd>Wiki!</dd>
+    </dl>
+</div>
diff --git a/intranet/templates/login.tmpl b/intranet/templates/login.tmpl
index 4777aa1e..a29a65cc 100644
--- a/intranet/templates/login.tmpl
+++ b/intranet/templates/login.tmpl
@@ -18,7 +18,7 @@
     label {
         display:block;
         float:left;
-        width:100px;
+        width:100%;
         clear:left;
     }
     textInputLabel {
@@ -37,28 +37,31 @@
         right:60px;
     }
     div#message {
-        background:white;
+    	background:white;
         border:2px #cc0000 solid;
         padding:5px;
         text-align:center;
-        width:230px;
         font-weight:bold;
-        margin:10px 60px;
+        margin:10px auto 10px auto;
+        clear:both;
     }
     </style>
 </head>
 <body>
 <h1>Bienvenue sur Cr@nsIntranet</h1>
 
-#if $message
-<div id="message">
-    $message
-</div>
-#end if
 
 <div class="form">
     <img src="/static/images/petitCr@ns.png" alt="logocr@ns" />
     <h2>Connexion</h2>
+    #if $message
+    <div  id="message">
+        $message
+    </div>
+    #else
+    <div id="messageFantom"></div>
+    #end if
+
     <form method="post" action="do_login">
         <label class="textInputLabel" for="login">Login :</label>
         <input type="text" id="login" name="login" value="$login" /><br />
