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

Merge branch 'implement-5.1' into 'master' 

Implement 5.1 WDN Framework

See merge request !17
parents 07e85202 296341b5
Branches
No related tags found
1 merge request!17Implement 5.1 WDN Framework
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 1
View file @ 3b4ea69c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
/test/tmp/ /test/tmp/
/test/version_tmp/ /test/version_tmp/
/tmp/ /tmp/
/public/wdn/ /public/wdn
/db/scripts/private/ /db/scripts/private/
## Documentation cache and generated files: ## Documentation cache and generated files:
......
Gemfile.lock
+ 5
− 5
View file @ 3b4ea69c
...@@ -42,7 +42,7 @@ GEM ...@@ -42,7 +42,7 @@ GEM
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (1.8.1) i18n (1.8.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
icalendar (2.6.1) icalendar (2.6.1)
ice_cube (~> 0.16) ice_cube (~> 0.16)
...@@ -54,7 +54,7 @@ GEM ...@@ -54,7 +54,7 @@ GEM
listen (3.2.1) listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.1.0) lumberjack (1.1.1)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
method_source (0.9.2) method_source (0.9.2)
...@@ -63,7 +63,7 @@ GEM ...@@ -63,7 +63,7 @@ GEM
mime-types-data (3.2019.1009) mime-types-data (3.2019.1009)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.13.0) minitest (5.14.0)
multi_json (1.14.1) multi_json (1.14.1)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
...@@ -81,7 +81,7 @@ GEM ...@@ -81,7 +81,7 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
public_suffix (4.0.3) public_suffix (4.0.3)
rack (2.0.8) rack (2.1.1)
rack-cas (0.16.1) rack-cas (0.16.1)
addressable (~> 2.3) addressable (~> 2.3)
nokogiri (~> 1.5) nokogiri (~> 1.5)
...@@ -158,4 +158,4 @@ RUBY VERSION ...@@ -158,4 +158,4 @@ RUBY VERSION
ruby 2.6.5p114 ruby 2.6.5p114
BUNDLED WITH BUNDLED WITH
1.17.3 2.0.2
Gemfile.lock.old 0 → 100644
+ 161
− 0
View file @ 3b4ea69c
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
views/fixed.erb
+ 36
− 36
View file @ 3b4ea69c
<!DOCTYPE html> <!DOCTYPE html>
<% template_dep_version = '5.0.6' %> <% template_dep_version = '5.1.0' %>
<html class="no-js" lang="en"> <html class="dcf-no-js dcf-no-webp" lang="en">
<head> <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. 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. 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 @@ ...@@ -13,7 +13,7 @@
<!-- TemplateBeginEditable name="doctitle" --> <!-- TemplateBeginEditable name="doctitle" -->
<title><%= @title %> | University of Nebraska&ndash;Lincoln</title> <title><%= @title %> | University of Nebraska&ndash;Lincoln</title>
<!-- TemplateEndEditable --> <!-- 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" --> <!-- TemplateBeginEditable name="head" -->
<!-- Place optional header elements here --> <!-- Place optional header elements here -->
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
...@@ -22,53 +22,53 @@ ...@@ -22,53 +22,53 @@
<% if defined?(kiosk_mode) && kiosk_mode == 'true' %> <% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
<link rel="stylesheet" href="/css/kiosk.css"> <link rel="stylesheet" href="/css/kiosk.css">
<% end %> <% 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'"> <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="https://unlcms.unl.edu/wdn/templates_5.0/css/deprecated.css"></noscript> <noscript><link rel="stylesheet" href="/wdn/templates_5.1/css/deprecated.css"></noscript>
<link rel="stylesheet" href="/css/jquery.mCustomScrollbar.min.css" /> <link rel="stylesheet" href="/css/jquery.mCustomScrollbar.min.css" />
<!-- TemplateEndEditable --> <!-- TemplateEndEditable -->
<!-- TemplateParam name="class" type="text" value="" --> <!-- TemplateParam name="class" type="text" value="" -->
</head> </head>
<body class="unl" data-version="5.0"> <body class="unl" data-version="5.1">
<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/skip-nav.html"))).result %> <%= 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"> <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.1/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.1/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/visit-global-1.html"))).result %>
<!-- TemplateBeginEditable name="visitlocal" --> <!-- TemplateBeginEditable name="visitlocal" -->
<!-- TemplateEndEditable --> <!-- 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.1/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/apply-global-1.html"))).result %>
<!-- TemplateBeginEditable name="applylocal" --> <!-- TemplateBeginEditable name="applylocal" -->
<!-- TemplateEndEditable --> <!-- 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.1/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/give-global-1.html"))).result %>
<!-- TemplateBeginEditable name="givelocal" --> <!-- TemplateBeginEditable name="givelocal" -->
<!-- TemplateEndEditable --> <!-- 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.1/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.1/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.1/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.1/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.1/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.1/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/site-affiliation-1.html"))).result %>
<!-- TemplateBeginEditable name="affiliation" --> <!-- TemplateBeginEditable name="affiliation" -->
<!-- TemplateEndEditable --> <!-- 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.1/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-title-1.html"))).result %>
<!-- TemplateBeginEditable name="titlegraphic" --> <!-- TemplateBeginEditable name="titlegraphic" -->
<a class="dcf-txt-h5" href="/">UNL Resource Scheduler</a> <a class="dcf-txt-h5" href="/">UNL Resource Scheduler</a>
<!-- TemplateEndEditable --> <!-- 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.1/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.1/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.1/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.1/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.1/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/nav-menu-child-1.html"))).result %>
<!-- TemplateBeginEditable name="navlinks" --> <!-- TemplateBeginEditable name="navlinks" -->
<%= erb :'template_partials/navigation' %> <%= erb :'template_partials/navigation' %>
<!-- TemplateEndEditable --> <!-- 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.1/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-2.html"))).result %>
</header> </header>
<main class="dcf-main" id="dcf-main" role="main" tabindex="-1"> <main class="dcf-main" id="dcf-main" role="main" tabindex="-1">
...@@ -151,15 +151,15 @@ ...@@ -151,15 +151,15 @@
<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 -->
<%= 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" --> <!-- TemplateBeginEditable name="contactinfo" -->
<%= erb :'template_partials/footer' %> <%= erb :'template_partials/footer' %>
<!-- 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.1/includes/global/footer-global-2.html"))).result %>
</footer> </footer>
<% end %> <% 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.1/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/js-body-local.html"))).result.gsub('$DEP_VERSION$', template_dep_version) %>
<!-- TemplateBeginEditable name="jsbody" --> <!-- TemplateBeginEditable name="jsbody" -->
<!-- put your custom javascript here --> <!-- put your custom javascript here -->
<script type="text/javascript">WDN.initializePlugin("notice");</script> <script type="text/javascript">WDN.initializePlugin("notice");</script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment