Merge branch 'develop' into global-status-expiration

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

diff --git a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
index 9b3d0509e7b698f0c4d281530df6fa4ed56a74a8..e7d2aecadf41e38502c6393d5b53e3f7f06f09b8 100644 (file)
--- a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
@@ -1,5 +1,5 @@
 <header>
-  <h1><%= link @instance_name, to: "/" %></h1>
+  <h1><%= link instance_name(), to: "/" %></h1>
 
   <h3>
     <form class="pull-right collapse" method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>">
@@ -8,7 +8,7 @@
       <button type="submit" class="collapse">Remote follow</button>
     </form>
     <%= raw Formatter.emojify(@user.name, emoji_for_user(@user)) %> |
-    <%= link "@#{@user.nickname}@#{Endpoint.host()}", to: User.profile_url(@user) %>
+    <%= link "@#{@user.nickname}@#{Endpoint.host()}", to: (@user.uri || @user.ap_id) %>
   </h3>
   <p><%= raw @user.bio %></p>
 </header>
@@ -18,5 +18,14 @@
     <%= for activity <- @timeline do %>
       <%= render("_notice.html", Map.put(activity, :selected, false)) %>
     <% end %>
+    <p id="pagination">
+      <%= if @prev_page_id do %>
+        <%= link "«", to: "?min_id=" <> @prev_page_id %>
+      <% end %>
+      <%= if @prev_page_id && @next_page_id, do: " | " %>
+      <%= if @next_page_id do %>
+        <%= link "»", to: "?max_id=" <> @next_page_id %>
+      <% end %>
+    </p>
   </div>
 </main>