From b6c254eedef7f75e3befb817066d4ddda869a32f Mon Sep 17 00:00:00 2001
From: Andreas Neustifter <andreas.neustifter@gmail.com>
Date: Tue, 24 Jul 2018 16:20:16 +0200
Subject: [PATCH] [frio] Fix profile edit links. [#5474] (#5475)

---
 mod/profiles.php                           | 2 ++
 view/theme/frio/css/style.css              | 1 +
 view/theme/frio/templates/profile_edit.tpl | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index e65b51aff4..b0ca02e3ca 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -578,7 +578,9 @@ function profiles_content(App $a) {
 			'$banner'	=> L10n::t('Edit Profile Details'),
 			'$submit'	=> L10n::t('Submit'),
 			'$profpic'	=> L10n::t('Change Profile Photo'),
+			'$profpiclink'	=> '/photos/' . $a->user['nickname'],
 			'$viewprof'	=> L10n::t('View this profile'),
+			'$viewallprof'	=> L10n::t('View all profiles'),
 			'$editvis' 	=> L10n::t('Edit visibility'),
 			'$cr_prof'	=> L10n::t('Create a new profile using these settings'),
 			'$cl_prof'	=> L10n::t('Clone this profile'),
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 3daa992330..0206c9d302 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -996,6 +996,7 @@ aside .widget,
     margin-bottom: 20px;
     padding: 10px;
     font-size: 13px;
+    overflow: auto;
 }
 aside .widget h3,
 .nav-container .widget h3 {
diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 12ec570370..c06e3a7159 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -10,14 +10,15 @@
 					<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-					<li role="presentation"><a role="menuitem" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</button></li>
+					<li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+					<li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
 					{{if ! $is_default}}
 					<li role="presentation" class="nav-item"><a role="menuitem" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil" aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
 					</li>
 					{{/if}}
 					<li role="presentation" class="divider"></li>
 					<li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
+					<li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof|escape:'html'}}">{{$viewallprof}}</a></li>
 					{{if $profile_clone_link}}
 					<li role="presentation" class="divider"></li>
 					<li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>