From 1692a120a0a96f7649dc7da1cf4649635975b6ef Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Mon, 27 Jul 2009 18:58:58 +0200
Subject: [PATCH] you will from now on be known as the name Balder

---
 README                                 |  4 +++-
 app/views/admin/users/edit.html.erb    | 10 ++++++----
 app/views/admin/users/index.html.erb   |  4 +++-
 app/views/admin/users/new.html.erb     |  4 +---
 app/views/admin/users/show.html.erb    |  7 ++++---
 app/views/layouts/application.html.erb |  2 +-
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 513e62a..1177d27 100644
--- a/README
+++ b/README
@@ -1,7 +1,9 @@
-== Welcome to the gallery without a name
+== Welcome to Balder photo gallery
 
 Made by Espen Antonsen.
 
+http://balderapp.com
+
 == Features
 
 * Stores photos to disk in folders
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index d495b9a..887735f 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -6,8 +6,10 @@
   <%= f.submit "Update" %>
 <% end %>
  
-<br /><%= link_to("Delete user", { :action => "destroy", :id => @user },
-  :confirm => "Are you sure you want to delete this user?",
-  :method => :delete) %>
 
-<br /><%= link_to "All users", users_path %>
\ No newline at end of file
+
+<% content_for :action_links do %>
+<%= link_to("Delete user", { :action => "destroy", :id => @user },
+	  :confirm => "Are you sure you want to delete this user?",
+	  :method => :delete) %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index f30cfc3..4c74ef2 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -2,4 +2,6 @@
 <h2><%= link_to user.name || user.email , user %></h2>
 <% end %>
 
-<br /><%= link_to "New user", new_user_path %>
\ No newline at end of file
+<% content_for :action_links do %>
+<%= link_to "New user", new_user_path %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/users/new.html.erb b/app/views/admin/users/new.html.erb
index 72387ee..fd293b1 100644
--- a/app/views/admin/users/new.html.erb
+++ b/app/views/admin/users/new.html.erb
@@ -4,6 +4,4 @@
   <%= f.error_messages %>
   <%= render :partial => "form", :object => f %>
   <%= f.submit "Register" %>
-<% end %>
-
-<br /><%= link_to "All users", users_path %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index bbc6bb1..507e2cc 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -39,6 +39,7 @@
   <%=h @user.current_login_ip %>
 </p>
  
- 
-<%= link_to 'Edit', edit_user_path(@user) %><br/>
-<br /><%= link_to "All users", users_path %>
\ No newline at end of file
+
+<% content_for :action_links do %>
+<%= link_to 'Edit', edit_user_path(@user) %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5440c29..8db6659 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,7 +37,7 @@
 <div id="footer">
   
   <hr class="seperator" />
-  &copy; Gallery without a name.
+  &copy; <a href="http://balderapp.com">Balder</a>.
 </div>
 </div>