X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/3e545735b4784af19edec9bfcc8e25ff17cb7f12..171c0354e74b4fdd73e25ea05f5b2d23c0d1642f:/app/views/layouts/main.rhtml?ds=sidebyside
diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index 027ef14..c6a14a3 100644
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -1,49 +1,44 @@
-<% %>
-
- <%= @page_title || "Selectricity" %>
- <%= stylesheet_link_tag "main", :media => "all" %>
-
- <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
-
-
-
- <% if @page_title %>
-
<%= @page_title %>
- <% else %>
-
- <% end %>
+
+
<%= @page_title || "Selectricity" %>
+ <%= stylesheet_link_tag "main", :media => "all" %>
+ <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
+
-
- <% if session[:user] %>
- Welcome <%= User.find(session[:user]).login.capitalize %>
- <%= link_to("Logout", :controller => "account", :action => "logout") %> |
- <% else %>
- <%= link_to("Login", :controller => "account", :action => "login")
- %>/<%= link_to("Sign up", :controller => "account", :action => "signup")%>
- <% end %> |
-
- <%= link_to("Help/About", :controller => "site", :action => "about") %>
-
-
<%= flash[:notice] %>
- <% end%>
+
+
+ <% if @page_title %>
+
<%= @page_title %>
+ <% else %>
+
+ <% end %>
-
- <%= @content_for_layout %>
-
+
+ <% if session[:user] %>
+ Welcome <%= User.find(session[:user]).login.capitalize %>
+ <%= link_to("Profile", :controller => "account",
+ :action => "summary", :id => session[:user][:id] )%>
+ <%= link_to("Logout", :controller => "account",
+ :action => "logout") %> |
+ <% else %>
+ <%= link_to("Login", :controller => "account", :action => "login")
+ %>/<%= link_to("Sign up", :controller => "account", :action => "signup")%>
+ <% end %> |
+
+ <%= link_to("Help/About", :controller => "site", :action => "about") %>
+
+
<%= flash[:notice] %>
+ <% end%>
-
+
+ <%= @content_for_layout %>
+
-
+ <%= render_partial 'layouts/footer' %>
+