From dea8d21bae09d11a538bbe5ce28f85e7f4c92341 Mon Sep 17 00:00:00 2001
From: Jeff Sturek <jsturek8@unl.edu>
Date: Mon, 23 Mar 2020 13:14:40 -0500
Subject: [PATCH 1/3] WIP: Implement 5.1 WDN Framework

---
 .gitignore                     |   2 +-
 Gemfile.lock                   |  10 +-
 Gemfile.lock.old               | 161 +++++++++++++++++++++++++++++++++
 app.rb                         |  10 +-
 views/{fixed.erb => local.erb} |  72 +++++++--------
 5 files changed, 208 insertions(+), 47 deletions(-)
 create mode 100644 Gemfile.lock.old
 rename views/{fixed.erb => local.erb} (76%)

diff --git a/.gitignore b/.gitignore
index 2cdf2b3..d543d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
-/public/wdn/
+/public/wdn
 /db/scripts/private/
 
 ## Documentation cache and generated files:
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ed0e81..bdc578c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,7 +42,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     icalendar (2.6.1)
       ice_cube (~> 0.16)
@@ -54,7 +54,7 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.1.0)
+    lumberjack (1.1.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
@@ -63,7 +63,7 @@ GEM
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multi_json (1.14.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -81,7 +81,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.3)
-    rack (2.0.8)
+    rack (2.1.1)
     rack-cas (0.16.1)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
@@ -158,4 +158,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   1.17.3
+   2.0.2
diff --git a/Gemfile.lock.old b/Gemfile.lock.old
new file mode 100644
index 0000000..c9030cb
--- /dev/null
+++ b/Gemfile.lock.old
@@ -0,0 +1,161 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    backports (3.15.0)
+    bcrypt (3.1.13)
+    coderay (1.1.2)
+    commonjs (0.2.7)
+    concurrent-ruby (1.1.5)
+    daemons (1.3.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    eventmachine (1.2.7)
+    ffi (1.11.3)
+    formatador (0.2.5)
+    guard (2.16.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-less (2.0.0)
+      guard (~> 2.0)
+      guard-compat (~> 1.2)
+      less (~> 2.3)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.8.1)
+      concurrent-ruby (~> 1.0)
+    icalendar (2.6.1)
+      ice_cube (~> 0.16)
+    ice_cube (0.16.3)
+    kgio (2.11.3)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.19)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.1.1)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
+    multi_json (1.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mysql2 (0.5.3)
+    nenv (0.3.0)
+    netrc (0.11.0)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pony (1.13.1)
+      mail (>= 2.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (4.0.3)
+    rack (2.1.0)
+    rack-cas (0.16.1)
+      addressable (~> 2.3)
+      nokogiri (~> 1.5)
+      rack (>= 1.3)
+    rack-protection (2.0.8.1)
+      rack
+    raindrops (0.19.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    ref (2.0.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    ruby2_keywords (0.0.2)
+    shellany (0.0.1)
+    shotgun (0.9.2)
+      rack (>= 1.0)
+    sinatra (2.0.8.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.8.1)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.8.1)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.8.1)
+      sinatra (= 2.0.8.1)
+      tilt (~> 2.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    unicorn (5.5.2)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
+    zeitwerk (2.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  bcrypt
+  guard
+  guard-less
+  icalendar
+  mysql2
+  pony
+  rack-cas
+  rest-client
+  shotgun
+  sinatra
+  sinatra-contrib
+  therubyracer
+  thin
+  unicorn
+
+RUBY VERSION
+   ruby 2.6.5p114
+
+BUNDLED WITH
+   1.17.3
diff --git a/app.rb b/app.rb
index c2602c7..542ea04 100644
--- a/app.rb
+++ b/app.rb
@@ -44,7 +44,7 @@ def flash(type, header, message)
 end
 
 before do
-  session['init'] = true
+  #session['init'] = true
 
   # site defaults
   @inline_body_script_content = ''
@@ -141,13 +141,13 @@ end
 
 not_found do
   @breadcrumbs << {:text => 'Not Found'}
-  erb 'That page was not found.', :layout => :fixed
+  erb 'That page was not found.', :layout => :local
 end
 
 error do
   @breadcrumbs << {:text => 'Error'}
   flash(:danger, 'Sorry! There was an error.', "We apologize. A really bad error occurred and it didn't work. We're fixing this as we speak.")
-  erb 'In the meantime, you can <a href="/">go back to the homepage</a>.', :layout => :fixed
+  erb 'In the meantime, you can <a href="/">go back to the homepage</a>.', :layout => :local
 end
 
 get '/' do
@@ -175,7 +175,7 @@ get '/' do
       where('end_time >= ?', Time.now.midnight).count + 4) / 5
   end
 
-  erb :home, :layout => :fixed, :locals => {
+  erb :home, :layout => :local, :locals => {
     spaces: spaces,
     resources: app_wide_resources,
     reservations: reservations,
@@ -185,7 +185,7 @@ end
 
 get '/kiosk-logout/' do
   session.clear
-  erb :kiosk_logout, :layout => :fixed, :locals => {
+  erb :kiosk_logout, :layout => :local, :locals => {
     url_redirect: params[:url_redirect],
     kiosk_mode: 'true'
   }
diff --git a/views/fixed.erb b/views/local.erb
similarity index 76%
rename from views/fixed.erb
rename to views/local.erb
index 71c6fd4..53fe5c5 100644
--- a/views/fixed.erb
+++ b/views/local.erb
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<% template_dep_version = '5.0.6' %>
-<html class="no-js" lang="en">
+<% template_dep_version = '5.1.0' %>
+<html class="dcf-no-js dcf-no-webp" lang="en">
 <head>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/head-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/head-1.html"))).result %>
   <!--
     Membership and regular participation in the UNL Web Developer Network is required to use the UNLedu Web Framework. Visit the WDN site at http://wdn.unl.edu/. Register for our mailing list and add your site or server to UNLwebaudit.
     All framework code is the property of the UNL Web Developer Network. The code seen in a source code view is not, and may not be used as, a template. You may not use this code, a reverse-engineered version of this code, or its associated visual presentation in whole or in part to create a derivative work.
@@ -13,7 +13,7 @@
   <!-- TemplateBeginEditable name="doctitle" -->
   <title><%= @title %> | University of Nebraska&ndash;Lincoln</title>
   <!-- TemplateEndEditable -->
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/head-2.html"))).result.gsub('$DEP_VERSION$', template_dep_version) %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/head-2-local.html"))).result.gsub('$DEP_VERSION$', template_dep_version) %>
   <!-- TemplateBeginEditable name="head" -->
   <!-- Place optional header elements here -->
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -22,53 +22,53 @@
     <% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
     <link rel="stylesheet" href="/css/kiosk.css">
     <% end %>
-    <link rel="preload" href="https://unlcms.unl.edu/wdn/templates_5.0/css/deprecated.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
-    <noscript><link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_5.0/css/deprecated.css"></noscript>
+    <link rel="preload" href="/wdn/templates_5.1/css/deprecated.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
+    <noscript><link rel="stylesheet" href="/wdn/templates_5.1/css/deprecated.css"></noscript>
     <link rel="stylesheet" href="/css/jquery.mCustomScrollbar.min.css" />
   <!-- TemplateEndEditable -->
   <!-- TemplateParam name="class" type="text" value="" -->
 </head>
-<body class="unl" data-version="5.0">
-<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/skip-nav.html"))).result %>
+<body class="unl" data-version="5.1">
+<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/skip-nav.html"))).result %>
 <header class="dcf-header" id="dcf-header" role="banner">
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/header-global-1.html"))).result %>
-    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-global-1.html"))).result %>
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/visit-global-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/header-global-1.html"))).result %>
+    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-global-1.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/visit-global-1.html"))).result %>
       <!-- TemplateBeginEditable name="visitlocal" -->
       <!-- TemplateEndEditable -->
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/visit-global-2.html"))).result %>
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/apply-global-1.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/visit-global-2.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/apply-global-1.html"))).result %>
       <!-- TemplateBeginEditable name="applylocal" -->
       <!-- TemplateEndEditable -->
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/apply-global-2.html"))).result %>
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/give-global-1.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/apply-global-2.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/give-global-1.html"))).result %>
       <!-- TemplateBeginEditable name="givelocal" -->
       <!-- TemplateEndEditable -->
-      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/give-global-2.html"))).result %>
-    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-global-2.html"))).result %>
-    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/idm.html"))).result %>
-    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/search.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/header-global-2.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/logo-lockup-1.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/site-affiliation-1.html"))).result %>
+      <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/give-global-2.html"))).result %>
+    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-global-2.html"))).result %>
+    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/idm.html"))).result %>
+    <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/search.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/header-global-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/logo-lockup-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/site-affiliation-1.html"))).result %>
   <!-- TemplateBeginEditable name="affiliation" -->
   <!-- TemplateEndEditable -->
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/site-affiliation-2.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/site-title-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/site-affiliation-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/site-title-1.html"))).result %>
   <!-- TemplateBeginEditable name="titlegraphic" -->
   <a class="dcf-txt-h5" href="/">UNL Resource Scheduler</a>
   <!-- TemplateEndEditable -->
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/site-title-2.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/logo-lockup-2.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-toggle-group.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-menu-1.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-toggle-btn.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-menu-child-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/site-title-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/logo-lockup-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-toggle-group.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-menu-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-toggle-btn.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-menu-child-1.html"))).result %>
   <!-- TemplateBeginEditable name="navlinks" -->
   <%= erb :'template_partials/navigation' %>
   <!-- TemplateEndEditable -->
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-menu-child-2.html"))).result %>
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/nav-menu-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-menu-child-2.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/nav-menu-2.html"))).result %>
 </header>
 
 <main class="dcf-main" id="dcf-main" role="main" tabindex="-1">
@@ -151,15 +151,15 @@
 <footer class="dcf-footer" id="dcf-footer" role="contentinfo">
   <!-- TemplateBeginEditable name="optionalfooter" -->
   <!-- TemplateEndEditable -->
-  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/footer-global-1.html"))).result %>
+  <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/footer-global-1.html"))).result %>
   <!-- TemplateBeginEditable name="contactinfo" -->
   <%= erb :'template_partials/footer' %>
   <!-- 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.1/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) %>
+<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/noscript.html"))).result %>
+<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.1/includes/global/js-body-local.html"))).result.gsub('$DEP_VERSION$', template_dep_version) %>
 <!-- TemplateBeginEditable name="jsbody" -->
 <!-- put your custom javascript here -->
 <script type="text/javascript">WDN.initializePlugin("notice");</script>
-- 
GitLab


From 89fab0042831c6900d08939372db45dfffc6fd7a Mon Sep 17 00:00:00 2001
From: Jeff Sturek <jsturek8@unl.edu>
Date: Mon, 23 Mar 2020 13:55:31 -0500
Subject: [PATCH 2/3] Do not rename fixed.erb

---
 app.rb                         | 8 ++++----
 views/{local.erb => fixed.erb} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename views/{local.erb => fixed.erb} (100%)

diff --git a/app.rb b/app.rb
index 542ea04..9518473 100644
--- a/app.rb
+++ b/app.rb
@@ -141,13 +141,13 @@ end
 
 not_found do
   @breadcrumbs << {:text => 'Not Found'}
-  erb 'That page was not found.', :layout => :local
+  erb 'That page was not found.', :layout => :fixed
 end
 
 error do
   @breadcrumbs << {:text => 'Error'}
   flash(:danger, 'Sorry! There was an error.', "We apologize. A really bad error occurred and it didn't work. We're fixing this as we speak.")
-  erb 'In the meantime, you can <a href="/">go back to the homepage</a>.', :layout => :local
+  erb 'In the meantime, you can <a href="/">go back to the homepage</a>.', :layout => :fixed
 end
 
 get '/' do
@@ -175,7 +175,7 @@ get '/' do
       where('end_time >= ?', Time.now.midnight).count + 4) / 5
   end
 
-  erb :home, :layout => :local, :locals => {
+  erb :home, :layout => :fixed, :locals => {
     spaces: spaces,
     resources: app_wide_resources,
     reservations: reservations,
@@ -185,7 +185,7 @@ end
 
 get '/kiosk-logout/' do
   session.clear
-  erb :kiosk_logout, :layout => :local, :locals => {
+  erb :kiosk_logout, :layout => :fixed, :locals => {
     url_redirect: params[:url_redirect],
     kiosk_mode: 'true'
   }
diff --git a/views/local.erb b/views/fixed.erb
similarity index 100%
rename from views/local.erb
rename to views/fixed.erb
-- 
GitLab


From 3d66bfb0e9b77b4a3133dad6ee9c3cafdfb0f74d Mon Sep 17 00:00:00 2001
From: Jeff Sturek <jsturek8@unl.edu>
Date: Thu, 26 Mar 2020 16:39:00 -0500
Subject: [PATCH 3/3] Remove commented code

---
 app.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.rb b/app.rb
index 9518473..c2602c7 100644
--- a/app.rb
+++ b/app.rb
@@ -44,7 +44,7 @@ def flash(type, header, message)
 end
 
 before do
-  #session['init'] = true
+  session['init'] = true
 
   # site defaults
   @inline_body_script_content = ''
-- 
GitLab