Skip to content
Snippets Groups Projects
Commit f24aff5c authored by Jeff Sturek's avatar Jeff Sturek
Browse files

Kiosk layout fixes so displays correctly

parent d8a7254f
No related branches found
No related tags found
1 merge request!9Kiosk layout fixes so displays correctly
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</header> </header>
<main class="dcf-main" id="dcf-main" role="main" tabindex="-1"> <main class="dcf-main" id="dcf-main" role="main" tabindex="-1">
<% unless defined?(kiosk_mode) && kiosk_mode == 'true' %>
<!-- TemplateBeginEditable name="hero" --> <!-- TemplateBeginEditable name="hero" -->
<div class="dcf-hero dcf-hero-default"> <div class="dcf-hero dcf-hero-default">
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
</div> </div>
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
</div> </div>
<% end %>
<div class="dcf-main-content dcf-wrapper"> <div class="dcf-main-content dcf-wrapper">
<!-- TemplateBeginEditable name="maincontentarea" --> <!-- TemplateBeginEditable name="maincontentarea" -->
<div class="dcf-bleed"> <div class="dcf-bleed">
...@@ -137,7 +138,6 @@ ...@@ -137,7 +138,6 @@
<% end %> <% end %>
<% else %> <% else %>
<% session.delete(:notice) %> <% session.delete(:notice) %>
<% session.delete("notice") %>
<% end %> <% end %>
<%= yield %> <%= yield %>
</div> </div>
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
</div> </div>
</main> </main>
<% unless defined?(kiosk_mode) && kiosk_mode == 'true' %>
<footer class="dcf-footer" id="dcf-footer" role="contentinfo"> <footer class="dcf-footer" id="dcf-footer" role="contentinfo">
<!-- TemplateBeginEditable name="optionalfooter" --> <!-- TemplateBeginEditable name="optionalfooter" -->
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
...@@ -154,6 +155,7 @@ ...@@ -154,6 +155,7 @@
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/footer-global-2.html"))).result %> <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/footer-global-2.html"))).result %>
</footer> </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/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) %> <%= 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" --> <!-- TemplateBeginEditable name="jsbody" -->
......
...@@ -20,9 +20,10 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar ...@@ -20,9 +20,10 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
%> %>
<div id="pagetitle"> <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>
<div class="dcf-clear-both">
<form action="" method="POST"> <form action="" method="POST">
<section class="dcf-grid dcf-col-gap-vw"> <section class="dcf-grid dcf-col-gap-vw">
<div class="dcf-col-100% dcf-col-67%-start@sm"> <div class="dcf-col-100% dcf-col-67%-start@sm">
...@@ -212,6 +213,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar ...@@ -212,6 +213,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div> </div>
</section> </section>
</form> </form>
</div>
<% append_script_declaration(%q[var ordinal = function(number) { <% append_script_declaration(%q[var ordinal = function(number) {
var mod = number % 100; var mod = number % 100;
......
...@@ -9,7 +9,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar ...@@ -9,7 +9,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<div id="pagetitle"> <div id="pagetitle">
<div id="kioskLogo"></div> <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 %> <%= resource.name %>
</h1> </h1>
</div> </div>
...@@ -19,7 +19,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar ...@@ -19,7 +19,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<% if @user %> <% 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> <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 %> <% 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> </div>
<% end %> <% end %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment