-<% %>
<html>
- <head>
- <title><%= @page_title || "Selectricity" %></title>
- <%= stylesheet_link_tag "main", :media => "all" %>
-
- <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
- </head>
- <body>
- <div id="top">
- <% if @page_title %>
- <h3><%= @page_title %></h3>
- <% else %>
- <span id="headertext"><%= link_to('<h3>Selectricity<br />
- <font size="-1">Voting Machinery for the Masses</font></h3>', :controller =>
- 'site', :action => 'index')%></span>
- <% end %>
+ <head>
+ <title><%= @page_title || "Selectricity" %></title>
+ <%= stylesheet_link_tag "main", :media => "all" %>
+ <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
+ </head>
- <div id="links">
- <% if session[:user] %>
- Welcome <strong><%= User.find(session[:user]).login.capitalize %></strong>
- <%= 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") %>
- </div>
- </div>
-
- <% if flash[:notice]%>
- <div id="notice"><%= flash[:notice] %></div>
- <% end%>
+ <body>
+ <div id="top">
+ <% if @page_title %>
+ <h3><%= @page_title %></h3>
+ <% else %>
+ <span id="headertext"><%= link_to('<h3>Selectricity<br />
+ <font size="-1">Voting Machinery for the Masses</font></h3>', :controller =>
+ 'site', :action => 'index')%></span>
+ <% end %>
- <div id="main">
- <%= @content_for_layout %>
- </div>
+ <div id="links">
+ <% if session[:user] %>
+ Welcome <strong><%= User.find(session[:user]).login.capitalize %></strong>
+ <%= 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") %>
+ </div>
+</div>
+
+ <% if flash[:notice]%>
+ <div id="notice"><%= flash[:notice] %></div>
+ <% end%>
- <div id="footer">
- <hr />
- <%= link_to "Copyleft", "http://code.selectricity.org/"
- %> 2006, 2007 ||
- <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and the
- <a href="http://code.selectricity.org/team">Selectricity Team</a>
- </div>
+ <div id="main">
+ <%= @content_for_layout %>
+ </div>
- </body>
+ <%= render_partial 'layouts/footer' %>
+ </body>
</html>
projects / selectricity / blobdiff