Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / views / friendships / make_friend.html.erb

diff --git a/app/views/friendships/make_friend.html.erb b/app/views/friendships/make_friend.html.erb
index e781f7b25fe89022f13b8f4b0bcfe324d3d93617..f5c2b9c0c1acc4f01c0d114fcf62bb4cee157597 100644 (file)
--- a/app/views/friendships/make_friend.html.erb
+++ b/app/views/friendships/make_friend.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t ".heading", :user => @new_friend.display_name %></h1>
+  <h1><%= t ".heading", :user => @friend.display_name %></h1>

 <% end %>
 
 <% end %>
 

-<%= form_tag(nil, :class => "standard-form") do %>
+<%= bootstrap_form_tag do |f| %>

   <% if params[:referer] -%>
   <% if params[:referer] -%>

-  <%= hidden_field_tag("referer", params[:referer]) %>
+  <%= f.hidden_field :referer, :value => params[:referer] %>

   <% end -%>
   <% end -%>

-  <%= submit_tag t(".button") %>
+  <%= f.primary t(".button") %>

 <% end %>
 <% end %>