From c25824013c289b784497fb68ad6255a79db8af5d Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Mac-Pro-de-Nicolas.local>
Date: Mon, 25 Jul 2016 19:22:26 +0200
Subject: [PATCH] suite

---
 app/assets/javascripts/public.js.coffee  |   8 ++---
 app/assets/stylesheets/public.scss       |  44 ++++++++++++++++++++++-
 app/models/menu_item.rb                  |   2 +-
 app/views/layouts/public.html.haml       |  17 +++++----
 public/{logo-navbar.png => logo-min.png} | Bin
 5 files changed, 59 insertions(+), 12 deletions(-)
 rename public/{logo-navbar.png => logo-min.png} (100%)

diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee
index 0728d71..3faaf91 100644
--- a/app/assets/javascripts/public.js.coffee
+++ b/app/assets/javascripts/public.js.coffee
@@ -16,7 +16,7 @@ $ ->
   
   
  
-  top = 0
+  top = 120
   
   resize = () ->
     #$(".bxslider li").each ->
@@ -64,11 +64,11 @@ $ ->
   scroll_ajust = () ->
     var_scroll = $(window).scrollTop()
     if var_scroll > top
-      $(".sub_menu_bar").addClass("move_top")
+      $("#top_bar").addClass("move_top")
     else
-      $(".sub_menu_bar").removeClass("move_top")
+      $("#top_bar").removeClass("move_top")
       
-    if var_scroll > 100
+    if var_scroll > top
       $(".top_link").css
         "opacity" : 1
     else
diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss
index 4c258dd..b05cebf 100644
--- a/app/assets/stylesheets/public.scss
+++ b/app/assets/stylesheets/public.scss
@@ -97,6 +97,7 @@ body{
   line-height: 22px;
   color: black;
   font-weight: 300;
+  padding-top:120px;
   
   
 }
@@ -105,6 +106,7 @@ a{
 }
 .center{
   max-width:1450px;
+  padding:0 20px;
   margin:auto;
 }
 
@@ -170,8 +172,37 @@ h3{
     
   }
 }
-
+#top_bar{
+  position:fixed;
+  top:0;
+  left:0;
+  right:0;
+  
+  #logo-min{
+    display:none;
+  }
+  
+  &.move_top{
+    #logo{
+      display:none;
+    }
+    
+    #logo-min{
+      display:block;
+      margin:10px 0;
+      float:left;
+    }
+    
+    .menu{
+      padding:16px 0;
+      position:static;
+      text-align:right;
+    }
+  }
+  
+}
 #home_top{
+  
   background:url('/Image-home.png') no-repeat center center;
   background-size:100%;
   background-size:cover;
@@ -510,5 +541,16 @@ padding:5px 8px;
   }
   
   
+}
+
+.resp-no-margin{
+  margin:0 !important;
+}
+
+#agence_bloc{
+  h2,h3{
+    text-align:center !important;
+  }
+  
 }
 }
\ No newline at end of file
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index adbb7dc..d965d46 100644
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -46,7 +46,7 @@ class MenuItem < ActiveRecord::Base
     end
   end
   
-  def cible_url(lang)
+  def cible_url(lang=LangSite.first)
     menu_item_path(:url => self.menu_item_langs.find_by_lang_site_id(lang.id).permalink, :lang => lang.slug)
   end
 
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 6752997..f21ef14 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -40,22 +40,27 @@
         =flash[:alert]
 
     
-    .top
+    .top#top_bar
 
         
     
       .center
       
         =link_to image_tag("/logo.png", :id => "logo"), "/"+@lang.slug+"/index.html"
+        =link_to image_tag("/logo-min.png", :id => "logo-min"), "/"+@lang.slug+"/index.html"
         .menu
     
     
           %ul
-            -MenuItem.where(:parent_id => nil, :menu_id => Menu.first.id).order(:position).each do |menu_item|
-              -description = ""
-              -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page"
+            -links = [["Home","main"],["L'agence","agence_bloc"],["Nos services","services-bloc"],["Un peu de nous","nous-bloc"], ["Contact","contact-bloc"]]
+            -links.each do |link|
               %li
-                =menu_item_link(menu_item)
+                %a{:href => "#", :onclick => "$('html,body').animate({scrollTop: ($('#"+link[1].to_s+"').offset().top - 50)},'slow');return false;"}
+                  =link[0]
+                
+                
+        .clean
+            
   
     
     #main{:class => (@menu_item.slug if @menu_item)}
@@ -88,7 +93,7 @@
       .clear
      
       
-  .contact_container
+  .contact_container#contact-bloc
     .center
       %div{:style => "text-align:center;"}
         =image_tag "/tete-section.png", :style => "width:300px"
diff --git a/public/logo-navbar.png b/public/logo-min.png
similarity index 100%
rename from public/logo-navbar.png
rename to public/logo-min.png