Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

[akkoma] / lib / pleroma / web / templates / static_fe / static_fe / _notice.html.eex

diff --git a/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
index c4cdb102956663082640a0b55336d830f7df3a1d..df0244795618f35ccf936a368b2878db42f868a8 100644 (file)
--- a/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
@@ -1,19 +1,23 @@
-<div class="activity" <%= if @data[:selected] do %> id="selected" <% end %>>
+<div class="activity h-entry" <%= if @selected do %> id="selected" <% end %>>
   <p class="pull-right">
-    <%= link @data.published, to: @data.link, class: "activity-link" %>
+    <a class="activity-link u-url u-uid" href="<%= @link %>">
+      <time class="dt-published" datetime="<%= @published %>">
+        <%= format_date(@published) %>
+      </time>
+    </a>
   </p>
-  <%= render("user_card.html", %{user: @data.user}) %>
+  <%= render("_user_card.html", %{user: @user}) %>
   <div class="activity-content">
-    <%= if @data.title != "" do %>
-      <details>
-        <summary><%= raw @data.title %></summary>
-        <div class="e-content"><%= raw @data.content %></div>
+    <%= if @title != "" do %>
+      <details <%= if open_content?() do %>open<% end %>>
+        <summary class="p-name"><%= raw @title %></summary>
+        <div class="e-content"><%= raw @content %></div>
       </details>
     <% else %>
-      <div class="e-content"><%= raw @data.content %></div>
+      <div class="e-content"><%= raw @content %></div>
     <% end %>
-    <%= for %{"name" => name, "url" => [url | _]} <- @data.attachment do %>
-      <%= if @data.sensitive do %>
+    <%= for %{"name" => name, "url" => [url | _]} <- @attachment do %>
+      <%= if @sensitive do %>
         <details class="nsfw">
           <summary><%= Gettext.gettext("sensitive media") %></summary>
           <div>
@@ -27,4 +31,11 @@
       <% end %>
     <% end %>
   </div>
+  <%= if @selected do %>
+    <dl class="counts">
+      <dt><%= Gettext.gettext("replies") %></dt><dd><%= @counts.replies %></dd>
+      <dt><%= Gettext.gettext("announces") %></dt><dd><%= @counts.announces %></dd>
+      <dt><%= Gettext.gettext("likes") %></dt><dd><%= @counts.likes %></dd>
+    </dl>
+  <% end %>
 </div>