From f24aff5cf43e43d3efe6a27f1b81fbb921bb57f7 Mon Sep 17 00:00:00 2001
From: Jeffrey Sturek <jsturek8@unl.edu>
Date: Tue, 12 Mar 2019 17:43:46 -0500
Subject: [PATCH] Kiosk layout fixes so displays correctly
---
views/fixed.erb | 6 ++++--
views/reserve.erb | 4 +++-
views/resource_calendar.erb | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/views/fixed.erb b/views/fixed.erb
index b13d553..550cafc 100644
--- a/views/fixed.erb
+++ b/views/fixed.erb
@@ -70,7 +70,7 @@
</header>
<main class="dcf-main" id="dcf-main" role="main" tabindex="-1">
-
+ <% unless defined?(kiosk_mode) && kiosk_mode == 'true' %>
<!-- TemplateBeginEditable name="hero" -->
<div class="dcf-hero dcf-hero-default">
<!-- TemplateEndEditable -->
@@ -102,6 +102,7 @@
</div>
<!-- TemplateEndEditable -->
</div>
+ <% end %>
<div class="dcf-main-content dcf-wrapper">
<!-- TemplateBeginEditable name="maincontentarea" -->
<div class="dcf-bleed">
@@ -137,7 +138,6 @@
<% end %>
<% else %>
<% session.delete(:notice) %>
- <% session.delete("notice") %>
<% end %>
<%= yield %>
</div>
@@ -145,6 +145,7 @@
<!-- TemplateEndEditable -->
</div>
</main>
+<% unless defined?(kiosk_mode) && kiosk_mode == 'true' %>
<footer class="dcf-footer" id="dcf-footer" role="contentinfo">
<!-- TemplateBeginEditable name="optionalfooter" -->
<!-- TemplateEndEditable -->
@@ -154,6 +155,7 @@
<!-- TemplateEndEditable -->
<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/footer-global-2.html"))).result %>
</footer>
+<% end %>
<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/noscript.html"))).result %>
<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/js-body.html"))).result.gsub('$DEP_VERSION$', template_dep_version) %>
<!-- TemplateBeginEditable name="jsbody" -->
diff --git a/views/reserve.erb b/views/reserve.erb
index 0b81da3..6dc347b 100644
--- a/views/reserve.erb
+++ b/views/reserve.erb
@@ -20,9 +20,10 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
%>
<div id="pagetitle">
- <h3><%= reservation.nil? ? 'Reserve Time for ' : 'Edit Reservation for ' %><%= resource.name %></h3>
+ <h3 class="dcf-txt-h5"><%= reservation.nil? ? 'Reserve Time for ' : 'Edit Reservation for ' %><%= resource.name %></h3>
</div>
+<div class="dcf-clear-both">
<form action="" method="POST">
<section class="dcf-grid dcf-col-gap-vw">
<div class="dcf-col-100% dcf-col-67%-start@sm">
@@ -212,6 +213,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
</section>
</form>
+</div>
<% append_script_declaration(%q[var ordinal = function(number) {
var mod = number % 100;
diff --git a/views/resource_calendar.erb b/views/resource_calendar.erb
index 40c1e59..f6c59cf 100644
--- a/views/resource_calendar.erb
+++ b/views/resource_calendar.erb
@@ -9,7 +9,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<div id="pagetitle">
<div id="kioskLogo"></div>
- <h1 class="clear-top dcf-float-left">
+ <h1 class="dcf-float-left dcf-txt-h4 dcf-lh-4 dcf-txt-middle">
<%= resource.name %>
</h1>
</div>
@@ -19,7 +19,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<% 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" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/?kiosk_mode=true">Reserve <%= resource.name %></a>
+ <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 %>
--
GitLab