9 files changed, 54 insertions, 79 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index ca30976f..447d596d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -20,9 +20,7 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.includes(:head, :draft)
-      .order('id DESC')
-      .paginate(:page => params[:page], :per_page => 25)
+    @nodes = index_matching(Node.root.descendants)
   end
 
   def new
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b06d11fd..20355aa8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -140,7 +140,7 @@ class UsersController < ApplicationController
 
     def verify_status
       @user ||= User.new
-      unless @user.id == current_user.id || current_user.admin
+      unless @user.id == current_user.id || current_user.is_admin?
         deny_user_access
       end
     end
diff --git a/app/models/node.rb b/app/models/node.rb
index d6fe32ff..f8c29b48 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -648,6 +648,10 @@ class Node < ApplicationRecord
     )
   end
 
+  def embargoed?
+    head&.published_at.present? && head.published_at > Time.zone.now
+  end
+
   # Nodes are never destroyed recursively
   # Descendants must be removed or reparented individually first.
   # The Trash feature will be the ordinary path to deletion.
diff --git a/app/models/user.rb b/app/models/user.rb
index 786f8d14..95706f86 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -70,24 +70,6 @@ class User < ApplicationRecord
     roles.include?("admin")
   end
 
-  # Compatibility shims for the users form, which posts user[admin] as a
-  # checkbox. Goes away when that form learns about roles.
-  def admin
-    is_admin?
-  end
-
-  def admin?
-    is_admin?
-  end
-
-  def admin=(value)
-    if ActiveModel::Type::Boolean.new.cast(value)
-      self.roles = (roles | ["admin"])
-    else
-      self.roles = (roles - ["admin"])
-    end
-  end
-
   def redaktion?
     roles.include?("redaktion")
   end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index a2710c2a..cc3f163d 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -22,10 +22,12 @@
 <% @events.each do |event| %>
   <tr>
     <td>
-      <span class="flag_stack">
-        <%= flag("clock-off", Event.human_attribute_name(:allday)) if event.allday %>
-      </span>
-      <%= link_to event.display_title, event %>
+      <div class="title_with_flags">
+        <span class="flag_stack">
+          <%= flag("clock-off", Event.human_attribute_name(:allday)) if event.allday %>
+        </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>
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
index 0dc3c5a0..458ab1ae 100644
--- a/app/views/nodes/_node_list.html.erb
+++ b/app/views/nodes/_node_list.html.erb
@@ -15,26 +15,46 @@
 <%= will_paginate @nodes %>
 <table class="node_table">
   <tr class="header">
-    <th class="node_id"><%= t("admin.columns.id") %></th>
     <th class="title"><%= t("admin.columns.title") %></th>
     <th class="actions"><%= t("admin.columns.actions") %></th>
-    <th class="editor"><%= t("admin.columns.locked_by") %></th>
     <th class="revision"><%= t("admin.columns.rev") %></th>
   </tr>
   <% @nodes.each do |node| %>
   <tr class="<%= cycle("even", "odd") %>">
-    <td class="node_id"><%= node.id %></td>
     <td class="title">
-      <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-      <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+      <div class="title_with_flags">
+        <span class="flag_stack">
+          <%= flag("lock", t(".flag_locked", :login => node.lock_owner.login),
+                   :tier => :attention) if node.lock_owner %>
+          <%= flag("calendar-clock",
+                   t(".flag_embargo", :date => admin_datetime(node.head.published_at)),
+                   :tier => :attention) if node.embargoed? %>
+          <%= flag("file-pencil", t(".flag_draft")) if node.draft %>
+          <%= flag("file-off", t(".flag_no_head")) unless node.head %>
+        </span>
+        <div class="title_body">
+          <div class="node_title"><%= link_to title_for_node(node), node_path(node) %></div>
+          <div class="node_path"><%= link_to_path(node.unique_name, node.unique_name) %></div>
+        </div>
+      </div>
     </td>
     <td class="actions">
-      <%= link_to 'show',      node_path(node) %>
-      <%= link_to 'edit',      edit_node_path(node) %>
-      <%= link_to 'revisions', node_revisions_path(node) %>
+      <div class="action_grid">
+        <span class="action_item">
+          <%= link_to node_path(node), "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 node_revisions_path(node), "aria-label" => t("admin.common.revisions"),
+                title: t("admin.common.revisions") do %>
+            <%= icon("history", library: "tabler", "aria-hidden": true) %>
+          <% end %>
+        </span>
+      </div>
     </td>
-    <td><%= node.lock_owner.login if node.lock_owner %></td>
-    <td><%= node.draft ? node.draft.revision : (node.head ? node.head.revision : t(".no_revision")) %></td>
+    <td><%= node.head ? node.head.revision : t(".no_revision") %></td>
   </tr>
   <% end %>
 </table>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 7ab5679e..357c938b 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -7,35 +7,4 @@
   <span class="field_hint"><%= t(".create_hint") %></span>
 </div>
 
-<%= will_paginate @nodes %>
-  <table class="node_table">
-    <tr class="header">
-      <th class="node_id"><%= t("admin.columns.id") %></th>
-      <th class="title"><%= t("admin.columns.title") %></th>
-      <th class="actions"><%= t("admin.columns.actions") %></th>
-      <th class="editor"><%= t("admin.columns.locked_by") %></th>
-      <th class="revision"><%= t("admin.columns.rev") %></th>
-    </tr>
-    <% @nodes.each do |node| %>
-    <tr class="<%= cycle("even", "odd") %>">
-      <td class="node_id"><%= node.id %></td>
-      <td class="title">
-        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
-      </td>
-      <td class="actions">
-        <%= link_to 'show',      node_path(node) %>
-        <%= link_to 'edit',      edit_node_path(node) %>
-        <%= link_to 'revisions', node_revisions_path(node) %>
-      </td>
-      <td>
-        <%= node.lock_owner.login if node.lock_owner %>
-      </td>
-      <td>
-        <%= node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY") %>
-      </td>
-    </tr>
-    <% end %>
-  </table>
-<%= will_paginate @nodes %>
-
+<%= render 'node_list' %>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index be92ad1d..028ee02f 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -27,17 +27,17 @@
       <span class="field_hint"><%= t(".no_roles") %></span>
     <% end %>
   </td>
-  <td class="user_actions">
-    <div class="user_action_grid">
-      <span class="user_action">
+  <td class="actions">
+    <div class="action_grid">
+      <span class="action_item">
         <%= link_to user_path(user), "aria-label" => t("admin.common.show"),
               title: t("admin.common.show") do %>
           <%= icon("eye", library: "tabler", "aria-hidden": true) %>
         <% end %>
       </span>
 
-      <span class="user_action">
-        <% if current_user.admin? || current_user == user %>
+      <span class="action_item">
+        <% if current_user.is_admin? || current_user == user %>
           <%= link_to edit_user_path(user), "aria-label" => t("admin.common.edit"),
                 title: t("admin.common.edit") do %>
             <%= icon("edit", library: "tabler", "aria-hidden": true) %>
@@ -45,15 +45,15 @@
         <% end %>
       </span>
 
-      <span class="user_action">
+      <span class="action_item">
         <%= link_to admin_log_path(:user_id => user.id),
               "aria-label" => t(".action_log"), title: t(".action_log") do %>
           <%= icon("history", library: "tabler", "aria-hidden": true) %>
         <% end %>
       </span>
 
-      <span class="user_action">
-        <% if current_user.admin? && current_user != user %>
+      <span class="action_item">
+        <% if current_user.is_admin? && current_user != user %>
           <% if user.alumni? %>
             <%= button_to reactivate_user_path(user), method: :put,
                   form: { class: 'button_to state_changing' },
@@ -71,7 +71,7 @@
         <% end %>
       </span>
 
-      <span class="user_action">
+      <span class="action_item">
         <% if current_user.redaktion? && !user.alumni? %>
           <% if user.redaktion? %>
             <% unless user == current_user %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index ad2e0891..1763394d 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -20,7 +20,7 @@
     <div class="layout_row_label"><%= t("users.labels.confirm") %></div>
     <div class="layout_row_content"><%= f.password_field :password_confirmation, :autocomplete => "new-password" %></div>
 
-    <% if current_user.admin? %>
+    <% if current_user.is_admin? %>
       <div class="layout_row_label"><%= t("users.labels.roles") %></div>
       <div class="layout_row_content">
         <% User::ROLES.each do |role| %>
@@ -62,7 +62,7 @@
         <% end %>
       <% end %>
     </div>
-  <% elsif current_user.admin? && @user.otp_enrolled? %>
+  <% elsif current_user.is_admin? && @user.otp_enrolled? %>
     <div class="layout_row_label"><%= t(".second_factor") %></div>
     <div class="layout_row_content">
       <%= t(".enabled") %>