From 5143f6151b365a3b43ef15844500fceb768f5c07 Mon Sep 17 00:00:00 2001
From: Nico <info@nicolasbally.com>
Date: Thu, 7 Feb 2013 18:16:59 +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/assets/stylesheets/application.css.scss | 18 ++++++++++++++++++
 app/views/layouts/admin.html.haml           |  2 +-
 app/views/portfolios/_portfolio_image.haml  | 18 ++++++++++--------
 config/database.yml                         |  4 +---
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index f83c331..40fc5f6 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -145,8 +145,26 @@ text-align:center;
 			.title{
 				text-align:left;
 				color:gray;
+				.exifs{
+					position:absolute;
+					right:0;
+					top:0px;
+					width:110%;
+					
+					font-size:0.6em;
+					
+					@include transform-origin(top, right); 
+					@include rotate(-90deg);
+					
+					text-align:right;
+					
+					&:hover{
+					font-size:1em;
+					}
 				
+				}
 			}
+			
 			.time{
 				color:gray;
 				float:right;
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 1f64a96..349b367 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 : ""), :class => "avatar"
+					=image_tag (current_admin.avatar? ? current_admin.avatar.square.url : "defaut.png"), :class => "avatar"
 					%span
 						=current_admin.firstname
 						=current_admin.name
diff --git a/app/views/portfolios/_portfolio_image.haml b/app/views/portfolios/_portfolio_image.haml
index ae7fd74..b341f1f 100644
--- a/app/views/portfolios/_portfolio_image.haml
+++ b/app/views/portfolios/_portfolio_image.haml
@@ -13,14 +13,16 @@
 			="-"
 			=l portfolio_image.shoot_at, :format => :date if portfolio_image.shoot_at
 			-if portfolio_image.exif
-				%br
-				=portfolio_image.exif.model
-				="-"
-				="f "+portfolio_image.exif.f_number.to_f.to_s
-				="-"
-				=portfolio_image.exif.exposure_time.to_s+" s"
-				="-"
-				=portfolio_image.exif.iso_speed_ratings.to_s+" iso"
+				.exifs
+					=portfolio_image.exif.model
+					="-"
+					="f "+portfolio_image.exif.f_number.to_f.to_s
+					="-"
+					=portfolio_image.exif.exposure_time.to_s+" s"
+					="-"
+					=portfolio_image.exif.iso_speed_ratings.to_s+" iso"
+					="-"
+					© Nicolas Bally
 	
 		-if current_admin
 			.admin
diff --git a/config/database.yml b/config/database.yml
index 1b02c96..391fe11 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -18,6 +18,7 @@ test:
   pool: 5
   timeout: 5000
 
+
 production:
   adapter: mysql2
   encoding: utf8
@@ -26,6 +27,3 @@ production:
   username: site_perso_app
   password: site_perso_app
   socket: /var/run/mysqld/mysqld.sock
-
-	
-	
\ No newline at end of file