modifs diverses

app/views/layouts/public.html.haml

@@ -55,6 +55,20 @@
       
       =yield
       
+      :javascript
+        $(".promotion_line .element").css("height", "auto");
+        $(".promotion_line").each(function() {
+          promotion_pannel_height= 0;
+          $(this).find(".element").each(function() {
+            if ($(this).height() > promotion_pannel_height) {
+              return promotion_pannel_height = $(this).height();
+            }
+          });
+          promotion_pannel_height = promotion_pannel_height - 0
+          $(this).find(".element").css("height", promotion_pannel_height+"px");
+        });
+        
+      
       #footer
         .center
           .column

app/views/portlets/dynamic_contents/_promotions-list.html.haml

@@ -1,9 +1,12 @@
-%h2 Cosmétiques
+%h2{:id => "cosmetique"} Cosmétiques
-=render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 2).order("month ASC, title ASC"))
+.promotion_line
-%p{:style=> "clear:both"}
+  =render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 2).order("month ASC, title ASC"))
-%h2 Bébés
+  %p{:style=> "clear:both"}
-=render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 3).order("month ASC, title ASC"))	
+%h2{:id => "bebe"} Bébés
-%p{:style=> "clear:both"}
+.promotion_line
-%h2 Hygiène
+  =render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 3).order("month ASC, title ASC"))	
-=render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 1).order("month ASC, title ASC"))
+  %p{:style=> "clear:both"}
-%p{:style=> "clear:both"}
+%h2{:id => "hygiene"} Hygiène
+.promotion_line
+  =render(:partial => "public/promotions/promotion", :collection => Promotion.where(:promotion_type_id => 1).order("month ASC, title ASC"))
+  %p{:style=> "clear:both"}

app/views/public/home/show.html.haml

@@ -24,7 +24,7 @@
   -block = @home.home_blocks.find_by_slug("right_block")
   -if block and block.cible and block.cible_type == "Folder"
     =image_tag((block.cible.image_file ? block.cible.image_file.file.large.medium.url : ""))
-		%h3 Dossier du mois
+    %h3 Actualité
     %h2=link_to block.cible.title, block.cible.cible_url
     .description= simple_format block.cible.description
     =link_to "Lire la suite", block.cible.cible_url, :class => "readmore"
@@ -37,47 +37,56 @@
     %p.center=link_to "PROMOTIONS (voir toutes les promotions)", "/pages/promotions.html"
   
   .center
-		.column_1.column
+    .promotion_line
+    
+      .column_1.column.element
         .cat
-				Cosmétiques
+          =link_to "Cosmétiques", "/pages/promotions.html#cosmetique"
+          
         -if @home.promotion_1
           -promotion = @home.promotion_1
     
     
       
           .img
-					=link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html" if promotion.image_file
+            =link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html#cosmetique" if promotion.image_file
           .title
-					=link_to promotion.title, "/pages/promotions.html"
+            =link_to promotion.title, "/pages/promotions.html#cosmetique"
           .description
-					=link_to raw(promotion.description), "/pages/promotions.html"
+            =link_to raw(promotion.description), "/pages/promotions.html#cosmetique"
-		.column_2.column
+      .column_2.column.element
         .cat
-				Bébés
+          =link_to "Bébés", "/pages/promotions.html#bebe"
+          
         -if @home.promotion_2
           -promotion = @home.promotion_2
     
     
         
           .img
-					=link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html" if promotion.image_file
+            =link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html#bebe" if promotion.image_file
           .title
-					=link_to promotion.title, "/pages/promotions.html"
+            =link_to promotion.title, "/pages/promotions.html#bebe"
           .description
-					=link_to raw(promotion.description), "/pages/promotions.html"
+            =link_to raw(promotion.description), "/pages/promotions.html#bebe"
-		.column_3.column
+      .column_3.column.element
         .cat
-				Hygiène
+          =link_to "Hygiène", "/pages/promotions.html#hygiene"
+          
         -if @home.promotion_3
           -promotion = @home.promotion_3
     
     
         
           .img
-					=link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html" if promotion.image_file
+            =link_to image_tag(promotion.image_file.file.large.medium.small.thumb.url), "/pages/promotions.html#hygiene" if promotion.image_file
           .title
-					=link_to promotion.title, "/pages/promotions.html"
+            =link_to promotion.title, "/pages/promotions.html#hygiene"
           .description
-					=link_to raw(promotion.description), "/pages/promotions.html"
+            =link_to raw(promotion.description), "/pages/promotions.html#hygiene"
     
       .clear
+:css
+  .cat a{
+    color:white !important;
+  }

app/views/public/promotions/_promotion.html.haml

@@ -1,11 +1,11 @@
-.promotion{:style => ("margin-right:0px" if (promotion_counter+1).modulo(3) == 0)}
+.promotion.element{:style => ("margin-right:0px" if (promotion_counter+1).modulo(3) == 0)}
 	
 
 	.img
 		=image_tag promotion.image_file.file.large.medium.small.thumb.url if promotion.image_file
 	
 	.title
-		%h3=promotion.title
+		=promotion.title
 	.description
 		=simple_format promotion.description
 	.clear