projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the Selectricity header into a link, and modified the config/routes.rb file...
[selectricity]
/
app
/
views
/
layouts
/
hc.rhtml
diff --git
a/app/views/layouts/hc.rhtml
b/app/views/layouts/hc.rhtml
old mode 100644
(file)
new mode 100755
(executable)
index
4daac12
..
c04eb87
--- a/
app/views/layouts/hc.rhtml
+++ b/
app/views/layouts/hc.rhtml
@@
-1,9
+1,8
@@
<% %>
<html>
<head>
<% %>
<html>
<head>
- <title><%= @page_title || "
HyperChad
" %></title>
+ <title><%= @page_title || "
Selectricity
" %></title>
<%= stylesheet_link_tag "hc", :media => "all" %>
<%= stylesheet_link_tag "hc", :media => "all" %>
- <% #engine_stylesheet 'login_engine' %>
<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
</head>
<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
</head>
@@
-12,28
+11,30
@@
<% if @page_title %>
<h3><%= @page_title %></h3>
<% else %>
<% if @page_title %>
<h3><%= @page_title %></h3>
<% else %>
- <h3>HyperChad<br />
- <font size="-1">Voting Machinery for the Masses</font></h3>
+ <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="links">
<% if session[:user] %>
<% end %>
<div id="links">
<% if session[:user] %>
- Welcome <strong><%=
session[:user]
.login.capitalize %></strong>
+ Welcome <strong><%=
User.find(session[:user])
.login.capitalize %></strong>
<% else %>
<% else %>
- <%= link_to("Login",
:controller => "user
", :action => "login")
- %>/<%= link_to("Sign up", :controller => "
user
", :action => "signup")%>
+ <%= link_to("Login",
:controller => "account
", :action => "login")
+ %>/<%= link_to("Sign up", :controller => "
account
", :action => "signup")%>
<% end %> |
<% if session[:user] %>
<% end %> |
<% if session[:user] %>
- <%= link_to("Logout", :controller => "
user
", :action => "logout") %> |
+ <%= link_to("Logout", :controller => "
account
", :action => "logout") %> |
<% end %>
<%= link_to("Help/About", :controller => "site", :action => "about") %>
<% end %>
<%= link_to("Help/About", :controller => "site", :action => "about") %>
+ <%= link_to( "Home", :controller => 'site', :action => 'index' )%>
</div>
</div>
</div>
</div>
- <% if
@
flash[:notice]%>
- <div id="notice"><%=
@
flash[:notice] %></div>
+ <% if flash[:notice]%>
+ <div id="notice"><%= flash[:notice] %></div>
<% end%>
<div id="main">
<% end%>
<div id="main">
@@
-42,7
+43,8
@@
<div id="footer">
<hr />
<div id="footer">
<hr />
- <%= link_to "Copyleft", "http://mako.cc/projects/hyperchad" %> 2006 |
+ <%= link_to "Copyleft", "http://mako.cc/projects/selectricity"
+ %> 2006, 2007 |
<%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
<a href="http://mako.cc">Benjamin Mako Hill</a>
</div>
<%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
<a href="http://mako.cc">Benjamin Mako Hill</a>
</div>
Benjamin Mako Hill
||
Want to submit a patch?