diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 5ada20e..6f94adf 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -19,7 +19,7 @@
= javascript_include_tag "application"
- =render :partial => "public/shared/ga"
+
=javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false®ion=FR"
@@ -198,7 +198,7 @@
=link_to image_tag("/ferme.png", :class => "ferme"), "http://www.bienvenue-a-la-ferme.com/", :target => "_blank"
- =link_to image_tag("/pv.png", :class => "ferme"), "http://www.paysvoironnais.com", :target => "_blank"
+ =link_to image_tag("/pv.png", :class => "ferme"), "https://www.paysvoironnais.info/", :target => "_blank"
.clear
@@ -221,6 +221,7 @@
.top_link
=i(:"arrow-circle-o-up")
-
+
+ =render :partial => "public/shared/ga"
diff --git a/app/views/layouts/public.html.haml.old b/app/views/layouts/public.html.haml.old
deleted file mode 100644
index 1028695..0000000
--- a/app/views/layouts/public.html.haml.old
+++ /dev/null
@@ -1,159 +0,0 @@
--@lang = @lang || LangSite.first
--if !@facebook_img or @facebook_img == ""
- -@facebook_img= ""
-!!!
--if @description and @description == ""
- - @description = ""
-
-%html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"}
- %head
- %title=@title.to_s+" "
-
-
- %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 }
-
-
- = javascript_include_tag "public"
-
- = csrf_meta_tag
- =render :partial => "public/shared/ga"
-
- = stylesheet_link_tag 'public'
- = stylesheet_link_tag '/fonts/Stylograph/stylesheet.css'
-
-
-
-
-
- =javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false®ion=FR"
-
- %body
-
- -if flash[:error] or flash[:notice] or flash[:alert]
- .flash
-
- =flash[:error]
- =flash[:notice]
- =flash[:alert]
-
-
- .top
-
-
-
-
- =link_to image_tag("/logo.png", :id => "logo"), "/"+@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"
- %li
- =menu_item_link(menu_item)
-
-
- #main{:class => (@menu_item.slug if @menu_item)}
-
-
-
- -if @menu_item and @menu_item.id == 1
-
-
-
- #home_slider
-
-
- .flexslider
-
- %ul.slides
- -@home_slider = HomeSlider.find_by_slug("home")
- -@date = Time.now
- -if @home_slider
- -@home_slides_simu = @home_slider.home_slider_slides.where(:enabled => true)
- -@home_slides_simu = @home_slides_simu.where("start_at IS NULL or start_at <= ?",@date)
- -@home_slides_simu = @home_slides_simu.where("end_at IS NULL or end_at >= ?",@date)
- -@home_slides_simu = @home_slides_simu.order(:position)
- -@home_slides_simu.each do |home_slider_slide|
- -if home_slider_slide.image_file
-
- %li
-
- -if home_slider_slide.url?
- =link_to home_slider_slide.url do
- .inner{:style => "background-image:url('#{home_slider_slide.image_file.file.url}');"}
- -else
- .inner{:style => "background-image:url('#{home_slider_slide.image_file.file.url}');"}
-
-
- #slider_bottom
- =link_to "/fr/contact.html" do
- =image_tag("/certif.png", :class => "certif")
-
- =link_to image_tag("/bouvier-signaletique.png", :class => "bouvier-signa", :style => ""), "http://www.bouvier-signa.com", :target => "_blank"
-
-
-
-
- :javascript
- $(window).load(function(){
- $('.flexslider').flexslider({
- animation: "slide",
- slideshowSpeed: 4500,
- animationSpeed: 2000,
- start: function(slider){
- $('body').removeClass('loading');
- }
- });
- });
-
-
-
-
- =yield
-
-
- .clear
-
-
-
- .bottom
-
- .socials_links
-
- =link_to "https://www.facebook.com/sharer/sharer.php?u=#{request.url}", :target => "_blank", :class => "link facebook" do
- =i(:"facebook")
-
- =link_to "https://twitter.com/intent/tweet?url=#{request.url}&via=&text="+CGI::escape(@title.to_s), :target => "_blank", :class => "link twitter" do
- =i(:"twitter")
-
- .top_link
- =i(:"arrow-up")
-
-
- =link_to "/fr/contact.html" do
- =image_tag("/certif.png", :id => "certif")
-
-
- .row
- .columns.span_4{:style => "padding:10px;"}
- =link_to image_tag("/logo-w.png", :class => "logo"),"/", :style => "margin-left:20Px;"
- %br
- %br
- %br
- .columns.span_6{:style => "padding:10px;text-align:center;"}
- =link_to "/fr/contact.html" do
- =image_tag("/carte-pmr.png", :id => "contact_card")
-
-
-
-
-
- .clear
- =link_to image_tag("/bouvier-signaletique.png", :style => "height:35px;margin-left:10px"), "http://www.bouvier-signa.com", :target => "_blank"
-
-
\ No newline at end of file
diff --git a/app/views/public/shared/_ga.html.erb b/app/views/public/shared/_ga.html.erb
index a9b6661..6550012 100644
--- a/app/views/public/shared/_ga.html.erb
+++ b/app/views/public/shared/_ga.html.erb
@@ -1,10 +1,10 @@
+
+
-
\ No newline at end of file
diff --git a/public/bouvier-signaletique.png b/public/bouvier-signaletique.png
deleted file mode 100644
index 3f638ef..0000000
Binary files a/public/bouvier-signaletique.png and /dev/null differ
diff --git a/public/bouvier-signaletique.psd b/public/bouvier-signaletique.psd
deleted file mode 100644
index 0837efc..0000000
Binary files a/public/bouvier-signaletique.psd and /dev/null differ
diff --git a/public/pv.png b/public/pv.png
index 5157318..566785a 100644
Binary files a/public/pv.png and b/public/pv.png differ