Share one flag stack between the account roster and the events list

2 files changed, 13 insertions, 19 deletions

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 7dfb854c..d07d6f82 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -15,7 +15,6 @@
     <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(:allday) %></th>
     <th><%= Event.human_attribute_name(:url) %></th>
     <th><%= Event.human_attribute_name(:start_node) %></th>
     <th></th>
@@ -23,11 +22,15 @@
 
 <% @events.each do |event| %>
   <tr>
-    <td><%= link_to event.display_title, event %></td>
+    <td>
+      <span class="flag_stack">
+        <%= flag("clock-off", Event.human_attribute_name(:allday)) if event.allday %>
+      </span>
+      <%= link_to event.display_title, event %>
+    </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><%= 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>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index aa65cc3d..be92ad1d 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,28 +1,19 @@
 <% users.each do |user| %>
 <tr>
   <td class="user_login">
-    <span class="user_flag_stack">
+    <span class="flag_stack">
       <% if user.otp_enrolled? %>
-        <span role="img" title="<%= t(".otp_enrolled") %>" aria-label="<%= t(".otp_enrolled") %>">
-          <%= icon("shield-check", library: "tabler", "aria-hidden": true) %>
-        </span>
+        <%= flag("shield-check", t(".otp_enrolled")) %>
       <% elsif user.otp_pending_secret.present? %>
-        <span role="img" class="otp_missing" title="<%= t(".otp_pending") %>" aria-label="<%= t(".otp_pending") %>">
-          <%= icon("shield-half", library: "tabler", "aria-hidden": true) %>
-        </span>
+        <%= flag("shield-half", t(".otp_pending"), :tier => :attention) %>
       <% else %>
-        <span role="img" class="otp_missing" title="<%= t(".otp_missing") %>" aria-label="<%= t(".otp_missing") %>">
-          <%= icon("shield-off", library: "tabler", "aria-hidden": true) %>
-        </span>
+        <%= flag("shield-off", t(".otp_missing"), :tier => :attention) %>
       <% end %>
       <% if (tier = user.staleness_tier) %>
         <% hint = tier == :never ? t(".stale_never")
-                                 : t(".stale_#{tier}", :year => user.last_login_at.year) %>
-        <span role="img" class="stale_flag stale_flag_<%= tier %>"
-              title="<%= hint %>" aria-label="<%= hint %>">
-          <%= icon(tier == :amber ? "clock-exclamation" : "alert-triangle",
-                   library: "tabler", "aria-hidden": true) %>
-        </span>
+                                : t(".stale_#{tier}", :year => user.last_login_at.year) %>
+        <%= flag(tier == :amber ? "clock-exclamation" : "alert-triangle", hint,
+                 :tier => tier == :amber ? :attention : :alert) %>
       <% end %>
     </span>
     <%= user.login %>