Update css for header and footer

app/assets/stylesheets/config_public/_fonts.scss

@@ -0,0 +1 @@
+@import url('https://fonts.googleapis.com/css?family=Archivo+Narrow:400,400i,500,500i,600,600i,700,700i|Fugaz+One|Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Roboto+Condensed:300,300i,400,400i,700,700i|Russo+One');

app/assets/stylesheets/config_public/_general_rules.scss

@@ -0,0 +1,28 @@
+body {
+  font-family: 'Montserrat', sans-serif;
+  color: #000;
+  font-size: 15px;
+  -webkit-font-smoothing: antialiased;
+  margin: 0;
+  padding: 0;
+}
+
+a {
+  text-decoration: none !important;
+  color: #CC4B14;
+  &:hover {
+    color: #000000;
+    text-decoration: underline;
+  }
+  &:focus {
+    color: #000000;
+    text-decoration: underline;
+  }
+  &:active {
+    color: #000000;
+    text-decoration: underline;
+  }
+  img {
+    border: none;
+  }
+}

app/assets/stylesheets/shared/_flashs.scss

@@ -0,0 +1,26 @@
+.flashs{
+  background: #F9F1E4;
+  color: #333f48;
+  padding: 30px 20px;
+  font-size: 14px;
+  position: relative;
+
+
+  .notice, .error, .alert{
+    margin:0;
+    padding:0;
+    max-width:1000px;
+    margin:auto;
+  }
+  .error{
+    color:red;
+  }
+
+  .remove{
+    position:absolute;
+    top:6px;
+    right:8px;
+    cursor:pointer;
+  }
+
+}

app/assets/stylesheets/shared/_footer.scss

@@ -0,0 +1,120 @@
+#footer {
+  position: relative;
+  width: 100%;
+  padding: 50px 0px;
+  background: url(/images/interface/bg-footer.jpg);
+  background-size: cover;
+
+  &:after {
+    opacity: .9;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    content: '';
+    background-color: #0d0d0d;
+  }
+
+  .footer-section {
+    z-index: 2;
+  }
+  .fa-facebook-f {
+    color: #bbb;
+  }
+
+  li {
+    font-size: 14px;
+    a {
+      color: #fff;
+    }
+  }
+  h3 {
+    margin-top: 28px;
+    margin-bottom: 27px;
+    font-size: 18px;
+    font-weight: 600;
+    color: white;
+    text-transform: uppercase;
+    font-family: "Roboto Condensed", sans-serif;
+    &:before {
+      display: inline-block;
+      width: 10px;
+      height: 3px;
+      margin-right: 15px;
+      content: '';
+      vertical-align: middle;
+      background-color: #ffe500;
+    }
+  }
+
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  .footer-list_columns {
+    a {
+      position: relative;
+      padding-left: 20px;
+      &:after {
+        position: absolute;
+        top: 7px;
+        left: 0;
+        width: 7px;
+        height: 7px;
+        content: '';
+        -webkit-transform: rotate(45deg);
+        transform: rotate(45deg);
+        border-top: 2px solid #ccc;
+        border-right: 2px solid #ccc;
+      }
+    }
+  }
+  .footer-contact {
+    position: relative;
+    margin-bottom: 9px;
+    padding-left: 38px;
+    letter-spacing: .02em;
+    color: #fff;
+    font-size: 14px;
+    a {
+      &:hover {
+        color: #CC4B14 !important;
+      }
+    }
+    .icon {
+      position: absolute;
+      top: 0;
+      left: 0;
+      margin-right: 10px;
+      font-size: 16px;
+      text-align: center;
+      color: #ccc;
+    }
+    .icon-xs {
+      font-size: 14px;
+    }
+    .icon-lg {
+      font-size: 18px;
+    }
+  }
+  .footer-contact_lg {
+    margin-bottom: 24px;
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 1.1;
+    letter-spacing: 0;
+  }
+  .footer__info {
+    margin: 30px 0px;
+    line-height: 1.86;
+    font-size: 14px;
+    color: #bbb;
+  }
+  .footer__logo {
+    display: block;
+    margin-bottom: 27px;
+  }
+}

app/assets/stylesheets/shared/_header.scss

@@ -0,0 +1,153 @@
+#header {
+  position: relative;
+  width: 100%;
+  background-color: #000;
+  margin: 0px;
+  padding: 10px 0px;
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -ms-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
+  transition: all 0.5s ease;
+  #logo {
+    z-index: 2;
+    margin: 0px;
+    display: inline-block;
+    width: 30%;
+    margin-bottom: -25px;
+    vertical-align: bottom;
+    text-align: left;
+    img {
+      z-index: 39;
+      width: 100%;
+    }
+  }
+  h1 {
+    margin: 0px;
+    padding: 0px;
+    font-size: 1.65em;
+  }
+  img {
+    margin: 0;
+    padding: 0;
+    background-image: none;
+  }
+}
+
+#header .top-bar {
+  display: flex;
+  justify-content: flex-end;
+  background-color: #000;
+  font-size: 13px;
+  padding: 10px;
+  padding-bottom: 0px;
+  font-family: "Roboto Condensed", sans-serif;
+  -webkit-transition: all 0.5s;
+  -moz-transition: all 0.5s;
+  -ms-transition: all 0.5s;
+  -o-transition: all 0.5s;
+  transition: all 0.5s;
+  height: 27px;
+  overflow: hidden;
+  i {
+    color: #fff;
+    opacity: 0.6;
+    padding: 0px 10px;
+    font-size: 15px;
+    padding-right:0px;
+  }
+  a {
+    color: rgba(255, 255, 255, 0.7);
+  }
+}
+
+#header .main-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  li {
+    display: inline-block;
+    text-transform: uppercase;
+    font-family: "Roboto Condensed", sans-serif;
+    padding: 3px 15px;
+  }
+  li a:hover, li a.active {
+    border-bottom: 1px solid #fd0;
+  }
+  li a {
+    padding-bottom: 5px;
+    color: rgba(255,255,255,0.7);
+  }
+}
+
+#mobile_menu{
+  z-index:900;
+  position:fixed;
+  top:0;
+  left:0;
+  right:0;
+  bottom:0;
+  background:rgba(0,0,0,0.9);
+  color:white;
+  padding:20px;
+  display:none;
+
+  .mobile_second_menu{
+    padding:10px 0;
+    ul{
+      margin:0;
+      list-style:none;
+      li{display:inline-block;
+        margin:4px 10px;
+        margin-left:0;
+
+      }
+
+      a{color:white;}
+    }
+  }
+
+
+  .mobile_first_menu{
+    margin-top:20px;
+    font-family: "Roboto Condensed", sans-serif;
+        text-transform: uppercase;
+        color:white;
+
+        ul{
+          margin:0;
+          list-style:none;
+          li{display:block;
+
+            padding:5px 0;
+          }
+
+          a{color:white;}
+        }
+
+  }
+}
+
+#burger_menu{
+  z-index:1000;
+  top:5px;
+  right:5px;
+  bottom:inherit;
+  display: none !important;
+}
+
+
+@media screen and (max-width: 1170px) {
+  #header .top-bar {
+    display: none;
+  }
+}
+
+@media screen and (max-width: 740px) {
+  #header #burger_menu {
+    display: block !important;
+  }
+  #header .menus {
+    display: none;
+  }
+}

app/controllers/application_controller.rb

@@ -2,10 +2,10 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  
 
 
-  
+
+
   before_action :set_locale
 
   before_action :time_stats
@@ -13,35 +13,35 @@ class ApplicationController < ActionController::Base
   def time_stats
     @gen_past_time = Time.now
   end
-  
+
   before_action :popups
-  
+
   before_action :debug_translation
-  
+
   before_action :get_sorting
-  
+
   def get_sorting( column_default=nil, direction_default="desc")
-    
-    
-    
+
+
+
     sorting_direction = %w[asc desc].include?(params[:direction]) ? params[:direction] : direction_default
     sorting_column = params[:column] ? params[:column] : column_default
-    
+
     if sorting_direction and sorting_column
       @sorting = [sorting_column, sorting_direction]
     end
   end
-  
-  
+
+
   before_action :set_qi_order
-  
+
   def set_qi_order
     params[:search] = params[:search] || {}
-    
+
     session[:qi_sort_string] = session[:qi_sort_string] || {}
-    
+
     if params[:qi_sort_string].to_s != "" and params[:qi_sort_string][:class]
-      
+
       if current_admin
         if ap = current_admin.admin_preferences.where(:key => "sort_table_"+params[:qi_sort_string][:class]).first
           ap.value = params[:qi_sort_string][:list].to_s
@@ -50,19 +50,19 @@ class ApplicationController < ActionController::Base
           current_admin.admin_preferences.create(:key => "sort_table_"+params[:qi_sort_string][:class], :value => params[:qi_sort_string][:list].to_s)
         end
 
-  
-       
+
+
       else
         session[:qi_sort_string][params[:qi_sort_string][:class]] = params[:qi_sort_string][:list].to_s
       end
-      
+
     else
-      
+
     end
-    
-    
+
+
     if params[:qi_sort_string].to_s != "" and params[:qi_sort_string][:nbr_colonnes].to_s != ""
-      
+
       if current_admin
         if ap = current_admin.admin_preferences.where(:key => "sort_table_"+params[:qi_sort_string][:class]+"_nbr_col").first
           ap.value = params[:qi_sort_string][:nbr_colonnes].to_s
@@ -70,31 +70,31 @@ class ApplicationController < ActionController::Base
         else
           current_admin.admin_preferences.create(:key => "sort_table_"+params[:qi_sort_string][:class]+"_nbr_col", :value => params[:qi_sort_string][:nbr_colonnes].to_s)
         end
-           
-      else        
+
+      else
         session[:qi_sort_string][params[:qi_sort_string][:class]+"_nbr_col"] = params[:qi_sort_string][:nbr_colonnes].to_s
       end
-      
+
     else
-      
+
     end
-    
-    
-    
-    
+
+
+
+
   end
-  
-  
+
+
   def sort_by_sorting(var, default=nil)
     if @sorting
       klass = var.klass.to_s
-    
+
       if eval(klass).valid_sort.include?(@sorting[0])
         if @sorting[0].split(",").size > 0
           order_text = ""
           i = 0
           @sorting[0].split(",").each do |s|
-            
+
             order_text += "#{s} #{@sorting[1]}"
             order_text += "," if i < (@sorting[0].split(",").size - 1 )
             i+=1
@@ -103,131 +103,131 @@ class ApplicationController < ActionController::Base
         else
           var = var.order("#{@sorting[0]} #{@sorting[1]}")
         end
-      
+
 
       end
-      
+
     elsif default
       var = var.order(default)
     end
-    
-    
-    
+
+
+
     return var
-    
-    
+
+
 
   end
-  
-  
-  
-  
+
+
+
+
   def debug_translation
     if params[:debug_translation]
       if current_admin
-       @debug_translation = true 
+       @debug_translation = true
       end
     end
   end
   def popups
 
-   
+
   end
-  
+
   def get_public_layout
     "public"
-   
-      
+
+
   end
-  
+
 
   def set_locale
     # if params[:locale] is nil then I18n.default_locale will be used
     #I18n.locale = params[:locale]#"fr" #
-    
+
     I18n.locale = params[:lang] || :fr
-    
+
     @lang = LangSite.find_by_slug I18n.locale.to_s
   end
-  
+
   def default_url_options(options={})
     { :lang => I18n.locale }  #
   end
-  
+
 
   def auth_p_customer
     if !current_p_customer
       redirect_to new_public_p_customer_auth_path
     end
   end
-      
-    
-  
-  
-  
+
+
+
+
+
   private
-  
-  
+
+
   def current_p_customer
    @current_p_customer ||= PCustomer.where(:auth_token => cookies[:p_customer_auth_token]).first if cookies[:p_customer_auth_token]
-    
-  
+
+
   end
-  
-  
-  
+
+
+
   private
-  
-  
+
+
     def auth_admin
       if !current_admin
         redirect_to new_admin_admin_auth_path
       end
-      
-    
+
+
     end
-  
+
 
 
 
     def current_admin
-      
+
       if cookies[:admin_remember_token]
-        if @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) 
-          @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token]) 
+        if @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token])
+          @current_admin = Admin.find_by_remember_token(cookies[:admin_remember_token])
         else
             cookies[:admin_remember_token] =nil
         end
-        
+
       end
-      
-      
-     
+
+
+
     end
-    
-   
+
+
 
     def get_specific_pref(key="")
-      
+
       sp = SpecificPreference.where(:key => key).first
-      
+
       if sp
         return sp.value
       else
         return ""
       end
-      
+
     end
-    
+
     def has_permission?(permission)
-     if current_admin and current_admin.has_permission?(permission)  
+     if current_admin and current_admin.has_permission?(permission)
        true
      else
        redirect_to "/admin"
-       
+
      end
     end
-    
+
     def is_super_admin
       if current_admin and current_admin.super_admin
         true
@@ -235,10 +235,10 @@ class ApplicationController < ActionController::Base
         redirect_to "/admin"
       end
     end
-    
-    
+
+
     helper_method :current_admin, :get_specific_pref, :sort_by_sorting, :current_p_customer
-  
-  
+
+
 end
 

app/controllers/public/menu_items_controller.rb

@@ -1,86 +1,85 @@
 # -*- encoding : utf-8 -*-
 class Public::MenuItemsController < ApplicationController
-  
+
   layout :get_public_layout
-  
+
   def redirect
     redirect_to menu_item_path(:url => params[:url]), status: 301
   end
-  
+
   def archive
     @menu_item= MenuItem.archived.find(params[:id])
   end
-  
-  
+
   def show
-    
+
     if params[:lang]
-      
+
       @lang = LangSite.find_by_slug(params[:lang])
     else
       @lang = LangSite.first
-      
+
     end
-    
-    
+
+
     if params[:url]
-      
+
       url = params[:url].split("/")
       url = url.map do |u|
         u.to_slug
       end
       url = url.join("/")
-      
+
       orignal_url = url
-      
+
       if url.scan(/peuples\-sauvages\/experimentes/).size > 0
-        url = url.gsub(/peuples\-sauvages\/experimentes/, 'compagnons-animaux/experimentes') 
+        url = url.gsub(/peuples\-sauvages\/experimentes/, 'compagnons-animaux/experimentes')
         @original_menu_item = MenuItem.find(19)
-      end  
+      end
       if url.scan(/animaux\-domestiques\/experimentes/).size > 0
-        url = url.gsub(/animaux\-domestiques\/experimentes/, 'compagnons-animaux/experimentes') 
+        url = url.gsub(/animaux\-domestiques\/experimentes/, 'compagnons-animaux/experimentes')
         @original_menu_item = MenuItem.find(20)
-      end  
-        
-      
-      
-      
+      end
+
+
+
+
 
       menu_id = 1
-      
-      
-      
+
+
+
       @menu_item_lang = @lang.menu_item_langs.joins(:menu_item).where(:menu_items => {:menu_id => menu_id}).find_by_permalink(url)
-      
+
       if @menu_item_lang
         @menu_item = @menu_item_lang.menu_item
-      
+
         @menu_item.ancestors_menu = @menu_item.ancestors
         @ancestor_1 = @menu_item.ancestors.reverse[1] if @menu_item
-      
+
       elsif menu_item_history = MenuItemSlugHistory.where(:permalink => url, :locale => @lang.slug).first
         redirect_to "/#{@lang.slug}/#{menu_item_history.menu_item_lang.permalink}.html"
-        
-        
+
+
       else
         redirect_to "/"
       end
-      
 
-      
+
+
     else
       menu_id = 1
-      
+
       @menu_item_lang = @lang.menu_item_langs.joins(:menu_item).where(:menu_items => {:menu_id => menu_id}).find_by_permalink("index")
-      
+
       if @menu_item_lang
         @menu_item = @menu_item_lang.menu_item
       else
         redirect_to "/"
       end
-      
-      
-    
+
+
+
     end
     if @menu_item and @menu_item.menu_content and @menu_item.menu_content.class.to_s == "Page"
       @lang_page = @menu_item.menu_content.lang_pages.find_by_lang_site_id(@lang.id)
@@ -90,10 +89,10 @@ class Public::MenuItemsController < ApplicationController
       @twitter_title = @lang_page.twitter_title if @lang_page.twitter_title?
 
     end
-    
+
     if @menu_item and @menu_item.menu_content and @menu_item.menu_content.page_type_id == 2
       @url_to_redirect = nil
-      
+
       MenuItem.where(:parent_id => @menu_item.id).order(:position).each do |menu_item|
 
         menu_item_lang = menu_item.menu_item_langs.find_by_lang_site_id(@lang.id)
@@ -103,18 +102,18 @@ class Public::MenuItemsController < ApplicationController
         if menu_item_lang.enabled == true and menu_item_lang.visible == true and menu_item.menu_content.page_type_id == 3
           @url_to_redirect = menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug)
           break
-          
+
         end
       end
-      
+
       if @url_to_redirect
         redirect_to @url_to_redirect
       end
-      
+
     end
-    
-   
-    
+
+
+
   end
 
 end

app/views/layouts/public.html.haml

@@ -21,8 +21,8 @@
 %html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"}
   %head
     =render :partial => "public/shared/ga"
-    
-    
+
+
     -@title = strip_tags(@title.to_s)
     %title=@title.to_s
 
@@ -35,242 +35,45 @@
     %meta{:name=>"viewport", :content=>"width=device-width,initial-scale=1"}
     %meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
     %meta{ :"name" => "Description", :content => @description }
-    %meta{ :"name" => "Keywords", :content => @keywords }  
+    %meta{ :"name" => "Keywords", :content => @keywords }
     =raw '<meta property="og:title" content="'+@facebook_title.to_s+'" />'
     =raw '<meta property="og:description" content="'+@description.to_s+'" />'
     =raw '<meta property="og:url" content="'+@social_url+'" />'
-    
-    
+
+
     =raw '<meta property="twitter:description" content="'+((@description and @description != "") ? @description : "En savoir plus :").to_s+'"/>'
     =raw '<meta property="twitter:title" content="'+@twitter_title.to_s+'"/>'
     =raw '<meta property="twitter:site" content=""/>'
     =raw '<meta property="twitter:creator" content=""/>'
     =raw '<meta property="twitter:url" content="'+@social_url+'"/>'
-    
-    
+
+
     -if @facebook_img
       =raw '<meta property="og:image" content="https://mmsc.olwen.xyz'+@facebook_img.to_s+'"/>'
       =raw '<link rel="image_src" href="https://mmsc.olwen.xyz'+@facebook_img.to_s+'"/>'
-      
+
       =raw '<meta name="twitter:card" content="summary_large_image">'
-      
-      
-      
-      
+
+
+
+
       =raw '<meta property="twitter:image" content="https://mmsc.olwen.xyz'+@facebook_img.to_s+'"/>'
-      
-     
-      
-      
-     
-  
+
+
+
+
+
+
     = javascript_include_tag "public"
-    
-    = csrf_meta_tag 
-    
+
+    = csrf_meta_tag
+
     = stylesheet_link_tag 'public', :media => :all
-    
-    
-      
-  %body.pageAccueil
-    #mobile_menu
-      .mobile_second_menu
-    
-        %ul.social-links
-      
-           
-          %li
-            -if current_p_customer
-              =link_to public_my_account_path do 
-                =ic(:user)
-                Mon compte : 
-                =current_p_customer.particular.firstname
-                =current_p_customer.particular.name
-              
-            -else
-              =link_to ic(:user)+" Mon compte", public_my_account_path
-          
-        
-          %li
-            %a{:href => "https://www.facebook.com/mamotosurcircuit/", :target => "_blank"}
-              =ic :"facebook-f"
-              
-          
-              
-        .mobile_first_menu
-          %ul
-        
-
-            -MenuItem.where(:parent_id => nil, :menu_id => 1).order(:position).each do |menu_item|
-              -if menu_item_link(menu_item) and menu_item_link(menu_item) != ""
-                %li
-                  =menu_item_link(menu_item)
-        
-
-            -if false
-              %li.PGS_ROULAGE
-                =link_to "Trouvez votre journée", public_m_events_path
 
 
-            %li.PGS_ANNUAIRE_CIRCUIT
-              =link_to "Circuits", public_circuits_path, :class => ("active" if @circuits_active)
-            %li.PGS_ANNUAIRE_ORGA
-              =link_to "Organisateurs", public_organisateurs_path, :class => ("active" if @organisateurs_active)
-        
-            %li.PGS_DISTRIBUTEUR
-              %a{:href => "https://www.dunlop.eu/fr_fr/motorcycle/dealers/find-a-dealer.html", :target => "_blank", :title => "Distributeurs"}
-                %span Distributeurs
-                
-        
-        .mobile_second_menu
-          %br
-          %br
-          %ul  
-            -if current_p_customer
-              %li=link_to ic(:"power-off")+" Déconnexion", logout_public_p_customer_auths_path()
-      
-      
-      
-    
-    %button.navbar-toggle.collapsed.btn-menu#burger_menu{:onclick => "$('#mobile_menu').toggle();"}
-      %span.sr-only Toggle navigation
-      %span.icon-bar
-      %span.icon-bar
-      %span.icon-bar
-      
-    %span.fond_body_1
-      %span.fond_body_2
-        #conteneur
-          #conteneur_contenu
-            #header.WithCarousel
-              .top-bar
-                .container
-                  .header-topbarbox-1
-                  .header-topbarbox-2
-                    %ul.social-links
-                  
-                      -if current_p_customer
-                        =link_to ic(:"power-off")+" Déconnexion", logout_public_p_customer_auths_path()
-                      
-                      
-                      %li
-                        -if current_p_customer
-                          =link_to public_my_account_path do 
-                            =ic(:user)
-                            Mon compte : 
-                            =current_p_customer.particular.firstname
-                            =current_p_customer.particular.name
-                          
-                        -else
-                          =link_to ic(:user)+" Mon compte", public_my_account_path
-                      
-                    
-                      %li
-                        %a{:href => "https://www.facebook.com/mamotosurcircuit/", :target => "_blank"}
-                          =ic :"facebook-f"
-                   
-              #conteneur_header
-                #logo
-                  %h1
-                    %a{:href => "/"}
-                      %img.logo_top{:alt => "Ma moto sur circuit", :src => "/images/interface/Logo-DMD.png", :title => "Ma moto sur circuit"}/
-                      %img.logo_scroll{:alt => "Ma moto sur circuit", :src => "/images/interface/logo_petit.png", :title => "Ma moto sur circuit"}/
-                #position-menu
-                  #menu_haut.WithCarousel
-                    %ul
-                    
-
-                      -MenuItem.where(:parent_id => nil, :menu_id => 1).order(:position).each do |menu_item|
-                        -if menu_item_link(menu_item) and menu_item_link(menu_item) != ""
-                          %li
-                            =menu_item_link(menu_item)
-                    
-
-                      -if false
-                        %li.PGS_ROULAGE
-                          =link_to "Trouvez votre journée", public_m_events_path
-
-
-                      %li.PGS_ANNUAIRE_CIRCUIT
-                        =link_to "Circuits", public_circuits_path, :class => ("active" if @circuits_active)
-                      %li.PGS_ANNUAIRE_ORGA
-                        =link_to "Organisateurs", public_organisateurs_path, :class => ("active" if @organisateurs_active)
-                    
-                      %li.PGS_DISTRIBUTEUR
-                        %a{:href => "https://www.dunlop.eu/fr_fr/motorcycle/dealers/find-a-dealer.html", :target => "_blank", :title => "Distributeurs"}
-                          %span Distributeurs
-           
-                   
-
-
-              
-          
-          
-          
-                
-            #contenu
-            
-              -if flash[:error] or flash[:notice] or flash[:alert] 
-                .flashs
-                  -if flash[:error]
-                    .error
-                      %span.remove=ic :times
-                      =flash[:error] 
-                  -if flash[:notice]
-                    .notice
-                      %span.remove=ic :times
-                      =flash[:notice] 
-                  -if flash[:alert]
-                    .alert
-                      %span.remove=ic :times
-                      =flash[:alert]
-            
-                
-              #centreetdroite
-              
-
-
-                =yield
-            
-            #pied
-              #conteneur_pied
-                .row
-                  .col-md-4
-                    .footer-section
-                      %a.footer__logo{:href => "#"}
-                        %img.img-responsive{:src => "/images/interface/Logo-DMD.png"}/
-                      .footer__info Devenez membre de la communauté pour accéder aux avantages exclusifs.
-                      %ul.social-net.list-inline
-                        %li.social-net__item
-                          %a.social-net__link.text-primary_h{:href => "https://www.facebook.com/mamotosurcircuit/", :target => "_blank"}
-                            =ic(:"facebook-f")
-                     
-                  .col-md-4
-                    %section.footer-section.footer-section_list-columns
-                      %h3.footer-section__title.ui-title-inner Liens utiles
-                      %ul.footer-list.footer-list_columns.list-unstyled
-                        %li
-                          %a{:accesskey => "3", :href => "/fr/plan-site.html", :title => "Plan du site"} Plan du site
-                        %li
-                          %a{:accesskey => "8", :href => "/fr/mentions-legales.html", :title => "Mentions légales"} Mentions légales
-                        %li
-                          %a{:accesskey => "8", :href => "/fr/conditions-generales-utilisation.html", :title => "Conditions générales d'utilisation"} Conditions générales d'utilisation
-                  .col-md-4
-                    %section.footer-section
-                      %h3.footer-section__title.ui-title-inner Nous contacter
-                      .footer-contact
-                        %i.icon.icon-xs.fa.fa-envelope-o
-                        %a{:href => "mailto:contact@mamotosurcircuit.com"} contact@mamotosurcircuit.com
-                      .footer-contact
-                        %i.icon.icon-lg.fa.fa-map-marker>
-                        8 route des bois 38500 VOIRON
-                      .footer-contact
-                        %i.icon.icon-lg.fa.fa-phone>
-                        04 76 31 38 38
-          / conteneur_contenu //
-        / conteneur//
-  
-    
-    :javascript
-      resize()
 
+  %body
+    =render partial: 'public/shared/header'
+    =render partial: 'public/shared/flashes'
+    =yield
+    =render partial: 'public/shared/footer'

app/views/public/shared/_flashes.html.haml

@@ -0,0 +1,14 @@
+-if flash[:error] or flash[:notice] or flash[:alert]
+  .flashs
+    -if flash[:error]
+      .error
+        %span.remove=ic :times
+        =flash[:error]
+    -if flash[:notice]
+      .notice
+        %span.remove=ic :times
+        =flash[:notice]
+    -if flash[:alert]
+      .alert
+        %span.remove=ic :times
+        =flash[:alert]

app/views/public/shared/_footer.html.haml

@@ -0,0 +1,29 @@
+#footer
+  .container
+    .row
+      .col-md-4.footer-section
+        =image_tag '/images/interface/Logo-DMD.png'
+        .footer__info Devenez membre de la communauté pour accéder aux avantages exclusifs.
+        =link_to "https://www.facebook.com/mamotosurcircuit/", target: '_blank' do
+          =ic(:"facebook-f")
+
+      .col-md-4.footer-section
+        %h3 Liens utiles
+        %ul.footer-list_columns.list-unstyled
+          %li
+            %a{:accesskey => "3", :href => "/fr/plan-site.html", :title => "Plan du site"} Plan du site
+          %li
+            %a{:accesskey => "8", :href => "/fr/mentions-legales.html", :title => "Mentions légales"} Mentions légales
+          %li
+            %a{:accesskey => "8", :href => "/fr/conditions-generales-utilisation.html", :title => "Conditions générales d'utilisation"} Conditions générales d'utilisation
+      .col-md-4.footer-section
+        %h3 Nous contacter
+        .footer-contact
+          %i.icon.icon-xs.fa.fa-envelope-o
+          %a{:href => "mailto:contact@mamotosurcircuit.com"} contact@mamotosurcircuit.com
+        .footer-contact
+          %i.icon.icon-lg.fa.fa-map-marker>
+          8 route des bois 38500 VOIRON
+        .footer-contact
+          %i.icon.icon-lg.fa.fa-phone>
+          04 76 31 38 38

app/views/public/shared/_header.html.haml

@@ -0,0 +1,40 @@
+#header
+  =render partial: 'public/shared/mobile_menu'
+  .container
+    .top-bar
+      -if current_p_customer
+        =link_to ic(:"power-off")+" Déconnexion", logout_public_p_customer_auths_path()
+
+      -if current_p_customer
+        =link_to public_my_account_path do
+          =ic(:user)
+          Mon compte :
+          =current_p_customer.particular.firstname
+          =current_p_customer.particular.name
+      -else
+        =link_to ic(:user)+" Mon compte", public_my_account_path
+
+      %a{:href => "https://www.facebook.com/mamotosurcircuit/", :target => "_blank"}
+        =ic :"facebook-f"
+    .main-content
+      #logo
+        %a{:href => "/"}
+          %img.logo_top{:alt => "Ma moto sur circuit", :src => "/images/interface/Logo-DMD.png", :title => "Ma moto sur circuit"}/
+          %img.logo_scroll{:alt => "Ma moto sur circuit", :src => "/images/interface/logo_petit.png", :title => "Ma moto sur circuit"}/
+      %ul.menus
+        -MenuItem.where(:parent_id => nil, :menu_id => 1).order(:position).each do |menu_item|
+          -if menu_item_link(menu_item) and menu_item_link(menu_item) != ""
+            %li
+              =menu_item_link(menu_item)
+
+        -if false
+          %li.PGS_ROULAGE
+            =link_to "Trouvez votre journée", public_m_events_path
+
+        %li.PGS_ANNUAIRE_CIRCUIT
+          =link_to "Circuits", public_circuits_path, :class => ("active" if @circuits_active)
+        %li.PGS_ANNUAIRE_ORGA
+          =link_to "Organisateurs", public_organisateurs_path, :class => ("active" if @organisateurs_active)
+        %li.PGS_DISTRIBUTEUR
+          %a{:href => "https://www.dunlop.eu/fr_fr/motorcycle/dealers/find-a-dealer.html", :target => "_blank", :title => "Distributeurs"}
+            %span Distributeurs

app/views/public/shared/_mobile_menu.html.haml

@@ -0,0 +1,62 @@
+#mobile_menu
+  .mobile_second_menu
+
+    %ul.social-links
+
+
+      %li
+        -if current_p_customer
+          =link_to public_my_account_path do
+            =ic(:user)
+            Mon compte :
+            =current_p_customer.particular.firstname
+            =current_p_customer.particular.name
+
+        -else
+          =link_to ic(:user)+" Mon compte", public_my_account_path
+
+
+      %li
+        %a{:href => "https://www.facebook.com/mamotosurcircuit/", :target => "_blank"}
+          =ic :"facebook-f"
+
+
+
+    .mobile_first_menu
+      %ul
+
+
+        -MenuItem.where(:parent_id => nil, :menu_id => 1).order(:position).each do |menu_item|
+          -if menu_item_link(menu_item) and menu_item_link(menu_item) != ""
+            %li
+              =menu_item_link(menu_item)
+
+
+        -if false
+          %li.PGS_ROULAGE
+            =link_to "Trouvez votre journée", public_m_events_path
+
+
+        %li.PGS_ANNUAIRE_CIRCUIT
+          =link_to "Circuits", public_circuits_path, :class => ("active" if @circuits_active)
+        %li.PGS_ANNUAIRE_ORGA
+          =link_to "Organisateurs", public_organisateurs_path, :class => ("active" if @organisateurs_active)
+
+        %li.PGS_DISTRIBUTEUR
+          %a{:href => "https://www.dunlop.eu/fr_fr/motorcycle/dealers/find-a-dealer.html", :target => "_blank", :title => "Distributeurs"}
+            %span Distributeurs
+
+
+    .mobile_second_menu
+      %br
+      %br
+      %ul
+        -if current_p_customer
+          %li=link_to ic(:"power-off")+" Déconnexion", logout_public_p_customer_auths_path()
+
+
+%button.navbar-toggle.collapsed.btn-menu#burger_menu{:onclick => "$('#mobile_menu').toggle();"}
+  %span.sr-only Toggle navigation
+  %span.icon-bar
+  %span.icon-bar
+  %span.icon-bar