aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hagelberg <phil@hagelb.org>2019-11-05 21:37:46 -0800
committerPhil Hagelberg <phil@hagelb.org>2019-11-09 18:08:08 -0800
commite27c61218d292c5fbf268f27e81dbe22f93ba90f (patch)
tree364c9f49619dbb74b2f6385e33955d129b76ce59
parentbfd5d798262f0ecc7ebc260d92c766d39c0766de (diff)
downloadpleroma-e27c61218d292c5fbf268f27e81dbe22f93ba90f.tar.gz
Expand subject content automatically when config is set.
-rw-r--r--lib/pleroma/web/static_fe/static_fe_view.ex7
-rw-r--r--lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex2
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_view.ex b/lib/pleroma/web/static_fe/static_fe_view.ex
index 5612a06bb..72e667728 100644
--- a/lib/pleroma/web/static_fe/static_fe_view.ex
+++ b/lib/pleroma/web/static_fe/static_fe_view.ex
@@ -38,4 +38,11 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
end
def instance_name, do: Pleroma.Config.get([:instance, :name], "Pleroma")
+
+ def open_content? do
+ Pleroma.Config.get(
+ [:frontend_configurations, :collapse_message_with_subjects],
+ true
+ )
+ end
end
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 2a46dadb4..df5e5eedd 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
@@ -5,7 +5,7 @@
<%= render("_user_card.html", %{user: @user}) %>
<div class="activity-content">
<%= if @title != "" do %>
- <details>
+ <details <%= if open_content?() do %>open<% end %>>
<summary><%= raw @title %></summary>
<div class="e-content"><%= raw @content %></div>
</details>