Commit 334f7a41 authored by Jeff Sturek's avatar Jeff Sturek
Browse files

Merge branch 'remove-wdn' into 'master'

Remove WDN References

See merge request !27
parents d4def5ad 2f6f81fe
This diff is collapsed.
......@@ -21,29 +21,3 @@
font-weight: 600;
font-style: normal;
}
.sans-serif-font() {
font-family: "Gotham SSm A", "Gotham SSm B", Verdana, "Verdana Ref", Geneva, Tahoma, "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans", "Liberation Sans", sans-serif;
font-weight: 400;
font-style: normal;
}
.fontello() {
font-family: "wdn-icon";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
// For safety - reset parent styles, that can break glyph codes
font-variant: normal;
text-transform: none;
// Uncomment for 3D effect
// text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3);
}
......@@ -5,12 +5,6 @@
@import "lib/fonts.less";
@import "lib/eventicon-embedded.less";
.sans-serif-font() {
font-family: "Gotham SSm A", "Gotham SSm B", Verdana, "Verdana Ref", Geneva, Tahoma, "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans", "Liberation Sans", sans-serif;
font-weight: 400;
font-style: normal;
}
.clearfix:after {
content: " "; /* Older browsers do not support empty content */
visibility: hidden;
......@@ -19,21 +13,6 @@
clear: both;
}
.icon-calendar:before {
content: "\e812";
speak: none;
display: inline-block;
font-family: wdn-icon;
font-style: normal;
font-variant: normal;
font-weight: 400;
margin-right: 0.2em;
text-align: center;
text-decoration: inherit;
text-transform: none;
width: 1em;
}
.tooltip {
> div {
position: absolute;
......@@ -159,45 +138,20 @@
}
}
#pagetitle h3 {
margin-top: 0;
}
.dcf-main-content form {
fieldset {
margin: 0;
margin-bottom: 1em;
}
legend {
font-size: 1.5em;
margin-top: 0.5em;
margin-bottom: 1em;
padding-bottom: 0;
}
&.delete-form, &.inline-form {
display: inline;
padding: 0;
}
input {
word-wrap: normal;
&[disabled] {
background: #CCCCCC;
}
}
textarea {
resize: vertical;
}
.helper {
font-family: "Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;
}
.offset-field-group {
background: @dark-triad;
border: solid 1px var(--b);
background: var(--bg-dialog);
border-radius: .5em;
padding: 1em;
label {
color: @cream;
color: var(--body);
}
}
}
......@@ -417,8 +371,8 @@ label.day-header {
margin-bottom: 1em;
padding: 0 23px 1.777em;
padding: 0 1.425rem 1.777em;
border-top: 5px solid #D00000;
background-color: #fff;
border-top: 5px solid var(--brand-alpha);
background-color: var(--bg-dialog);
box-shadow: 0 0 0 1px fadeout(mix(#000, @cream, 92%), 90%);
.date-wrapper,
......@@ -426,19 +380,18 @@ label.day-header {
.location,
.contact {
display: block;
.sans-serif-font();
font-size: 13px;
font-size: 0.802rem;
&:before {
color: @ui05;
color: var(--brand-alpha);
}
}
.description {
margin: 1em 0 0;
padding-top: 1em;
border-top: 1px solid mix(#000, @cream, 24%);
border-top: 1px solid var(--b);
}
}
......@@ -513,32 +466,6 @@ label.day-header {
border: 1px solid var(--b);
margin-bottom: 0.75em;
text-align: center;
&.hours {
text-align: left;
}
.icon-calendar {
margin-right: -2.3em;
position: relative;
z-index: 2;
margin-left: 0.8em;
}
.am_pm {
display: inline-block;
font-family: "Gotham";
font-size: .75em;
margin-left: .75em;
}
input {
padding-left: 2.3em;
width: 90%;
position: relative;
text-align: center;
}
select {
width: 90%;
text-align: center;
padding: 0;
}
> * {
vertical-align: middle;
}
......@@ -553,16 +480,6 @@ label.day-header {
.medium-block {
display: block !important;
}
.date-time-select {
input {
width: 100%;
}
select {
width: 30%;
text-align: center;
}
}
}
......@@ -594,16 +511,3 @@ label.day-header {
background-repeat: no-repeat;
z-index: 3;
}
.wdn_tabs>li {
background-color: var(--bg-light-gray);
.selected {
background-color: var(--bg-tab-selected);
}
}
.wdn_tabs_content {
background-color: var(--bg-tabs-panel);
border-color: var(--b-tab);
}
<div id="pagetitle">
<h3>Add User</h3>
</div>
<h1 class="dcf-txt-h3">Add User</h1>
<form id="edit-user" action="" method="POST">
<form class="dcf-form" id="edit-user" action="" method="POST">
<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>
<select id="user_id" name="user_id">
<option value=""></option>
<% available_users.each do |user| %>
<option value="<%= user.id %>"><%= user.sortable_name %>
<% end %>
</select>
<div class="dcf-form-group">
<label for="user_id">User</label>
<select id="user_id" name="user_id">
<option value=""></option>
<% available_users.each do |user| %>
<option value="<%= user.id %>"><%= user.sortable_name %>
<% end %>
</select>
</div>
</fieldset>
<% if @user.is_super_user?(@space) %>
......@@ -21,17 +21,20 @@
<fieldset>
<legend>Manager Permissions</legend>
<% permissions.each do |perm| %>
<input type="checkbox" id="permission-<%= perm.id %>" name="permission_<%= perm.id %>">
<label for="permission-<%= perm.id %>"><%= perm.name %></label><br>
<div class="dcf-form-group dcf-input-checkbox">
<input type="checkbox" id="permission-<%= perm.id %>" name="permission_<%= perm.id %>">
<label for="permission-<%= perm.id %>"><%= perm.name %></label>
</div>
<% end %>
</fieldset>
<fieldset>
<legend>Make Super User</legend>
<label>Super Users can edit any user's permissions in the space and can create new Super Users, as well as
remove your Super User status. Only give Super User to someone you <em>absolutely</em> trust.</label><br>
<br>
<input type="checkbox" id="permission-<%= su_permission.id %>" name="permission_<%= su_permission.id %>">
<label for="permission-<%= su_permission.id %>"><%= su_permission.name %></label><br>
<p>Super Users can edit any user's permissions in the space and can create new Super Users, as well as
remove your Super User status. Only give Super User to someone you <em>absolutely</em> trust.</p>
<div class="dcf-form-group dcf-input-checkbox">
<input type="checkbox" id="permission-<%= su_permission.id %>" name="permission_<%= su_permission.id %>">
<label for="permission-<%= su_permission.id %>"><%= su_permission.name %></label>
</div>
</fieldset>
</div>
<% end %>
......
<form style="float: right; width: 320px;">
<form class="dcf-form dcf-float-right">
<div class="offset-field-group">
<label for="date">Go to another date:</label>
<div class="date-time-select">
<span class="icon-calendar"></span>
<input style="width: 90%;" id="date" name="date" title="Reservation Date" type="text" class="datepicker" value="<%= date.strftime('%m/%d/%Y') %>" />
<div class="dcf-datepicker">
<input id="date" name="date" title="Reservation Date" type="text" value="<%= date.strftime('%m/%d/%Y') %>" />
</div>
</div>
</form>
<div id="pagetitle">
<h3>Today's Agenda <span class="dcf-subhead"><%= date.strftime('%B %d, %Y') %></h3>
</div>
<h1 class="dcf-txt-h3">Today's Agenda <span class="dcf-subhead"><%= date.strftime('%B %d, %Y') %></h1>
<h4>
Today's Hours
</h4>
<h2 class="dcf-txt-h4">Today's Hours</h2>
<% unless space_hour.nil? %>
<%= space_hour.hours.map do |record|
start_time = date + record[:start].minutes
......@@ -26,13 +20,11 @@ Today's Hours
The space is open all day.
<% end %>
<h4>
Today's Reservations
</h4>
<h2 class="dcf-txt-h4">Today's Reservations</h2>
<% if reservations.empty? %>
No reservations today. Hopefully someone will still come in to use the space!<br>
<% else %>
<table>
<table class="dcf-w-100% dcf-table dcf-table-bordered">
<thead>
<tr>
<th>Name</th>
......@@ -62,7 +54,7 @@ No reservations today. Hopefully someone will still come in to use the space!<br
<%= reservation.length %> minutes
</td>
<td>
<form class="delete-form" method="POST" action="/<%= @space.url_name %>/admin/agenda/reservations/<%= reservation.id %>/remove/">
<form class="dcf-form delete-form" method="POST" action="/<%= @space.url_name %>/admin/agenda/reservations/<%= reservation.id %>/remove/">
<button class="dcf-btn dcf-btn-primary" type="submit">Remove</button>
</form>
</td>
......@@ -72,14 +64,12 @@ No reservations today. Hopefully someone will still come in to use the space!<br
</table>
<% end %>
<h4 class="dcf-mt-6">
Today's Events
</h4>
<h2 class="dcf-txt-h4 dcf-mt-6">Today's Events</h2>
<% if events.empty? %>
No events today. Perhaps you'd like to create one?<br>
<a href="<%= @space.admin_events_href %>/create/" class="dcf-btn dcf-btn-primary">New Event</a>
<a href="<%= @space.admin_events_href %>/create/" class="dcf-mt-6 dcf-btn dcf-btn-primary">New Event</a>
<% else %>
<table>
<table class="dcf-w-100% dcf-table dcf-table-bordered">
<thead>
<tr>
<th>Title</th>
......@@ -104,15 +94,12 @@ No events today. Perhaps you'd like to create one?<br>
<% end %>
</tbody>
</table>
<br>
<a href="<%= @space.admin_events_href %>" class="dcf-btn dcf-btn-secondary">Go To Events</a>
<a href="<%= @space.admin_events_href %>" class="dcf-mt-6 dcf-btn dcf-btn-secondary">Go To Events</a>
<% end %>
<% append_script_declaration("WDN.initializePlugin('datepickers');") %>
<% 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();
$('#date').change(function () {
var date = $('#date').val().split('/');
window.location = window.location.href.split('?')[0] + '?date=' + date[2] + '-' + date[0] + '-' + date[1];
......
<div id="pagetitle">
<h3><%= resource.id.nil? ? 'Create Resource' : "Edit #{resource.name}" %></h3>
</div>
<h1 class="dcf-txt-h3"><%= resource.id.nil? ? 'Create Resource' : "Edit #{resource.name}" %></h1>
<form action="" method="POST">
<label for="name">Name</label>
<input type="text" name="name" id="name" value='<%= resource.name %>'/>
<form class="dcf-form" action="" method="POST">
<div class="dcf-form-group">
<label for="name">Name</label>
<input class="dcf-w-100%" type="text" name="name" id="name" value='<%= resource.name %>'/>
</div>
<label for="description">Description</label>
<textarea id="description" name="description"><%= resource.description %></textarea>
<div class="dcf-form-group">
<label for="description">Description</label>
<textarea id="description" name="description"><%= resource.description %></textarea>
</div>
<div>
<input type="checkbox" <%= 'checked="checked"' if resource.is_reservable || resource.id.nil? %> name='is_reservable' id="is-reservable">
<label for="is-reservable">Requires Reservation?</label>
</div>
<div>
<label for="minutes-per-reservation">Minutes Per Reservation</label><br>
<input type="radio" name="time_slot_type" id="time-slot-type-exact" value="exact" <%= 'checked="checked"' if resource.time_slot_type == 'exact' || resource.time_slot_type.nil? %>>
<label for="time-slot-type-exact">Exactly:</label> <input type="number" name="minutes_per_reservation" id="minutes-per-reservation" value="<%= resource.minutes_per_reservation %>"><br><br>
<input type="radio" name="time_slot_type" id="time-slot-type-range" value="range" <%= 'checked="checked"' if resource.time_slot_type == 'range' %>>
<label for="time-slot-type-range">Range:</label>
<label for="min-minutes-per-reservation">Min:</label> <input style="width: 100px" type="number" name="min_minutes_per_reservation" id="min-minutes-per-reservation" value="<%= resource.min_minutes_per_reservation %>">
<label for="max-minutes-per-reservation">Max:</label> <input style="width: 100px" type="number" name="max_minutes_per_reservation" id="max-minutes-per-reservation" value="<%= resource.max_minutes_per_reservation %>">
<label for="increment-minutes-per-reservation">Increment:</label> <input style="width: 100px" type="number" name="increment_minutes_per_reservation" id="increment-minutes-per-reservation" value="<%= resource.increment_minutes_per_reservation %>"><br>
</div>
<div>
<input type="checkbox" <%= 'checked="checked"' if resource.available_app_wide %> name='available_app_wide' id="available-app-wide">
<label for="available-app-wide">Open to all Users? (Checking this will allow ANYONE who signs in to UNL Resource Scheduler
to reserve the resource)</label>
</div>
<br>
<div class="dcf-form-group dcf-input-checkbox">
<input type="checkbox" <%= 'checked="checked"' if resource.is_reservable || resource.id.nil? %> name='is_reservable' id="is-reservable">
<label for="is-reservable">Requires Reservation?</label>
</div>
<button type="submit" class="dcf-btn dcf-btn-primary">Save Resource</button>
</form>
\ No newline at end of file
<fieldset>
<legend>Minutes Per Reservation</legend>
<div class="dcf-form-group">
<div class="dcf-form-group dcf-input-radio">
<input type="radio" name="time_slot_type" id="time-slot-type-exact" value="exact" <%= 'checked="checked"' if resource.time_slot_type == 'exact' || resource.time_slot_type.nil? %>>
<label for="time-slot-type-exact">Exactly:</label>
</div>
<div class="dcf-form-group dcf-pl-5">
<label for="minutes-per-reservation">Min:</label>
<input class="dcf-w-10" type="number" name="minutes_per_reservation" id="minutes-per-reservation" value="<%= resource.minutes_per_reservation %>">
</div>
</div>
<div class="dcf-form-group">
<div class="dcf-form-group dcf-input-radio">
<input type="radio" name="time_slot_type" id="time-slot-type-range" value="range" <%= 'checked="checked"' if resource.time_slot_type == 'range' %>>
<label for="time-slot-type-range">Range:</label>
</div>
<div class="dcf-form-group dcf-pl-5">
<div class="dcf-form-group">
<label for="min-minutes-per-reservation">Min:</label>
<input class="dcf-w-10" type="number" name="min_minutes_per_reservation" id="min-minutes-per-reservation" value="<%= resource.min_minutes_per_reservation %>">
</div>
<div class="dcf-form-group">
<label for="max-minutes-per-reservation">Max:</label>
<input class="dcf-w-10" type="number" name="max_minutes_per_reservation" id="max-minutes-per-reservation" value="<%= resource.max_minutes_per_reservation %>">
</div>
<div class="dcf-form-group">
<label for="increment-minutes-per-reservation">Increment:</label>
<input class="dcf-w-10" type="number" name="increment_minutes_per_reservation" id="increment-minutes-per-reservation" value="<%= resource.increment_minutes_per_reservation %>">
</div>
</div>
</div>
</fieldset>
<div class="dcf-form-group dcf-input-checkbox">
<input type="checkbox" <%= 'checked="checked"' if resource.available_app_wide %> name='available_app_wide' id="available-app-wide">
<label for="available-app-wide">Open to all Users? (Checking this will allow ANYONE who signs in to UNL Resource Scheduler
to reserve the resource)</label>
</div>
<button type="submit" class="dcf-mt-6 dcf-btn dcf-btn-primary">Save Resource</button>
</form>
<div id="pagetitle">
<h3>
This Week's Hours for <%= resource.name %>
<span class="dcf-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
</h3>
</div>
<h1 class="dcf-txt-h3">
This Week's Hours for <%= resource.name %>
<span class="dcf-subhead"><%= "#{sunday.strftime("%m/%d")} - #{(sunday+6.days).strftime("%m/%d")}" %></span>
</h1>
<div style="margin-bottom: 16px;">
<div class="dcf-mb-3">
<a href="<%= resource.edit_hours_href %>?date=<%= (date-7.days).strftime('%Y-%m-%d') %>" class="dcf-btn dcf-btn-secondary" id="prev-week">&lt; PREV</a>
<a href="<%= resource.edit_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="dcf-btn dcf-btn-secondary" style="float: right;" id="next-week">NEXT &gt;</a>
<a href="<%= resource.edit_hours_href %>?date=<%= (date+7.days).strftime('%Y-%m-%d') %>" class="dcf-btn dcf-btn-secondary dcf-float-right" id="next-week">NEXT &gt;</a>
</div>
<table>
<table class="dcf-w-100% dcf-table dcf-table-bordered">
<thead>
<tr>
<th>Day</th>
......@@ -40,12 +38,10 @@
</tbody>
</table>
<h3>
Upcoming Changes
</h3>
<h3 class="dcf-mt-6">Upcoming Changes</h3>
<a class="dcf-btn dcf-btn-primary" href="<%= resource.add_hours_href %>">Add Hours Change</a><br><br>
<table>
<table class="dcf-w-100% dcf-table dcf-table-bordered">
<thead>
<tr>
<th>Day</th>
......@@ -77,8 +73,8 @@ Upcoming Changes
</td>
<td class="table-actions">
<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="dcf-btn">Remove</button>
<form class="dcf-form delete-space-hour delete-form" action="<%= @space.admin_resources_href %><%= resource.id %>/hours/<%= resource_hour.id %>/delete/" method="POST">
<button type="submit" class="dcf-btn dcf-btn-secondary">Remove</button>
</form>
</td>
</tr>
......
<div id="pagetitle">
<h3>Edit User <%= user.username %></h3>
</div>
<h1 class="dcf-txt-h3">Edit User <%= user.username %></h1>
<form id="edit-user" action="" method="POST">
<form class="dcf-form" id="edit-user" action="" method="POST">
<div class="dcf-grid dcf-col-gap-vw">
<% if @user.is_super_user?(@space) %>
<div class="dcf-col-100% dcf-col-50%-start@sm">
<fieldset>
<legend>Manager Permissions</legend>
<% permissions.each do |perm| %>
<input <%= 'checked="checked"' if user.permissions_in_space(@space).include?(perm) %> type="checkbox" id="permission-<%= perm.id %>" name="permission_<%= perm.id %>">
<label for="permission-<%= perm.id %>"><%= perm.name %></label><br>
<div class="dcf-form-group dcf-input-checkbox">
<input <%= 'checked="checked"' if user.permissions_in_space(@space).include?(perm) %> type="checkbox" id="permission-<%= perm.id %>" name="permission_<%= perm.id %>">
<label for="permission-<%= perm.id %>"><%= perm.name %></label>
</div>
<% end %>
</fieldset>
<fieldset>
<legend>Make Super User</legend>
<label>Super Users can edit any user's permissions in the space and can create new Super Users, as well as
remove your Super User status. Only give Super User to someone you <em>absolutely</em> trust.</label><br>
<br>
<input <%= 'checked="checked"' if user.permissions_in_space(@space).include?(su_permission) %> type="checkbox" id="permission-<%= su_permission.id %>" name="permission_<%= su_permission.id %>">
<label for="permission-<%= su_permission.id %>"><%= su_permission.name %></label><br>
<p>Super Users can edit any user's permissions in the space and can create new Super Users, as well as
remove your Super User status. Only give Super User to someone you <em>absolutely</em> trust.</p>
<div class="dcf-form-group dcf-input-checkbox">
<input <%= 'checked="checked"' if user.permissions_in_space(@space).include?(su_permission) %> type="checkbox" id="permission-<%= su_permission.id %>" name="permission_<%= su_permission.id %>">
<label for="permission-<%= su_permission.id %>"><%= su_permission.name %></label>
</div>
</fieldset>
</div>
<% end %>
......
<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 class="dcf-grid dcf-col-gap-vw">
<nav class="dcf-col-100% dcf-col-25%-start@sm">
<div class="toolbox">
<h3>Toolbox</h3>
<div class="tools">
<div class="dcf-txt-center">
<a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_events_href %>create/">+ New Event</a>
</div>
</div>
</div>
<ul class="wdn_tabs">
<li class="<%='selected' if tab == 'upcoming' %>"><a href="?tab=upcoming">Upcoming</a></li>
<li class="<%='selected' if tab == 'past' %>"><a href="?tab=past">Past</a></li>
</ul>
<div class="wdn_tabs_content">
</nav>
<div class="dcf-tabs-fake dcf-col-100% dcf-col-75%-end@sm">
<h3>Events</h3>
<ol class="dcf-tabs-list dcf-list-bare dcf-mb-0" role="tablist">
<li class="dcf-tabs-list-item dcf-mb-0" role="presentation"><a id="tab-upcoming" href="?tab=upcoming" class="dcf-tab dcf-d-block" role="tab" <%='tabindex="-1" aria-selected="true"' if tab == 'upcoming' %>>Upcoming</a></li>
<li class="dcf-tabs-list-item dcf-mb-0" role="presentation"><a id="tab-past" href="?tab=past" class="dcf-tab dcf-d-block" role="tab" <%='tabindex="-1" aria-selected="true"' if tab == 'past' %>>Past</a></li>
</ol>
<section id="status-<%= tab %>" role="tabpanel" tabindex="-1" class="dcf-tabs-panel" aria-labelledby="tab-<%= tab %>">
<div class="event-page">
<table class="event-list">
<h4><%= tab.capitalize %> Event Items</h4>
<table class="dcf-w-100% dcf-table dcf-table-bordered" aria-label="Event Listings">
<thead>
<tr>
<th>Title</th>
......@@ -25,7 +34,7 @@
<a href="<%= @space.admin_events_href %><%= event.id %>/edit/"><%= event.title %></a>
</td>
<td>
<ul>
<ul class="dcf-list-bare">
<li>
<%= event.start_time.in_time_zone.strftime('%m/%d/%Y @ %l:%M %P') %><br>
<%= event.location.name %>
......@@ -39,8 +48,8 @@
<% end %>
</td>
<td>
<form class="delete-event delete-form" action="<%= @space.admin_events_href %><%=event.id%>/delete/" method="POST">
<button type="submit" class="dcf-btn">Delete</button>
<form class="dcf-form delete-event delete-form" action="<%= @space.admin_events_href %><%=event.id%>/delete/" method="POST">
<button type="submit" class="dcf-btn dcf-btn-secondary">Delete</button>
</form>
</td>
</tr>
......@@ -76,23 +85,11 @@
</ol>
</nav>
<% end %>
</div>
</section>
</div>
<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="dcf-btn dcf-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>
</div>
</div>
</div>