bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc

Browse source 
Use profile.about for profile description
This commit is contained in:
Michael Vogel 2020-02-10 23:36:59 +01:00 committed by GitHub
commit e80d68ba53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2020.03-dev (Dalmatian Bellflower) -- Friendica 2020.03-dev (Dalmatian Bellflower)
-- DB_UPDATE_VERSION 1332 -- DB_UPDATE_VERSION 1333
-- ------------------------------------------ -- ------------------------------------------
@ -999,7 +999,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`is-default` boolean COMMENT 'Deprecated', `is-default` boolean COMMENT 'Deprecated',
`hide-friends` boolean NOT NULL DEFAULT '0' COMMENT 'Hide friend list from viewers of this profile', `hide-friends` boolean NOT NULL DEFAULT '0' COMMENT 'Hide friend list from viewers of this profile',
`name` varchar(255) NOT NULL DEFAULT '' COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`pdesc` varchar(255) NOT NULL DEFAULT '' COMMENT 'Title or description', `pdesc` varchar(255) COMMENT 'Deprecated',
`dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT 'Day of birth', `dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT 'Day of birth',
`address` varchar(255) NOT NULL DEFAULT '' COMMENT '', `address` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`locality` varchar(255) NOT NULL DEFAULT '' COMMENT '', `locality` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@ -1018,7 +1018,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`prv_keywords` text COMMENT '', `prv_keywords` text COMMENT '',
`likes` text COMMENT 'Deprecated', `likes` text COMMENT 'Deprecated',
`dislikes` text COMMENT 'Deprecated', `dislikes` text COMMENT 'Deprecated',
`about` text COMMENT 'Deprecated', `about` text COMMENT 'Profile description',
`summary` varchar(255) COMMENT 'Deprecated', `summary` varchar(255) COMMENT 'Deprecated',
`music` text COMMENT 'Deprecated', `music` text COMMENT 'Deprecated',
`book` text COMMENT 'Deprecated', `book` text COMMENT 'Deprecated',

4
doc/database/db_profile.md
View file

@ -9,7 +9,7 @@ Table profile
| is-default | Mark this profile as default profile | tinyint(1) | NO | | 0 | | | is-default | Mark this profile as default profile | tinyint(1) | NO | | 0 | |
| hide-friends | Hide friend list from viewers of this profile | tinyint(1) | NO | | 0 | | | hide-friends | Hide friend list from viewers of this profile | tinyint(1) | NO | | 0 | |
| name | | varchar(255) | NO | | | | | name | | varchar(255) | NO | | | |
| pdesc | Title or description | varchar(255) | NO | | | | | pdesc | Deprecated | varchar(255) | NO | | | |
| dob | Day of birth | varchar(32) | NO | | 0001-01-01 | | | dob | Day of birth | varchar(32) | NO | | 0001-01-01 | |
| address | | varchar(255) | NO | | | | | address | | varchar(255) | NO | | | |
| locality | | varchar(255) | NO | | | | | locality | | varchar(255) | NO | | | |
@ -28,7 +28,7 @@ Table profile
| prv_keywords | | text | NO | | NULL | | | prv_keywords | | text | NO | | NULL | |
| likes | Deprecated | text | NO | | NULL | | | likes | Deprecated | text | NO | | NULL | |
| dislikes | Deprecated | text | NO | | NULL | | | dislikes | Deprecated | text | NO | | NULL | |
| about | Deprecated | text | NO | | NULL | | | about | Profile description | text | NO | | | |
| summary | Deprecated | varchar(255) | NO | | | | | summary | Deprecated | varchar(255) | NO | | | |
| music | Deprecated | text | NO | | NULL | | | music | Deprecated | text | NO | | NULL | |
| book | Deprecated | text | NO | | NULL | | | book | Deprecated | text | NO | | NULL | |

4
mod/cal.php
View file

@ -75,9 +75,9 @@ function cal_init(App $a)
$vcard_widget = Renderer::replaceMacros($tpl, [ $vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'], '$name' => $profile['name'],
'$photo' => $profile['photo'], '$photo' => $profile['photo'],
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""), '$addr' => $profile['addr'] ?: '',
'$account_type' => $account_type, '$account_type' => $account_type,
'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""), '$about' => $profile['about'] ?: '',
]); ]);
$cal_widget = Widget\CalendarExport::getHTML(); $cal_widget = Widget\CalendarExport::getHTML();

2
mod/photos.php
View file

@ -81,7 +81,7 @@ function photos_init(App $a) {
'$photo' => $profile['photo'], '$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '', '$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type, '$account_type' => $account_type,
'$pdesc' => $profile['pdesc'] ?? '', '$about' => $profile['about'] ?? '',
]); ]);
$albums = Photo::getAlbums($a->data['user']['uid']); $albums = Photo::getAlbums($a->data['user']['uid']);

2
mod/videos.php
View file

@ -66,7 +66,7 @@ function videos_init(App $a)
'$photo' => $profile['photo'], '$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '', '$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type, '$account_type' => $account_type,
'$pdesc' => $profile['pdesc'] ?? '', '$about' => $profile['about'] ?? '',
]); ]);
// If not there, create 'aside' empty // If not there, create 'aside' empty

2
src/Model/Contact.php
View file

@ -739,7 +739,7 @@ class Contact
return; 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']; 'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]); $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
if (!DBA::isResult($profile)) { if (!DBA::isResult($profile)) {

4
src/Model/Profile.php
View file

@ -916,7 +916,7 @@ class Profile
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
AND ((`profile`.`name` LIKE ?) OR AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR (`user`.`nickname` LIKE ?) OR
(`profile`.`pdesc` LIKE ?) OR (`profile`.`about` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR (`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR (`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR
@ -951,7 +951,7 @@ class Profile
WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self` WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
AND ((`profile`.`name` LIKE ?) OR AND ((`profile`.`name` LIKE ?) OR
(`user`.`nickname` LIKE ?) OR (`user`.`nickname` LIKE ?) OR
(`profile`.`pdesc` LIKE ?) OR (`profile`.`about` LIKE ?) OR
(`profile`.`locality` LIKE ?) OR (`profile`.`locality` LIKE ?) OR
(`profile`.`region` LIKE ?) OR (`profile`.`region` LIKE ?) OR
(`profile`.`country-name` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR

2
src/Module/Api/Friendica/Profile/Show.php
View file

@ -96,7 +96,7 @@ class Show extends BaseApi
'profile_thumb' => $profile_row['thumb'], 'profile_thumb' => $profile_row['thumb'],
'publish' => $profile_row['publish'] ? true : false, 'publish' => $profile_row['publish'] ? true : false,
'net_publish' => $profile_row['net-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'], 'date_of_birth' => $profile_row['dob'],
'address' => $profile_row['address'], 'address' => $profile_row['address'],
'city' => $profile_row['locality'], 'city' => $profile_row['locality'],

4
src/Module/Directory.php
View file

@ -124,7 +124,7 @@ class Directory extends BaseModule
$profile_link = $contact['profile_url']; $profile_link = $contact['profile_url'];
$pdesc = (($contact['pdesc']) ? $contact['pdesc'] . '<br />' : ''); $about = (($contact['about']) ? $contact['about'] . '<br />' : '');
$details = ''; $details = '';
if (strlen($contact['locality'])) { if (strlen($contact['locality'])) {
@ -176,7 +176,7 @@ class Directory extends BaseModule
'profile' => $profile, 'profile' => $profile,
'location' => $location_e, 'location' => $location_e,
'tags' => $contact['pub_keywords'], 'tags' => $contact['pub_keywords'],
'pdesc' => $pdesc, 'about' => $about,
'homepage' => $homepage, 'homepage' => $homepage,
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,

2
src/Module/NoScrape.php
View file

@ -131,7 +131,7 @@ class NoScrape extends BaseModule
$json_info['last-activity'] = date('o-W', $last_active); $json_info['last-activity'] = date('o-W', $last_active);
//These are optional fields. //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) { foreach ($profile_fields as $field) {
if (!empty($a->profile[$field])) { if (!empty($a->profile[$field])) {
$json_info["$field"] = $a->profile[$field]; $json_info["$field"] = $a->profile[$field];

4
src/Module/Profile/Profile.php
View file

@ -155,8 +155,8 @@ class Profile extends BaseProfile
} }
} }
if ($a->profile['pdesc']) { if ($a->profile['about']) {
$basic_fields += self::buildField('pdesc', DI::l10n()->t('Description:'), HTML::toLink($a->profile['pdesc'])); $basic_fields += self::buildField('about', DI::l10n()->t('Description:'), BBCode::convert($a->profile['about']));
} }
if ($a->profile['xmpp']) { if ($a->profile['xmpp']) {

6
src/Module/Settings/Profile/Index.php
View file

@ -89,7 +89,7 @@ class Index extends BaseSettings
$namechanged = $profile['name'] != $name; $namechanged = $profile['name'] != $name;
$pdesc = Strings::escapeTags(trim($_POST['pdesc'])); $about = Strings::escapeTags(trim($_POST['about']));
$address = Strings::escapeTags(trim($_POST['address'])); $address = Strings::escapeTags(trim($_POST['address']));
$locality = Strings::escapeTags(trim($_POST['locality'])); $locality = Strings::escapeTags(trim($_POST['locality']));
$region = Strings::escapeTags(trim($_POST['region'])); $region = Strings::escapeTags(trim($_POST['region']));
@ -121,7 +121,7 @@ class Index extends BaseSettings
'profile', 'profile',
[ [
'name' => $name, 'name' => $name,
'pdesc' => $pdesc, 'about' => $about,
'dob' => $dob, 'dob' => $dob,
'address' => $address, 'address' => $address,
'locality' => $locality, 'locality' => $locality,
@ -273,7 +273,7 @@ class Index extends BaseSettings
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
'$nickname' => $a->user['nickname'], '$nickname' => $a->user['nickname'],
'$name' => ['name', DI::l10n()->t('Display name:'), $profile['name']], '$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']), '$dob' => Temporal::getDateofBirthField($profile['dob'], $a->user['timezone']),
'$hide_friends' => $hide_friends, '$hide_friends' => $hide_friends,
'$address' => ['address', DI::l10n()->t('Street Address:'), $profile['address']], '$address' => ['address', DI::l10n()->t('Street Address:'), $profile['address']],

2
src/Repository/ProfileField.php
View file

@ -282,7 +282,7 @@ class ProfileField extends BaseRepository
'religion' => $this->l10n->t('Religious Views:'), 'religion' => $this->l10n->t('Religious Views:'),
'likes' => $this->l10n->t('Likes:'), 'likes' => $this->l10n->t('Likes:'),
'dislikes' => $this->l10n->t('Dislikes:'), 'dislikes' => $this->l10n->t('Dislikes:'),
'about' => $this->l10n->t('About:'), 'pdesc' => $this->l10n->t('Title/Description:'),
'summary' => $this->l10n->t('Summary'), 'summary' => $this->l10n->t('Summary'),
'music' => $this->l10n->t('Musical interests'), 'music' => $this->l10n->t('Musical interests'),
'book' => $this->l10n->t('Books, literature'), 'book' => $this->l10n->t('Books, literature'),

6
static/dbstructure.config.php
View file

@ -51,7 +51,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1332); define('DB_UPDATE_VERSION', 1333);
} }
return [ return [
@ -1105,7 +1105,7 @@ return [
"is-default" => ["type" => "boolean", "comment" => "Deprecated"], "is-default" => ["type" => "boolean", "comment" => "Deprecated"],
"hide-friends" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hide friend list from viewers of this profile"], "hide-friends" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hide friend list from viewers of this profile"],
"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"pdesc" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Title or description"], "pdesc" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"dob" => ["type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00", "comment" => "Day of birth"], "dob" => ["type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00", "comment" => "Day of birth"],
"address" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "address" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"locality" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "locality" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
@ -1124,7 +1124,7 @@ return [
"prv_keywords" => ["type" => "text", "comment" => ""], "prv_keywords" => ["type" => "text", "comment" => ""],
"likes" => ["type" => "text", "comment" => "Deprecated"], "likes" => ["type" => "text", "comment" => "Deprecated"],
"dislikes" => ["type" => "text", "comment" => "Deprecated"], "dislikes" => ["type" => "text", "comment" => "Deprecated"],
"about" => ["type" => "text", "comment" => "Deprecated"], "about" => ["type" => "text", "comment" => "Profile description"],
"summary" => ["type" => "varchar(255)", "comment" => "Deprecated"], "summary" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"music" => ["type" => "text", "comment" => "Deprecated"], "music" => ["type" => "text", "comment" => "Deprecated"],
"book" => ["type" => "text", "comment" => "Deprecated"], "book" => ["type" => "text", "comment" => "Deprecated"],

2
view/templates/profile/vcard.tpl
View file

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{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}} {{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> <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>

8
view/templates/settings/profile/index.tpl
View file

@ -20,11 +20,11 @@
<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}"/> <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}"/>
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper"> <div id="profile-edit-about-wrapper">
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label> <label id="profile-edit-about-label" for="profile-edit-about">{{$about.1}} </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}"/> <input type="text" size="32" name="about" id="profile-edit-about" value="{{$about.1}}"/>
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-about-end"></div>
<div id="profile-edit-dob-wrapper"> <div id="profile-edit-dob-wrapper">
{{$dob nofilter}} {{$dob nofilter}}
</div> </div>

2
view/templates/widget/vcard.tpl
View file

@ -2,7 +2,7 @@
<div class="vcard h-card"> <div class="vcard h-card">
<div class="fn p-name">{{$name}}</div> <div class="fn p-name">{{$name}}</div>
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}} {{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}} {{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> <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}} {{else}}

8
view/theme/duepuntozero/style.css
View file

@ -732,7 +732,7 @@ input#dfrn-url {
#profile-edit-profile-name-label, #profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-about-label,
#profile-edit-dob-label, #profile-edit-dob-label,
#profile-edit-address-label, #profile-edit-address-label,
#profile-edit-locality-label, #profile-edit-locality-label,
@ -748,7 +748,7 @@ input#dfrn-url {
#profile-edit-profile-name, #profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-about,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
@ -823,7 +823,7 @@ input#dfrn-url {
} }
#profile-edit-pdesc-desc, #profile-edit-about-desc,
#profile-edit-pubkeywords-desc, #profile-edit-pubkeywords-desc,
#profile-edit-prvkeywords-desc { #profile-edit-prvkeywords-desc {
float: left; float: left;
@ -855,7 +855,7 @@ input#dfrn-url {
} }
#profile-edit-name-end, #profile-edit-name-end,
#profile-edit-pdesc-end, #profile-edit-about-end,
#profile-edit-dob-end, #profile-edit-dob-end,
#profile-edit-address-end, #profile-edit-address-end,
#profile-edit-locality-end, #profile-edit-locality-end,

2
view/theme/duepuntozero/templates/profile/vcard.tpl
View file

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{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> <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}} {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

2
view/theme/frio/templates/profile/vcard.tpl
View file

@ -41,7 +41,7 @@
{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}} {{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}} {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
</div> </div>

2
view/theme/frio/templates/settings/profile/index.tpl
View file

@ -62,7 +62,7 @@
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$pdesc}} {{include file="field_textarea.tpl" field=$about}}
{{$dob nofilter}} {{$dob nofilter}}

2
view/theme/frio/templates/widget/vcard.tpl
View file

@ -30,7 +30,7 @@
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}} {{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}} {{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
</div> </div>

4
view/theme/quattro/dark/style.css
View file

@ -1945,7 +1945,7 @@ ul.tabs li .active {
padding: 7px; padding: 7px;
} }
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-about-label,
#profile-edit-dob-label, #profile-edit-dob-label,
#profile-edit-address-label, #profile-edit-address-label,
#profile-edit-locality-label, #profile-edit-locality-label,
@ -1960,7 +1960,7 @@ ul.tabs li .active {
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-about,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,

4
view/theme/quattro/green/style.css
View file

@ -1945,7 +1945,7 @@ ul.tabs li .active {
padding: 7px; padding: 7px;
} }
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-about-label,
#profile-edit-dob-label, #profile-edit-dob-label,
#profile-edit-address-label, #profile-edit-address-label,
#profile-edit-locality-label, #profile-edit-locality-label,
@ -1960,7 +1960,7 @@ ul.tabs li .active {
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-about,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,

4
view/theme/quattro/lilac/style.css
View file

@ -1945,7 +1945,7 @@ ul.tabs li .active {
padding: 7px; padding: 7px;
} }
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-about-label,
#profile-edit-dob-label, #profile-edit-dob-label,
#profile-edit-address-label, #profile-edit-address-label,
#profile-edit-locality-label, #profile-edit-locality-label,
@ -1960,7 +1960,7 @@ ul.tabs li .active {
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-about,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,

4
view/theme/quattro/quattro.less
View file

@ -1238,7 +1238,7 @@ ul.tabs {
padding: 7px; padding: 7px;
} }
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-about-label,
#profile-edit-dob-label, #profile-edit-dob-label,
#profile-edit-address-label, #profile-edit-address-label,
#profile-edit-locality-label, #profile-edit-locality-label,
@ -1253,7 +1253,7 @@ ul.tabs {
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-about,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,

2
view/theme/quattro/templates/profile/vcard.tpl
View file

@ -17,7 +17,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{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> <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}} {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

2
view/theme/vier/templates/profile/vcard.tpl
View file

@ -11,7 +11,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{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}} {{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> <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>

8
view/theme/vier/templates/settings/profile/index.tpl
View file

@ -54,11 +54,11 @@
</div> </div>
<div id="profile-edit-name-end"></div> <div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper"> <div id="profile-edit-about-wrapper">
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label> <label id="profile-edit-about-label" for="profile-edit-about">{{$about.1}} </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}"/> <input type="text" size="32" name="about" id="profile-edit-about" value="{{$about.2}}"/>
</div> </div>
<div id="profile-edit-pdesc-end"></div> <div id="profile-edit-about-end"></div>
<div id="profile-edit-xmpp-wrapper"> <div id="profile-edit-xmpp-wrapper">
<label id="profile-edit-xmpp-label" for="profile-edit-xmpp">{{$xmpp.1}} </label> <label id="profile-edit-xmpp-label" for="profile-edit-xmpp">{{$xmpp.1}} </label>