From 86e6381a7c8f280748edbd6b2d0c26d67d31aa84 Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Thu, 11 Aug 2016 14:58:20 -0500
Subject: [PATCH] Tune ups on agenda page
---
views/admin/agenda.erb | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/views/admin/agenda.erb b/views/admin/agenda.erb
index 3be8c92..8fbe4c5 100644
--- a/views/admin/agenda.erb
+++ b/views/admin/agenda.erb
@@ -36,7 +36,7 @@ No reservations today. Hopefully someone will still come in to use the space!<br
<thead>
<tr>
<th>Name</th>
- <th>Tool</th>
+ <th>Resource</th>
<th>Time</th>
</tr>
</thead>
@@ -47,7 +47,10 @@ No reservations today. Hopefully someone will still come in to use the space!<br
<% if reservation.user %>
<%= reservation.user.full_name %>
<% elsif !reservation.event.nil? %>
- <strong>Event:</strong> <%= reservation.event.title %>
+ <strong>Event:</strong> <%= reservation.event.title %>
+ <% end %>
+ <% unless reservation.title.nil? || reservation.title.empty? %>
+ <br><small><%= reservation.title %></small>
<% end %>
</td>
<td>
@@ -68,7 +71,7 @@ Today's Events
</h4>
<% if events.empty? %>
No events today. Perhaps you'd like to create one?<br>
-<a href="/admin/events/create/" class="wdn-button wdn-button-brand">New Event</a>
+<a href="<%= @space.admin_events_href %>/create/" class="wdn-button wdn-button-brand">New Event</a>
<% else %>
<table>
<thead>
@@ -96,7 +99,7 @@ No events today. Perhaps you'd like to create one?<br>
</tbody>
</table>
<br>
-<a href="/admin/events/" class="wdn-button wdn-button-triad">Go To Events</a>
+<a href="<%= @space.admin_events_href %>" class="wdn-button wdn-button-triad">Go To Events</a>
<% end %>
<script type="text/javascript">
--
GitLab