X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/f7aee769411a893c1059c529a220c0d25c72974f..04f827dd4647f3a7d6e5bd8f5e9083c730a8dccc:/app/views/layouts/vb.rhtml
diff --git a/app/views/layouts/vb.rhtml b/app/views/layouts/vb.rhtml
index 76b6d36..71003b5 100644
--- a/app/views/layouts/vb.rhtml
+++ b/app/views/layouts/vb.rhtml
@@ -1,9 +1,9 @@
<% %>
- <%= @page_title || "VotingBooth" %>
+ <%= @page_title || "HyperChad" %>
<%= stylesheet_link_tag "vb", :media => "all" %>
- <%= engine_stylesheet 'login_engine' %>
+ <% #engine_stylesheet 'login_engine' %>
<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
@@ -12,22 +12,20 @@
<% if @page_title %>
<%= @page_title %>
<% else %>
- Voting Booth
- Preferential Voting on the Web
+ HyperChad
+ Voting Machinery for the Masses
<% end %>
<% 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") %>
@@ -42,8 +40,9 @@
<%= @content_for_layout %>
-
-