From 4ab7efbf2a307793f1dccd7ab7e181483a52abc3 Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Mon, 10 Aug 2009 16:22:06 +0200
Subject: [PATCH] site logo

---
 app/models/album.rb                    | 1 -
 app/views/layouts/application.html.erb | 5 ++++-
 config/settings.example.yml            | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/album.rb b/app/models/album.rb
index ed67a23..8db5778 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -25,7 +25,6 @@ class Album < ActiveRecord::Base
   
   
   def ensure_path
-    puts self.title.parameterize
     self.path = self.title.parameterize unless self.path
   end
   
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 68db9da..b2bd3ee 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,7 +21,10 @@
 	<%= link_to 'Login', login_path %>
 	<% end %>
 	</div>
-	<h1><%= APP_CONFIG[:site_name] %></h1>
+	<h1>
+		<%= APP_CONFIG[:site_name] %>
+		<%= (image_tag APP_CONFIG[:site_logo]) if APP_CONFIG[:site_logo]  %>
+		</h1>
 	<form action="/albums" method="get" id="search">
 		<input type="text" name="q" class="textfie.d"/>
 		<input type="submit" value="Search" class="button" />
diff --git a/config/settings.example.yml b/config/settings.example.yml
index c702afa..2c2d293 100644
--- a/config/settings.example.yml
+++ b/config/settings.example.yml
@@ -1,17 +1,20 @@
 development:
-    site_name: Photos
+    site_name: 'Photos'
+    #site_logo: 'logo.png'
     photos_path: <%= RAILS_ROOT + '/photos/' %>
     thumbs_path: <%= RAILS_ROOT + '/public/thumbs/'  %>
     photos_path_public: '/files/'
     thumbs_path_public: '/thumbs/'
 production:
-    site_name: Photos
+    site_name: 'Photos'
+    #site_logo: 'logo.png'
     photos_path: <%= RAILS_ROOT + '/photos/' %>
     thumbs_path: <%= RAILS_ROOT + '/public/thumbs/'  %>
     photos_path_public: '/files/'
     thumbs_path_public: '/thumbs/'
 test:
-    site_name: Photos
+    site_name: 'Photos'
+    #site_logo: 'logo.png'
     photos_path: <%= RAILS_ROOT + '/photos/' %>
     thumbs_path: <%= RAILS_ROOT + '/public/thumbs/'  %>
     photos_path_public: '/files/'