diff --git a/app.rb b/app.rb
index c0206052d50582e30a55b87235903f91c1cff344..bd64aa296f1164dd1cda35cf3dd4aa6e7f8cc5df 100644
--- a/app.rb
+++ b/app.rb
@@ -43,6 +43,7 @@ before do
session['init'] = true
# site defaults
+ @inline_body_script_content = ''
@title = 'UNL Resource Scheduler'
@breadcrumbs = [
{
@@ -57,6 +58,14 @@ before do
]
end
+def append_script_tag(src)
+ @inline_body_script_content << "<script type=\"text/javascript\" src="#{src}"></script>\n"
+end
+
+def append_script_declaration(content)
+ @inline_body_script_content << "<script>#{content}</script>\n"
+end
+
def calculate_time(date_string, hour, minute, am_pm)
hour ||= 0
minute ||= 0
diff --git a/views/admin/add_user.erb b/views/admin/add_user.erb
index a444b1662f5c5acbce92dd1b90fcd9ea31e89f35..492ffee4a20bfa01fb04bf687e60326e271694ca 100644
--- a/views/admin/add_user.erb
+++ b/views/admin/add_user.erb
@@ -3,8 +3,8 @@
</div>
<form id="edit-user" action="" method="POST">
- <div class="wdn-grid-set">
- <fieldset class="bp2-wdn-col-one-half">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <fieldset class="dcf-col-100% dcf-col-50%-start@sm">
<legend>User Details</legend>
<label for="user_id">User</label>
@@ -17,7 +17,7 @@
</fieldset>
<% if @user.is_super_user?(@space) %>
- <div class="bp2-wdn-col-one-half">
+ <div class="dcf-col-100% dcf-col-50%-end@sm">
<fieldset>
<legend>Manager Permissions</legend>
<% permissions.each do |perm| %>
@@ -36,5 +36,5 @@
</div>
<% end %>
</div>
- <button class="wdn-button wdn-button-brand" type="submit">Add</button>
+ <button class="dcf-btn dcf-btn-primary" type="submit">Add</button>
</form>
\ No newline at end of file
diff --git a/views/admin/agenda.erb b/views/admin/agenda.erb
index f2baa923b35ba01c24d36beab3129ac1ebf3f3e8..2541c9db654c0aec2a3d9680cf634fdb06dc98ef 100644
--- a/views/admin/agenda.erb
+++ b/views/admin/agenda.erb
@@ -9,7 +9,7 @@
</form>
<div id="pagetitle">
- <h3>Today's Agenda<span class="wdn-subhead"><%= date.strftime('%B %d, %Y') %></h3>
+ <h3>Today's Agenda<span class="dcf-subhead"><%= date.strftime('%B %d, %Y') %></h3>
</div>
@@ -63,7 +63,7 @@ No reservations today. Hopefully someone will still come in to use the space!<br
</td>
<td>
<form class="delete-form" method="POST" action="/<%= @space.url_name %>/admin/agenda/reservations/<%= reservation.id %>/remove/">
- <button class="wdn-button wdn-button-brand" type="submit">Remove</button>
+ <button class="dcf-btn dcf-btn-primary" type="submit">Remove</button>
</form>
</td>
</tr>
@@ -77,7 +77,7 @@ Today's Events
</h4>
<% if events.empty? %>
No events today. Perhaps you'd like to create one?<br>
-<a href="<%= @space.admin_events_href %>/create/" class="wdn-button wdn-button-brand">New Event</a>
+<a href="<%= @space.admin_events_href %>/create/" class="dcf-btn dcf-btn-primary">New Event</a>
<% else %>
<table>
<thead>
@@ -105,11 +105,10 @@ No events today. Perhaps you'd like to create one?<br>
</tbody>
</table>
<br>
-<a href="<%= @space.admin_events_href %>" class="wdn-button wdn-button-triad">Go To Events</a>
+<a href="<%= @space.admin_events_href %>" class="dcf-btn wdn-button-triad">Go To Events</a>
<% end %>
-<script type="text/javascript">
-WDN.initializePlugin('jqueryui', [function() {
+<% append_script_declaration(%q[WDN.initializePlugin('jqueryui', [function() {
$ = require('jquery');
$('.datepicker').datepicker();
$("LINK[href^='//unlcms.unl.edu/wdn/templates_4.0/scripts/plugins/ui/css/jquery-ui.min.css']").remove();
@@ -118,5 +117,4 @@ WDN.initializePlugin('jqueryui', [function() {
var date = $('#date').val().split('/');
window.location = window.location.href.split('?')[0] + '?date=' + date[2] + '-' + date[0] + '-' + date[1];
});
-}]);
-</script>
+}]);]) %>
diff --git a/views/admin/edit_resource.erb b/views/admin/edit_resource.erb
index bddd2d3811c03b7ddc519228206d34eddb2f96ba..a1e38740cbc5b6ef6a8c471e01a41515ba04a2d7 100644
--- a/views/admin/edit_resource.erb
+++ b/views/admin/edit_resource.erb
@@ -30,5 +30,5 @@
</div>
<br>
- <button type="submit" class="wdn-button wdn-button-brand">Save Resource</button>
+ <button type="submit" class="dcf-btndcf-btn-primary">Save Resource</button>
</form>
\ No newline at end of file
diff --git a/views/admin/edit_resource_hours.erb b/views/admin/edit_resource_hours.erb
index fc1d8b33be91dfeaaba6e01bed9cccf3df384501..9324856e4d1cb9837f99cc0b89e9e896b13847ab 100644
--- a/views/admin/edit_resource_hours.erb
+++ b/views/admin/edit_resource_hours.erb
@@ -1,13 +1,13 @@
<div id="pagetitle">
<h3>
This Week's Hours for <%= resource.name %>
- <span class="wdn-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
+ <span class="dcf-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
</h3>
</div>
<div style="margin-bottom: 16px;">
-<a href="<%= resource.edit_hours_href %>?date=<%= (date-7.days).strftime('%Y-%m-%d') %>" class="wdn-button wdn-button-triad" id="prev-week">< PREV</a>
-<a href="<%= resource.edit_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="wdn-button wdn-button-triad" style="float: right;" id="next-week">NEXT ></a>
+<a href="<%= resource.edit_hours_href %>?date=<%= (date-7.days).strftime('%Y-%m-%d') %>" class="dcf-btn wdn-button-triad" id="prev-week">< PREV</a>
+<a href="<%= resource.edit_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="dcf-btn wdn-button-triad" style="float: right;" id="next-week">NEXT ></a>
</div>
<table>
@@ -43,7 +43,7 @@
<h3>
Upcoming Changes
</h3>
-<a class="wdn-button wdn-button-brand" href="<%= resource.add_hours_href %>">Add Hours Change</a><br><br>
+<a class="dcf-btndcf-btn-primary" href="<%= resource.add_hours_href %>">Add Hours Change</a><br><br>
<table>
<thead>
@@ -76,9 +76,9 @@ Upcoming Changes
<% end %>
</td>
<td class="table-actions">
- <a class="wdn-button wdn-button-brand" href="<%= @space.admin_resources_href %><%= resource.id %>/hours/<%= resource_hour.id %>/edit/">Edit</a>
+ <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_resources_href %><%= resource.id %>/hours/<%= resource_hour.id %>/edit/">Edit</a>
<form class="delete-space-hour delete-form" action="<%= @space.admin_resources_href %><%= resource.id %>/hours/<%= resource_hour.id %>/delete/" method="POST">
- <button type="submit" class="wdn-button">Remove</button>
+ <button type="submit" class="dcf-btn">Remove</button>
</form>
</td>
</tr>
@@ -86,8 +86,7 @@ Upcoming Changes
</tbody>
</table>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration(%q[require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-space-hour').submit(function (submit) {
if (!window.confirm('Are you sure you want to remove this hours change?')) {
@@ -95,5 +94,4 @@ require(['jquery'], function($) {
}
});
});
-});
-</script>
\ No newline at end of file
+});]) %>
\ No newline at end of file
diff --git a/views/admin/edit_user.erb b/views/admin/edit_user.erb
index 995fcbcdb9a30fd57ca0af9f9bd851cf005d8a2a..8d9f2deb49e019e9f51338cc8162dbd0d2d28e5f 100644
--- a/views/admin/edit_user.erb
+++ b/views/admin/edit_user.erb
@@ -3,9 +3,9 @@
</div>
<form id="edit-user" action="" method="POST">
- <div class="wdn-grid-set">
+ <div class="dcf-grid dcf-col-gap-vw">
<% if @user.is_super_user?(@space) %>
- <div class="bp2-wdn-col-one-half">
+ <div class="dcf-col-100% dcf-col-50%-start@sm">
<fieldset>
<legend>Manager Permissions</legend>
<% permissions.each do |perm| %>
@@ -24,5 +24,5 @@
</div>
<% end %>
</div>
- <button class="wdn-button wdn-button-brand" type="submit">Update</button>
+ <button class="dcf-btn dcf-btn-primary" type="submit">Update</button>
</form>
\ No newline at end of file
diff --git a/views/admin/events.erb b/views/admin/events.erb
index f5070f768f97df0bb472718364fd469513c3d8fa..130ea49ba8ef730808c88d9c7cd420edb5e4653f 100644
--- a/views/admin/events.erb
+++ b/views/admin/events.erb
@@ -1,5 +1,5 @@
-<section class="wdn-grid-set reverse">
- <div class="bp2-wdn-col-three-fourths">
+<section class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-75%-start@sm">
<div id="pagetitle">
<h3>Events</h3>
</div>
@@ -40,7 +40,7 @@
</td>
<td>
<form class="delete-event delete-form" action="<%= @space.admin_events_href %><%=event.id%>/delete/" method="POST">
- <button type="submit" class="wdn-button">Delete</button>
+ <button type="submit" class="dcf-btn">Delete</button>
</form>
</td>
</tr>
@@ -49,9 +49,7 @@
</table>
</div>
<% if total_pages > 1 %>
- <script type="text/javascript">
- WDN.loadCSS(WDN.getTemplateFilePath('css/modules/pagination.css'));
- </script>
+ <% append_script_declaration("WDN.loadCSS('/wdn/templates_4.1/css/modules/pagination.css');") %>
<div style="text-align: center;">
<div style="display: inline-block;">
<ul id="pending-pagination" class="wdn_pagination" data-tab="pending" style="padding-left: 0;">
@@ -82,12 +80,12 @@
<% end %>
</div>
</div>
- <nav class="bp2-wdn-col-one-fourth">
+ <nav class="dcf-col-100% dcf-col-25%-end@sm">
<div class="toolbox">
<h3>Toolbox</h3>
<div class="tools">
<div style="text-align: center; margin-bottom: .8em">
- <a class="wdn-button wdn-button-brand" href="<%= @space.admin_events_href %>create/">
+ <a class="dcf-btndcf-btn-primary" href="<%= @space.admin_events_href %>create/">
<span style="font-size: 2em; vertical-align: middle; font-weight: 600">+</span>
<span style="vertical-align: middle;">New Event</span>
</a>
@@ -97,8 +95,7 @@
</nav>
</section>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration(%q[require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-event').submit(function (submit) {
if (!window.confirm('Are you sure you want to delete this event?')) {
@@ -106,5 +103,4 @@ require(['jquery'], function($) {
}
});
});
-});
-</script>
\ No newline at end of file
+});] )%>
\ No newline at end of file
diff --git a/views/admin/home.erb b/views/admin/home.erb
index 9cc8261cad5df806ca5bf6edca95b6d12492054d..8fb3c470a7ee4e60e1abb13267b9ceadde032156 100644
--- a/views/admin/home.erb
+++ b/views/admin/home.erb
@@ -1,6 +1,6 @@
<div id="pagetitle">
<h3><%= @space.name %> Resource Scheduler Administration</h3>
- <span class="wdn-subhead">Hello, <%= @user.full_name %> (<%= @user.username %>) <% if @user.is_super_user?(@space) %><br>Super User<% end %></span>
+ <span class="dcf-subhead">Hello, <%= @user.full_name %> (<%= @user.username %>) <% if @user.is_super_user?(@space) %><br>Super User<% end %></span>
</div>
<table>
@@ -9,21 +9,21 @@
<tr>
<td><strong>Users</strong></td>
<td></td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.admin_users_href %>">Manage</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %>">Manage</a></td>
</tr>
<% end %>
<% if @user.has_permission?(Permission::MANAGE_EVENTS, @space) %>
<tr>
<td><strong>Events</strong></td>
<td><%= upcoming_event_count %> upcoming events</td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.admin_events_href %>">Manage</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_events_href %>">Manage</a></td>
</tr>
<% end %>
<% if @user.has_permission?(Permission::MANAGE_RESOURCES, @space) %>
<tr>
<td><strong>Resources</strong></td>
<td><%= resource_count %> resources</td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.admin_resources_href %>">Manage</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_resources_href %>">Manage</a></td>
</tr>
<% end %>
<% if @user.has_permission?(Permission::MANAGE_SPACE_HOURS, @space) %>
@@ -40,21 +40,21 @@
The space is open all day.
<% end %>
</td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.admin_hours_href %>">Manage</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_hours_href %>">Manage</a></td>
</tr>
<% end %>
<% if @user.has_permission?(Permission::MANAGE_EMAILS, @space) %>
<tr>
<td><strong>Emails</strong></td>
<td></td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.admin_emails_href %>">Manage</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_emails_href %>">Manage</a></td>
</tr>
<% end %>
<% if @user.has_permission?(Permission::SEE_AGENDA, @space) %>
<tr>
<td><strong>Agenda</strong></td>
<td></td>
- <td><a class="wdn-button wdn-button-brand" href="<%= @space.agenda_href %>">View</a></td>
+ <td><a class="dcf-btn dcf-btn-primary" href="<%= @space.agenda_href %>">View</a></td>
</tr>
<% end %>
</tbody>
@@ -71,7 +71,7 @@
<% end %>
<input style="font-size: 10px;" type="file" name="imagedata" id="imagedata" title="Service Space Image">
<br><br>
-<button type="submit" class="wdn-button wdn-button-brand">Submit</button>
+<button type="submit" class="dcf-btn dcf-btn-primary">Submit</button>
</form>
<% end %>
diff --git a/views/admin/hours.erb b/views/admin/hours.erb
index 49409306178320e334ee71a39fff57269555acfe..76a6796e1d9779439501d4f29688f93f3cccf819 100644
--- a/views/admin/hours.erb
+++ b/views/admin/hours.erb
@@ -1,13 +1,13 @@
<div id="pagetitle">
<h3>
Your Hours For The Week
- <span class="wdn-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
+ <span class="dcf-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
</h3>
</div>
<div style="margin-bottom: 16px;">
-<a href="<%= @space.admin_hours_href %>?date=<%= (date-7.days).strftime('%Y-%m-%d') %>" class="wdn-button wdn-button-triad" id="prev-week">< PREV</a>
-<a href="<%= @space.admin_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="wdn-button wdn-button-triad" style="float: right;" id="next-week">NEXT ></a>
+<a href="<%= @space.admin_hours_href %>?date=<%= (date-7.days).strftime('%Y-%m-%d') %>" class="dcf-btn wdn-button-triad" id="prev-week">< PREV</a>
+<a href="<%= @space.admin_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="dcf-btn wdn-button-triad" style="float: right;" id="next-week">NEXT ></a>
</div>
<table>
@@ -43,7 +43,7 @@
<h3>
Upcoming Changes
</h3>
-<a class="wdn-button wdn-button-brand" href="<%= @space.admin_hours_href %>create/">Add Hours Change</a><br><br>
+<a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_hours_href %>create/">Add Hours Change</a><br><br>
<table>
<thead>
@@ -76,9 +76,9 @@ Upcoming Changes
<% end %>
</td>
<td class="table-actions">
- <a class="wdn-button wdn-button-brand" href="<%= @space.admin_hours_href %><%= space_hour.id %>/edit/">Edit</a>
+ <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_hours_href %><%= space_hour.id %>/edit/">Edit</a>
<form class="delete-space-hour delete-form" action="<%= @space.admin_hours_href %><%= space_hour.id %>/delete/" method="POST">
- <button type="submit" class="wdn-button">Remove</button>
+ <button type="submit" class="dcf-btn">Remove</button>
</form>
</td>
</tr>
@@ -86,8 +86,7 @@ Upcoming Changes
</tbody>
</table>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration(%q[require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-space-hour').submit(function (submit) {
if (!window.confirm('Are you sure you want to remove this hours change?')) {
@@ -95,5 +94,4 @@ require(['jquery'], function($) {
}
});
});
-});
-</script>
\ No newline at end of file
+});]) %>
\ No newline at end of file
diff --git a/views/admin/manage_authorizations.erb b/views/admin/manage_authorizations.erb
index 99c81cdbf7e1be4b6bf21e981657ee3777cf1ccf..4c3de4cef371ada791647bf6bb7565bc6ec5fba7 100644
--- a/views/admin/manage_authorizations.erb
+++ b/views/admin/manage_authorizations.erb
@@ -29,5 +29,5 @@
</tbody>
</table>
<br>
-<button class="wdn-button wdn-button-brand" type="submit">Save User</button>
+<button class="dcf-btn dcf-btn-primary" type="submit">Save User</button>
</form>
diff --git a/views/admin/new_event.erb b/views/admin/new_event.erb
index 3298ea3d3c5038f192bd6527af356f0edfdae7a3..0a39a061339657a0c132e45156c18ab53d4015d5 100644
--- a/views/admin/new_event.erb
+++ b/views/admin/new_event.erb
@@ -1,6 +1,7 @@
-<div class="wdn-grid-set">
- <form id="create-event-form" action="" method="POST" enctype="multipart/form-data">
- <div class="bp3-wdn-col-two-thirds">
+
+<form id="create-event-form" action="" method="POST" enctype="multipart/form-data">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-67%-start@sm">
<fieldset>
<legend style="margin-top: 0">Event Details</legend>
<label for="title"><span class="required">*</span> Title</label>
@@ -118,7 +119,7 @@
</fieldset>
</div>
- <div class="bp3-wdn-col-one-third">
+ <div class="dcf-col-100% dcf-col-33%-end@sm">
<div class="visual-island">
<div class="vi-header">
<label>Image</label>
@@ -135,16 +136,16 @@
</div>
</div>
</div>
-
- <div class="bp1-wdn-col-two-thirds">
- <button class="wdn-button wdn-button-brand wdn-pull-left" type="submit"><%= event.id.nil? ? 'Create' : 'Save' %> Event</button>
+ </div>
+ <div class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-67%-start@sm">
+ <button class="dcf-btndcf-btn-primary dcf-float-left" type="submit"><%= event.id.nil? ? 'Create' : 'Save' %> Event</button>
</div>
- </form>
-</div>
+ </div>
+</form>
<br>
-<script type="text/javascript">
-WDN.initializePlugin('jqueryui', [function() {
+<% append_script_declaration(%q[WDN.initializePlugin('jqueryui', [function() {
$ = require('jquery');
$('.datepicker').datepicker();
$("LINK[href^='//unlcms.unl.edu/wdn/templates_4.0/scripts/plugins/ui/css/jquery-ui.min.css']").remove();
@@ -173,5 +174,4 @@ WDN.initializePlugin('jqueryui', [function() {
$('#consider-for-unl-main').attr('disabled', 'disabled');
}
}).change();
-}]);
-</script>
\ No newline at end of file
+}]);]) %>
\ No newline at end of file
diff --git a/views/admin/new_hours.erb b/views/admin/new_hours.erb
index 266f8509fd83ee94e38c89fd8be04e00f40ab835..292a8f282a6c3140d58d7071e2e1c92733a898f9 100644
--- a/views/admin/new_hours.erb
+++ b/views/admin/new_hours.erb
@@ -3,8 +3,8 @@
</div>
<form id="create-hours" action="" method="POST">
- <div class="wdn-grid-set">
- <div class="bp1-wdn-col-one-half">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-50%-start@sm">
<label for="day-of-week">Day Of Week</label>
<select id="day-of-week" name="day_of_week">
<% (weekdays = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)).each_index do |i| %>
@@ -75,18 +75,17 @@
<input <%= 'checked="checked"' if record[:end] >= 720 %> class="end-time-am-pm" title="PM" type="radio" value="pm" name="<%= z %>">PM
</div>
- <button title="Remove" type="button" class="<%= 'hidden' if x == 0 %> remove-hours wdn-button">×</button>
+ <button title="Remove" type="button" class="<%= 'hidden' if x == 0 %> remove-hours dcf-btn">×</button>
</div>
<% end %>
</div>
- <button id="add-hours" type="button" class="wdn-button wdn-button-complement">Add Hours</button>
+ <button id="add-hours" type="button" class="dcf-btn wdn-button-complement">Add Hours</button>
</fieldset>
- <button type="submit" class="wdn-button wdn-button-brand">Submit</button>
+ <button type="submit" class="dcf-btn dcf-btn-primary">Submit</button>
</form>
-<script type="text/javascript">
-WDN.initializePlugin('jqueryui', [function() {
+<% append_script_declaration(%q[WDN.initializePlugin('jqueryui', [function() {
$ = require('jquery');
$('.datepicker').datepicker();
$("LINK[href^='//unlcms.unl.edu/wdn/templates_4.0/scripts/plugins/ui/css/jquery-ui.min.css']").remove();
@@ -126,5 +125,4 @@ WDN.initializePlugin('jqueryui', [function() {
$('#hours').val(JSON.stringify(hours));
});
-}]);
-</script>
\ No newline at end of file
+}]);]) %>
\ No newline at end of file
diff --git a/views/admin/new_resource_hours.erb b/views/admin/new_resource_hours.erb
index 2ffd735c7421c7c5eb8046cd62e3abcc402e1c83..f11a7e1c961fdb4dc5219683b9a0a80e7ef49225 100644
--- a/views/admin/new_resource_hours.erb
+++ b/views/admin/new_resource_hours.erb
@@ -3,8 +3,8 @@
</div>
<form id="create-hours" action="" method="POST">
- <div class="wdn-grid-set">
- <div class="bp1-wdn-col-one-half">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-50%-start@sm">
<label for="day-of-week">Day Of Week</label>
<select id="day-of-week" name="day_of_week">
<% (weekdays = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)).each_index do |i| %>
@@ -75,18 +75,17 @@
<input <%= 'checked="checked"' if record[:end] >= 720 %> class="end-time-am-pm" title="PM" type="radio" value="pm" name="<%= z %>">PM
</div>
- <button title="Remove" type="button" class="<%= 'hidden' if x == 0 %> remove-hours wdn-button">×</button>
+ <button title="Remove" type="button" class="<%= 'hidden' if x == 0 %> remove-hours dcf-btn">×</button>
</div>
<% end %>
</div>
- <button id="add-hours" type="button" class="wdn-button wdn-button-complement">Add Hours</button>
+ <button id="add-hours" type="button" class="dcf-btn wdn-button-complement">Add Hours</button>
</fieldset>
- <button type="submit" class="wdn-button wdn-button-brand">Submit</button>
+ <button type="submit" class="dcf-btn dcf-btn-primary">Submit</button>
</form>
-<script type="text/javascript">
-WDN.initializePlugin('jqueryui', [function() {
+<% append_script_declaration(%q[WDN.initializePlugin('jqueryui', [function() {
$ = require('jquery');
$('.datepicker').datepicker();
$("LINK[href^='//unlcms.unl.edu/wdn/templates_4.0/scripts/plugins/ui/css/jquery-ui.min.css']").remove();
@@ -126,5 +125,4 @@ WDN.initializePlugin('jqueryui', [function() {
$('#hours').val(JSON.stringify(hours));
});
-}]);
-</script>
\ No newline at end of file
+}]);]) %>
\ No newline at end of file
diff --git a/views/admin/resources.erb b/views/admin/resources.erb
index 21a87cc07668676dd472976bf63543b0d3654384..a8b3506766ac86cbbfd18d4ded71e371f4294c40 100644
--- a/views/admin/resources.erb
+++ b/views/admin/resources.erb
@@ -2,7 +2,7 @@
<h3>All Resources</h3>
</div>
-<a class="wdn-button wdn-button-brand" href="/<%= @space.url_name %>/admin/resources/create/">Create Resource</a><br><br>
+<a class="dcf-btn dcf-btn-primary" href="/<%= @space.url_name %>/admin/resources/create/">Create Resource</a><br><br>
<table>
<thead>
@@ -18,10 +18,10 @@
<%= resource.name %>
</td>
<td class="table-actions">
- <a href="/<%= @space.url_name %>/admin/resources/<%= resource.id %>/edit/" class="wdn-button wdn-button-brand">Edit</a>
- <a href="/<%= @space.url_name %>/admin/resources/<%= resource.id %>/hours/" class="wdn-button wdn-button-triad">Set Hours</a>
+ <a href="/<%= @space.url_name %>/admin/resources/<%= resource.id %>/edit/" class="dcf-btn dcf-btn-primary">Edit</a>
+ <a href="/<%= @space.url_name %>/admin/resources/<%= resource.id %>/hours/" class="dcf-btn wdn-button-triad">Set Hours</a>
<form method="POST" action="/<%= @space.url_name %>/admin/resources/<%= resource.id %>/delete/" class="delete-form delete-resource">
- <button class="wdn-button" type="submit">Delete</button>
+ <button class="dcf-btn" type="submit">Delete</button>
</form>
</td>
</tr>
@@ -29,8 +29,7 @@
</tbody>
</table>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration(%q[require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-resource').submit(function (submit) {
if (!window.confirm('Are you sure you want to delete this resource?')) {
@@ -38,5 +37,4 @@ require(['jquery'], function($) {
}
});
});
-});
-</script>
\ No newline at end of file
+});]) %>
\ No newline at end of file
diff --git a/views/admin/send_email.erb b/views/admin/send_email.erb
index 5e6b04d97c387f558a77da502bda755034dc026d..d8993fca7aa42138a4131c026e3c4f9d1f5a4eb7 100644
--- a/views/admin/send_email.erb
+++ b/views/admin/send_email.erb
@@ -3,8 +3,8 @@
</div>
<form action="" method="POST" enctype="multipart/form-data">
- <div class="wdn-grid-set">
- <fieldset class="bp2-wdn-col-one-half">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <fieldset class="dcf-col-100% dcf-col-50%-start@sm">
<legend>Send to:</legend>
<input type="checkbox" id="send-to-all-non-admins" name="send_to_all_non_admins"> <label for="send-to-all-non-admins">All Non-Admins of <%= @space.name %></label><br>
<input type="checkbox" id="send-to-all-users" name="send_to_all_users"> <label for="send-to-all-users">All Users of <%= @space.name %></label><br>
@@ -17,16 +17,16 @@
</select><br>
</fieldset>
- <fieldset class="bp2-wdn-col-one-half">
+ <fieldset class="dcf-col-100% dcf-col-50%-end@sm">
<legend>Attachments</legend>
<div id="files">
<div id="file-container" class="file-container" style="padding-right: 60px; position: relative;">
<input class="file-input" type="file" name="file_1" />
- <button style="display: none; position: absolute; right: 5px; top: 5px;" type="button" class="remove-file wdn-button">×</button>
+ <button style="display: none; position: absolute; right: 5px; top: 5px;" type="button" class="remove-file dcf-btn">×</button>
</div>
</div>
<br>
- <button id="add-file" type="button" class="wdn-button wdn-button-triad">Add another file</button>
+ <button id="add-file" type="button" class="dcf-btn wdn-button-triad">Add another file</button>
</fieldset>
</div>
@@ -39,14 +39,13 @@
<label for="body">Body:</label>
<textarea class="ckeditor" style="min-height: 150px" id="body" name="body"></textarea>
<br><br>
- <button type="submit" class="wdn-button wdn-button-brand">Send</button>
+ <button type="submit" class="dcf-btn dcf-btn-primary">Send</button>
</fieldset>
</form>
-<script type="text/javascript" src="/js/lib/ckeditor/ckeditor.js"></script>
+<% append_script_tag('/js/lib/ckeditor/ckeditor.js') %>
-<script type="text/javascript">
-var files = 1;
+<% append_script_declaration(%q[var files = 1;
require(['jquery'], function ($) {
$(document).ready(function () {
@@ -68,5 +67,4 @@ require(['jquery'], function ($) {
$(this).closest('.file-container').remove();
});
});
-});
-</script>
\ No newline at end of file
+});]) %>
\ No newline at end of file
diff --git a/views/admin/users.erb b/views/admin/users.erb
index 220a835da2f5e91dc711f3da68bbfa6bb350f78c..1c7597b5f64dd9ed29625f6cc40f120ed087cd89 100644
--- a/views/admin/users.erb
+++ b/views/admin/users.erb
@@ -1,24 +1,24 @@
<div id="pagetitle">
- <h3>Manage Users<span class="wdn-subhead"><a id="show-toolbox" href="#">Show Toolbox</a></span></h3>
+ <h3>Manage Users<span class="dcf-subhead"><a id="show-toolbox" href="#">Show Toolbox</a></span></h3>
</div>
<div id="toolbox" class="toolbox" style="display: none;">
<h3>Toolbox <span style="float: right;"><a style="color: white;" href="#" id="hide-toolbox">–</a></span></h3>
<div class="tools">
- <a class="wdn-button wdn-button-brand" href="<%= @space.admin_users_href %>add/">Add User</a>
- <a class="wdn-button wdn-button-brand" href="<%= @space.admin_users_href %><%= @user.id %>/edit/">Edit My User</a>
- <a class="wdn-button wdn-button-triad" href="<%= @space.admin_users_href %><%= @user.id %>/manage/">My Resources</a>
+ <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %>add/">Add User</a>
+ <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %><%= @user.id %>/edit/">Edit My User</a>
+ <a class="dcf-btnn wdn-button-triad" href="<%= @space.admin_users_href %><%= @user.id %>/manage/">My Resources</a>
</div>
</div>
<form id="find-controls">
- <div class="wdn-grid-set">
- <div class="wdn-col-one-fifth">
+ <div class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-25%-start@sm">
<label style="font-size: 120%; margin-right: 20px;">Find users by:</label>
<br>
- <a href="<%= @space.admin_users_href %>" class="wdn-button" style="font-size: 60%">Clear</a>
+ <a href="<%= @space.admin_users_href %>" class="dcf-btn" style="font-size: 60%">Clear</a>
</div>
- <div class="wdn-col-two-fifths">
+ <div class="dcf-col-100% dcf-col-75%-end@sm"">
<label>Resource Authorization:</label>
<select id="resource-authorization" name="resource_authorization">
<option value=""></option>
@@ -62,10 +62,10 @@
<% end %>
</td>
<td class="table-actions">
- <a href="<%= @space.admin_users_href %><%= user.id %>/edit/" class="wdn-button wdn-button-brand">Edit</a>
- <a href="<%= @space.admin_users_href %><%= user.id %>/manage/" class="wdn-button wdn-button-triad">Resources</a>
+ <a href="<%= @space.admin_users_href %><%= user.id %>/edit/" class="dcf-btn dcf-btn-primary">Edit</a>
+ <a href="<%= @space.admin_users_href %><%= user.id %>/manage/" class="dcf-btn wdn-button-triad">Resources</a>
<form class="delete-form delete-user" action="<%= @space.admin_users_href %><%= user.id %>/delete/" method="POST">
- <button type="submit" class="wdn-button">Delete</button>
+ <button type="submit" class="dcf-btn">Delete</button>
</form>
</td>
</tr>
@@ -78,8 +78,7 @@
<label>No users meet this criteria, or you have not added any. Open the toolbox to get started.</label>
<% end %>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration(%q[require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-user').submit(function (submit) {
if (!window.confirm('Are you sure you want to delete this user?')) {
@@ -109,5 +108,4 @@ require(['jquery'], function($) {
window.location = '?' + conditions.join('&');
});
});
-});
-</script>
\ No newline at end of file
+});]) %>
\ No newline at end of file
diff --git a/views/calendar.erb b/views/calendar.erb
index 646daae18c50b16cd5aa26eb0b18f5533dcaa924..4bf810008579f5f133bd4311a19d85cc6c2b1950 100644
--- a/views/calendar.erb
+++ b/views/calendar.erb
@@ -10,15 +10,15 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<div id="pagetitle">
<h3>
<%= @space.name %> Calendar
- <span class="wdn-subhead">See all our upcoming events!</span>
+ <span class="dcf-subhead">See all our upcoming events!</span>
</h3>
</div>
<div class="calendar">
<div class="calendar-header">
- <a href="/<%= @space.url_name %>/calendar/?date=<%= (date-7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="prev-week" class="schedulericon-angle-circled-left"><span class="wdn-text-hidden">Previous Week</span></a>
- <a href="/<%= @space.url_name %>/calendar/?date=<%= (date+7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="next-week" class="schedulericon-angle-circled-right"><span class="wdn-text-hidden">next week</span></a>
- <h4 class="wdn-sans-serif">
+ <a href="/<%= @space.url_name %>/calendar/?date=<%= (date-7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="prev-week" class="schedulericon-angle-circled-left"><span class="dcf-sr-only">Previous Week</span></a>
+ <a href="/<%= @space.url_name %>/calendar/?date=<%= (date+7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="next-week" class="schedulericon-angle-circled-right"><span class="dcf-sr-only">next week</span></a>
+ <h4 class="unl-font-sans">
<%= month = sunday.strftime('%B %Y') %><%= (month2 = (sunday+6.days).strftime('%B %Y')) == month ? '' : " - #{month2}" %>
</h4>
</div>
@@ -158,7 +158,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<div>
<h6 style="margin-top: 0px; margin-bottom: .25em;"><%= res.title ? (res.title.empty? ? 'Reserved' : res.title) : 'Reserved' %></h6>
<p style="margin-bottom: 10px;" class="eventicon-clock"><%= res.start_time.in_time_zone.strftime('%I:%M %p') %> - <%= res.end_time.in_time_zone.strftime('%I:%M %p') %></p>
- <p style="margin-bottom: 10px;"><a href="<%= res.info_link %>"" class="wdn-button wdn-button-brand wdn-button-small">View</a> <a href="<%= res.download_link %>" class="download-ics wdn-button wdn-button-triad wdn-button-small">Download</a></p>
+ <p style="margin-bottom: 10px;"><a href="<%= res.info_link %>"" class="dcf-btn dcf-btn-primary dcf-txt-sm">View</a> <a href="<%= res.download_link %>" class="download-ics dcf-btn wdn-button-triad dcf-txt-sm">Download</a></p>
<div class="close"><a href="#">×</a></div>
</div>
</div>
@@ -183,9 +183,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
</div>
-<script type="text/javascript">
-
-require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jquery.mCustomScrollbar.js'], function ($, functions) {
+<% append_script_declaration(%q[require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jquery.mCustomScrollbar.js'], function ($, functions) {
var openZ = 5;
var closedZ = 3;
$(document).ready(function () {
@@ -253,5 +251,4 @@ require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jque
tick();
setInterval(tick, 60000);
});
-});
-</script>
\ No newline at end of file
+});])
\ No newline at end of file
diff --git a/views/event_details.erb b/views/event_details.erb
index cd0fa0a2df219d2f5b28f39c958b465fa5d1062a..675bd1b13824a9ccab715b6b77890271fade6346 100644
--- a/views/event_details.erb
+++ b/views/event_details.erb
@@ -1,7 +1,7 @@
<div class="event-details">
<div>
<h3>
- <%= event.title %><span class="wdn-subhead"><%= event.type.description %></span>
+ <%= event.title %><span class="dcf-subhead"><%= event.type.description %></span>
</h3>
</div>
<div>
@@ -30,16 +30,16 @@
<% # the user is already signed up %>
<% if event.type.description == 'Free Event' %>
This event is noted on your homepage.<br>
- <a href="<%= @space.href %>" class="wdn-button wdn-button-triad">View Homepage</a>
+ <a href="<%= @space.href %>" class="dcf-btn wdn-button-triad">View Homepage</a>
<% else %>
You have signed up for this event.<br>
- <a href='<%= @space.href %>' class="wdn-button wdn-button-triad">View Homepage</a>
+ <a href='<%= @space.href %>' class="dcf-btn wdn-button-triad">View Homepage</a>
<% end %>
<% elsif @user %>
<% # the user is logged in but not signed up %>
<% if event.max_signups.nil? || event.signups.count < event.max_signups %>
<form action="/<%= @space.url_name %>/events/<%= event.id %>/sign_up/" class="delete-form" method="POST">
- <button type="submit" class="wdn-button wdn-button-brand">
+ <button type="submit" class="dcf-btn dcf-btn-primary">
<% if event.type.description == 'Free Event' %>
Note event on my homepage
<% else %>
@@ -54,10 +54,10 @@
<% # a non user. May still sign up for the event UNLESS it is a tool training %>
<% if event.type.description != 'Machine Training' %>
<% if event.max_signups.nil? || event.signups.count < event.max_signups %>
- <a class="wdn-button wdn-button-brand" href="/<%= @space.url_name %>/events/<%= event.id %>/sign_up_as_non_member/">Sign up for this event</a>
+ <a class="dcf-btn dcf-btn-primary" href="/<%= @space.url_name %>/events/<%= event.id %>/sign_up_as_non_member/">Sign up for this event</a>
<% else %>
All slots for this event are filled.
<% end %>
<% end %>
<% end %>
-<a href="<%= event.download_link %>" class="download-ics wdn-button wdn-button-triad">Download</a>
\ No newline at end of file
+<a href="<%= event.download_link %>" class="download-ics dcf-btn wdn-button-triad">Download</a>
\ No newline at end of file
diff --git a/views/fixed.erb b/views/fixed.erb
index a877cc9b587f6ae33caf3433d5f8ddd57630d2e1..e1f9c6baec31ebf5f888023578efade56109c83e 100644
--- a/views/fixed.erb
+++ b/views/fixed.erb
@@ -1,141 +1,164 @@
<!DOCTYPE html>
-<html class="no-js" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
+<html class="no-js" lang="en">
<head>
-<%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/metanfavico.html"))).result %>
-<!--
+ <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/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.
This message may not be removed from any pages based on the UNLedu Web Framework.
- $Id: fixed.dwt | 6edb0e1ee94038935f3821c6ce15dfd5c217b2e2 | Tue Dec 1 17:08:56 2015 -0600 | Kevin Abel $
--->
-<%= erb :'template_partials/scriptsandstyles' %>
-<!-- InstanceBeginEditable name="doctitle" -->
-<title><%= @title %> | University of Nebraska–Lincoln</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<link rel="stylesheet" href="/css/resource_scheduler.css">
-<link rel="stylesheet" href="/css/spencers.css">
-<% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
-<link rel="stylesheet" href="/css/kiosk.css">
-<% end %>
-<script type="text/javascript">WDN.initializePlugin("notice");</script>
-<link rel="stylesheet" href="/css/jquery.mCustomScrollbar.min.css" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="" -->
+ $Id$
+ -->
+ <!-- TemplateBeginEditable name="doctitle" -->
+ <title><%= @title %> | University of Nebraska–Lincoln</title>
+ <!-- TemplateEndEditable -->
+ <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_5.0/includes/global/head-2.html"))).result %>
+ <!-- TemplateBeginEditable name="head" -->
+ <!-- Place optional header elements here -->
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <link rel="stylesheet" href="/css/resource_scheduler.css">
+ <link rel="stylesheet" href="/css/spencers.css">
+ <% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
+ <link rel="stylesheet" href="/css/kiosk.css">
+ <% end %>
+ <link rel="stylesheet" href="/css/jquery.mCustomScrollbar.min.css" />
+ <!-- TemplateEndEditable -->
+ <!-- TemplateParam name="class" type="text" value="" -->
</head>
-<body class="" data-version="4.1">
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/skipnav.html"))).result %>
- <div id="wdn_wrapper">
- <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/noscript-padding.html"))).result %>
- <header id="header" role="banner" class="wdn-content-slide wdn-band">
- <div id="wdn_header_top">
- <span id="wdn_institution_title"><a href="http://www.unl.edu/">University of Nebraska–Lincoln</a></span>
- <div id="wdn_resources">
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/wdnResources.html"))).result %>
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/idm.html"))).result %>
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/search.html"))).result %>
- </div>
- </div>
- <div id="wdn_logo_lockup">
- <div class="wdn-inner-wrapper">
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/logo.html"))).result %>
- <span id="wdn_site_affiliation"><!-- InstanceBeginEditable name="affiliation" --><!-- InstanceEndEditable --></span>
- <span id="wdn_site_title"><!-- InstanceBeginEditable name="titlegraphic" -->UNL Resource Scheduler<!-- InstanceEndEditable --></span>
- </div>
- </div>
- </header>
- <div id="wdn_navigation_bar" class="wdn-band">
- <nav id="breadcrumbs" class="wdn-inner-wrapper" role="navigation" aria-label="breadcrumbs">
- <!-- InstanceBeginEditable name="breadcrumbs" -->
- <ul>
- <% @breadcrumbs.each do |crumb| %>
- <% if crumb[:href].nil? %>
- <li><%= crumb[:text] %></li>
- <% else %>
- <li><a href="<%= crumb[:href] %>" title="<%= crumb[:title] || crumb[:text] %>"><%= crumb[:text] %></a></li>
- <% end %>
- <% end %>
- </ul>
- <!-- InstanceEndEditable -->
- </nav>
- <div id="wdn_navigation_wrapper">
- <nav id="navigation" role="navigation" aria-label="main navigation">
- <!-- InstanceBeginEditable name="navlinks" -->
- <%= erb :'template_partials/navigation' %>
- <!-- InstanceEndEditable -->
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/navigation-addons.html"))).result %>
- </nav>
- </div>
- </div>
- <div class="wdn-menu-trigger wdn-content-slide">
- <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/share.html"))).result %>
- </div>
- <main id="wdn_content_wrapper" role="main" class="wdn-content-slide" tabindex="-1">
- <div id="maincontent" class="wdn-main">
- <div class="wdn-band">
- <% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
- <div class="kiosk-mode">
- <% else %>
- <div class="wdn-inner-wrapper">
- <% end %>
- <% unless session["notice"].nil? %>
- <% notices = session.delete("notice") %>
- <% notices.each do |notice| %>
- <% notice_class = '' %>
- <% case notice[:type]
- when 'success', :success
- notice_class = 'affirm'
- when 'failure', :failure
- notice_class = 'negate'
- when 'alert', 'danger', 'error', :error, :alert, :danger
- notice_class = 'alert' %>
- <% end %>
- <div id="notice" class="wdn_notice <%= notice_class %>">
- <div class="close">
- <a href="#" title="Close this notice">Close this notice</a>
- </div>
- <div class="message">
- <h4><%= notice[:header] %></h4>
- <div class="message-content">
- <%= notice[:message] %>
- </div>
- </div>
- </div>
- <% end %>
- <% else %>
- <% session.delete(:notice) %>
- <% session.delete("notice") %>
- <% end %>
- <%= yield %>
+<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 %>
+<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 %>
+ <!-- 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 %>
+ <!-- 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 %>
+ <!-- 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 %>
+ <!-- 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 %>
+ <!-- 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 %>
+ <!-- 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 %>
+</header>
+
+<main class="dcf-main" id="dcf-main" role="main" tabindex="-1">
+
+ <!-- TemplateBeginEditable name="hero" -->
+ <div class="dcf-hero dcf-hero-default">
+ <!-- TemplateEndEditable -->
+ <div class="dcf-hero-group-1">
+ <div class="dcf-breadcrumbs-wrapper">
+ <nav class="dcf-breadcrumbs" id="dcf-breadcrumbs" role="navigation" aria-label="breadcrumbs">
+ <!-- TemplateBeginEditable name="breadcrumbs" -->
+ <ol>
+ <% @breadcrumbs.each do |crumb| %>
+ <% if crumb[:href].nil? %>
+ <li><%= crumb[:text] %></li>
+ <% else %>
+ <li><a href="<%= crumb[:href] %>" title="<%= crumb[:title] || crumb[:text] %>"><%= crumb[:text] %></a></li>
+ <% end %>
+ <% end %>
+ </ol>
+ <!-- TemplateEndEditable -->
+ </nav>
+ </div>
+ <header class="dcf-page-title dcf-d-none" id="dcf-page-title">
+ <!-- TemplateBeginEditable name="pagetitle" -->
+ <!-- TemplateEndEditable -->
+ </header>
+ <!-- TemplateBeginEditable name="herogroup1" -->
+ <!-- TemplateEndEditable -->
+ </div>
+ <!-- TemplateBeginEditable name="herogroup2" -->
+ <div class="dcf-hero-group-2">
+ </div>
+ <!-- TemplateEndEditable -->
+ </div>
+ <div class="dcf-main-content dcf-wrapper">
+ <!-- TemplateBeginEditable name="maincontentarea" -->
+ <div class="dcf-bleed">
+ <% if defined?(kiosk_mode) && kiosk_mode == 'true' %>
+ <div class="kiosk-mode">
+ <% else %>
+ <div class="dcf-wrapper dcf-pb-8">
+ <% end %>
+
+ <% unless session["notice"].nil? %>
+ <% notices = session.delete("notice") %>
+ <% notices.each do |notice| %>
+ <% notice_class = '' %>
+ <% case notice[:type]
+ when 'success', :success
+ notice_class = 'affirm'
+ when 'failure', :failure
+ notice_class = 'negate'
+ when 'alert', 'danger', 'error', :error, :alert, :danger
+ notice_class = 'alert' %>
+ <% end %>
+ <div id="notice" class="wdn_notice <%= notice_class %>">
+ <div class="close">
+ <a href="#" title="Close this notice">Close this notice</a>
+ </div>
+ <div class="message">
+ <h4><%= notice[:header] %></h4>
+ <div class="message-content">
+ <%= notice[:message] %>
+ </div>
</div>
</div>
- </div>
- </main>
- <footer id="footer" role="contentinfo" class="wdn-content-slide">
- <div id="wdn_optional_footer" class="wdn-band wdn-footer-optional">
- <div class="wdn-inner-wrapper">
- <!-- InstanceBeginEditable name="optionalfooter" -->
- <!-- InstanceEndEditable -->
- </div>
- </div>
- <div id="wdn_local_footer" class="wdn-band wdn-footer-local">
- <div class="wdn-inner-wrapper">
- <%= erb :'template_partials/footer' %>
- </div>
- </div>
- <div id="wdn_global_footer" class="wdn-band wdn-footer-global">
- <div class="wdn-inner-wrapper">
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/globalfooter.html"))).result %>
- </div>
- </div>
- </footer>
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/noscript.html"))).result %>
+ <% end %>
+ <% else %>
+ <% session.delete(:notice) %>
+ <% session.delete("notice") %>
+ <% end %>
+ <%= yield %>
+ </div>
</div>
- <%= ERB.new(File.read(File.expand_path("#{ROOT}/public/wdn/templates_4.1/includes/body_scripts.html"))).result %>
+ <!-- TemplateEndEditable -->
+ </div>
+</main>
+<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 %>
+ <!-- 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 %>
+</footer>
+<%= 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 %>
+<!-- TemplateBeginEditable name="jsbody" -->
+<!-- put your custom javascript here -->
+<script type="text/javascript">WDN.initializePlugin("notice");</script>
+<%= @inline_body_script_content %>
+<!-- TemplateEndEditable -->
</body>
-<!-- InstanceEnd --></html>
\ No newline at end of file
+</html>
diff --git a/views/home.erb b/views/home.erb
index 32c0f6418a03afce9b81456543b211766d1b5482..e4799ad400418ea8abbb254ff046c8fca8a2b556 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -1,5 +1,5 @@
<div id="pagetitle">
- <h3>Welcome to UNL Resource Scheduler<span class="wdn-subhead"><%= @user.full_name if @user %></span></h3>
+ <h3>Welcome to UNL Resource Scheduler<span class="dcf-subhead"><%= @user.full_name if @user %></span></h3>
</div>
<p>
@@ -8,16 +8,16 @@ If you'd like your organization, building, or department in our scheduler, pleas
to set up a service space. Enjoy!
</p>
-<h5 class="wdn-center wdn-brand">Your Service Spaces</h5>
+<h5 class="dcf-txt-center">Your Service Spaces</h5>
<% unless @user %>
Please login to see your service spaces.<br>
-<a class="wdn-button wdn-button-brand" href="https://shib.unl.edu/idp/profile/cas/login?service=<%= "http://#{request.host}#{":" if request.port != 80}#{request.port if request.port != 80}#{request.path_info}" %>">Login</a>
+<a class="dcf-btn dcf-btn-primary" href="https://shib.unl.edu/idp/profile/cas/login?service=<%= "http://#{request.host}#{":" if request.port != 80}#{request.port if request.port != 80}#{request.path_info}" %>">Login</a>
<% end %>
<% unless spaces.empty? %>
- <div class="wdn-grid-set-fourths">
+ <div class="dcf-grid-full dcf-grid-fourths dcf-col-gap-vw">
<% spaces.each do |space| %>
- <div class="wdn-col wdn-center">
+ <div class="dcf-txt-center">
<a href="<%= space.href %>">
<div class="space-image">
<% if space.imagedata.nil? %>
@@ -34,7 +34,7 @@ Please login to see your service spaces.<br>
<% end %>
<% unless resources.empty? %>
- <h5 class="wdn-brand wdn-center">Available Resources</h5>
+ <h5 class="dcf-txt-center">Available Resources</h5>
<p>These resources are available to everyone at the University. You will be required to log in to reserve them.
<table>
<thead>
@@ -52,8 +52,8 @@ Please login to see your service spaces.<br>
</td>
<td class="table-actions">
<% if resource.is_reservable %>
- <a href="/<%= resource.service_space.url_name %>/resources/<%= resource.id %>/reserve/" class="wdn-button wdn-button-brand">Reserve Time</a>
- <a href="/<%= resource.service_space.url_name %>/resources/<%= resource.id %>/calendar/" class="wdn-button wdn-button-triad">See Calendar</a>
+ <a href="/<%= resource.service_space.url_name %>/resources/<%= resource.id %>/reserve/" class="dcf-btn dcf-btn-primary">Reserve Time</a>
+ <a href="/<%= resource.service_space.url_name %>/resources/<%= resource.id %>/calendar/" class="dcf-btn dcf-btn-primary">See Calendar</a>
<% else %>
Reservation not required
<% end %>
@@ -94,14 +94,14 @@ My Reservations (for resources available UNL-wide)
<%= reservation.length %> minutes
</td>
<td class="table-actions">
- <a href="<%= reservation.download_link %>" class="wdn-button wdn-button-triad">Download</a>
- <a href="<%= reservation.edit_link %>" class="wdn-button wdn-button-brand">Edit</a>
+ <a href="<%= reservation.download_link %>" class="dcf-btn wdn-button-triad">Download</a>
+ <a href="<%= reservation.edit_link %>" class="dcf-btn dcf-btn-primary">Edit</a>
<form method="POST" action="<%= reservation.cancel_link %>" class="delete-form">
- <button class="wdn-button" type="submit">Remove</button>
+ <button class="dcf-btn" type="submit">Remove</button>
</form>
<% unless reservation.recurring_reference_id.nil? %>
<form method="POST" action="<%= reservation.cancel_all_link %>" class="delete-form delete-recurring-reservation">
- <button class="wdn-button" type="submit">Remove All</button>
+ <button class="dcf-btn" type="submit">Remove All</button>
</form>
<% end %>
</td>
@@ -110,9 +110,7 @@ My Reservations (for resources available UNL-wide)
</tbody>
</table>
<% if total_pages > 1 %>
-<script>
- WDN.loadCSS(WDN.getTemplateFilePath('css/modules/pagination.css'));
-</script>
+<% append_script_declaration("WDN.loadCSS('/wdn/templates_4.1/css/modules/pagination.css');") %>
<div style="text-align: center;">
<div style="display: inline-block;">
<ul class="wdn_pagination" data-tab="pending" style="padding-left: 0;">
@@ -142,4 +140,4 @@ My Reservations (for resources available UNL-wide)
</div>
<% end %>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/views/reserve.erb b/views/reserve.erb
index 305b4671188916964655ee9ff28eb5ee7423f78c..6e3845680b44181ba0a462408158cc2b6096892d 100644
--- a/views/reserve.erb
+++ b/views/reserve.erb
@@ -24,8 +24,8 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
<form action="" method="POST">
-<section class="wdn-grid-set">
- <div class="bp1-wdn-col-two-thirds">
+<section class="dcf-grid dcf-col-gap-vw">
+ <div class="dcf-col-100% dcf-col-67%-start@sm">
<label>Schedule for <span id="current-date"><%= day.strftime('%m/%d/%Y') %></span></label>
<div class="calendar-container individual-day">
<label class="day-header"><%= day.strftime("%^a %-m/%d") %></label>
@@ -145,7 +145,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
</div>
</div>
- <div class="bp1-wdn-col-one-third">
+ <div class="dcf-col-100% dcf-col-33%-end@sm">
<label for="date">Date</label>
<div class="date-time-select">
<span class="wdn-icon-calendar"></span>
@@ -208,13 +208,12 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<br><br>
<% end %>
- <button type="submit" class="wdn-button wdn-button-brand"><%= reservation.nil? ? 'Reserve' : 'Update' %></button>
+ <button type="submit" class="dcf-btn dcf-btn-primary"><%= reservation.nil? ? 'Reserve' : 'Update' %></button>
</div>
</section>
</form>
-<script type="text/javascript">
-var ordinal = function(number) {
+<% append_script_declaration(%q[var ordinal = function(number) {
var mod = number % 100;
if (mod >= 11 && mod <= 13) {
return number + 'th';
@@ -320,5 +319,5 @@ WDN.initializePlugin('jqueryui', [function() {
});
setRecurringOptions($('#date'), $('#monthly-group'));
-}]);
-</script>
\ No newline at end of file
+}]);])
+%>
\ No newline at end of file
diff --git a/views/resource_calendar.erb b/views/resource_calendar.erb
index 931707b8987cc95516b4f4d897623528a0ca205e..d62b1673b0135de249ec29ba125d73390eb7c630 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="wdn-brand clear-top wdn-pull-left">
+ <h1 class="clear-top dcf-float-left">
<%= resource.name %>
</h1>
</div>
@@ -17,22 +17,22 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<% if kiosk_mode %>
<div class="kiosk-buttons">
<% if @user %>
- <a class="wdn-sans-serif" 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 %>
- <a class="wdn-button wdn-button-brand" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/?kiosk_mode=true">Reserve <%= resource.name %></a>
+ <a class="dcf-btn dcf-btn-primary" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/?kiosk_mode=true">Reserve <%= resource.name %></a>
</div>
<% end %>
<% unless kiosk_mode %>
-<div class="wdn-pull-right">
- <a class="wdn-button wdn-button-brand" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/">Reserve <%= resource.name %></a>
+<div class="dcf-float-right">
+ <a class="dcf-btn dcf-btn-primary" href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/">Reserve <%= resource.name %></a>
</div>
<% end %>
<div class="calendar">
<div class="calendar-header">
- <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/?date=<%= (date-7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="prev-week" class="schedulericon-angle-circled-left"><span class="wdn-text-hidden">Previous Week</span></a>
- <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/?date=<%= (date+7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="next-week" class="schedulericon-angle-circled-right"><span class="wdn-text-hidden">next week</span></a>
- <h4 class="wdn-sans-serif">
+ <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/?date=<%= (date-7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="prev-week" class="schedulericon-angle-circled-left"><span class="dcf-sr-only">Previous Week</span></a>
+ <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/?date=<%= (date+7.days).strftime('%Y-%m-%d') %><%= defined?(kiosk_mode) && kiosk_mode == 'true' ? '&kiosk_mode=true' : ''%>" id="next-week" class="schedulericon-angle-circled-right"><span class="dcf-sr-only">next week</span></a>
+ <h4 class="unl-font-sans">
<%= month = sunday.strftime('%B %Y') %><%= (month2 = (sunday+6.days).strftime('%B %Y')) == month ? '' : " - #{month2}" %>
</h4>
</div>
@@ -173,7 +173,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<h6 style="margin-top: 0px; margin-bottom: .25em;"><%= res.title ? (res.title.empty? ? 'Reserved' : res.title) : 'Reserved' %></h6>
<p style="margin-bottom: 10px;" class="eventicon-clock"><%= res.start_time.in_time_zone.strftime('%I:%M %p') %> - <%= res.end_time.in_time_zone.strftime('%I:%M %p') %><br>
Reserved by: <span class="italic"><%= res.user.full_name rescue nil %></span></p>
- <p style="margin-bottom: 10px;"><a href="<%= res.download_link %>" class="download-ics wdn-button wdn-button-triad wdn-button-small">Download</a></p>
+ <p style="margin-bottom: 10px;"><a href="<%= res.download_link %>" class="download-ics dcf-btn wdn-button-triad dcf-txt-sm">Download</a></p>
<div class="close"><a href="#">×</a></div>
</div>
</div>
@@ -198,9 +198,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
</div>
-<script type="text/javascript">
-
-require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jquery.mCustomScrollbar.js'], function ($, functions) {
+<% append_script_declaration(%q[require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jquery.mCustomScrollbar.js'], function ($, functions) {
var openZ = 5;
var closedZ = 3;
$(document).ready(function () {
@@ -270,12 +268,11 @@ require(['jquery', '/js/functions.js', '/js/jquery.mousewheel.min.js', '/js/jque
setInterval(tick, 60000);
});
});
-</script>
+</script>])
-<% if @user && kiosk_mode # auto logout after 10 minutes! %>
-<script type="text/javascript">
- window.setTimeout(function() {
+if @user && kiosk_mode # auto logout after 10 minutes!
+ append_script_declaration(%q[window.setTimeout(function() {
window.location = '/kiosk-logout/?url_redirect=' + encodeURIComponent(window.location);
- }, 10*60*1000);
-</script>
-<% end %>
\ No newline at end of file
+ }, 10*60*1000);])
+end
+%>
\ No newline at end of file
diff --git a/views/resources.erb b/views/resources.erb
index 8fab1a8964a9f992ee58a5f4f05b008294b70f7c..0196be12ea5bd021b908733724b52db40db7b868 100644
--- a/views/resources.erb
+++ b/views/resources.erb
@@ -18,8 +18,8 @@
</td>
<td class="table-actions">
<% if resource.is_reservable %>
- <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/" class="wdn-button wdn-button-brand">Reserve Time</a>
- <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/" class="wdn-button wdn-button-triad">See Calendar</a>
+ <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/reserve/" class="dcf-btn dcf-btn-primary">Reserve Time</a>
+ <a href="/<%= @space.url_name %>/resources/<%= resource.id %>/calendar/" class="dcf-btn wdn-button-triad">See Calendar</a>
<% else %>
Reservation not required
<% end %>
diff --git a/views/space_home.erb b/views/space_home.erb
index e3783909e29e4ef6b0761a76f5ddd71dec518085..d0f17de918fcbc24a40a4f3603d2e165a8426609 100644
--- a/views/space_home.erb
+++ b/views/space_home.erb
@@ -1,5 +1,5 @@
<div id="pagetitle">
- <h3>Welcome to <%= @space.name %> Resource Scheduler<span class="wdn-subhead">Hello, <%= @user.full_name %></span></h3>
+ <h3>Welcome to <%= @space.name %> Resource Scheduler<span class="dcf-subhead">Hello, <%= @user.full_name %></span></h3>
</div>
<h4>
@@ -7,7 +7,7 @@ My Reservations
</h4>
<% if reservations.empty? %>
You have no upcoming reservations. You can view upcoming trainings to get certified, or check out the list of resources you can reserve.<br>
-<a href="<%= @space.resources_href %>" class="wdn-button wdn-button-brand">View Resources</a>
+<a href="<%= @space.resources_href %>" class="dcf-btn dcf-btn-primary">View Resources</a>
<% else %>
<table>
<thead>
@@ -34,14 +34,14 @@ You have no upcoming reservations. You can view upcoming trainings to get certif
<%= reservation.length %> minutes
</td>
<td class="table-actions">
- <a href="<%= reservation.download_link %>" class="wdn-button wdn-button-triad">Download</a>
- <a href="/<%= @space.url_name %>/resources/<%= reservation.resource.id %>/edit_reservation/<%= reservation.id %>/" class="wdn-button wdn-button-brand">Edit</a>
+ <a href="<%= reservation.download_link %>" class="dcf-btn wdn-button-triad">Download</a>
+ <a href="/<%= @space.url_name %>/resources/<%= reservation.resource.id %>/edit_reservation/<%= reservation.id %>/" class="dcf-btn dcf-btn-primary">Edit</a>
<form method="POST" action="/<%= @space.url_name %>/resources/<%= reservation.resource.id %>/cancel/<%= reservation.id %>/" class="delete-form">
- <button class="wdn-button" type="submit">Remove</button>
+ <button class="dcf-btn" type="submit">Remove</button>
</form>
<% unless reservation.recurring_reference_id.nil? %>
<form method="POST" action="/<%= @space.url_name %>/resources/<%= reservation.resource.id %>/cancel_all/<%= reservation.recurring_reference_id %>/" class="delete-form delete-recurring-reservation">
- <button class="wdn-button" type="submit">Remove All</button>
+ <button class="dcf-btn" type="submit">Remove All</button>
</form>
<% end %>
</td>
@@ -50,9 +50,7 @@ You have no upcoming reservations. You can view upcoming trainings to get certif
</tbody>
</table>
<% if total_pages > 1 %>
-<script>
- WDN.loadCSS(WDN.getTemplateFilePath('css/modules/pagination.css'));
-</script>
+<% append_script_declaration("WDN.loadCSS('/wdn/templates_4.1/css/modules/pagination.css');") %>
<div style="text-align: center;">
<div style="display: inline-block;">
<ul class="wdn_pagination" data-tab="pending" style="padding-left: 0;">
@@ -89,7 +87,7 @@ My Events
</h4>
<% if events.empty? %>
You have not signed up for any upcoming events. Why not check out the calendar to find some?<br>
-<a href="<%= @space.calendar_href %>" class="wdn-button wdn-button-triad">View Calendar</a>
+<a href="<%= @space.calendar_href %>" class="dcf-btn wdn-button-triad">View Calendar</a>
<% else %>
<table>
<thead>
@@ -110,9 +108,9 @@ You have not signed up for any upcoming events. Why not check out the calendar t
<%= event.location.name %>
</td>
<td class="table-actions">
- <a href="<%= event.download_link %>" class="wdn-button wdn-button-triad">Download</a>
+ <a href="<%= event.download_link %>" class="dcf-btn wdn-button-triad">Download</a>
<form action="/<%= @space.url_name %>/events/<%= event.id %>/remove_signup/" method="POST" class="delete-form">
- <button class="wdn-button" type="submit">
+ <button class="dcf-btn" type="submit">
Remove
</button>
</form>
@@ -123,8 +121,7 @@ You have not signed up for any upcoming events. Why not check out the calendar t
</table>
<% end %>
-<script type="text/javascript">
-require(['jquery'], function($) {
+<% append_script_declaration("require(['jquery'], function($) {
$(document).ready(function() {
$('.delete-recurring-reservation').submit(function (submit) {
if (!window.confirm('This will remove all recurrences of this reservation. Are you sure?')) {
@@ -132,5 +129,4 @@ require(['jquery'], function($) {
}
});
});
-});
-</script>
\ No newline at end of file
+});")%.
\ No newline at end of file
diff --git a/views/template_partials/footer.erb b/views/template_partials/footer.erb
index c314c3fac2ed15872bfe6d6a2c3073bd467adca0..85bd64efad3d4f8eeeae33bf93837768379097e4 100644
--- a/views/template_partials/footer.erb
+++ b/views/template_partials/footer.erb
@@ -1,19 +1,15 @@
-<div class="wdn-grid-set wdn-footer-links-local">
- <div class="bp960-wdn-col-two-thirds">
- <div class="wdn-footer-module">
- <span role="heading" class="wdn-footer-heading">About UNL Resource Scheduler</span>
- <p>This application is a product of the <a href="https://iim.unl.edu/">Internet and Interactive Media group at Nebraska</a>. IIM is a partnership of <a href="https://ucomm.unl.edu/">University Communication</a> and <a href="https://its.unl.edu/">Information Technology Services</a>.</p>
- </div>
- </div>
- <div class="bp960-wdn-col-one-third">
- <div class="wdn-footer-module">
- <span role="heading" class="wdn-footer-heading">Related Links</span>
- <ul class="wdn-related-links-v1">
- <li><a href="http://wdn.unl.edu/">Web Developer Network</a></li>
- <li><a href="http://iim.unl.edu/">Internet and Interactive Media</a></li>
- <li><a href="http://ucomm.unl.edu/">University Communication</a></li>
- <li><a href="http://its.unl.edu/">Information Technology Services</a></li>
- </ul>
- </div>
- </div>
-</div>
\ No newline at end of file
+<nav id="dcf-footer-group-1" role="navigation" aria-labelledby="dcf-footer-group-1-heading">
+ <div class="">
+ <h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-1-heading">About UNL Resource Scheduler</h3>
+ <p>This application is a product of the <a href="https://iim.unl.edu/">Internet and Interactive Media group at Nebraska</a>. IIM is a partnership of <a href="https://ucomm.unl.edu/">University Communication</a> and <a href="https://its.unl.edu/">Information Technology Services</a>.</p>
+ </div>
+</nav>
+<nav id="dcf-footer-group-2" role="navigation" aria-labelledby="dcf-footer-group-2-heading">
+ <h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-2-heading">Related Links</h3>
+ <ul class="dcf-list-bare dcf-mb-0">
+ <li><a href="http://wdn.unl.edu/">Web Developer Network</a></li>
+ <li><a href="http://iim.unl.edu/">Internet and Interactive Media</a></li>
+ <li><a href="http://ucomm.unl.edu/">University Communication</a></li>
+ <li><a href="http://its.unl.edu/">Information Technology Services</a></li>
+ </ul>
+</nav>
\ No newline at end of file
diff --git a/views/template_partials/related_links.erb b/views/template_partials/related_links.erb
deleted file mode 100644
index 47967d8ab3856c63bf27534cdb478a08b54e8c15..0000000000000000000000000000000000000000
--- a/views/template_partials/related_links.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="wdn-footer-module">
- <span role="heading" class="wdn-footer-heading">Related Links</span>
- <ul>
- </ul>
-</div>
\ No newline at end of file
diff --git a/views/template_partials/scriptsandstyles.erb b/views/template_partials/scriptsandstyles.erb
deleted file mode 100644
index 8cf695239a03556b5e5eab4633b35542fc956714..0000000000000000000000000000000000000000
--- a/views/template_partials/scriptsandstyles.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% UNL_WDN_FRAMEWORK_VERSION = '4.1.9' %>
-<link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
-<link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_4.1/css/all.css?dep=<%= UNL_WDN_FRAMEWORK_VERSION %>" />
-<link rel="stylesheet" media="print" href="https://unlcms.unl.edu/wdn/templates_4.1/css/print.css?dep=<%= UNL_WDN_FRAMEWORK_VERSION %>" />
-<script src="https://unlcms.unl.edu/wdn/templates_4.1/scripts/compressed/all.js?dep=<%= UNL_WDN_FRAMEWORK_VERSION %>" id="wdn_dependents"></script>
\ No newline at end of file