Visually separate header.

This commit is contained in:
Phil Hagelberg 2019-10-31 17:44:43 -07:00
parent 2ac1ece652
commit 274cc18e8a
5 changed files with 37 additions and 26 deletions

View file

@ -34,17 +34,17 @@ def get_counts(%Activity{} = activity) do
} }
end end
def represent(%Activity{} = activity, selected) do def represent(%Activity{object: %Object{data: data}} = activity, selected) do
{:ok, user} = User.get_or_fetch(activity.object.data["actor"]) {:ok, user} = User.get_or_fetch(activity.object.data["actor"])
%{ %{
user: user, user: user,
title: get_title(activity.object), title: get_title(activity.object),
content: activity.object.data["content"] || nil, content: data["content"] || nil,
attachment: activity.object.data["attachment"], attachment: data["attachment"],
link: Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity.id), link: Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity.id),
published: activity.object.data["published"], published: data["published"],
sensitive: activity.object.data["sensitive"], sensitive: data["sensitive"],
selected: selected, selected: selected,
counts: get_counts(activity) counts: get_counts(activity)
} }

View file

@ -8,6 +8,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
alias Calendar.Strftime alias Calendar.Strftime
alias Pleroma.Emoji.Formatter alias Pleroma.Emoji.Formatter
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.Endpoint
alias Pleroma.Web.Gettext alias Pleroma.Web.Gettext
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
alias Pleroma.Formatter alias Pleroma.Formatter

View file

@ -1,7 +1,11 @@
<header>
<h1><%= link @instance_name, to: "/" %></h1> <h1><%= link @instance_name, to: "/" %></h1>
</header>
<main>
<div class="conversation"> <div class="conversation">
<%= for activity <- @activities do %> <%= for activity <- @activities do %>
<%= render("_notice.html", activity) %> <%= render("_notice.html", activity) %>
<% end %> <% end %>
</div> </div>
</main>

View file

@ -1,3 +1,4 @@
<header>
<h1><%= link @instance_name, to: "/" %></h1> <h1><%= link @instance_name, to: "/" %></h1>
<h3> <h3>
@ -6,11 +7,16 @@
<input type="hidden" name="profile" value=""> <input type="hidden" name="profile" value="">
<button type="submit" class="collapse">Remote follow</button> <button type="submit" class="collapse">Remote follow</button>
</form> </form>
<%= raw (@user.name |> Formatter.emojify(emoji_for_user(@user))) %> <%= raw Formatter.emojify(@user.name, emoji_for_user(@user)) %> |
<%= link "@#{@user.nickname}@#{Endpoint.host()}", to: User.profile_url(@user) %>
</h3> </h3>
<p><%= raw @user.bio %></p> <p><%= raw @user.bio %></p>
</header>
<main>
<div class="activity-stream"> <div class="activity-stream">
<%= for activity <- @timeline do %> <%= for activity <- @timeline do %>
<%= render("_notice.html", Map.put(activity, :selected, false)) %> <%= render("_notice.html", Map.put(activity, :selected, false)) %>
<% end %> <% end %>
</div> </div>
</main>

Binary file not shown.