diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 21eeac3..69c62f1 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -33,6 +33,10 @@ body{ margin:0; } +#logo_fondmob, .bars { + display: none; +} + .slide_home_wrapper{ position:relative; background:no-repeat center center; @@ -51,16 +55,23 @@ body{ .bx-wrapper{ margin:0; } - + .bx-controls{ position:absolute; bottom:40px; left:0; right:0; - + } - + .slide{ + .link_overlay{ + position:absolute; + top:0; + left:0; + right:0; + bottom:0; + } position:relative; .description{ position:absolute; @@ -68,14 +79,14 @@ body{ right:50px; background:rgba(255,255,255,0.85); width:590px; - + } .logo{ position:absolute; top:30px; left:30px; width:135px; - + } .content{ text-decoration:none; @@ -88,10 +99,10 @@ body{ text-transform:uppercase; margin-top:0; } - + } - - + + } } @@ -103,7 +114,9 @@ body{ clear:both; } .center{ - max-width:1010px; + max-width:1050px; + padding:20px; + box-sizing:border-box; margin:auto; } .btn{ @@ -129,8 +142,8 @@ h1{ margin-top:0; text-transform:uppercase; font-weight:500; - - + + } #main_content{ @@ -161,43 +174,45 @@ h1{ h2{ color:white; } - + fieldset{ border:0; padding:0; margin:0; - + } - + table{ - max-width:100%; + width:100% !important; + + max-width:600px !important; border-collapse:collapse; td{ padding-bottom:12px; } } - + input, textarea{ box-sizing:border-box; padding:12px 15px; font-size:1em; width:100%; border:0; - - + + } .error{ color:red; } .submit{ - //width:600px; + width:auto; max-width:100%; text-align:right; padding:14px 0; padding-top:0px; - + } - + .btn{ border-color:white !important; color:white; @@ -209,6 +224,14 @@ h1{ padding: 0 30px; padding-right:20px; text-align:right; + + + #groupepayreid img{ + height: 110px !important; + position: relative; + bottom: 0px !important + } + a{ text-decoration:none; color:inherit; @@ -233,6 +256,7 @@ h1{ } #contacts{ padding-right:50px; + left: 0px !important; } #place{ padding-right:35px; @@ -247,10 +271,11 @@ h1{ } } } + #actus{ padding:20px 0; padding-bottom:50px; - + .blog_img{ display:block; margin:auto; @@ -262,7 +287,7 @@ h1{ color:#2c4709; font-weight:bold; strong{ - + color:#00893f; } } @@ -271,7 +296,7 @@ h1{ font-weight:500; margin-bottom:-10px; padding-bottom:0; - + } #left_actus{ float:right; @@ -280,26 +305,21 @@ h1{ text-align:center; } } - + #right_actus{ float:left; width:38%; } - + } -td { - width: 50%; - vertical-align: top; - padding-right: 6px; -} .actu{ .img{ float:left; width:260px; background:center center no-repeat; - + } .description{ margin-left:280px; @@ -307,15 +327,12 @@ td { } } -#logo_fondmob { - display: none; -} - #bottom_actus{ background:#ececec; padding:40px 0; - + box-sizing:border-box; + .breve{ width:30%; margin:20px 1.5%; @@ -325,7 +342,7 @@ td { h2{ background:no-repeat bottom left; - + background-image:url('/bottom-lines.png'); background-size: 225px; padding-top:20px; @@ -334,8 +351,8 @@ h2{ margin-top:0; text-transform:uppercase; font-weight:500; - - + + } @@ -354,23 +371,23 @@ h2{ left:0; right:0; left:0; - + min-height:250px; - + background:black; padding-top:0px; + + - - - background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.25) 30%,rgba(0,0,0,0) 100%); - - + background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.25) 30%,rgba(0,0,0,0) 100%); + + z-index:2; color:white; - + text-align:center; - + a{ color:white; text-decoration:none; @@ -390,7 +407,7 @@ h2{ font-weight:500; font-size:1.2em; text-transform:uppercase; - + } .devis{ background:#f2930d; @@ -402,7 +419,7 @@ h2{ color:black; text-decoration:none; font-size:1.2em; - + .color{ height:1em; width:5px; @@ -410,13 +427,13 @@ h2{ top:2px; background:black; display:inline-block; - + } - + border-bottom:1px dashed rgba(0,0,0,0.9); padding-bottom:10px; margin-bottom:10px; - + } .product_icon{ text-align:center; @@ -427,14 +444,14 @@ h2{ padding-bottom:30px; } #products{ - + a{ text-decoration:none; } h2{ background-position:center bottom; text-align:center; - + } text-align:center; img{ @@ -457,18 +474,50 @@ img{ max-width:100%; } -#menu_top { - .bars { - display: none; - } +#sub_footer img { + position: relative; + bottom: 10px; } -#footer { - padding: 20px 10px !important; -} @media screen and (max-width: 880px) { + + #sub_footer { + padding: 5px 0 !important; + text-align: center; + + #logos { + padding: 20px; + + img { + + } + } + + #place, #contacts { + padding-right: 10px !important; + padding-left: 10px !important; + padding-top: 0px !important; + + } + + img { + height: 70px !important; + + } + + #groupepayreid img{ + height: 90px !important; + display: block; + margin: 0 auto !important; + padding-bottom: 20px; + position: relative; + bottom: 0px; + } + + } + //page d'accueil #menu_top { position: relative; @@ -601,7 +650,7 @@ img{ #actus h2 { position: relative; - font-size: 12px !important; + //font-size: 12px !important; padding: 40px; text-align: center; } @@ -619,7 +668,9 @@ img{ padding: 20px; } } - + .actu .description{ + margin-left:20px; + } .article { } @@ -645,6 +696,9 @@ img{ //actu #bottom_actus{ padding-left: 15px; + .actus{ + margin:0 !important; + } .breve { float: none; width: 90%; @@ -660,17 +714,7 @@ img{ padding-bottom: 90px !important; } - #sub_footer { - padding: 5px 0 !important; - text-align: center; - #logos { - padding: 20px; - } - - img { - height: 70px !important; - } - } + table { padding-left: 20px; @@ -712,3 +756,16 @@ img{ } } +@media screen and (max-width: 874px) { + #sub_footer #logos { + float: none; + } +} + +@media screen and (min-width: 880px) { + #sub_footer #place, #sub_footer #contacts { + padding-right: 10px !important; + padding-top: 40px; + } +} + diff --git a/app/views/layouts/public.html copy.haml b/app/views/layouts/public.html copy.haml new file mode 100644 index 0000000..fe9c0c4 --- /dev/null +++ b/app/views/layouts/public.html copy.haml @@ -0,0 +1,354 @@ + + +-@facebook_title = @facebook_title || @title +- @twitter_title = @twitter_title || @title + +-@menu_shadow=true +-@lang = @lang || LangSite.first +-if !@facebook_img or @facebook_img == "" + -@facebook_img= "/public_medias/image_file/file/13/large_4df7bef3.jpg" +!!! + +- @social_url = @social_url || request.url.to_s +-if @description and @description == "" + - @description = qit "SEO texte description par défaut 2","" + +%html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"} + %head + -@title = strip_tags(@title.to_s) + %title="Payre Jardinerie - "+@title.to_s+ " - Groupe Payre" + + + + + + + + + + + + + + + + + + + + + %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 } + + -if @facebook_img + =raw '' + =raw '' + + =raw '' + + + + + =raw '' + + + + + -@img_size = FastImage.size('http://payresas.fr'+@facebook_img.to_s) + + -if @img_size and @img_size.size > 0 + =raw '' + =raw '' + + = javascript_include_tag "public" + + = csrf_meta_tag + =render :partial => "public/shared/ga" + + = stylesheet_link_tag 'public', :media => :all + + + + =javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&sensor=false" + + + + + + %body + -if !current_admin + %center + %br + %br + #actus + .center + #left_actus + =image_tag("/blog.png", :class => "blog_img") + %h2 + Notre nouveau site sera en ligne + %strong dans quelques jours + .clear + %br + %br + +
+ + +
+
+
+

NOS MAGASINS

+ +
+ +
+
+
+
+ +
+ + +
+
+
+

SARL JARDIMAISON

+

Av. du Montcelet
38380 ENTRE DEUX GUIERS

+
+ +
+

04 76 66 80 59

Lundi au Samedi
9:00–12:00   14:00-19:00

+
+
+
+
+

SAS Payre

+

Sillo les Aversains
38710 Mens

+
+ +
+

04 76 34 61 84

Mardi au Vendredi
8:30–12:30  14:00-18:00

+

Samedi
8:30–12:30  14:00-17:00

+
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+
+
+ + +
+ + + -else + + =link_to image_tag("/logo-fondmob.png", :id => "logo_fondmob"), "/" + =link_to image_tag("/logo-fond.png", :id => "logo_fond"), "/" + -if @menu_item and @menu_item.id == 1 #SI PAGE D'ACCUEIL + .slide_home_wrapper + + =render :partial => "public/shared/menu_top" + + + + + .slide_home.slider + + -@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 = @home_slides_simu.joins(:lang_sites).where("lang_sites.id = ?", @lang.id) + -@home_slides_simu.each do |home_slider_slide| + -if home_slider_slide.image_file + + %div.with_ratio.slide{:style => "background-image:url('#{home_slider_slide.image_file.file.large.url}');background-size:100%;background-size:cover;", :data => {:ratio => 0.45}} + =link_to home_slider_slide.url.to_s, :target => ("_blank" if home_slider_slide.popup) do + .link_overlay + .description.vertical_center + =link_to home_slider_slide.url.to_s, :target => ("_blank" if home_slider_slide.popup) do + + + + -if home_slider_slide.titre2? + .sub_title=home_slider_slide.titre2 + -elsif home_slider_slide.article + .sub_title + -if home_slider_slide.article.category + + -cats = [] + -home_slider_slide.article.categories.uniq.each do |cat| + -cats << cat.lang(I18n.locale.to_s).name + =cats.join(", ") + + %span.sep + ="|" + =l(home_slider_slide.article.published_at, :format => :human_date) + .content + %h3=home_slider_slide.titre1 + #contentdescription + =home_slider_slide.description1 + + + + + + :javascript + $(document).ready(function(){ + $('.slider').bxSlider({ + auto: true, + nextText: '>', + prevText: '<' + }); + }); + + -else + =render :partial => "public/shared/menu_top" + .slide_home_wrapper.with_ratio{:style => "background-image:url('#{@img_url}');", :data => {:ratio => 0.35}} + + + + + -if @menu_item and @menu_item.id == 1 + + + -else + #main_content=yield + -if @menu_item and @menu_item.id == 1 + #actus + .center + #left_actus + =image_tag("/blog.png", :class => "blog_img") + %h2 + LE JARDIN AU FIL DES MOIS + %strong + ="/ Notre Blog" + + .article + -Article.before(Time.now).recents.limit(3).each do |article| + -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) + -if article.image_file + -img_url = article.image_file.file.large.medium.url + %div{:class => "actu"} + + + .img.with_ratio{:style => "background-image:url('#{img_url}');background-size:100%;background-size:cover;", :data => {:ratio => 0.62}} + + + + + .description + %h3= lang_article.title + + =simple_format lang_article.description + + .cta + =link_to article_path(:slug => lang_article.slug, :lang => @lang.slug), :class => "btn", :target => "_blank" do + =qit("Lire l'article") + > + .clear + + + + + #right_actus + .blog_img + %h2 + L’actualité de nos + %strong jardinerie + + -@breves_rss[0..10].each do |article| + =link_to "https://groupe-payre.fr"+article["url"].to_s, :target => "_blank", :style => "text-decoration:none;" do + %div{:class =>"breve"} + .color{:style => "background:#{Category.find(article['category_id']).color};"} + =l (Time.parse(article['date'].to_s)), :format => "%d %b" + ="-" + = article['title'] + .clear + + #main=yield + + + #bottom_actus + .center + %h2 + L’actualité du groupe Payre + + .actus{:style => "margin:0 -1.5%"} + -@articles_rss[0..2].each do |article| + =link_to "https://groupe-payre.fr"+article["url"].to_s, :target => "_blank", :style => "text-decoration:none;" do + %div{:class =>"breve"} + .color{:style => "background:#{Category.find(article['category_id']).color};"} + =l (Time.parse(article['date'].to_s)), :format => "%d %b" + ="-" + = article['title'] + .clear + + #footer + .center + %h2 + Nous contacter + + -@contact = @contact || Contact.new(:provenance_id => 5) + + .contact_form.contact_militer#form + =render :partial => "public/contacts/form" + =image_tag "/bottom-lines.png", :id => "bottom_lines" + #sub_footer + + #logos + =link_to "https://payreagriculture.fr", :target => "_blank" do + =image_tag "/payre-agriculture.png" + + =link_to "https://payreenergies.fr", :target => "_blank" do + =image_tag "/payre-energies.png" + + =link_to "https://payremaintenance.fr", :target => "_blank" do + =image_tag "/payre-maintenance.png" + + =link_to "http://payrejardinerie.fr/", :target => "_blank" do + =image_tag "/payre-jardinerie.png" + + #place + %p + SAS PAYRE + %br + 2089 route de St Quentin + %br + 38430 MOIRANS + #contacts + + %p + =ic :phone + 04 76 35 31 69 + %br + =ic :fax + 04 76 35 67 36 + %br + =link_to "mailto:contact@ets-payre.fr" do + =ic :"envelope-o" + contact@ets-payre.fr + + .clear + + + :javascript + resize() + diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index fe9c0c4..6fb3d90 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -36,46 +36,46 @@ - + %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 } -if @facebook_img =raw '' =raw '' - + =raw '' - - - - + + + + =raw '' - - - - + + + + -@img_size = FastImage.size('http://payresas.fr'+@facebook_img.to_s) - + -if @img_size and @img_size.size > 0 =raw '' =raw '' - + = javascript_include_tag "public" - - = csrf_meta_tag + + = csrf_meta_tag =render :partial => "public/shared/ga" - + = stylesheet_link_tag 'public', :media => :all - + =javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&sensor=false" - - - + + + %body -if !current_admin @@ -84,15 +84,15 @@ %br #actus .center - #left_actus + #left_actus{:style => "width:100%;float:none"} =image_tag("/blog.png", :class => "blog_img") %h2 - Notre nouveau site sera en ligne + Notre nouveau site sera en ligne %strong dans quelques jours .clear %br %br - +
@@ -152,10 +152,10 @@
- - - -else - + + + -else + =link_to image_tag("/logo-fondmob.png", :id => "logo_fondmob"), "/" =link_to image_tag("/logo-fond.png", :id => "logo_fond"), "/" -if @menu_item and @menu_item.id == 1 #SI PAGE D'ACCUEIL @@ -240,40 +240,40 @@ LE JARDIN AU FIL DES MOIS %strong ="/ Notre Blog" - - .article - -Article.before(Time.now).recents.limit(3).each do |article| - -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) - -if article.image_file - -img_url = article.image_file.file.large.medium.url - %div{:class => "actu"} + + + -Article.before(Time.now).recents.limit(3).each do |article| + -lang_article = article.lang_articles.find_by_lang_site_id(@lang.id) + -if article.image_file + -img_url = article.image_file.file.large.medium.url + %div{:class => "actu"} - .img.with_ratio{:style => "background-image:url('#{img_url}');background-size:100%;background-size:cover;", :data => {:ratio => 0.62}} + .img.with_ratio{:style => "background-image:url('#{img_url}');background-size:100%;background-size:cover;", :data => {:ratio => 0.62}} .description %h3= lang_article.title - + =simple_format lang_article.description - + .cta =link_to article_path(:slug => lang_article.slug, :lang => @lang.slug), :class => "btn", :target => "_blank" do =qit("Lire l'article") > .clear - - - + + + #right_actus .blog_img %h2 - L’actualité de nos + L’actualité de nos %strong jardinerie - + -@breves_rss[0..10].each do |article| =link_to "https://groupe-payre.fr"+article["url"].to_s, :target => "_blank", :style => "text-decoration:none;" do %div{:class =>"breve"} @@ -282,15 +282,15 @@ ="-" = article['title'] .clear - + #main=yield - - + + #bottom_actus .center %h2 L’actualité du groupe Payre - + .actus{:style => "margin:0 -1.5%"} -@articles_rss[0..2].each do |article| =link_to "https://groupe-payre.fr"+article["url"].to_s, :target => "_blank", :style => "text-decoration:none;" do @@ -300,7 +300,7 @@ ="-" = article['title'] .clear - + #footer .center %h2 @@ -311,44 +311,10 @@ .contact_form.contact_militer#form =render :partial => "public/contacts/form" =image_tag "/bottom-lines.png", :id => "bottom_lines" - #sub_footer - - #logos - =link_to "https://payreagriculture.fr", :target => "_blank" do - =image_tag "/payre-agriculture.png" - - =link_to "https://payreenergies.fr", :target => "_blank" do - =image_tag "/payre-energies.png" - - =link_to "https://payremaintenance.fr", :target => "_blank" do - =image_tag "/payre-maintenance.png" - - =link_to "http://payrejardinerie.fr/", :target => "_blank" do - =image_tag "/payre-jardinerie.png" - - #place - %p - SAS PAYRE - %br - 2089 route de St Quentin - %br - 38430 MOIRANS - #contacts - - %p - =ic :phone - 04 76 35 31 69 - %br - =ic :fax - 04 76 35 67 36 - %br - =link_to "mailto:contact@ets-payre.fr" do - =ic :"envelope-o" - contact@ets-payre.fr - - .clear - - + + =render :partial => "public/shared/footer" + + :javascript resize() - + \ No newline at end of file diff --git a/app/views/public/shared/_footer.html.haml b/app/views/public/shared/_footer.html.haml new file mode 100644 index 0000000..48bc8c1 --- /dev/null +++ b/app/views/public/shared/_footer.html.haml @@ -0,0 +1,24 @@ +#sub_footer + + #logos + =link_to "https://groupe-payre.fr", :id => "groupepayreid", :target => "_blank" do + =image_tag "/logo.png" + + =link_to "https://payreagriculture.fr", :class => "imgpayre", :target => "_blank" do + =image_tag "/payre-agriculture.png" + + =link_to "https://etschaix.fr/", :class => "imgpayre", :target => "_blank" do + =image_tag "/chaix.png" + + =link_to "https://payreenergies.fr", :class => "imgpayre", :target => "_blank" do + =image_tag "/payre-energies.png" + + =link_to "https://payremaintenance.fr", :class => "imgpayre", :target => "_blank" do + =image_tag "/payre-maintenance.png" + + =link_to "http://payrejardinerie.fr/", :class => "imgpayre", :target => "_blank" do + =image_tag "/payre-jardinerie.png" + + =render :partial => "public/shared/particulars" + + .clear \ No newline at end of file diff --git a/app/views/public/shared/_particulars.html.haml b/app/views/public/shared/_particulars.html.haml new file mode 100644 index 0000000..632219b --- /dev/null +++ b/app/views/public/shared/_particulars.html.haml @@ -0,0 +1,19 @@ +#place + %p + SAS PAYRE + %br + 2089 route de St Quentin + %br + 38430 MOIRANS +#contacts + + %p + =ic :phone + 04 76 35 31 69 + %br + =ic :fax + 04 76 35 67 36 + %br + =link_to "mailto:contact@ets-payre.fr" do + =ic :"envelope-o" + contact@ets-payre.fr diff --git a/public/chaix.png b/public/chaix.png new file mode 100644 index 0000000..46e3e12 Binary files /dev/null and b/public/chaix.png differ diff --git a/public/payre-chaix.png b/public/payre-chaix.png new file mode 100644 index 0000000..1d3fc2f Binary files /dev/null and b/public/payre-chaix.png differ