# HG changeset patch
# User veltr
# Date 1351169477 -7200
# Node ID 7536b92a7775fda4d03dd28903b848ba18c853df
# Parent  56937307d7f472f702289aeaf980445bc7e0f648
a few changes before a merge

diff -r 56937307d7f4 -r 7536b92a7775 integration/css/common.css
--- a/integration/css/common.css	Thu Oct 25 13:31:02 2012 +0200
+++ b/integration/css/common.css	Thu Oct 25 14:51:17 2012 +0200
@@ -167,14 +167,8 @@
 }
 /* popin - user */
 
-.user.popin.signup {
-	display: none;
-}
-.user.popin.info {
-	display: none;
-}
-.user.popin.login {
-	display: none;
+.popin {
+    display: none;
 }
 
 .user.popin{
@@ -205,17 +199,24 @@
 .button:hover{
 	background-color: #FF00FC
 }
-.user h2 {
+.user.login h2, .user.signup h2 {
 	color: #de2500;
 	font-size: 14px;
+	font-weight: 600;
 	margin-bottom: 12px;
 }
+
+.user.info h2 {
+    color: #7628df;
+    font-size: 18px;
+    font-weight: 600;margin-bottom: 2px;
+}
+
 .user label{
 	width: 84px;
 	font-size: 12px;
 	display: inline-block;
-	float: left;
-	line-height: 12px;
+	line-height: 10px;
 }
 .user p {
 	display: block;
@@ -225,7 +226,6 @@
 }
 .user input[type=text],
 .user input[type=password] {
-	float: left;
 	position: relative;
 	width: 110px;
 	padding: 0 5px;
@@ -236,16 +236,9 @@
     float: right;
 }
 /* popin - user - info */
-.user .popin-content{
-	min-width: 150px;
+.user.info {
 	text-align: right;
 }
-.user h2{
-	color: #7628df;
-	font-size: 18px;
-	font-weight: 600;
-	margin-bottom: 2px;
-}
 .user h3{
 	color: #30036d;
 	font-size: 14px;
diff -r 56937307d7f4 -r 7536b92a7775 integration/css/edition.css
--- a/integration/css/edition.css	Thu Oct 25 13:31:02 2012 +0200
+++ b/integration/css/edition.css	Thu Oct 25 14:51:17 2012 +0200
@@ -38,34 +38,33 @@
 	color: #de2500;
 }
 /* popin - update-title */
-.update-title.popin{
-    display: none;
+.update-title {
 	top: 34px;
 	left: 150px;
 }
-.update-title.popin .form-right, 
-.update-title.popin .form-left{
+.update-title .form-right, 
+.update-title .form-left{
 	float: left;
 }
-.update-title.popin textarea{
+.update-title textarea{
 	width: 200px;
 	height: 66px;
 	max-width: 530px;
 }
-.update-title.popin .form-left{
+.update-title .form-left{
 	margin-right: 12px;
 }
-.update-title.popin img.pointer{
+.update-title .pointer{
 	left: 110px;
 }
-.update-title.popin label{
+.update-title label{
 	display: block;
 	margin-bottom: 4px;
 }
-.update-title.popin input[type=text]{
+.update-title input[type=text]{
 	width: 200px;
 }
-.update-title.popin p.titre-wrap{
+.update-title p.titre-wrap{
 	margin-bottom: 6px;
 }
 /* col */
diff -r 56937307d7f4 -r 7536b92a7775 integration/edition.html
--- a/integration/edition.html	Thu Oct 25 13:31:02 2012 +0200
+++ b/integration/edition.html	Thu Oct 25 14:51:17 2012 +0200
@@ -55,7 +55,7 @@
                     <img class="pointer" src="img/popin-triangle.png" alt="" />
                     <div class="popin-content">
                         <h2>Créer un compte :</h2>
-                        <form action="#">
+                        <form action="#" class="signup-form">
                             <p>
                                 <label for="signup-pseudo">Pseudonyme : </label>
                                 <input type="text" id="signup-pseudo" name="" />
@@ -73,7 +73,7 @@
                                 <input type="password" id="signup-password" name="" />
                             </p>
                             <p>
-                                <input type="submit" value="Créer le compte">
+                                <input class="button" type="submit" value="Créer le compte">
                             </p>
                         </form>
    
@@ -84,7 +84,7 @@
                     <img class="pointer" src="img/popin-triangle.png" alt="" />
                     <div class="popin-content">
                         <h2>Connexion :</h2>
-                        <form action="#">
+                        <form action="#" class="login-form">
                             <p>
                                 <label for="signup-pseudo">E-mail : </label>
                                 <input type="text" id="signup-pseudo" name="" />
diff -r 56937307d7f4 -r 7536b92a7775 integration/js/common.js
--- a/integration/js/common.js	Thu Oct 25 13:31:02 2012 +0200
+++ b/integration/js/common.js	Thu Oct 25 14:51:17 2012 +0200
@@ -3,8 +3,9 @@
     $(".open-popin").click(function(){
         var target = $(this).attr("href");
         if($(target).is(':visible')){
-            $(target).hide();
+            $(".popin").hide();
         }else{
+            $(".popin").hide();
             $(target).show();
         }
         return false;
@@ -18,4 +19,7 @@
         $(".user").hide();
         $(".user.signup").show();
     });
+    $(".login-form, .signup-form").submit(function() {
+        $(".user").hide();
+    });
 });
\ No newline at end of file