bring back profile edit popup menu, needs some more theming
This commit is contained in:
friendica
parent
d5800c61dc
commit
68c49322b7
38
boot.php
38
boot.php
@ -1256,12 +1256,12 @@ function profile_load(&$a, $nickname, $profile = 0) {
|
||||
require_once($theme_info_file);
|
||||
}
|
||||
|
||||
if(local_user() && local_user() == $a->profile['uid']) {
|
||||
$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
|
||||
'$editprofile' => t('Edit profile'),
|
||||
'$profid' => $a->profile['id']
|
||||
));
|
||||
}
|
||||
// if(local_user() && local_user() == $a->profile['uid']) {
|
||||
// $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
|
||||
// '$editprofile' => t('Edit profile'),
|
||||
// '$profid' => $a->profile['id']
|
||||
// ));
|
||||
// }
|
||||
|
||||
$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
||||
|
||||
@ -1306,6 +1306,9 @@ if(! function_exists('profile_sidebar')) {
|
||||
if((! is_array($profile)) && (! count($profile)))
|
||||
return $o;
|
||||
|
||||
|
||||
$is_owner = (($profile['uid'] == local_user()) ? true : false);
|
||||
|
||||
$profile['picdate'] = urlencode($profile['picdate']);
|
||||
|
||||
call_hooks('profile_sidebar_enter', $profile);
|
||||
@ -1333,17 +1336,24 @@ if(! function_exists('profile_sidebar')) {
|
||||
|
||||
|
||||
// show edit profile to yourself
|
||||
if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
|
||||
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
||||
|
||||
if($is_owner) {
|
||||
|
||||
$profile['menu'] = array(
|
||||
'chg_photo' => t('Change profile photo'),
|
||||
'entries' => array(),
|
||||
);
|
||||
|
||||
|
||||
if(feature_enabled(local_user(),'multi_profiles')) {
|
||||
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
||||
$profile['menu']['cr_new'] = t('Create New Profile');
|
||||
}
|
||||
else
|
||||
$profile['edit'] = array($a->get_baseurl() . '/profiles/' . $profile['id'], t('Edit Profile'),'',t('Edit Profile'));
|
||||
|
||||
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
|
||||
local_user());
|
||||
|
||||
$profile['menu'] = array(
|
||||
'chg_photo' => t('Change profile photo'),
|
||||
'cr_new' => t('Create New Profile'),
|
||||
'entries' => array(),
|
||||
);
|
||||
|
||||
if(count($r)) {
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
<div class="vcard">
|
||||
|
||||
<div class="fn label">$profile.name</div>
|
||||
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
|
||||
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
<dl class="location"><dt class="location-label">$location</dt>
|
||||
<dd class="adr">
|
||||
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
|
||||
<span class="city-state-zip">
|
||||
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
||||
<span class="region">$profile.region</span>
|
||||
<span class="postal-code">$profile.postal-code</span>
|
||||
</span>
|
||||
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||
</dd>
|
||||
</dl>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
|
||||
|
||||
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" >$profile.homepage</a></dd></dl>{{ endif }}
|
||||
|
||||
{{ inc diaspora_vcard.tpl }}{{ endinc }}
|
||||
|
||||
<div id="profile-vcard-break"></div>
|
||||
<div id="profile-extra-links">
|
||||
<ul>
|
||||
{{ if $connect }}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
|
||||
{{ endif }}
|
||||
{{ if $wallmessage }}
|
||||
<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
$contact_block
|
||||
|
||||
|
||||
@ -1,5 +1,21 @@
|
||||
<div class="vcard">
|
||||
|
||||
{{ if $profile.edit }}
|
||||
<div class="action">
|
||||
<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="$profile.edit.3" href="#" ><span>$profile.edit.1</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{ for $profile.menu.entries as $e }}
|
||||
<li>
|
||||
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
|
||||
</li>
|
||||
{{ endfor }}
|
||||
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
<div class="fn label">$profile.name</div>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user