Merge pull request #1415 from YaleSTC/1414_current_res_tweak

[1414] Reorder current reservations page
YaleSTC · Jan 12, 2016 · 22807db · 22807db
2 parents 121d025 + b51a732
commit 22807db
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/views/reservations/current_reservations.html.erb b/app/views/reservations/current_reservations.html.erb
@@ -8,6 +8,11 @@
   <%= render :partial => "user_reservations_list", :collection => @user_overdue_reservations_set %>
 <% end %>
 
+<% unless @user_reserved_reservations_set.empty? %>
+  <h3>Future reservations</h3>
+  <%= render :partial => "user_reservations_list", :collection => @user_reserved_reservations_set %>
+<% end %>
+
 <% unless @user_checked_out_today_reservations_set.empty? %>
   <h3>Checked out today</h3>
   <%= render :partial => "user_reservations_list", :collection => @user_checked_out_today_reservations_set %>
@@ -18,11 +23,6 @@
   <%= render :partial => "user_reservations_list", :collection => @user_checked_out_previous_reservations_set %>
 <% end %>
 
-<% unless @user_reserved_reservations_set.empty? %>
-  <h3>Future reservations</h3>
-  <%= render :partial => "user_reservations_list", :collection => @user_reserved_reservations_set %>
-<% end %>
-
 <% if @user_overdue_reservations_set.empty? and @user_checked_out_today_reservations_set.empty? and @user_checked_out_previous_reservations_set.empty? and @user_reserved_reservations_set.empty? %>
   <% if can? :manage, Reservation %>
     <h3>There are no current or upcoming reservations associated with this user.</h3>