Reorganized markup of the results view to be easier to understand

Author: djanelle-mit

app/views/search/results.html.erb

@@ -11,13 +11,17 @@
 
   <%= turbo_frame_tag "search-results", data: { turbo_action: "advance" } do %>
     <div id="results-section">
+      
       <% if @show_primo_continuation %>
+
         <%= render partial: 'search/primo_continuation' %>
+
       <% elsif @results.present? && @errors.blank? %>
-      <h2 class="results-context"><%= results_summary(@pagination[:hits]) %></h2>
-      <p class="results-context-description">From all MIT Libraries sources</p>    
-      <div id="results-layout-wrapper">  
-        <main id="results">
+
+        <h2 class="results-context"><%= results_summary(@pagination[:hits]) %></h2>
+        <p class="results-context-description">From all MIT Libraries sources</p>    
+        <div id="results-layout-wrapper">  
+          <main id="results">
             <ol class="results-list" start="<%= @pagination[:start] %>">
               <% case @active_tab %>
               <% when 'primo' %>
@@ -35,23 +39,25 @@
               <% end %>
             </ol>
             <%= render partial: "results_callouts" %>
-          <% elsif @errors.blank? %>
-            <main id="results">
-              <div class="no-results">
-                <p class="hd-2">No results found for your search</p>
-              </div>
-            </main>
-          <% end %>
-        </main>
-        <% if @results.present? %>
+          </main>
           <%= render partial: "results_sidebar" %>
-        <% end %>
-      </div>
+        </div>
+        <%= render partial: "pagination" %>
+
+      <% elsif @errors.blank? %>
+
+        <div id="results-layout-wrapper">
+          <main id="results">
+            <div class="no-results">
+              <p class="hd-2">No results found for your search</p>
+            </div>
+          </main>
+        </div>
+
+      <% end %>
+
     </div>
 
-    <% if @results.present? %>
-      <%= render partial: "pagination" %>
-    <% end %>
   <% end %>
 
 </div>