consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify rendering document/image fields

Browse Source 
We were adding <div> tags with the `images` or `documents` HTML class
prettly much every time we rendered a NestedComponent. We're now
including the HTML class inside the component, as we usually do.

We're also rendering the nested components directly, since it's been a
while since the partials were changed to simply render the components.
This commit is contained in:
Javi Martín
2023-10-12 21:21:42 +02:00
parent 00f063b291
commit 1e1d7996bb
16 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/admin/budget_phases/form_component.html.erb
View File

@@ -56,8 +56,8 @@
<% end %> <% end %>
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images small-12 column"> <div class="small-12 column">
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
<p class="help-text"><%= t("admin.budget_phases.edit.image_description") %></p> <p class="help-text"><%= t("admin.budget_phases.edit.image_description") %></p>
</div> </div>
<% end %> <% end %>

4
app/components/admin/budgets/form_component.html.erb
View File

@@ -54,8 +54,8 @@
<% end %> <% end %>
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images small-12 column"> <div class="small-12 column">
<%= render "/images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
<p class="help-text"><%= t("admin.budgets.edit.image_description") %></p> <p class="help-text"><%= t("admin.budgets.edit.image_description") %></p>
</div> </div>
<% end %> <% end %>

4
app/components/admin/poll/questions/answers/documents/index_component.html.erb
View File

@@ -12,9 +12,7 @@
<%= form_for(Poll::Question::Answer.new, url: admin_answer_documents_path(answer)) do |f| %> <%= form_for(Poll::Question::Answer.new, url: admin_answer_documents_path(answer)) do |f| %>
<%= render "shared/errors", resource: answer %> <%= render "shared/errors", resource: answer %>
<div class="documents"> <%= render Documents::NestedComponent.new(f) %>
<%= render "documents/nested_documents", f: f %>
</div>
<div class="small-12 medium-6 large-2"> <div class="small-12 medium-6 large-2">
<%= f.submit(class: "button expanded", value: t("shared.save")) %> <%= f.submit(class: "button expanded", value: t("shared.save")) %>

8
app/components/budgets/investments/form_component.html.erb
View File

@@ -37,15 +37,11 @@
<legend><%= t("shared.optional") %></legend> <legend><%= t("shared.optional") %></legend>
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images"> <%= render Images::NestedComponent.new(f) %>
<%= render "images/nested_image", f: f %>
</div>
<% end %> <% end %>
<% if feature?(:allow_attached_documents) %> <% if feature?(:allow_attached_documents) %>
<div class="documents"> <%= render Documents::NestedComponent.new(f) %>
<%= render "documents/nested_documents", f: f %>
</div>
<% end %> <% end %>
<% if feature?(:map) %> <% if feature?(:map) %>

2
app/components/documents/nested_component.html.erb
View File

@@ -1,4 +1,4 @@
<fieldset class="documents-list"> <fieldset class="documents-list documents">
<legend><%= t("documents.form.title") %></legend> <legend><%= t("documents.form.title") %></legend>
<p class="help-text"><%= note %></p> <p class="help-text"><%= note %></p>

2
app/components/images/nested_component.html.erb
View File

@@ -1,4 +1,4 @@
<fieldset> <fieldset class="images">
<legend><%= t("images.form.title") %></legend> <legend><%= t("images.form.title") %></legend>
<p class="help-text"><%= note %></p> <p class="help-text"><%= note %></p>

8
app/components/proposals/form_component.html.erb
View File

@@ -38,15 +38,11 @@
</div> </div>
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images"> <%= render Images::NestedComponent.new(f) %>
<%= render "images/nested_image", f: f %>
</div>
<% end %> <% end %>
<% if feature?(:allow_attached_documents) %> <% if feature?(:allow_attached_documents) %>
<div class="documents"> <%= render Documents::NestedComponent.new(f) %>
<%= render "documents/nested_documents", f: f %>
</div>
<% end %> <% end %>
<% if Geozone.any? %> <% if Geozone.any? %>

4
app/views/admin/dashboard/actions/_form.html.erb
View File

@@ -64,8 +64,8 @@
</div> </div>
<% if feature?(:allow_attached_documents) %> <% if feature?(:allow_attached_documents) %>
<div class="documents small-12 column"> <div class="small-12 column">
<%= render "documents/nested_documents", f: f %> <%= render Documents::NestedComponent.new(f) %>
</div> </div>
<% end %> <% end %>

8
app/views/admin/legislation/processes/_form.html.erb
View File

@@ -109,12 +109,12 @@
</fieldset> </fieldset>
<div class="row"> <div class="row">
<div class="documents small-12 column"> <div class="small-12 column">
<%= render "documents/nested_documents", f: f %> <%= render Documents::NestedComponent.new(f) %>
</div> </div>
<div class="images small-12 column"> <div class="small-12 column">
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">

7
app/views/admin/milestones/_form.html.erb
View File

@@ -27,11 +27,8 @@
<div class="column"> <div class="column">
<%= f.date_field :publication_date %> <%= f.date_field :publication_date %>
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
<%= render Documents::NestedComponent.new(f) %>
<div class="documents">
<%= render "documents/nested_documents", f: f %>
</div>
<%= f.submit nil, class: "button success" %> <%= f.submit nil, class: "button success" %>
</div> </div>

4
app/views/admin/poll/polls/_form.html.erb
View File

@@ -32,8 +32,8 @@
</div> </div>
<div class="row"> <div class="row">
<div class="images small-12 column"> <div class="small-12 column">
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
</div> </div>
<div class="clear"> <div class="clear">

4
app/views/admin/poll/questions/answers/images/new.html.erb
View File

@@ -2,9 +2,7 @@
<%= form_for(@answer, url: admin_answer_images_path(@answer), method: :post) do |f| %> <%= form_for(@answer, url: admin_answer_images_path(@answer), method: :post) do |f| %>
<%= render "shared/errors", resource: @answer %> <%= render "shared/errors", resource: @answer %>
<div class="images"> <%= render Images::NestedComponent.new(f, image_fields: :images) %>
<%= render Images::NestedComponent.new(f, image_fields: :images) %>
</div>
<%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %> <%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %>
<% end %> <% end %>

2
app/views/admin/widget/cards/_form.html.erb
View File

@@ -45,7 +45,7 @@
<div class="row"> <div class="row">
<div class="image-form"> <div class="image-form">
<div class="image small-12 column"> <div class="image small-12 column">
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
</div> </div>
</div> </div>
<div class="column"> <div class="column">

1
app/views/documents/_nested_documents.html.erb
View File

@@ -1 +0,0 @@
<%= render Documents::NestedComponent.new(f) %>

1
app/views/images/_nested_image.html.erb
View File

@@ -1 +0,0 @@
<%= render Images::NestedComponent.new(f) %>

8
app/views/legislation/proposals/_form.html.erb
View File

@@ -27,13 +27,13 @@
</div> </div>
<% if feature?(:allow_images) %> <% if feature?(:allow_images) %>
<div class="images small-12 column"> <div class="small-12 column">
<%= render "images/nested_image", f: f %> <%= render Images::NestedComponent.new(f) %>
</div> </div>
<% end %> <% end %>
<div class="documents small-12 column"> <div class="small-12 column">
<%= render "documents/nested_documents", f: f %> <%= render Documents::NestedComponent.new(f) %>
</div> </div>
<% if Geozone.any? %> <% if Geozone.any? %>