replace applet with potlatch

[rails.git] / app / views / layouts / site.rhtml

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 1154237cb811924a56b744b0c980d37f159f42cb..d32490729f6cd5fd86edbf92a742e554b0f26d3f 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -15,7 +15,7 @@
     <% end %>
     <div id="content">
       <% if flash[:notice] %>
     <% end %>
     <div id="content">
       <% if flash[:notice] %>

-      <div id="notice"><%= flash[:notice] %></div>
+        <div id="notice"><%= flash[:notice] %></div>

       <% end %>
 
       <%= yield %>
       <% end %>
 
       <%= yield %>


@@ -23,12 +23,13 @@
     </div>
 
     <span id="greeting">
     </div>
 
     <span id="greeting">

-      <% if @user %>
-      Welcome, <%= @user.display_name %> |
-      <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>
+        <% if @user %>
+        Welcome, <%= @user.display_name %> |
+        <%= link_to 'account', {:controller => 'user', :action => 'account'}, {:id => 'loginanchor'}%> |
+        <%= link_to 'logout', {:controller => 'user', :action => 'logout'}, {:id => 'loginanchor'}%>

       <% else %>
       <% else %>

-      <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
-      <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+        <%= link_to 'log in', {:controller => 'user', :action => 'login'}, {:id => 'loginanchor'}%> |
+        <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>

       <% end %>
     </span>
 
       <% end %>
     </span>