kotovalexarian/lpr-partynest
Archived
1
0
Fork 0
Code Activity

Remove unnecessary HTML from forms

Browse source
This commit is contained in:
Alex Kotov 2019-09-03 10:37:22 +05:00
parent 45d3500453
commit f6edb386e8
Signed by: kotovalexarian
GPG key ID: 553C0EBBEB5D5F08
12 changed files with 94 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/settings/contacts/_form.html.erb
View file

@ -1,12 +1,8 @@
<%= simple_form_for contact, url: settings_contacts_path do |f| %> <%= simple_form_for contact, url: settings_contacts_path do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.association :contact_network, collection: ContactNetwork.all %>
<%= f.association :contact_network, collection: ContactNetwork.all %> <%= f.input :value %>
<%= f.input :value %>
</div>
<div class="form-actions"> <%= f.button :submit, translate(:create) %>
<%= f.button :submit, translate(:create) %>
</div>
<% end %> <% end %>

21
app/views/settings/profiles/edit.html.erb
View file

@ -8,19 +8,16 @@
<%= simple_form_for @account, url: settings_profile_path do |f| %> <%= simple_form_for @account, url: settings_profile_path do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :nickname, required: true %>
<%= f.input :nickname, required: true %> <%= f.input :public_name %>
<%= f.input :public_name %> <%= f.input :biography %>
<%= f.input :biography %> <%= f.input :avatar, direct_upload: true %>
<%= f.input :avatar, direct_upload: true %>
<% if f.object.avatar.attached? %>
<%= image_tag f.object.avatar, class: 'img-thumbnail mb-4' %>
<% end %>
</div>
<div class="form-actions"> <% if f.object.avatar.attached? %>
<%= f.button :submit, translate('users.registrations.edit.update') %> <%= image_tag f.object.avatar, class: 'img-thumbnail mb-4' %>
</div> <% end %>
<%= f.button :submit, translate('users.registrations.edit.update') %>
<% end %> <% end %>
</div> </div>
</div> </div>

20
app/views/staffs/people/new.html.erb
View file

@ -8,18 +8,14 @@
<%= simple_form_for [:staff, @person] do |f| %> <%= simple_form_for [:staff, @person] do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :last_name %>
<%= f.input :last_name %> <%= f.input :first_name %>
<%= f.input :first_name %> <%= f.input :middle_name %>
<%= f.input :middle_name %> <%= f.input :sex, collection: Person.sexes.keys.map(&:to_sym) %>
<%= f.input :sex, collection: Person.sexes.keys.map(&:to_sym) %> <%= f.input :date_of_birth %>
<%= f.input :date_of_birth %> <%= f.input :place_of_birth %>
<%= f.input :place_of_birth %> <%= f.input :photo, direct_upload: true %>
<%= f.input :photo, direct_upload: true %>
</div>
<div class="form-actions"> <%= f.button :submit %>
<%= f.button :submit %>
</div>
<% end %> <% end %>
</div> </div>

10
app/views/staffs/people/person_comments/index.html.erb
View file

@ -56,14 +56,10 @@
<%= simple_form_for [:staff, @person, @person_comment] do |f| %> <%= simple_form_for [:staff, @person, @person_comment] do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :text %>
<%= f.input :text %> <%= f.input :attachment, direct_upload: true %>
<%= f.input :attachment, direct_upload: true %>
</div>
<div class="form-actions"> <%= f.button :submit %>
<%= f.button :submit %>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>

16
app/views/users/confirmations/new.html.erb
View file

@ -5,17 +5,13 @@
<%= f.error_notification %> <%= f.error_notification %>
<%= f.full_error :confirmation_token %> <%= f.full_error :confirmation_token %>
<div class="form-inputs"> <%= f.input :email,
<%= f.input :email, required: true,
required: true, autofocus: true,
autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), input_html: { autocomplete: 'email' } %>
input_html: { autocomplete: 'email' } %>
</div>
<div class="form-actions"> <%= f.button :submit, translate('.resend_confirmation_instructions') %>
<%= f.button :submit, translate('.resend_confirmation_instructions') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

24
app/views/users/passwords/edit.html.erb
View file

@ -10,22 +10,18 @@
<%= f.input :reset_password_token, as: :hidden %> <%= f.input :reset_password_token, as: :hidden %>
<%= f.full_error :reset_password_token %> <%= f.full_error :reset_password_token %>
<div class="form-inputs"> <%= f.input :password,
<%= f.input :password, label: translate('.new_password'),
label: translate('.new_password'), required: true,
required: true, autofocus: true,
autofocus: true, hint: (translate('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
hint: (translate('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length), input_html: { autocomplete: 'new-password' } %>
input_html: { autocomplete: 'new-password' } %>
<%= f.input :password_confirmation, <%= f.input :password_confirmation,
label: translate('.confirm_new_password'), label: translate('.confirm_new_password'),
required: true %> required: true %>
</div>
<div class="form-actions"> <%= f.button :submit, translate('.change_my_password') %>
<%= f.button :submit, translate('.change_my_password') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

14
app/views/users/passwords/new.html.erb
View file

@ -4,16 +4,12 @@
<%= simple_form_for resource, as: resource_name, url: password_path(resource_name) do |f| %> <%= simple_form_for resource, as: resource_name, url: password_path(resource_name) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :email,
<%= f.input :email, required: true,
required: true, autofocus: true,
autofocus: true, input_html: { autocomplete: 'email' } %>
input_html: { autocomplete: 'email' } %>
</div>
<div class="form-actions"> <%= f.button :submit, translate('.send_me_reset_password_instructions') %>
<%= f.button :submit, translate('.send_me_reset_password_instructions') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

36
app/views/users/registrations/edit.html.erb
View file

@ -8,31 +8,27 @@
<%= simple_form_for resource, as: resource_name, url: registration_path(resource_name), html: { method: :put } do |f| %> <%= simple_form_for resource, as: resource_name, url: registration_path(resource_name), html: { method: :put } do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :email, required: true, autofocus: true %>
<%= f.input :email, required: true, autofocus: true %>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<p><%= translate '.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email %></p> <p><%= translate '.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email %></p>
<% end %> <% end %>
<%= f.input :password, <%= f.input :password,
hint: translate('.leave_blank_if_you_don_t_want_to_change_it'), hint: translate('.leave_blank_if_you_don_t_want_to_change_it'),
required: false, required: false,
input_html: { autocomplete: 'new-password' } %> input_html: { autocomplete: 'new-password' } %>
<%= f.input :password_confirmation, <%= f.input :password_confirmation,
required: false, required: false,
input_html: { autocomplete: 'new-password' } %> input_html: { autocomplete: 'new-password' } %>
<%= f.input :current_password, <%= f.input :current_password,
hint: translate('.we_need_your_current_password_to_confirm_your_changes'), hint: translate('.we_need_your_current_password_to_confirm_your_changes'),
required: true, required: true,
input_html: { autocomplete: 'current-password' } %> input_html: { autocomplete: 'current-password' } %>
</div>
<div class="form-actions"> <%= f.button :submit, translate('.update') %>
<%= f.button :submit, translate('.update') %>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>

32
app/views/users/registrations/new.html.erb
View file

@ -4,27 +4,23 @@
<%= simple_form_for resource, as: resource_name, url: registration_path(resource_name) do |f| %> <%= simple_form_for resource, as: resource_name, url: registration_path(resource_name) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <%= f.input :email,
<%= f.input :email, required: true,
required: true, autofocus: true ,
autofocus: true , input_html: { autocomplete: 'email' }%>
input_html: { autocomplete: 'email' }%> <%= f.input :password,
<%= f.input :password, required: true,
required: true, hint: (translate('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
hint: (translate('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length), input_html: { autocomplete: 'new-password' } %>
input_html: { autocomplete: 'new-password' } %> <%= f.input :password_confirmation,
<%= f.input :password_confirmation, required: true,
required: true, input_html: { autocomplete: 'new-password' } %>
input_html: { autocomplete: 'new-password' } %>
<div class="mb-3"> <div class="mb-3">
<%= recaptcha_tags %> <%= recaptcha_tags %>
</div>
</div> </div>
<div class="form-actions"> <%= f.button :submit, translate('.sign_up') %>
<%= f.button :submit, translate('.sign_up') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

26
app/views/users/sessions/new.html.erb
View file

@ -2,26 +2,22 @@
<h1><%= translate '.sign_in' %></h1> <h1><%= translate '.sign_in' %></h1>
<%= simple_form_for resource, as: resource_name, url: session_path(resource_name) do |f| %> <%= simple_form_for resource, as: resource_name, url: session_path(resource_name) do |f| %>
<div class="form-inputs"> <%= f.input :email,
<%= f.input :email, required: false,
required: false, autofocus: true,
autofocus: true, input_html: { autocomplete: 'email' } %>
input_html: { autocomplete: 'email' } %>
<%= f.input :password, <%= f.input :password,
required: false, required: false,
input_html: { autocomplete: 'current-password' } %> input_html: { autocomplete: 'current-password' } %>
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %> <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
<div class="mb-3"> <div class="mb-3">
<%= recaptcha_tags %> <%= recaptcha_tags %>
</div>
</div> </div>
<div class="form-actions"> <%= f.button :submit, translate('.sign_in') %>
<%= f.button :submit, translate('.sign_in') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

14
app/views/users/unlocks/new.html.erb
View file

@ -5,16 +5,12 @@
<%= f.error_notification %> <%= f.error_notification %>
<%= f.full_error :unlock_token %> <%= f.full_error :unlock_token %>
<div class="form-inputs"> <%= f.input :email,
<%= f.input :email, required: true,
required: true, autofocus: true,
autofocus: true, input_html: { autocomplete: 'email' } %>
input_html: { autocomplete: 'email' } %>
</div>
<div class="form-actions"> <%= f.button :submit, translate('.resend_unlock_instructions') %>
<%= f.button :submit, translate('.resend_unlock_instructions') %>
</div>
<% end %> <% end %>
<%= render 'users/shared/links' %> <%= render 'users/shared/links' %>

11
lib/templates/erb/scaffold/_form.html.erb
View file

@ -1,15 +1,12 @@
<%# frozen_string_literal: true %> <%# frozen_string_literal: true %>
<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
<%%= simple_form_for @<%= singular_table_name %> do |f| %>
<%%= f.error_notification %> <%%= f.error_notification %>
<%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %> <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
<div class="form-inputs">
<%- attributes.each do |attribute| -%> <%- attributes.each do |attribute| -%>
<%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
<%- end -%> <%- end -%>
</div>
<div class="form-actions"> <%%= f.button :submit %>
<%%= f.button :submit %>
</div>
<%% end %> <%% end %>