All instances of <% *_form_for ... %> changed to <%= instead of <%

Rafael Manzo
1 parent 269dc4a4
Showing 57 changed files with 57 additions and 57 deletions Show diff stats
app/views/account/_login_form.html.erb
app/views/account/forgot_password.html.erb
app/views/account/new_password.html.erb
app/views/admin_panel/message_for_disabled_enterprise.html.erb
app/views/admin_panel/set_portal_news_amount.html.erb
app/views/admin_panel/site_info.html.erb
app/views/categories/_form.html.erb
app/views/cms/destroy.html.erb
app/views/cms/edit.html.erb
app/views/cms/suggest_an_article.html.erb
app/views/cms/upload_files.html.erb
app/views/contact/new.html.erb
app/views/enterprise_registration/basic_information.html.erb
app/views/enterprise_validation/edit_validation_info.html.erb
app/views/environment_role_manager/change_role.html.erb
app/views/environment_role_manager/make_admin.html.erb
app/views/features/_manage_community_fields.html.erb
app/views/features/_manage_enterprise_fields.html.erb
app/views/features/_manage_person_fields.html.erb
app/views/features/index.html.erb
-<% labelled_form_for :user, @user,
+<%= labelled_form_for :user, @user,
    :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
 <%= f.text_field :login,
@@ -2,7 +2,7 @@
 <%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
-<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
+<%= labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
   <%= f.text_field :login,
                    :onchange => 'this.value = convToValidLogin( this.value )' %>
@@ -6,7 +6,7 @@
 <%= error_messages_for :change_password %>
-<% form_for(:change_password) do |f| %>
+<%= form_for(:change_password) do |f| %>
   <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
   <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
@@ -2,7 +2,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
+<%= labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
   <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
 <h1><%= _('News amount by folder') %></h1>
-<% labelled_form_for :environment, @environment do |f| %>
+<%= labelled_form_for :environment, @environment do |f| %>
   <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<%= labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
 <%= error_messages_for 'category' %>
-<% labelled_form_for 'category', @category, :html => { :multipart => true} do |f| %>
+<%= labelled_form_for 'category', @category, :html => { :multipart => true} do |f| %>
   <%= required_fields_message %>
@@ -2,7 +2,7 @@
 <%= error_messages_for 'article' %>
-<% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
+<%= labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
   <strong>
     <% if @article.folder? %>
 <%= error_messages_for 'article' %>
 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
-<% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
+<%= labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
   <%= hidden_field_tag("type", @type) if @type %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for 'task', @task do |f| %>
+<%= labelled_form_for 'task', @task do |f| %>
   <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
@@ -19,6 +19,6 @@
 <h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
-<% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
+<%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do |f| %>
   <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
 <% end %>
@@ -8,7 +8,7 @@
 <%= error_messages_for 'contact' %>
-<% labelled_form_for :contact, @contact do |f| %>
+<%= labelled_form_for :contact, @contact do |f| %>
   <%= hidden_field_tag(:confirm, 'false') %>
   <%= required_fields_message %>
@@ -18,7 +18,7 @@
   <%= required_fields_message %>
-  <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+  <%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
     <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
     <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
@@ -2,7 +2,7 @@
 <%= error_messages_for :info %>
-<% labelled_form_for :info, @info do |f| %>
+<%= labelled_form_for :info, @info do |f| %>
   <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
   <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
   <% button_bar do %>
 <%= _('Changing role of %s') % @admin.name %>
-<% labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
 <h2> <% _('Make new admin') %> </h2>
-<% labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Admin') %> <br>
   <% @people.each do |p| %>
     <%= labelled_form_field(p.name, (radio_button_tag "person", p.id)) %>
 <h2><%= _('Manage community fields') %></h2>
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 <table id='community_fields_conf'>
   <tr>
 <h2><%= _('Manage enterprise fields') %></h2>
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 <table id='enterprise_fields_conf'>
   <tr>
 <h2><%= _('Manage person fields') %></h2>
-<% labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 <table id='person_fields_conf'>
   <tr>
@@ -8,7 +8,7 @@
 Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the <em>"Save changes" button</em> to confirm your changes.') %>
 </p>
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
 <table>
   <tr>
 <%= error_messages_for :license %>
-<% form_for :license, @license do |f| %>
+<%= form_for :license, @license do |f| %>
   <%= hidden_field_tag(:license_id, params[:license_id]) %>
   <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
   <%= labelled_form_field(_('License url'), f.text_field(:url)) %>
 <div id='request_result_message' style='display: none'></div>
-<% form_for(@input,
+<%= form_for(@input,
            :url => {:action => 'add_input', :id => @product},
            :html => {:method => 'post', :id => 'input-category-form'}
            ) do |f| %>
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-description-form')",
                    :before => ("tinyMCE.triggerSave()" unless Rails.env == 'test'),
                    :update => 'product-description',
@@ -2,7 +2,7 @@
   <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
 </div>
-<% form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
+<%= form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
   <% f.fields_for :image_builder, @product.image do |i| %>
     <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
     <p><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %></p>
@@ -2,7 +2,7 @@
   <%= render_dialog_error_messages 'product' %>
 <% end %>
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-info-form')",
                    :update => 'product-info',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
-<% form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
+<%= form_for(@input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
             :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
   <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
-<% remote_form_for(@product,
+<%= remote_form_for(@product,
                    :loading => "small_loading('product-name-form')",
                    :update => 'product-name',
                    :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
 <%= error_messages_for :product %> <br/>
-<% form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
+<%= form_for :product, @product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
   <%= required_fields_message %>
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
@@ -8,7 +8,7 @@
   <div id='request_result_message' style='display: none'></div>
-  <% remote_form_for(@product,
+  <%= remote_form_for(@product,
                      :loading => "open_loading('#{ _('loading...') }')",
                      :update => "request_result_message",
                      :url => {:action => 'edit_category', :id => @product},
@@ -2,7 +2,7 @@
 <div id='request_result_message' style='display: none'></div>
-<% remote_form_for :product, @product,
+<%= remote_form_for :product, @product,
    :loading => "open_loading('#{ _('loading...') }')",
    :update => "request_result_message",
    :url => {:action => 'new'},
@@ -3,7 +3,7 @@
   <%= flash[:error] %>
 </div>
-<% form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
+<%= form_for :profile_data, :url => {:action => 'edit_location'}, :html => {:id => 'location-form'} do |f| %>
   <div id='location-fields'>
     <%= select_country _('Country'), 'profile_data', 'country', {:class => 'type-select'} %>
@@ -10,7 +10,7 @@
 <div>
-<% labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
+<%= labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
   <%= required_fields_message %>
@@ -4,7 +4,7 @@
 <%= _('Select which plugins you want to enable in your environment') %>
 </p>
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
   <table>
     <% @active_plugins.sort_by(&:plugin_name).each do |plugin|   %>
-<% form_for @abuse_report, :url => {:action => 'register_report'},
+<%= form_for @abuse_report, :url => {:action => 'register_report'},
                            :html => {:onsubmit => "return send_request(this)", :id => 'report-abuse-form'} do |f| %>
   <%= labelled_form_field('* ' + _('Report reasons'), f.text_area(:reason, :rows => 6, :cols => 60, :class => 'required')) %>
   <%= hidden_field_tag(:content_type, params[:content_type]) %>
@@ -6,7 +6,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
+<%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
@@ -2,7 +2,7 @@
 <%= error_messages_for :profile %>
-<% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
+<%= labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
   <% if user.has_permission?('manage_environment_templates', profile.environment) %>
     <div id="profile-is-template">
 <h3> <%= _('Changing role of %s') % @member.name %> </h3>
-<% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
 <%= error_messages_for :role %>
-<% labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
+<%= labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
   <%= required_fields_message %>
 <h1><%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %></h1>
 <%# FIXME: put style in css %>
-<% labelled_form_for :ticket, @ticket do |f| %>
+<%= labelled_form_for :ticket, @ticket do |f| %>
   <% if @ticket.target %>
     <%= f.hidden_field :target_id  %>
   <% else %>
@@ -4,7 +4,7 @@
 <%= render :file => 'shared/tiny_mce' %>
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+<%= form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
 <h1><%= _('AntiSpam settings')%></h1>
-<% form_for(:settings) do |f| %>
+<%= form_for(:settings) do |f| %>
   <%= labelled_form_field _('Host'), f.text_field(:host) %>
 <%= error_messages_for :bsc %>
 <h1><%= _('BSC registration') %></h1>
-<% labelled_form_for :profile_data, @bsc do |f| %>
+<%= labelled_form_for :profile_data, @bsc do |f| %>
   <%= render :partial => 'shared/fields', :locals => {:f => f, :profile => @bsc} %>
   <% button_bar do %>
 <%= error_messages_for :contract %>
-<% labelled_form_for :contract, @contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
+<%= labelled_form_for :contract, @contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
   <%= hidden_field_tag :contract_id, @contract.id %>
   <%= required f.text_field(:client_name) %>
   <%= labelled_form_field(_('Client type'), f.select(:client_type, BscPlugin::Contract::ClientType.types.map{|type| [BscPlugin::Contract::ClientType.names[type], type]}))%>
@@ -4,7 +4,7 @@
 <%= required_fields_message %>
-<% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+<%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
   <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
@@ -2,7 +2,7 @@
 <%= error_messages_for :form %>
-<% form_for :form, @form do |f| %>
+<%= form_for :form, @form do |f| %>
   <%= required labelled_form_field _('Name'), f.text_field(:name) %>
   <%= labelled_form_field(_('Period'), (
     date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, 
@@ -4,7 +4,7 @@
 <% if @submission.id.nil? %>
   <%= error_messages_for :submission %>
-  <% form_for :submission, @submission do |f| %>
+  <%= form_for :submission, @submission do |f| %>
     <% if !user %>
       <%= required labelled_form_field _('Author name'), text_field_tag(:author_name, @submission.author_name) %>
       <%= required labelled_form_field _('Author email'), text_field_tag(:author_email, @submission.author_email) %>
-<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :beginning_id, beginning_id %>
   <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %>
 <% end %>
-<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %>
 <% end %>
@@ -4,7 +4,7 @@
 <h2><%= @configuration_content.name %> Configuration</h2>
-<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
@@ -4,7 +4,7 @@
 <h2><%= @configuration_content.name %> Configuration</h2>
-<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
 <h2><%= @configuration_content.name %> Configuration</h2>
-<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
+<%= form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
@@ -2,7 +2,7 @@
 <h2><%= @configuration_content.name %> Configuration</h2>
-<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
+<%= form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
   <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
 <h1><%= _("SendEmailPlugin's config") %></h1>
-<% form_for :environment, :url => {:action => 'index'}, :html => {:method => 'post'} do |f| %>
+<%= form_for :environment, :url => {:action => 'index'}, :html => {:method => 'post'} do |f| %>
   <%= labelled_form_field(_("E-Mail addresses you want to allow to send"), f.text_area(:send_email_plugin_allow_to, :rows => 8)) %>
   <small><%= _('(list of email addresses separated by comma)') %></small>
   <% button_bar do %>
 <h1> <%= _('Basket options') %> </h1>
-<% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
+<%= form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
   <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %>
   <%= labelled_form_field(_('Delivery?'), f.check_box(:shopping_cart_delivery)) %>
   <%= labelled_form_field(_('Delivery price:'), f.text_field(:shopping_cart_delivery_price)) %>
 <% person = user.nil? ? Person.new : user %>
 <div id='cart-request-box'>
-  <% form_for(:customer, person, :url => {:action => 'send_request'},
+  <%= form_for(:customer, person, :url => {:action => 'send_request'},
               :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
     <div id="cart-form-main">
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
 <h1><%= _('Spaminator settings')%></h1>
-<% form_for(:settings) do |f| %>
+<%= form_for(:settings) do |f| %>
   <div id="spaminator-config-fields">
     <%= labelled_form_field _('Period (days) for scanning spammers'), f.text_field(:period, :size => 4) %>
@@ -2,7 +2,7 @@
 <%= error_messages_for :tolerance %>
-<% form_for :tolerance, @tolerance do |f| %>
+<%= form_for :tolerance, @tolerance do |f| %>
   <% time_units = [[_('Seconds'), 1], [_('Minutes'), 60], [_('Hours'), 3600]]%>
1	-<% labelled_form_for :user, @user,	1	+<%= labelled_form_for :user, @user,
2	:url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do \|f\| %>	2	:url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do \|f\| %>
3		3
4	<%= f.text_field :login,	4	<%= f.text_field :login,
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>	3	<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
4		4
5	-<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do \|f\| %>	5	+<%= labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do \|f\| %>
6		6
7	<%= f.text_field :login,	7	<%= f.text_field :login,
8	:onchange => 'this.value = convToValidLogin( this.value )' %>	8	:onchange => 'this.value = convToValidLogin( this.value )' %>
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6		6
7	<%= error_messages_for :change_password %>	7	<%= error_messages_for :change_password %>
8		8
9	-<% form_for(:change_password) do \|f\| %>	9	+<%= form_for(:change_password) do \|f\| %>
10		10
11	<%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>	11	<%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
12	<%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>	12	<%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%= render :file => 'shared/tiny_mce' %>	3	<%= render :file => 'shared/tiny_mce' %>
4		4
5	-<% labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do \|f\| %>	5	+<%= labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do \|f\| %>
6		6
7	<%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>	7	<%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
8		8
1	<h1><%= _('News amount by folder') %></h1>	1	<h1><%= _('News amount by folder') %></h1>
2		2
3	-<% labelled_form_for :environment, @environment do \|f\| %>	3	+<%= labelled_form_for :environment, @environment do \|f\| %>
4		4
5	<%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>	5	<%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
6		6
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4		4
5	<%= render :file => 'shared/tiny_mce' %>	5	<%= render :file => 'shared/tiny_mce' %>
6		6
7	-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do \|f\| %>	7	+<%= labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do \|f\| %>
8	<% tabs = [] %>	8	<% tabs = [] %>
9	<% tabs << {:title => _('Site info'), :id => 'site-info',	9	<% tabs << {:title => _('Site info'), :id => 'site-info',
10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>	10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>
1	<%= error_messages_for 'category' %>	1	<%= error_messages_for 'category' %>
2		2
3	-<% labelled_form_for 'category', @category, :html => { :multipart => true} do \|f\| %>	3	+<%= labelled_form_for 'category', @category, :html => { :multipart => true} do \|f\| %>
4		4
5	<%= required_fields_message %>	5	<%= required_fields_message %>
6		6
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2		2
3	<%= error_messages_for 'article' %>	3	<%= error_messages_for 'article' %>
4		4
5	-<% labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do \|f\| %>	5	+<%= labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do \|f\| %>
6		6
7	<strong>	7	<strong>
8	<% if @article.folder? %>	8	<% if @article.folder? %>
1	<%= error_messages_for 'article' %>	1	<%= error_messages_for 'article' %>
2		2
3	<div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>	3	<div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
4	-<% labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do \|f\| %>	4	+<%= labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do \|f\| %>
5		5
6	<%= hidden_field_tag("type", @type) if @type %>	6	<%= hidden_field_tag("type", @type) if @type %>
7		7
	@@ -19,6 +19,6 @@		@@ -19,6 +19,6 @@
19		19
20	<h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>	20	<h5><%= _('Uploading files to %s') % content_tag('code', @target) %></h5>
21		21
22	-<% form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do \|f\| %>	22	+<%= form_for('uploaded_file', :url => { :action => 'upload_files' }, :html => {:multipart => true}) do \|f\| %>
23	<%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>	23	<%= render :partial => 'upload_file_form', :locals => { :size => '45'} %>
24	<% end %>	24	<% end %>