3 files changed, 11 insertions, 15 deletions

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 138a02ec..7dfb854c 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -24,16 +24,12 @@
 <% @events.each do |event| %>
   <tr>
     <td><%= link_to event.display_title, event %></td>
-    <td><%=h event.start_time %></td>
-    <td><%=h event.end_time %></td>
+    <td><%= admin_datetime(event.start_time) %></td>
+    <td><%= admin_datetime(event.end_time) %></td>
     <td class="rrule_cell"><span class="rrule_text"><%= rrule_with_break_opportunities(event.rrule) %></span></td>
-    <td><%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %></td>
-    <td class="url_cell">
-    <% if event.url.present? %>
-    <span class="truncate"><%= link_to event.url, event.url %></span>
-    <% end %>
-    </td>
-    <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
+    <td><%= t("admin.common.#{event.allday ? "yes" : "no"}") %></td>
+    <td class="url_cell"><span class="truncate"><%= external_url_link(event.url) %></span></td>
+    <td><%= event.node ? link_to(event.node.unique_name, node_path(event.node)) : "" %></td>
     <td><%= link_to t(".edit_link"), edit_event_path(event) %></td>
   </tr>
 <% end %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 98e972c6..d77f770e 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -24,10 +24,10 @@
     </div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:start_time) %></div>
-    <div class="layout_row_content"><%=h @event.start_time %></div>
+    <div class="layout_row_content"><%= admin_datetime(@event.start_time) %></div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:end_time) %></div>
-    <div class="layout_row_content"><%=h @event.end_time %></div>
+    <div class="layout_row_content"><%= admin_datetime(@event.end_time) %></div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:rrule) %></div>
     <div class="layout_row_content"><%=h @event.rrule %></div>
diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb
index c610b560..e59eedc7 100644
--- a/app/views/events/without_node.html.erb
+++ b/app/views/events/without_node.html.erb
@@ -20,11 +20,11 @@
 <% @events.each do |event| %>
   <tr>
     <td><%= link_to event.display_title, event %></td>
-    <td><%=h event.start_time %></td>
-    <td><%=h event.end_time %></td>
-    <td><%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %></td>
+    <td><%= admin_datetime(event.start_time) %></td>
+    <td><%= admin_datetime(event.end_time) %></td>
+    <td><%= t("admin.common.#{event.allday ? "yes" : "no"}") %></td>
     <td><%=h event.url %></td>
-    <td><%= link_to t("events.index.edit_link"), edit_event_path(event) %></td>
+    <td class="url_cell"><span class="truncate"><%= external_url_link(event.url) %></span></td>
   </tr>
 <% end %>
 </table>