mirror of
https://github.com/friendica/friendica
synced 2024-12-22 22:40:16 +00:00
Use profile.about instead of profile.pdesc for profile description
This commit is contained in:
Hypolite Petovan
parent
da09215db8
commit
a42104ce43
26 changed files with 45 additions and 45 deletions
|
|
@ -59,9 +59,9 @@ function cal_init(App $a)
|
|||
$vcard_widget = Renderer::replaceMacros($tpl, [
|
||||
'$name' => $profile['name'],
|
||||
'$photo' => $profile['photo'],
|
||||
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
|
||||
'$addr' => $profile['addr'] ?: '',
|
||||
'$account_type' => $account_type,
|
||||
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
|
||||
'$about' => $profile['about'] ?: '',
|
||||
]);
|
||||
|
||||
$cal_widget = Widget\CalendarExport::getHTML();
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ function photos_init(App $a) {
|
|||
'$photo' => $profile['photo'],
|
||||
'$addr' => $profile['addr'] ?? '',
|
||||
'$account_type' => $account_type,
|
||||
'$pdesc' => $profile['pdesc'] ?? '',
|
||||
'$about' => $profile['about'] ?? '',
|
||||
]);
|
||||
|
||||
$albums = Photo::getAlbums($a->data['user']['uid']);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ function videos_init(App $a)
|
|||
'$photo' => $profile['photo'],
|
||||
'$addr' => $profile['addr'] ?? '',
|
||||
'$account_type' => $account_type,
|
||||
'$pdesc' => $profile['pdesc'] ?? '',
|
||||
'$about' => $profile['about'] ?? '',
|
||||
]);
|
||||
|
||||
// If not there, create 'aside' empty
|
||||
|
|
|
|||
|
|
@ -722,7 +722,7 @@ class Contact
|
|||
return;
|
||||
}
|
||||
|
||||
$fields = ['name', 'photo', 'thumb', 'pdesc' => 'about', 'address', 'locality', 'region',
|
||||
$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
|
||||
'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
|
||||
$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
|
||||
if (!DBA::isResult($profile)) {
|
||||
|
|
|
|||
|
|
@ -899,7 +899,7 @@ class Profile
|
|||
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
|
||||
AND ((`profile`.`name` LIKE ?) OR
|
||||
(`user`.`nickname` LIKE ?) OR
|
||||
(`profile`.`pdesc` LIKE ?) OR
|
||||
(`profile`.`about` LIKE ?) OR
|
||||
(`profile`.`locality` LIKE ?) OR
|
||||
(`profile`.`region` LIKE ?) OR
|
||||
(`profile`.`country-name` LIKE ?) OR
|
||||
|
|
@ -934,7 +934,7 @@ class Profile
|
|||
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
|
||||
AND ((`profile`.`name` LIKE ?) OR
|
||||
(`user`.`nickname` LIKE ?) OR
|
||||
(`profile`.`pdesc` LIKE ?) OR
|
||||
(`profile`.`about` LIKE ?) OR
|
||||
(`profile`.`locality` LIKE ?) OR
|
||||
(`profile`.`region` LIKE ?) OR
|
||||
(`profile`.`country-name` LIKE ?) OR
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class Show extends BaseApi
|
|||
'profile_thumb' => $profile_row['thumb'],
|
||||
'publish' => $profile_row['publish'] ? true : false,
|
||||
'net_publish' => $profile_row['net-publish'] ? true : false,
|
||||
'description' => $profile_row['pdesc'],
|
||||
'description' => $profile_row['about'],
|
||||
'date_of_birth' => $profile_row['dob'],
|
||||
'address' => $profile_row['address'],
|
||||
'city' => $profile_row['locality'],
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class Directory extends BaseModule
|
|||
|
||||
$profile_link = $contact['profile_url'];
|
||||
|
||||
$pdesc = (($contact['pdesc']) ? $contact['pdesc'] . '<br />' : '');
|
||||
$about = (($contact['about']) ? $contact['about'] . '<br />' : '');
|
||||
|
||||
$details = '';
|
||||
if (strlen($contact['locality'])) {
|
||||
|
|
@ -157,7 +157,7 @@ class Directory extends BaseModule
|
|||
'profile' => $profile,
|
||||
'location' => $location_e,
|
||||
'tags' => $contact['pub_keywords'],
|
||||
'pdesc' => $pdesc,
|
||||
'about' => $about,
|
||||
'homepage' => $homepage,
|
||||
'photo_menu' => $photo_menu,
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class NoScrape extends BaseModule
|
|||
$json_info['last-activity'] = date('o-W', $last_active);
|
||||
|
||||
//These are optional fields.
|
||||
$profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name'];
|
||||
$profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name'];
|
||||
foreach ($profile_fields as $field) {
|
||||
if (!empty($a->profile[$field])) {
|
||||
$json_info["$field"] = $a->profile[$field];
|
||||
|
|
|
|||
|
|
@ -136,8 +136,8 @@ class Profile extends BaseProfile
|
|||
}
|
||||
}
|
||||
|
||||
if ($a->profile['pdesc']) {
|
||||
$basic_fields += self::buildField('pdesc', DI::l10n()->t('Description:'), HTML::toLink($a->profile['pdesc']));
|
||||
if ($a->profile['about']) {
|
||||
$basic_fields += self::buildField('about', DI::l10n()->t('Description:'), BBCode::convert($a->profile['about']));
|
||||
}
|
||||
|
||||
if ($a->profile['xmpp']) {
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class Index extends BaseSettings
|
|||
|
||||
$namechanged = $profile['name'] != $name;
|
||||
|
||||
$pdesc = Strings::escapeTags(trim($_POST['pdesc']));
|
||||
$about = Strings::escapeTags(trim($_POST['about']));
|
||||
$address = Strings::escapeTags(trim($_POST['address']));
|
||||
$locality = Strings::escapeTags(trim($_POST['locality']));
|
||||
$region = Strings::escapeTags(trim($_POST['region']));
|
||||
|
|
@ -102,7 +102,7 @@ class Index extends BaseSettings
|
|||
'profile',
|
||||
[
|
||||
'name' => $name,
|
||||
'pdesc' => $pdesc,
|
||||
'about' => $about,
|
||||
'dob' => $dob,
|
||||
'address' => $address,
|
||||
'locality' => $locality,
|
||||
|
|
@ -254,7 +254,7 @@ class Index extends BaseSettings
|
|||
'$baseurl' => DI::baseUrl()->get(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$name' => ['name', DI::l10n()->t('Display name:'), $profile['name']],
|
||||
'$pdesc' => ['pdesc', DI::l10n()->t('Title/Description:'), $profile['pdesc']],
|
||||
'$about' => ['about', DI::l10n()->t('Description:'), $profile['about']],
|
||||
'$dob' => Temporal::getDateofBirthField($profile['dob'], $a->user['timezone']),
|
||||
'$hide_friends' => $hide_friends,
|
||||
'$address' => ['address', DI::l10n()->t('Street Address:'), $profile['address']],
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ class ProfileField extends BaseRepository
|
|||
'religion' => $this->l10n->t('Religious Views:'),
|
||||
'likes' => $this->l10n->t('Likes:'),
|
||||
'dislikes' => $this->l10n->t('Dislikes:'),
|
||||
'about' => $this->l10n->t('About:'),
|
||||
'pdesc' => $this->l10n->t('Title/Description:'),
|
||||
'summary' => $this->l10n->t('Summary'),
|
||||
'music' => $this->l10n->t('Musical interests'),
|
||||
'book' => $this->l10n->t('Books, literature'),
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
|
||||
|
||||
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
|
||||
|
||||
{{if $profile.picdate}}
|
||||
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}"/>
|
||||
</div>
|
||||
<div id="profile-edit-name-end"></div>
|
||||
<div id="profile-edit-pdesc-wrapper">
|
||||
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label>
|
||||
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}"/>
|
||||
<div id="profile-edit-about-wrapper">
|
||||
<label id="profile-edit-about-label" for="profile-edit-about">{{$about.1}} </label>
|
||||
<input type="text" size="32" name="about" id="profile-edit-about" value="{{$about.1}}"/>
|
||||
</div>
|
||||
<div id="profile-edit-pdesc-end"></div>
|
||||
<div id="profile-edit-about-end"></div>
|
||||
<div id="profile-edit-dob-wrapper">
|
||||
{{$dob nofilter}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="vcard h-card">
|
||||
<div class="fn p-name">{{$name}}</div>
|
||||
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
|
||||
{{if $pdesc}}<div class="title p-job-title">{{$pdesc}}</div>{{/if}}
|
||||
{{if $about}}<div class="title p-job-title">{{$about}}</div>{{/if}}
|
||||
{{if $url}}
|
||||
<div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
|
||||
{{else}}
|
||||
|
|
|
|||
|
|
@ -732,7 +732,7 @@ input#dfrn-url {
|
|||
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-about-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
|
|
@ -748,7 +748,7 @@ input#dfrn-url {
|
|||
|
||||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-about,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
|
|
@ -823,7 +823,7 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
|
||||
#profile-edit-pdesc-desc,
|
||||
#profile-edit-about-desc,
|
||||
#profile-edit-pubkeywords-desc,
|
||||
#profile-edit-prvkeywords-desc {
|
||||
float: left;
|
||||
|
|
@ -855,7 +855,7 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
#profile-edit-name-end,
|
||||
#profile-edit-pdesc-end,
|
||||
#profile-edit-about-end,
|
||||
#profile-edit-dob-end,
|
||||
#profile-edit-address-end,
|
||||
#profile-edit-locality-end,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
|
||||
|
||||
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
|
||||
<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
|
||||
|
||||
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
|
||||
|
||||
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
<div class="section-content-tools-wrapper">
|
||||
{{include file="field_input.tpl" field=$name}}
|
||||
|
||||
{{include file="field_input.tpl" field=$pdesc}}
|
||||
{{include file="field_textarea.tpl" field=$about}}
|
||||
|
||||
{{$dob nofilter}}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
|
||||
|
||||
{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
|
||||
{{if $about}}<div class="title">{{$about}}</div>{{/if}}
|
||||
|
||||
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1945,7 +1945,7 @@ ul.tabs li .active {
|
|||
padding: 7px;
|
||||
}
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-about-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
|
|
@ -1960,7 +1960,7 @@ ul.tabs li .active {
|
|||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-about,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
|
|
|
|||
|
|
@ -1945,7 +1945,7 @@ ul.tabs li .active {
|
|||
padding: 7px;
|
||||
}
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-about-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
|
|
@ -1960,7 +1960,7 @@ ul.tabs li .active {
|
|||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-about,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
|
|
|
|||
|
|
@ -1945,7 +1945,7 @@ ul.tabs li .active {
|
|||
padding: 7px;
|
||||
}
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-about-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
|
|
@ -1960,7 +1960,7 @@ ul.tabs li .active {
|
|||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-about,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
|
|
|
|||
|
|
@ -1238,7 +1238,7 @@ ul.tabs {
|
|||
padding: 7px;
|
||||
}
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-about-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
|
|
@ -1253,7 +1253,7 @@ ul.tabs {
|
|||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-about,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
|
||||
|
||||
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
{{if $about}}<div class="title">{{$profile.about}}</div>{{/if}}
|
||||
<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
|
||||
|
||||
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
|
||||
|
||||
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
|
||||
|
||||
{{if $profile.picdate}}
|
||||
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
|
||||
|
|
|
|||
|
|
@ -54,11 +54,11 @@
|
|||
</div>
|
||||
<div id="profile-edit-name-end"></div>
|
||||
|
||||
<div id="profile-edit-pdesc-wrapper">
|
||||
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label>
|
||||
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}"/>
|
||||
<div id="profile-edit-about-wrapper">
|
||||
<label id="profile-edit-about-label" for="profile-edit-about">{{$about.1}} </label>
|
||||
<input type="text" size="32" name="about" id="profile-edit-about" value="{{$about.2}}"/>
|
||||
</div>
|
||||
<div id="profile-edit-pdesc-end"></div>
|
||||
<div id="profile-edit-about-end"></div>
|
||||
|
||||
<div id="profile-edit-xmpp-wrapper">
|
||||
<label id="profile-edit-xmpp-label" for="profile-edit-xmpp">{{$xmpp.1}} </label>
|
||||
|
|
|
|||
Loading…
Reference in a new issue