Skip to content
Snippets Groups Projects

Kiosk layout fixes so displays correctly

Merged Jeff Sturek requested to merge JSTUREK8/unl-resource-scheduler:master into master
3 files
+ 9
5
Compare changes
  • Side-by-side
  • Inline
Files
3
+ 4
2
@@ -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" -->
Loading