diff --git a/app/controllers/public/articles_controller.rb b/app/controllers/public/articles_controller.rb index ec55d51..8e78a47 100644 --- a/app/controllers/public/articles_controller.rb +++ b/app/controllers/public/articles_controller.rb @@ -15,7 +15,7 @@ class Public::ArticlesController < ApplicationController - @articles = Article.before(Date.today).recents.joins(:lang_articles).where("lang_articles.enabled = 1 and lang_articles.lang_site_id = 1") + @articles = Article.recents @articles = @articles.page(params[:page]).per(11) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 2e43e25..e68a34c 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -116,7 +116,7 @@ .bottom.row-fluid .span12{:style => "text-align:center;padding:2em;font-size:12px;"} %p{:style => "font-size:13px;"} - Lux Laverie, Sarl CCCP 38 au capital de 10 000 € - Siret 753 839 638 00016 - APE : 7112B - RC : 753 839 638 R.C.S. Grenoble - + Lux Laverie, Sarl CCCP 38 au capital de 10 000 € - Siret 753 839 638 00024 - APE : 7112B - RC : 753 839 638 R.C.S. Grenoble - Partenaire =link_to "Une autre laverie", "http://une-autre-laverie.com/", :target => "_blank" ="-" diff --git a/app/views/public/menu_items/contact.html.haml b/app/views/public/menu_items/contact.html.haml index bbe28c3..0a62701 100644 --- a/app/views/public/menu_items/contact.html.haml +++ b/app/views/public/menu_items/contact.html.haml @@ -15,8 +15,7 @@ .span4 %h3 Par téléphone %p 04 76 35 19 77 - %h3 Par fax - %p 04 76 35 20 41 + .span4 %h3 Par courrier @@ -24,7 +23,7 @@ Lux Laverie %br - 523 rue des Béalières + 523 route des Béalières %br 38360 Noyarey