index.html.erb in blacklight-spotlight-3.0.0.alpha.1

- old
+ new
@@ -1,50 +1,49 @@
-<div class="col-md-9">
-  <% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
-    <ul class="nav nav-tabs" role="tablist">
-      <li role="presentation" class="active"><a href="#published" aria-controls="published" role="tab" data-toggle="tab"><%= t('.published') %></a></li>
-      <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
-        <li role="presentation"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab"><%= t('.unpublished') %></a></li>
-      <% end %>
-      <% if current_user && current_user.exhibits.any? %>
-        <li role="presentation"><a href="#user" aria-controls="user" role="tab" data-toggle="tab"><%= t('.user') %></a></li>
-      <% end %>
-    </ul>
-  <% end %>
+<% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="nav-item"><a href="#published" aria-controls="published" role="tab" data-toggle="tab" class="nav-link active"><%= t('.published') %></a></li>
+    <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
+      <li role="presentation" class="nav-item"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab" class="nav-link"><%= t('.unpublished') %></a></li>
+    <% end %>
+    <% if current_user && current_user.exhibits.any? %>
+      <li role="presentation" class="nav-item"><a href="#user" aria-controls="user" role="tab" data-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
+    <% end %>
+  </ul>
+<% end %>
 
-  <div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="published">
-      <% if @exhibits.published.none? %>
-        <%= render 'missing_exhibits' %>
-      <% else %>
-        <%= render 'tags', tags: @exhibits.published.all_tags %>
-        <%= render 'exhibits', exhibits: @published_exhibits %>
+<div class="tab-content">
+  <div role="tabpanel" class="tab-pane active" id="published">
+    <% if @exhibits.published.none? %>
+      <%= render 'missing_exhibits' %>
+    <% else %>
+      <%= render 'tags', tags: @exhibits.published.all_tags %>
+      <%= render 'exhibits', exhibits: @published_exhibits %>
 
-        <% if @published_exhibits.total_count > @published_exhibits.size %>
-          <nav>
-            <ul class="pager">
-              <li><%= link_to_previous_page @published_exhibits, t('views.pagination.previous').html_safe %></li>
-              <li><%= link_to_next_page @published_exhibits, t('views.pagination.next').html_safe %></li>
-            </ul>
-          </nav>
-        <% end %>
+      <% if @published_exhibits.total_count > @published_exhibits.size %>
+        <nav>
+          <ul class="pager">
+            <li><%= link_to_previous_page @published_exhibits, t('views.pagination.previous').html_safe %></li>
+            <li><%= link_to_next_page @published_exhibits, t('views.pagination.next').html_safe %></li>
+          </ul>
+        </nav>
       <% end %>
-
-    </div>
-
-    <% if @exhibits.unpublished.accessible_by(current_ability).any? %>
-      <div role="tabpanel" class="tab-pane" id="unpublished">
-        <%= render 'exhibits', exhibits: @exhibits.unpublished.ordered_by_weight.accessible_by(current_ability) %>
-      </div>
     <% end %>
 
-    <% if current_user && current_user.exhibits.any? %>
-      <div role="tabpanel" class="tab-pane" id="user">
-        <%= render 'exhibits', exhibits: current_user.exhibits %>
-      </div>
-    <% end %>
   </div>
+
+  <% if @exhibits.unpublished.accessible_by(current_ability).any? %>
+    <div role="tabpanel" class="tab-pane" id="unpublished">
+      <%= render 'exhibits', exhibits: @exhibits.unpublished.ordered_by_weight.accessible_by(current_ability) %>
+    </div>
+  <% end %>
+
+  <% if current_user && current_user.exhibits.any? %>
+    <div role="tabpanel" class="tab-pane" id="user">
+      <%= render 'exhibits', exhibits: current_user.exhibits %>
+    </div>
+  <% end %>
 </div>
 
-<aside class="col-md-3">
+<% content_for(:sidebar_position) { 'order-last' } %>
+<% content_for(:sidebar) do %>
   <%= render "shared/site_sidebar" %>
-</aside>
+<% end %>