# HG changeset patch
# User Gautier Thibault <gthibault@universcine.com>
# Date 1269447022 -3600
# Node ID 6c5bf4fc94eea64eadc0386630d0f9e4976ecc56
# Parent  9a7dd07eeae6b741bd87adc3161acc3fc044f788
(no commit message)

diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/apps/frontend/modules/account/actions/components.class.php
--- a/web/thdProject/apps/frontend/modules/account/actions/components.class.php	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/apps/frontend/modules/account/actions/components.class.php	Wed Mar 24 17:10:22 2010 +0100
@@ -4,4 +4,8 @@
   public function executeLeftPanel() {
 
   }
+  public function executeRegisterUserForm() {
+
+  }
+
 }
\ No newline at end of file
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/apps/frontend/modules/account/templates/_loginUserFormHeader.php
--- a/web/thdProject/apps/frontend/modules/account/templates/_loginUserFormHeader.php	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/apps/frontend/modules/account/templates/_loginUserFormHeader.php	Wed Mar 24 17:10:22 2010 +0100
@@ -1,27 +1,16 @@
 <form class="table-form<?php if (isset($classes)) echo ' '.$classes; ?>" method="post" action="<?php echo url_for('@loginUser')?>">
-  <span class="head">Déja inscrit ? connectez-vous</span>
+  <span class="head">Bienvenue sur UniversCine THD</span>
   <?php if($sf_user->hasFlash('login_error')): ?>
     <div class="form-error">
       Votre email et/ou votre mot de passe sont incorrects.
     </div>
   <?php endif;?>
-  <div class="field required">
-    <label for="login[email]">Email</label>
-    <input type="text" name="login[email]" />
-  </div>
-
-  <div class="field required">
-    <label for="login[password]">Mot de passe</label>
-    <input type="password" name="login[password]" />
-  </div>
+  <ul>
+  	<li><a href="" class="link-action">Mon compte</a></li>
+  	<li><a href=""class ="link-action">Mes tags</a></li>
+  </ul>
+ <div class="buttons">
+    <?php echo uc_render_submit_button('se déconnecter'); ?>
+  </div>  
+</form>
 
-  <input type="hidden" name="header_auth" value="1" />
-  <input type="hidden" name="page_uri" value="1" />
-
-  <div class="buttons">
-    <?php echo uc_render_submit_button('Validez'); ?>
-  </div>
-</form>
-<div class="register">
-      <a class="button" href="<?php echo url_for('@registerUser'); ?>">Créer mon compte</a>
-    </div>
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/apps/frontend/modules/account/templates/_registerUserForm.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/thdProject/apps/frontend/modules/account/templates/_registerUserForm.php	Wed Mar 24 17:10:22 2010 +0100
@@ -0,0 +1,9 @@
+<div id="register">
+	<div class="head"><h3>Pas encore inscrit ?</div>
+	<div class="infos">Bienvenue dans le projet UniversCiné THD.<br/><br/>Ce site entre dans le cadre d'un projet de recherche sur le très haut débit réunissant trois acteurs autour de ce site :<br/><a href="http://www.universcine.com">UniversCiné</a>, <a href="http://ww.iri.centrepompidou.com">l'iri</a>, <a href="http://www.csl.sony.fr">Sony CSL</a> et <a href="http://www.capdigital.com">Cap digital</a></div>
+	<div class="access">
+		<div class="buttons">
+		    <?php echo uc_render_submit_button('Accéder au service'); ?>
+		 </div>  
+	</div>	
+</div>
\ No newline at end of file
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/apps/frontend/modules/homepage/templates/indexSuccess.php
--- a/web/thdProject/apps/frontend/modules/homepage/templates/indexSuccess.php	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/apps/frontend/modules/homepage/templates/indexSuccess.php	Wed Mar 24 17:10:22 2010 +0100
@@ -4,11 +4,15 @@
 	<div id="document-sidebar">
 		<?php include_component( "homepage", "leftPanel" ) ?>
 	</div>
+	
 	<div id="document">
+	<?php include_component( "account", "registerUserForm" ) ?>
+	</div>
+	<!--<div id="document">
 		<?php include_component( "homepage", "randomFilm" ) ?>
 		<?php include_component( "homepage", "lastTaggedList") ?>
 		<?php include_component( "homepage", "mostTaggedList" ) ?>		
-	</div>
+	</div>-->
 </div>
 <script language="JavaScript">
 	// a very simple setup
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php
--- a/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/apps/frontend/modules/partials/templates/_userPanel.php	Wed Mar 24 17:10:22 2010 +0100
@@ -2,7 +2,7 @@
   <div class="main"> 
     <div class="login">
       <?php include_partial('account/loginUserFormHeader', Array('classes' => 'ajax')); ?>
-    </div>
+    </div>    
     <div class="retrieve-password">
       <a href="<?php echo url_for('@loginUser'); ?>">Mot de passe oublié ?</a>
     </div>
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/web/css/base.css
--- a/web/thdProject/web/css/base.css	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/web/css/base.css	Wed Mar 24 17:10:22 2010 +0100
@@ -254,6 +254,24 @@
   background: #990000 url("/images/pictos/error.png") no-repeat 5px 10px;
 }
 
+.table-form li {
+  display:block;
+}
+.table-form ul {
+  margin: 0 20px;
+}
+
+.table-form a.link-action {
+  font-family: arial, verdana, sans-serif;
+  font-size: 10px;
+  color: #FFFFFF;
+  font-weight: bold;
+  text-transform: uppercase;
+  text-decoration: none;
+  padding: 0 0 0 8px;
+  background: transparent url('../images/pictos/link_action.png') no-repeat 0 3px;
+}
+
 .table-form fieldset {
   display: block;
   padding: 10px 0;
@@ -413,4 +431,9 @@
 .table-form ul.error-list li {
   display: block;
   padding: 5px 10px 5px 50px;
+}
+
+#register .access {
+text-align:center;
+  padding: 20px;
 }
\ No newline at end of file
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/web/css/layout.css
--- a/web/thdProject/web/css/layout.css	Wed Mar 24 15:42:58 2010 +0100
+++ b/web/thdProject/web/css/layout.css	Wed Mar 24 17:10:22 2010 +0100
@@ -100,6 +100,8 @@
 }
 
 #header-user .login .head {
+padding: 10px 0;
+text-align:center;
 	color: #EFEFEF;
 }
 
@@ -108,8 +110,8 @@
 }
 
 #header-user .login .buttons {
-	text-align: right;
-	padding: 5px 7px;
+	text-align: center;
+	padding: 15px 7px;
 }
 
 #header-user .login label {
@@ -214,6 +216,7 @@
 }
 
 
+
 /* BODY============== */
 #global {
   position: relative;
diff -r 9a7dd07eeae6 -r 6c5bf4fc94ee web/thdProject/web/images/pictos/link_action.png
Binary file web/thdProject/web/images/pictos/link_action.png has changed