From 08338c7379915221e23070a952240fc5d75d432c Mon Sep 17 00:00:00 2001 From: Nico Date: Thu, 7 Feb 2013 18:38:27 +0100 Subject: [PATCH] =?UTF-8?q?Modification=20pr=C3=A9sentation=20exifs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/uploaders/avatar_uploader.rb | 4 ++++ app/uploaders/image_uploader.rb | 3 +++ app/views/layouts/admin.html.haml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index e6b2a0a..fa88a99 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -10,6 +10,10 @@ class AvatarUploader < CarrierWave::Uploader::Base storage :file # storage :s3 + def default_url + "/images/fallback/" + [version_name, "default.png"].compact.join('_') + end + # Override the directory where uploaded files will be stored. # This is a sensible default for uploaders that are meant to be mounted: def store_dir diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index a8f359c..0199f39 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -10,6 +10,9 @@ class ImageUploader < CarrierWave::Uploader::Base storage :file # storage :s3 + def default_url + "/images/fallback/" + [version_name, "default.png"].compact.join('_') + end # Override the directory where uploaded files will be stored. # This is a sensible default for uploaders that are meant to be mounted: def store_dir diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 349b367..bf71afe 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -28,7 +28,7 @@ #breadcrumb .personnal - =image_tag (current_admin.avatar? ? current_admin.avatar.square.url : "defaut.png"), :class => "avatar" + =image_tag current_admin.avatar.square.url, :class => "avatar" %span =current_admin.firstname =current_admin.name