From a89eda7779ff3b2e092ebf47b5ae726751e49330 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 18 Dec 2014 01:01:48 +0100 Subject: [PATCH] =?UTF-8?q?titres=20actualit=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/public/articles_controller.rb | 8 ++++---- app/views/public/articles/_sidebar_archives.html.haml | 2 +- app/views/public/articles/index.html.haml | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/public/articles_controller.rb b/app/controllers/public/articles_controller.rb index 60042a7..a230c60 100644 --- a/app/controllers/public/articles_controller.rb +++ b/app/controllers/public/articles_controller.rb @@ -15,7 +15,7 @@ class Public::ArticlesController < ApplicationController @articles = @articles.page(params[:page]).per(12) - @title = "Articles du blog" + @index_title = "Actualités du Pic Vert" end def feed @@ -62,7 +62,7 @@ class Public::ArticlesController < ApplicationController @articles = @category.articles.before(Date.today).recents @articles = @articles.page(params[:page]).per(3) @title = "Articles du blog" - @index_title = 'Articles de la catégorie "'+@category.name+'"' + @index_title = 'Actualités de la catégorie "'+@category.name+'"' render :action => :index end @@ -73,9 +73,9 @@ class Public::ArticlesController < ApplicationController @articles = @articles.page(params[:page]).per(12) @title = "Articles du blog" if [4,8].include?(@month.month) - @index_title = 'Articles du mois d\''+l(@month, :format => "%B %Y")+'' + @index_title = 'Actualités du Pic Vert du mois d\''+l(@month, :format => "%B %Y")+'' else - @index_title = 'Articles du mois de '+l(@month, :format => "%B %Y")+'' + @index_title = 'Actualités du Pic Vert du mois de '+l(@month, :format => "%B %Y")+'' end render :action => :index diff --git a/app/views/public/articles/_sidebar_archives.html.haml b/app/views/public/articles/_sidebar_archives.html.haml index 5c9956d..db74aaa 100644 --- a/app/views/public/articles/_sidebar_archives.html.haml +++ b/app/views/public/articles/_sidebar_archives.html.haml @@ -1,5 +1,5 @@ .archives.widget - %h3 Archives du blog + .main_section_title Archives des actualités -if Article.before(Date.today).recents.size > 0 %ul diff --git a/app/views/public/articles/index.html.haml b/app/views/public/articles/index.html.haml index 84d837d..4f085b3 100644 --- a/app/views/public/articles/index.html.haml +++ b/app/views/public/articles/index.html.haml @@ -1,3 +1,4 @@ +%h1=@index_title =render :partial => "index" -content_for :sidebar do