Commit 46e64d51e426e4d4fdbce665216fd33624806b71
1 parent
ffdbc10c
Exists in
master
and in
29 other branches
rails3: output the result of form_tag
Showing
16 changed files
with
17 additions
and
17 deletions
Show diff stats
app/views/account/activation_question.html.erb
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | 24 | ||
| 25 | <div class='activation-box'> | 25 | <div class='activation-box'> |
| 26 | <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2> | 26 | <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2> |
| 27 | - <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> | 27 | + <%= form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> |
| 28 | 28 | ||
| 29 | <p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p> | 29 | <p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p> |
| 30 | 30 |
app/views/cms/_text_editor_sidebar.html.erb
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | <div class='text-editor-sidebar-box' id='media-upload-box'> | 7 | <div class='text-editor-sidebar-box' id='media-upload-box'> |
| 8 | <div class='header'><strong><%= _('Insert media') %></strong></div> | 8 | <div class='header'><strong><%= _('Insert media') %></strong></div> |
| 9 | <div id='media-upload-form'> | 9 | <div id='media-upload-form'> |
| 10 | - <% form_tag({ :action => 'media_upload' }, :multipart => true) do %> | 10 | + <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %> |
| 11 | <div class='formfield'> | 11 | <div class='formfield'> |
| 12 | <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %> | 12 | <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %> |
| 13 | <%= select_profile_folder( | 13 | <%= select_profile_folder( |
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | <div id='media-search-box' class='text-editor-sidebar-box'> | 34 | <div id='media-search-box' class='text-editor-sidebar-box'> |
| 35 | <div class='header'><strong><%= _('Media search') %></strong></div> | 35 | <div class='header'><strong><%= _('Media search') %></strong></div> |
| 36 | <p> | 36 | <p> |
| 37 | - <% form_tag({ :action => 'search' }) do %> | 37 | + <%= form_tag({ :action => 'search' }) do %> |
| 38 | <span class='formfield'> | 38 | <span class='formfield'> |
| 39 | <input name='q' type='text' id='media-search-query' style='width: 250px;'/> | 39 | <input name='q' type='text' id='media-search-query' style='width: 250px;'/> |
| 40 | </span> | 40 | </span> |
app/views/content_viewer/_comment_form.html.erb
| @@ -49,7 +49,7 @@ function submit_comment_form(button) { | @@ -49,7 +49,7 @@ function submit_comment_form(button) { | ||
| 49 | </script> | 49 | </script> |
| 50 | <% end %> | 50 | <% end %> |
| 51 | 51 | ||
| 52 | -<% form_tag( url, { :class => 'comment_form' } ) do %> | 52 | +<%= form_tag( url, { :class => 'comment_form' } ) do %> |
| 53 | <%= required_fields_message %> | 53 | <%= required_fields_message %> |
| 54 | 54 | ||
| 55 | <% unless logged_in? %> | 55 | <% unless logged_in? %> |
app/views/content_viewer/_confirm_unfollow.html.erb
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class='unfollow-article'> | 2 | <div class='unfollow-article'> |
| 3 | <h1><%= _('Cancel notification of new comments') %></h1> | 3 | <h1><%= _('Cancel notification of new comments') %></h1> |
| 4 | <p><%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %></p> | 4 | <p><%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %></p> |
| 5 | - <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %> | 5 | + <%= form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %> |
| 6 | <%= hidden_field_tag(:unfollow, 'commit') %> | 6 | <%= hidden_field_tag(:unfollow, 'commit') %> |
| 7 | <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %> | 7 | <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %> |
| 8 | <% button_bar do %> | 8 | <% button_bar do %> |
app/views/environment_role_manager/affiliate.html.erb
| 1 | <h2> <%= @member.name %> </h2> | 1 | <h2> <%= @member.name %> </h2> |
| 2 | 2 | ||
| 3 | -<% form_tag( {:action => 'give_role'}, {:method => :post}) do %> | 3 | +<%= form_tag( {:action => 'give_role'}, {:method => :post}) do %> |
| 4 | <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %> | 4 | <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %> |
| 5 | <%= hidden_field_tag 'person', current_user.person.id %> | 5 | <%= hidden_field_tag 'person', current_user.person.id %> |
| 6 | <% button_bar do %> | 6 | <% button_bar do %> |
app/views/manage_products/_manage_product_details.html.erb
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <%= render :partial => 'price_composition_bar' %> | 2 | <%= render :partial => 'price_composition_bar' %> |
| 3 | </div> | 3 | </div> |
| 4 | 4 | ||
| 5 | -<% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %> | 5 | +<%= form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %> |
| 6 | <div> | 6 | <div> |
| 7 | <table id='display-product-price-details'> | 7 | <table id='display-product-price-details'> |
| 8 | <tr> | 8 | <tr> |
app/views/profile_editor/index.html.erb
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | <% if profile.person? && environment.enabled?('enterprise_activation') %> | 77 | <% if profile.person? && environment.enabled?('enterprise_activation') %> |
| 78 | 78 | ||
| 79 | <div id='activation_enterprise'> | 79 | <div id='activation_enterprise'> |
| 80 | - <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %> | 80 | + <%= form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %> |
| 81 | <p><strong><%= _('Activate your enterprise') %></strong></p> | 81 | <p><strong><%= _('Activate your enterprise') %></strong></p> |
| 82 | <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p> | 82 | <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p> |
| 83 | <p><%= environment.help_message_to_add_enterprise %> </p> | 83 | <p><%= environment.help_message_to_add_enterprise %> </p> |
app/views/profile_members/affiliate.html.erb
| 1 | <h2> <%= @member.name %> </h2> | 1 | <h2> <%= @member.name %> </h2> |
| 2 | 2 | ||
| 3 | -<% form_tag( {:action => 'give_role'}, {:method => :post}) do %> | 3 | +<%= form_tag( {:action => 'give_role'}, {:method => :post}) do %> |
| 4 | <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %> | 4 | <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]}) %> |
| 5 | <%= hidden_field_tag 'person', current_user.person.id %> | 5 | <%= hidden_field_tag 'person', current_user.person.id %> |
| 6 | <% button_bar do %> | 6 | <% button_bar do %> |
app/views/region_validators/region.html.erb
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | <%= help _('First search organizations by their name, then use the buttons in the search result to add them as validators for this region. ') %> | 17 | <%= help _('First search organizations by their name, then use the buttons in the search result to add them as validators for this region. ') %> |
| 18 | </p> | 18 | </p> |
| 19 | 19 | ||
| 20 | -<% form_tag({}, { :method => 'get' }) do %> | 20 | +<%= form_tag({}, { :method => 'get' }) do %> |
| 21 | <%= text_field_tag :search, nil, :id => 'search_validator' %> | 21 | <%= text_field_tag :search, nil, :id => 'search_validator' %> |
| 22 | <% button_bar do %> | 22 | <% button_bar do %> |
| 23 | <%= submit_button('search', _('Search')) %> | 23 | <%= submit_button('search', _('Search')) %> |
app/views/search/_search_form.html.erb
| 1 | <div class='search-form'> | 1 | <div class='search-form'> |
| 2 | 2 | ||
| 3 | - <% form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) }, | 3 | + <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) }, |
| 4 | :method => 'get', :class => 'search_form' ) do %> | 4 | :method => 'get', :class => 'search_form' ) do %> |
| 5 | 5 | ||
| 6 | <%= hidden_field_tag :display, params[:display] %> | 6 | <%= hidden_field_tag :display, params[:display] %> |
app/views/search/_sellers_form.html.erb
| 1 | <h3><%= title %></h3> | 1 | <h3><%= title %></h3> |
| 2 | 2 | ||
| 3 | -<% form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %> | 3 | +<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %> |
| 4 | 4 | ||
| 5 | <div class="search-in-opt"><%= _('Search in:') %> | 5 | <div class="search-in-opt"><%= _('Search in:') %> |
| 6 | <dir> | 6 | <dir> |
app/views/shared/_profile_search_form.html.erb
| 1 | -<% form_tag( { :controller => 'profile_search', :profile => profile.identifier}, :method => 'get', :class => 'search_form' ) do %> | 1 | +<%= form_tag( { :controller => 'profile_search', :profile => profile.identifier}, :method => 'get', :class => 'search_form' ) do %> |
| 2 | <div class="search-field"> | 2 | <div class="search-field"> |
| 3 | <span class="formfield"> | 3 | <span class="formfield"> |
| 4 | <%= text_field_tag 'q', @q, :title => _("Find in %s's content") % profile.short_name %> | 4 | <%= text_field_tag 'q', @q, :title => _("Find in %s's content") % profile.short_name %> |
app/views/themes/add_image.html.erb
| 1 | -<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %> | 1 | +<%= form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %> |
| 2 | <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %> | 2 | <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %> |
| 3 | <% button_bar do %> | 3 | <% button_bar do %> |
| 4 | <%= submit_button(:add, _('Add image')) %> | 4 | <%= submit_button(:add, _('Add image')) %> |
app/views/themes/css_editor.html.erb
| 1 | <h2><%= _('CSS code: "%s"') % @css %></h2> | 1 | <h2><%= _('CSS code: "%s"') % @css %></h2> |
| 2 | 2 | ||
| 3 | -<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %> | 3 | +<%= form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %> |
| 4 | <%= hidden_field_tag('css', @css) %> | 4 | <%= hidden_field_tag('css', @css) %> |
| 5 | <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %> | 5 | <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %> |
| 6 | <% button_bar do %> | 6 | <% button_bar do %> |
app/views/themes/new.html.erb
| 1 | <h2><%= _('Create new theme') %></h2> | 1 | <h2><%= _('Create new theme') %></h2> |
| 2 | 2 | ||
| 3 | -<% form_tag(:action => 'new') do %> | 3 | +<%= form_tag(:action => 'new') do %> |
| 4 | 4 | ||
| 5 | <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %> | 5 | <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %> |
| 6 | 6 |
app/views/users/index.html.erb
| 1 | <h1><%= _('Manage users') %></h1> | 1 | <h1><%= _('Manage users') %></h1> |
| 2 | 2 | ||
| 3 | -<% form_tag( { :action => 'index' }, :method => 'get', :class => 'users-search' ) do %> | 3 | +<%= form_tag( { :action => 'index' }, :method => 'get', :class => 'users-search' ) do %> |
| 4 | <div id="search-users"> | 4 | <div id="search-users"> |
| 5 | <%= render :partial => 'users_search_form' %> | 5 | <%= render :partial => 'users_search_form' %> |
| 6 | </div> | 6 | </div> |