projects
/
selectricity
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aca2ebb
)
Remove deprecated start_form_tag and end_form_tags. Now you're supposed to do form_ta...
author
John Dong
<jdong@mit.edu>
Mon, 20 Aug 2007 18:58:30 +0000
(14:58 -0400)
committer
John Dong
<jdong@mit.edu>
Mon, 20 Aug 2007 18:58:30 +0000
(14:58 -0400)
app/views/election/edit.rhtml
patch
|
blob
|
history
app/views/election/edit_candidate.rhtml
patch
|
blob
|
history
app/views/election/edit_candidates.rhtml
patch
|
blob
|
history
app/views/election/edit_voters.rhtml
patch
|
blob
|
history
app/views/election/new.rhtml
patch
|
blob
|
history
app/views/election/new_voters.rhtml
patch
|
blob
|
history
app/views/quickvote/_candidate_list.rhtml
patch
|
blob
|
history
app/views/quickvote/create.rhtml
patch
|
blob
|
history
app/views/user/login.rhtml
patch
|
blob
|
history
app/views/voter/_vote.rhtml
patch
|
blob
|
history
app/views/voter/index.rhtml
patch
|
blob
|
history
diff --git
a/app/views/election/edit.rhtml
b/app/views/election/edit.rhtml
index af0cb493e5fc6952a3ab44e386dae1b5a971af48..968d1575124c730204089cc2a17e7b5ef094f280 100644
(file)
--- a/
app/views/election/edit.rhtml
+++ b/
app/views/election/edit.rhtml
@@
-1,6
+1,6
@@
<h1><strong><%= @election.name %>:</strong> Edit Overview</h1>
<h1><strong><%= @election.name %>:</strong> Edit Overview</h1>
-<%
= start_form_tag :action => 'update', :id => @election
%>
+<%
form_tag(:action => 'update', :id => @election) do
%>
<%= render :partial => 'overview_form' %>
<%= submit_tag 'Done!' %>
<%= render :partial => 'overview_form' %>
<%= submit_tag 'Done!' %>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/election/edit_candidate.rhtml
b/app/views/election/edit_candidate.rhtml
index e465ae961714ff6e227fdd8ad707ad967394ff1a..fe56aa08c37f3d20d8c33f03da7c2cef4442f181 100644
(file)
--- a/
app/views/election/edit_candidate.rhtml
+++ b/
app/views/election/edit_candidate.rhtml
@@
-1,9
+1,9
@@
<h1>Editing <%= @candidate.name %></h1>
<%= error_messages_for :candidate %>
<h1>Editing <%= @candidate.name %></h1>
<%= error_messages_for :candidate %>
-<%
=
form_tag( { :action => :update_candidate, :id => @candidate.id },
- :multipart => true ) %>
+<% form_tag( { :action => :update_candidate, :id => @candidate.id },
+ :multipart => true )
do
%>
<%= render :partial => 'candidate_form' %>
<%= submit_tag "Save" %>
<%= render :partial => 'candidate_form' %>
<%= submit_tag "Save" %>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/election/edit_candidates.rhtml
b/app/views/election/edit_candidates.rhtml
index cc2c16a8a9ebb33225f95609456e9d90f11d2308..99f2f129abd0607b2308d256d52572dc775d6c96 100644
(file)
--- a/
app/views/election/edit_candidates.rhtml
+++ b/
app/views/election/edit_candidates.rhtml
@@
-16,10
+16,10
@@
<p>Please enter new candidates below.</p>
<p>Please enter new candidates below.</p>
-<%
=
form_tag( { :action => :add_candidate, :id => @election.id },
- :multipart => true ) %>
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+ :multipart => true )
do
%>
<%= render :partial => 'candidate_form' %>
<%= submit_tag "Add Candidate" %>
<%= render :partial => 'candidate_form' %>
<%= submit_tag "Add Candidate" %>
-<%
= end_form_tag
%>
+<%
end
%>
<%= button_to "Done!", :action => 'show', :id => @election %>
<%= button_to "Done!", :action => 'show', :id => @election %>
diff --git
a/app/views/election/edit_voters.rhtml
b/app/views/election/edit_voters.rhtml
index 429a9077fe15ce98483a69743602eee75e403ced..1e98fbaf93d39ac0dd636d14fe1675749af94203 100644
(file)
--- a/
app/views/election/edit_voters.rhtml
+++ b/
app/views/election/edit_voters.rhtml
@@
-3,8
+3,8
@@
<%= render :partial => 'voter_list' %>
<%= render :partial => 'voter_list' %>
-<%
= form_tag :action => 'edit_voters', :id => @election.id
%>
+<%
form_tag (:action => 'edit_voters', :id => @election.id) do
%>
<%= render :partial => 'voters_form' %>
<%= render :partial => 'voters_form' %>
-<%
= end_form_tag
%>
+<%
end
%>
<%= button_to 'Done!', :action => 'show', :id => @election.id %>
<%= button_to 'Done!', :action => 'show', :id => @election.id %>
diff --git
a/app/views/election/new.rhtml
b/app/views/election/new.rhtml
index fc390a059ed596a6ad8466b86aa11bfb3b0ff486..7b717486c0042739b2fe91d53b0f492e52677901 100644
(file)
--- a/
app/views/election/new.rhtml
+++ b/
app/views/election/new.rhtml
@@
-2,8
+2,8
@@
<h2>Vote Overview</h2>
<h2>Vote Overview</h2>
-<%
= form_tag :action => 'create_election'
%>
+<%
form_tag (:action => 'create_election') do
%>
<%= render :partial => 'overview_form' %>
<%= submit_tag "Done!" %>
<%= render :partial => 'overview_form' %>
<%= submit_tag "Done!" %>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/election/new_voters.rhtml
b/app/views/election/new_voters.rhtml
index b750085e6706a95157a3ccf78fb3a21fcfb2628a..9c3bad3a6f9c99cb36b07a35f19806ef8503ed7f 100644
(file)
--- a/
app/views/election/new_voters.rhtml
+++ b/
app/views/election/new_voters.rhtml
@@
-3,6
+3,6
@@
<%= render :partial => 'voter_list' %>
<%= render :partial => 'voter_list' %>
-<%
= form_tag :action => 'new_voters', :id => @election.id
%>
+<%
form_tag(:action => 'new_voters', :id => @election.id) do
%>
<%= render :partial => 'voters_form' %>
<%= render :partial => 'voters_form' %>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/quickvote/_candidate_list.rhtml
b/app/views/quickvote/_candidate_list.rhtml
index f4f1c0628c06d91139300d38a0338cbfa3b02611..64aa97926c228cdb0813e0096965d4f005aec67d 100644
(file)
--- a/
app/views/quickvote/_candidate_list.rhtml
+++ b/
app/views/quickvote/_candidate_list.rhtml
@@
-1,18
+1,18
@@
<% %>
<!-- the list of candidates -->
<% %>
<!-- the list of candidates -->
-<% if
@
flash[:candlist] %>
+<% if flash[:candlist] %>
<ul>
<ul>
- <% for cand in
@
flash[:candlist] %>
+ <% for cand in flash[:candlist] %>
<li><%= cand.capitalize %></li>
<% end %>
</ul>
<% end %>
<li><%= cand.capitalize %></li>
<% end %>
</ul>
<% end %>
-<%
= form_remote_tag
:update => 'candlist',
+<%
form_remote_tag(
:update => 'candlist',
:url => { :action => 'add_candidate' },
:url => { :action => 'add_candidate' },
- :complete => "Field.focus('ajax_newcandidate')" %>
+ :complete => "Field.focus('ajax_newcandidate')"
) do
%>
<p>
<%= text_field "ajax", "newcandidate", :size => 40 %>
<%= submit_tag "Add(+)" %>
</p>
<p>
<%= text_field "ajax", "newcandidate", :size => 40 %>
<%= submit_tag "Add(+)" %>
</p>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/quickvote/create.rhtml
b/app/views/quickvote/create.rhtml
index 6b6ada8b6488acfcd8fe3f797c8e051726b378d8..cf91e198a4e15183020a680bea65c51ed49f9241 100644
(file)
--- a/
app/views/quickvote/create.rhtml
+++ b/
app/views/quickvote/create.rhtml
@@
-10,7
+10,7
@@
<%= render :partial => 'candidate_list' %>
</div>
<%= render :partial => 'candidate_list' %>
</div>
-<%
= form_tag :action => 'create'
%>
+<%
form_tag(:action => 'create') do
%>
<!--[form:election]-->
<p><label for="quickvote_name">One Word Description (for URL)<br />
<!--[form:election]-->
<p><label for="quickvote_name">One Word Description (for URL)<br />
@@
-26,5
+26,5
@@
<%= submit_tag "Create Quickvote" -%>
<%= submit_tag "Create Quickvote" -%>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/user/login.rhtml
b/app/views/user/login.rhtml
index f4902a4e8e5d628b61b086f5641494b9154fc620..3e2f7461af226bc968594c04677b67834ccfc399 100644
(file)
--- a/
app/views/user/login.rhtml
+++ b/
app/views/user/login.rhtml
@@
-2,7
+2,7
@@
<h3>Please Login</h3>
<div class="form-padding">
<h3>Please Login</h3>
<div class="form-padding">
- <%
= start_form_tag :action => 'login'
%>
+ <%
form_tag(:action => 'login') do
%>
<table>
<%= form_input :text_field, "Login ID", "login", :size => 30 %>
<%= form_input :password_field, "Password", "password", :size => 30 %>
<table>
<%= form_input :text_field, "Login ID", "login", :size => 30 %>
<%= form_input :password_field, "Password", "password", :size => 30 %>
@@
-13,6
+13,6
@@
<p><%= link_to 'Register for an account', :action => 'signup' %></p>
<p><%= link_to 'Forgot my password', :action => 'forgot_password' %></p>
</div>
<p><%= link_to 'Register for an account', :action => 'signup' %></p>
<p><%= link_to 'Forgot my password', :action => 'forgot_password' %></p>
</div>
- <%
= end_form_tag
%>
+ <%
end
%>
</div>
</div>
</div>
</div>
diff --git
a/app/views/voter/_vote.rhtml
b/app/views/voter/_vote.rhtml
index d1447916c846451b64d19d05e580411977f12bc0..b95fc96209151e9c27ade5fce98d281fb940689c 100644
(file)
--- a/
app/views/voter/_vote.rhtml
+++ b/
app/views/voter/_vote.rhtml
@@
-12,12
+12,12
@@
least preferred. Please list <em>all</em> choices in every vote.
<em>(For example, 123 or 321 or 213, etc.)</em></p>
<% if @voter.election.quickvote? %>
<em>(For example, 123 or 321 or 213, etc.)</em></p>
<% if @voter.election.quickvote? %>
- <%
= form_tag quickaction_url( :ident => @voter.election.name, :action => 'confirm')
%>
+ <%
form_tag(quickaction_url( :ident => @voter.election.name, :action => 'confirm')) do
%>
<% else %>
<%= form_tag :action => 'review', :id => @voter.password %>
<% end %>
<%= text_field :vote, :votestring -%>
<%= submit_tag "Vote!" %>
<% else %>
<%= form_tag :action => 'review', :id => @voter.password %>
<% end %>
<%= text_field :vote, :votestring -%>
<%= submit_tag "Vote!" %>
-<%
= end_form_tag
%>
+<%
end
%>
diff --git
a/app/views/voter/index.rhtml
b/app/views/voter/index.rhtml
index 7e31c920a0b7a47400cd1c53c9947510f546509d..5c2ea2702c6e91ef88d0cb219ba165d46e06b141 100644
(file)
--- a/
app/views/voter/index.rhtml
+++ b/
app/views/voter/index.rhtml
@@
-2,7
+2,7
@@
<p>Please enter your password/token to log in and vote:</p>
<p>Please enter your password/token to log in and vote:</p>
-<%
= form_tag :action => 'index'
%>
+<%
form_tag(:action => 'index') do
%>
<%= text_field :vote, :password %>
<%= submit_tag "Log In" %>
<%= text_field :vote, :password %>
<%= submit_tag "Log In" %>
-<%
= end_form_tag
%>
+<%
end
%>
Benjamin Mako Hill
||
Want to submit a patch?