X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/469888b30ec666c4f5e11f0be42cab539b2a7ab4..2ba40f97b78f529984ff26c7c7d61c91d213e7b0:/app/views/layouts/vb.rhtml?ds=sidebyside
diff --git a/app/views/layouts/vb.rhtml b/app/views/layouts/vb.rhtml
index 1161c7f..a05ae54 100644
--- a/app/views/layouts/vb.rhtml
+++ b/app/views/layouts/vb.rhtml
@@ -3,6 +3,8 @@
<%= @page_title || "VotingBooth" %>
<%= stylesheet_link_tag "vb", :media => "all" %>
+ <% #engine_stylesheet 'login_engine' %>
+
<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
@@ -18,14 +20,12 @@
<% if session[:user] %>
Welcome <%= session[:user].login.capitalize %>
<% else %>
- <%= link_to("Login",:controller => "account", :action => "login") %>/<%= link_to("Sign up", :controller => "account", :action => "signup")%>
+ <%= link_to("Login",:controller => "user", :action => "login")
+ %>/<%= link_to("Sign up", :controller => "user", :action => "signup")%>
<% end %> |
- <%= link_to("Home", :controller => "site", :action => "index")%> |
- <%= link_to("Browse", :controller => "site", :action => "index")%> |
-
<% if session[:user] %>
- <%= link_to("Logout", :controller => "account", :action => "logout") %> |
+ <%= link_to("Logout", :controller => "user", :action => "logout") %> |
<% end %>
<%= link_to("Help/About", :controller => "site", :action => "about") %>