Merge branch 'fix-kiosk-display' into 'master'

Layout fixes to get kiosk mode to display correctly

See merge request iim/unl-resource-scheduler!10

app.rb

@@ -180,6 +180,7 @@ get '/' do
 end
 
 get '/kiosk-logout/' do
+  session.clear
   erb :kiosk_logout, :layout => :fixed, :locals => {
     url_redirect: params[:url_redirect],
     kiosk_mode: 'true'

views/reserve.erb

@@ -19,13 +19,10 @@ SIX_AM_MINUTES = 360 # start time of calendar
 EIGHT_PM_MINUTES = 1200 # end time of calendar
 %>
 
-<div id="pagetitle">
-	<h3 class="dcf-txt-h5"><%= reservation.nil? ? 'Reserve Time for ' : 'Edit Reservation for ' %><%= resource.name %></h3>
-</div>
+<h3 class="dcf-txt-h4"><%= reservation.nil? ? 'Reserve Time for ' : 'Edit Reservation for ' %><%= resource.name %></h3>
 
-<div class="dcf-clear-both">
 <form action="" method="POST">
-<section class="dcf-grid dcf-col-gap-vw">
+<section class="dcf-grid dcf-col-gap-vw dcf-row-gap-4">
     <div class="dcf-col-100% dcf-col-67%-start@sm">
     	<label>Schedule for <span id="current-date"><%= day.strftime('%m/%d/%Y') %></span></label>
         <div class="calendar-container individual-day">
@@ -213,7 +210,6 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
     </div>
 </section>
 </form>
-</div>
 
 <% append_script_declaration(%q[var ordinal = function(number) {
     var mod = number % 100;

views/resource_calendar.erb

@@ -7,27 +7,28 @@ SIX_AM_MINUTES = 360 # start time of calendar
 EIGHT_PM_MINUTES = 1200 # end time of calendar
 %>
 
-<div id="pagetitle">
-	<div id="kioskLogo"></div>
-	<h1 class="dcf-float-left dcf-txt-h4 dcf-lh-4 dcf-txt-middle">
-		<%= resource.name %>
-	</h1>
-</div>
+<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
+    <div>
+        <div id="kioskLogo"></div>
+        <h1 class="dcf-txt-h4 dcf-d-inline"><%= resource.name %></h1>
+    </div>
 
-<% if kiosk_mode %>
-<div class="kiosk-buttons">
-	<% if @user %>
-		<a class="unl-font-sans" href="/kiosk-logout/?url_redirect=<%= url_encode("/#{@space.url_name}/resources/#{resource.id}/calendar/?kiosk_mode=true") %>">Log Out</a>
-	<% end %>
-	<a class="dcf-btn dcf-btn-primary dcf-txt-2xs" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/?kiosk_mode=true">Reserve <%= resource.name %></a>
-</div>
-<% end %>
+    <% if kiosk_mode %>
+    <div class="dcf-txt-right">
+        <% if @user %>
+            <a class="unl-font-sans" href="/kiosk-logout/?url_redirect=<%= url_encode("/#{@space.url_name}/resources/#{resource.id}/calendar/?kiosk_mode=true") %>">Log Out</a>
+        <% end %>
+        <a class="dcf-btn dcf-btn-primary dcf-txt-2xs" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/?kiosk_mode=true">Reserve <%= resource.name %></a>
+    </div>
+    <% end %>
 
-<% unless kiosk_mode %>
-<div class="dcf-float-right">
-	<a class="dcf-btn dcf-btn-primary" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/">Reserve <%= resource.name %></a>
+    <% unless kiosk_mode %>
+    <div>
+        <a class="dcf-btn dcf-btn-primary dcf-txt-2xs" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/">Reserve <%= resource.name %></a>
+    </div>
+    <% end %>
 </div>
-<% end %>
+
 <div class="calendar dcf-pt-4">
 	<div class="calendar-header">
 		<a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/?date=<%= (date-7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="prev-week" class="schedulericon-angle-circled-left dcf-txt-decor-none"><span class="dcf-sr-only">Previous Week</span></a>