Merge branch 'issue/1348' into 'develop'

[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 90b5ef67c7007b8ec7ec964406ee77dcd2653d4b..df5e5eeddb3172d747d05299b0a5e065ce332e65 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,20 +1,21 @@
-<div class="activity" <%= if @data[:selected] do %> id="selected" <% end %>>
+<div class="activity" <%= if @selected do %> id="selected" <% end %>>
   <p class="pull-right">
-    <a href="<%= @data.link %>" class="activity-link"><%= @data.published %></a></p>
-  <%= render("user_card.html", %{user: @data.user}) %>
+    <%= link format_date(@published), to: @link, class: "activity-link" %>
+  </p>
+  <%= 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><%= 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>sensitive media</summary>
+          <summary><%= Gettext.gettext("sensitive media") %></summary>
           <div>
             <%= render("_attachment.html", %{name: name, url: url["href"],
                                              mediaType: fetch_media_type(url)}) %>
@@ -26,4 +27,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>