[TAC025] Validate HTML for initiatives public views

ahukkanen · ahukkanen · commit 53d5adf5622c · 2020-03-27T19:19:27.000+02:00
diff --git a/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb b/decidim-initiatives/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
@@ -5,7 +5,7 @@
       <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3 large-up-4 card-grid">
         <% highlighted_initiatives.each do |initiative| %>
           <div class="column">
-            <article class="card card--initiative card--mini">
+            <div class="card card--initiative card--mini">
               <%= link_to decidim_initiatives.initiative_path(initiative), class: "card__link" do %>
                 <span class="show-for-sr"><%= translated_attribute initiative.title %></span>
               <% end %>
@@ -14,7 +14,7 @@
                   <span class="card__title"><%= decidim_html_escape(translated_attribute(initiative.title)) %></span>
                 <% end %>
               </div>
-            </article>
+            </div>
           </div>
         <% end %>
       </div>
diff --git a/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb b/decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb
@@ -7,6 +7,7 @@ module InitiativesHelper
       def initiatives_filter_form_for(filter)
         content_tag :div, class: "filters" do
           form_for filter,
+                   namespace: filter_form_namespace,
                    builder: Decidim::Initiatives::InitiativesFilterFormBuilder,
                    url: url_for,
                    as: :filter,
@@ -17,6 +18,15 @@ def initiatives_filter_form_for(filter)
           end
         end
       end
+
+      private
+
+      # Creates a unique namespace for a filter form to prevent dupliacte IDs in
+      # the DOM when multiple filter forms are rendered with the same fields (e.g.
+      # for desktop and mobile).
+      def filter_form_namespace
+        "filters_#{SecureRandom.uuid}"
+      end
     end
   end
 end
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
@@ -1,8 +1,7 @@
 <%= render "layouts/decidim/application" do %>
   <% if wizard_steps.first == step %>
     <div class="wrapper">
-    <%= yield %>
-    </div>
+      <%= yield %>
     </div>
   <% else %>
     <div class="wrapper">
