2 files changed, 76 insertions, 14 deletions

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 1e2e91dc..b14395ab 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -13,6 +13,37 @@ module EventsHelper
 
   def external_url_link(url)
     return nil if url.blank?
-    url.match?(%r{\Ahttps?://}i) ? link_to(url, url) : h(url)
+    return h(url) unless url.match?(%r{\Ahttps?://}i)
+    link_to(url, url, :target => "_blank", :rel => "noopener")
   end
+
+  def event_date_range(event)
+    return t("events.schedule.none") if event.start_time.blank?
+
+    from = event.start_time
+    to   = event.end_time
+
+    return one_day_range(from, event.allday) if to.blank? || to.to_date == from.to_date
+
+    if !event.allday && (to - from) <= 12.hours
+      return t("events.schedule.evening",
+               :date => admin_date(from),
+               :from => I18n.l(from, :format => :time),
+               :to   => I18n.l(to,   :format => :time))
+    end
+
+    key = from.year == to.year && from.month == to.month ? :same_month : :spanning
+    t("events.schedule.#{key}",
+       :from_day   => from.day, :to_day => to.day,
+       :from_month => I18n.l(from, :format => :ccc_month),
+       :to_month   => I18n.l(to,   :format => :ccc_month),
+       :from_full  => admin_date(from), :to_full => admin_date(to))
+  end
+
+  private
+
+    def one_day_range(from, allday)
+      return admin_date(from) if allday
+      admin_datetime(from)
+    end
 end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 14790526..51269282 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -11,11 +11,7 @@
 <table class="events_table">
   <tr class="header">
     <th><%= t("admin.columns.title") %></th>
-    <th><%= Event.human_attribute_name(:start_time) %></th>
-    <th><%= Event.human_attribute_name(:end_time) %></th>
-    <th><%= Event.human_attribute_name(:rrule) %></th>
-    <th><%= Event.human_attribute_name(:url) %></th>
-    <th><%= Event.human_attribute_name(:start_node) %></th>
+    <th><%= t(".when") %></th>
     <th></th>
   </tr>
 
@@ -24,17 +20,52 @@
     <td>
       <div class="title_with_flags">
         <span class="flag_stack">
-          <%= flag("clock-off", Event.human_attribute_name(:allday)) if event.allday %>
+          <%= flag("hours-24", Event.human_attribute_name(:allday)) if event.allday %>
+          <%= flag("sticker", t(".flag_own_title")) if event.title.present? %>
+        </span>
+        <div class="title_body">
+          <div class="event_title"><%= link_to event.display_title, event %></div>
+          <% if event.node %>
+            <div class="event_meta">
+              <%= icon("file", library: "tabler", "aria-hidden": true) %>
+              <%= link_to event.node.unique_name, node_path(event.node) %>
+            </div>
+          <% end %>
+          <% if event.url.present? %>
+            <div class="event_meta">
+              <%= icon("external-link", library: "tabler", "aria-hidden": true) %>
+              <%= external_url_link(event.url) %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </td>
+    <td class="event_when">
+      <% if event.rrule.present? %>
+        <span class="rrule_raw" title="<%= event.rrule %>"><%= event_schedule_text(event) %></span>
+        <% if event.humanize_rrule.nil? && event.start_time %>
+          <div class="event_meta"><%= admin_date(event.start_time) %></div>
+        <% end %>
+      <% else %>
+        <%= event_date_range(event) %>
+      <% end %>
+    </td>
+    <td class="actions">
+      <div class="action_grid">
+        <span class="action_item">
+          <%= link_to event_path(event), "aria-label" => t("admin.common.show"),
+                title: t("admin.common.show") do %>
+            <%= icon("eye", library: "tabler", "aria-hidden": true) %>
+          <% end %>
+        </span>
+        <span class="action_item">
+          <%= link_to edit_event_path(event), "aria-label" => t("admin.common.edit"),
+                title: t("admin.common.edit") do %>
+            <%= icon("edit", library: "tabler", "aria-hidden": true) %>
+          <% end %>
         </span>
-        <div class="title_body"><%= link_to event.display_title, event %></div>
       </div>
     </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 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 %>
 </table>