diff --git a/Gemfile b/Gemfile index 12e2aeb..f4e5663 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ end gem "capistrano", group: :development gem "rvm-capistrano", group: :development - +gem 'net-ssh', '~>2.7.0' # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index bb96904..330ca6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.9.1) + net-ssh (2.7.0) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) nokogiri (1.6.3.1) @@ -183,6 +183,7 @@ DEPENDENCIES jquery-rails kaminari mysql2 + net-ssh (~> 2.7.0) nokogiri rails (= 4.0.9) rmagick diff --git a/app/assets/images/nouveau.png b/app/assets/images/nouveau.png new file mode 100644 index 0000000..41255a7 Binary files /dev/null and b/app/assets/images/nouveau.png differ diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 85cf345..3876bad 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -4,8 +4,8 @@ resize = () -> - $(".electrolux_img img").css("padding-top", ($(".electrolux_img").height() - $(".electrolux_img img").height())/ 2) - $(".miele_img img").css("padding-top", ($(".miele_img").height() - $(".miele_img img").height())/ 2) + $(".electrolux_img .img").css("padding-top", ($(".electrolux_img").height() - $(".electrolux_img img").height())/ 2) + $(".miele_img .img").css("padding-top", ($(".miele_img").height() - $(".miele_img img").height())/ 2) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index d320b04..2050679 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -655,7 +655,7 @@ background:url("/laverie-electrolux2.jpg")center center; background-size:cover; height:350px; -img{ +.img{ width:396px; margin:auto; display:block; @@ -667,11 +667,17 @@ display:block; } .miele_img{ +.new{ +position:absolute; +top:0px; +right:0px; +width:200px; - +} +position:relative; background-image:url("/laverie-miele2.jpg") ; -img{ +.img{ width:273px; margin:auto; display:block; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 38c3e8f..ce9a2cb 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,7 +1,7 @@ !!! %html{:xmlns=>"http://www.w3.org/1999/xhtml", :"xml:lang"=>"fr", :lang=>"fr"} %head - %title= "Auclair Laverie - "+ @title.to_s+" " + %title= @title.to_s %meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" } %meta{ :"name" => "Description", :content => @description } %meta{ :"name" => "Keywords", :content => @keywords } diff --git a/app/views/pages_content/index.html.haml b/app/views/pages_content/index.html.haml index d9cb137..88600d1 100644 --- a/app/views/pages_content/index.html.haml +++ b/app/views/pages_content/index.html.haml @@ -1,6 +1,6 @@ --@title = "Laverie automatiques à Grenoble, Voiron, Saint Egrève et Seyssinet Pariset" --@description = "Laverie self service pratiques et performantes (acceptent CB), pour laver votre linge, vos couettes, dans un cadre agréable." --@keywords = "Laverie automatique,Laverie self service, laver, couette, pressing, electrolux" +-@title = "Laverie automatique - Miele et Electrolux" +-@description = "Lux Laverie & Une autre laverie installe des laveries automatiques en libre service sur toutre la france. Concept et design attrayant." +-@keywords = "Laverie automatique,Laverie self service, acheter laverie, laverie libre service, franchise laverie, laveries libre service,lavomatique, laverie, libre-service, pressing, blanchisserie, laver, machine a laver, lavoir, linge, lavette, distributeur de lessive, lessive, centrale de paiement, monnayeur, miele, electrolux" @@ -12,7 +12,7 @@ .span_6.columns .electrolux .electrolux_img - =link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie" + =link_to image_tag("logo-lux-laverie.png", :alt => "Acheter laverie automatique electrolux", :class => "img"), "http://luxlaverie.com", :title => "Laverie automatique Electrolux avec Lux Laverie" =link_to image_tag("logo-electrolux.png", :alt => "Installer laverie automatique electrolux", :class => "logo"), "http://luxlaverie.com", :title => "Lux Laverie, installation laverie automatique Electrolux" @@ -25,7 +25,8 @@ .span_6.columns .miele .miele_img - =link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" + =link_to image_tag("nouveau.png", :alt => "Nouveau : Une autre laverie, laverie automatique Miele", :class => "new"), "http://luxlaverie.com", :title => "Nouveau : Une autre laverie, laverie automatique Miele" + =link_to image_tag("logo-une-autre-laverie.png", :alt => "Une autre laverie, laverie automatique Miele", :class => "img"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional" =link_to image_tag("logo-miele.png", :class => "logo", :alt => "Une autre laverie, laverie automatique Miele"), "http://une-autre-laverie.com", :title => "Une autre laverie, installation laverie automatique Miele Professional"