From 4f859364377ed2d72dac5691ebb6caf43bb314c1 Mon Sep 17 00:00:00 2001 From: David Joseph Guzsik Date: Sun, 28 Jun 2020 21:49:34 +0200 Subject: [PATCH] Link avatar on user's own profile to the avatar change page (#151) --- lib/philomena_web/templates/avatar/edit.html.slime | 6 +++++- lib/philomena_web/templates/profile/show.html.slime | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/philomena_web/templates/avatar/edit.html.slime b/lib/philomena_web/templates/avatar/edit.html.slime index 2e1603dd..53ac6e8d 100644 --- a/lib/philomena_web/templates/avatar/edit.html.slime +++ b/lib/philomena_web/templates/avatar/edit.html.slime @@ -42,4 +42,8 @@ = button_to "Remove my avatar", Routes.avatar_path(@conn, :delete), method: "delete", class: "button", data: [confirm: "Are you really, really sure?"] br - = link "Back", to: Routes.pow_registration_path(@conn, :edit) \ No newline at end of file + - return_to = if blank?(@conn.params["profile"]) do + = Routes.pow_registration_path(@conn, :edit) + - else + = Routes.profile_path(@conn, :show, @current_user) + = link "Back", to: return_to diff --git a/lib/philomena_web/templates/profile/show.html.slime b/lib/philomena_web/templates/profile/show.html.slime index 4a41f6a0..238bb037 100644 --- a/lib/philomena_web/templates/profile/show.html.slime +++ b/lib/philomena_web/templates/profile/show.html.slime @@ -1,6 +1,10 @@ .profile-top .profile-top__avatar - = render PhilomenaWeb.UserAttributionView, "_user_avatar.html", object: %{user: @user}, class: "avatar--125px" + - avatar = render PhilomenaWeb.UserAttributionView, "_user_avatar.html", object: %{user: @user}, class: "avatar--125px" + = if current?(@user, @conn.assigns.current_user) do + = link avatar, to: Routes.avatar_path(@conn, :edit, profile: true), title: "Change avatar" + - else + = avatar .profile-top__name-and-links div h1.profile-top__name-header