Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 12:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8190 from MrPetovan/task/profile-tidings

Browse source 
Deprecated profile fields cleanup
This commit is contained in:
Philipp 2020-01-28 13:41:55 +01:00 committed by GitHub
commit 353dddaf15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 45 additions and 574 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
doc/API-Entities.md
View file

@ -1181,54 +1181,6 @@ Mutually exclusive with <code>link</code>.
<td></td> <td></td>
</tr> </tr>
<tr>
<td><code>hometown</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>gender</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>marital</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>marital_with</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>marital_since</code></td>
<td>String (Date)</td>
<td></td>
</tr>
<tr>
<td><code>sexual</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>politic</code></td>
<td>String</td>
<td></td>
</tr>
<tr>
<td><code>religion</code></td>
<td>String</td>
<td></td>
</tr>
<tr> <tr>
<td><code>public_keywords</code></td> <td><code>public_keywords</code></td>
<td>String</td> <td>String</td>
@ -1241,90 +1193,12 @@ Mutually exclusive with <code>link</code>.
<td>Comma-separated list of words meant to be used for search only.</td> <td>Comma-separated list of words meant to be used for search only.</td>
</tr> </tr>
<tr>
<td><code>likes</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>dislikes</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>about</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>music</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>book</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>tv</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>film</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>interest</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>romance</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>work</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>education</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr>
<td><code>social_networks</code></td>
<td>String (Plaintext)</td>
<td></td>
</tr>
<tr> <tr>
<td><code>homepage</code></td> <td><code>homepage</code></td>
<td>String (URL)</td> <td>String (URL)</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td><code>users</code></td>
<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
<td>If populated, only these contacts have access to the profile.</td>
</tr>
</tbody> </tbody>
</table> </table>

3
doc/Addons.md
View file

@ -695,9 +695,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
### src/Content/ContactSelector.php ### src/Content/ContactSelector.php
Hook::callAll('network_to_name', $nets); Hook::callAll('network_to_name', $nets);
Hook::callAll('gender_selector', $select);
Hook::callAll('sexpref_selector', $select);
Hook::callAll('marital_selector', $select);
### src/Content/OEmbed.php ### src/Content/OEmbed.php

42
doc/database/db_profile.md
View file

@ -16,29 +16,29 @@ Table profile
| region | | varchar(255) | NO | | | | | region | | varchar(255) | NO | | | |
| postal-code | | varchar(32) | NO | | | | | postal-code | | varchar(32) | NO | | | |
| country-name | | varchar(255) | NO | | | | | country-name | | varchar(255) | NO | | | |
| hometown | | varchar(255) | NO | MUL | | | | hometown | Deprecated | varchar(255) | NO | MUL | | |
| gender | | varchar(32) | NO | | | | | gender | Deprecated | varchar(32) | NO | | | |
| marital | | varchar(255) | NO | | | | | marital | Deprecated | varchar(255) | NO | | | |
| with | | text | NO | | NULL | | | with | Deprecated | text | NO | | NULL | |
| howlong | | datetime | NO | | 0001-01-01 00:00:00 | | | howlong | Deprecated | datetime | NO | | 0001-01-01 00:00:00 | |
| sexual | | varchar(255) | NO | | | | | sexual | Deprecated | varchar(255) | NO | | | |
| politic | | varchar(255) | NO | | | | | politic | Deprecated | varchar(255) | NO | | | |
| religion | | varchar(255) | NO | | | | | religion | Deprecated | varchar(255) | NO | | | |
| pub_keywords | | text | NO | | NULL | | | pub_keywords | | text | NO | | NULL | |
| prv_keywords | | text | NO | | NULL | | | prv_keywords | | text | NO | | NULL | |
| likes | | text | NO | | NULL | | | likes | Deprecated | text | NO | | NULL | |
| dislikes | | text | NO | | NULL | | | dislikes | Deprecated | text | NO | | NULL | |
| about | | text | NO | | NULL | | | about | Deprecated | text | NO | | NULL | |
| summary | | varchar(255) | NO | | | | | summary | Deprecated | varchar(255) | NO | | | |
| music | | text | NO | | NULL | | | music | Deprecated | text | NO | | NULL | |
| book | | text | NO | | NULL | | | book | Deprecated | text | NO | | NULL | |
| tv | | text | NO | | NULL | | | tv | Deprecated | text | NO | | NULL | |
| film | | text | NO | | NULL | | | film | Deprecated | text | NO | | NULL | |
| interest | | text | NO | | NULL | | | interest | Deprecated | text | NO | | NULL | |
| romance | | text | NO | | NULL | | | romance | Deprecated | text | NO | | NULL | |
| work | | text | NO | | NULL | | | work | Deprecated | text | NO | | NULL | |
| education | | text | NO | | NULL | | | education | Deprecated | text | NO | | NULL | |
| contact | | text | NO | | NULL | | | contact | Deprecated | text | NO | | NULL | |
| homepage | | varchar(255) | NO | | | | | homepage | | varchar(255) | NO | | | |
| photo | | varchar(255) | NO | | | | | photo | | varchar(255) | NO | | | |
| thumb | | varchar(255) | NO | | | | | thumb | | varchar(255) | NO | | | |

3
doc/de/Addons.md
View file

@ -408,9 +408,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
### src/Content/ContactSelector.php ### src/Content/ContactSelector.php
Hook::callAll('network_to_name', $nets); Hook::callAll('network_to_name', $nets);
Hook::callAll('gender_selector', $select);
Hook::callAll('sexpref_selector', $select);
Hook::callAll('marital_selector', $select);
### src/Content/OEmbed.php ### src/Content/OEmbed.php

2
mod/common.php
View file

@ -41,7 +41,7 @@ function common_content(App $a)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
DI::page()['aside'] = ""; DI::page()['aside'] = "";
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"])); Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"]));
} }
} else { } else {
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]); $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);

2
mod/crepair.php
View file

@ -108,7 +108,7 @@ function crepair_content(App $a)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->data['contact'] = $contact; $a->data['contact'] = $contact;
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"])); Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"]));
} }
$warning = DI::l10n()->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.'); $warning = DI::l10n()->t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');

2
mod/display.php
View file

@ -114,7 +114,7 @@ function display_init(App $a)
} }
} }
Profile::load($a, $nick, 0, $profiledata); Profile::load($a, $nick, $profiledata);
} }
function display_fetchauthor($a, $item) function display_fetchauthor($a, $item)

2
mod/follow.php
View file

@ -192,7 +192,7 @@ function follow_content(App $a)
$profiledata = Contact::getDetailsByURL($ret['url']); $profiledata = Contact::getDetailsByURL($ret['url']);
if ($profiledata) { if ($profiledata) {
Profile::load($a, '', 0, $profiledata, false); Profile::load($a, '', $profiledata, false);
} }
if ($gcontact_id <> 0) { if ($gcontact_id <> 0) {

2
mod/unfollow.php
View file

@ -141,7 +141,7 @@ function unfollow_content(App $a)
]); ]);
DI::page()['aside'] = ''; DI::page()['aside'] = '';
Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url'])); Profile::load($a, '', Contact::getDetailsByURL($contact['url']));
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]); $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);

140
src/Content/ContactSelector.php
View file

@ -19,7 +19,7 @@ class ContactSelector
/** /**
* @param string $current current * @param string $current current
* @param boolean $disabled optional, default false * @param boolean $disabled optional, default false
* @return object * @return string
*/ */
public static function pollInterval($current, $disabled = false) public static function pollInterval($current, $disabled = false)
{ {
@ -47,7 +47,7 @@ class ContactSelector
/** /**
* @param string $profile Profile URL * @param string $profile Profile URL
* @return string Server URL * @return string Server URL
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Exception
*/ */
private static function getServerURLForProfile($profile) private static function getServerURLForProfile($profile)
{ {
@ -147,7 +147,7 @@ class ContactSelector
* @param string $network network * @param string $network network
* @param string $profile optional, default empty * @param string $profile optional, default empty
* @return string * @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Exception
*/ */
public static function networkToIcon($network, $profile = "") public static function networkToIcon($network, $profile = "")
{ {
@ -195,138 +195,4 @@ class ContactSelector
return $network_icon; return $network_icon;
} }
/**
* @param string $current optional, default empty
* @param string $suffix optionsl, default empty
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function gender($current = "", $suffix = "")
{
$o = '';
$select = [
'' => DI::l10n()->t('No answer'),
'Male' => DI::l10n()->t('Male'),
'Female' => DI::l10n()->t('Female'),
'Currently Male' => DI::l10n()->t('Currently Male'),
'Currently Female' => DI::l10n()->t('Currently Female'),
'Mostly Male' => DI::l10n()->t('Mostly Male'),
'Mostly Female' => DI::l10n()->t('Mostly Female'),
'Transgender' => DI::l10n()->t('Transgender'),
'Intersex' => DI::l10n()->t('Intersex'),
'Transsexual' => DI::l10n()->t('Transsexual'),
'Hermaphrodite' => DI::l10n()->t('Hermaphrodite'),
'Neuter' => DI::l10n()->t('Neuter'),
'Non-specific' => DI::l10n()->t('Non-specific'),
'Other' => DI::l10n()->t('Other'),
'Undecided' => DI::l10n()->t('Undecided'),
];
Hook::callAll('gender_selector', $select);
$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
foreach ($select as $neutral => $selection) {
if ($selection !== 'NOTRANSLATION') {
$selected = (($neutral == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$neutral\" $selected >$selection</option>";
}
}
$o .= '</select>';
return $o;
}
/**
* @param string $current optional, default empty
* @param string $suffix optionsl, default empty
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function sexualPreference($current = "", $suffix = "")
{
$o = '';
$select = [
'' => DI::l10n()->t('No answer'),
'Males' => DI::l10n()->t('Males'),
'Females' => DI::l10n()->t('Females'),
'Gay' => DI::l10n()->t('Gay'),
'Lesbian' => DI::l10n()->t('Lesbian'),
'No Preference' => DI::l10n()->t('No Preference'),
'Bisexual' => DI::l10n()->t('Bisexual'),
'Autosexual' => DI::l10n()->t('Autosexual'),
'Abstinent' => DI::l10n()->t('Abstinent'),
'Virgin' => DI::l10n()->t('Virgin'),
'Deviant' => DI::l10n()->t('Deviant'),
'Fetish' => DI::l10n()->t('Fetish'),
'Oodles' => DI::l10n()->t('Oodles'),
'Nonsexual' => DI::l10n()->t('Nonsexual'),
];
Hook::callAll('sexpref_selector', $select);
$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
foreach ($select as $neutral => $selection) {
if ($selection !== 'NOTRANSLATION') {
$selected = (($neutral == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$neutral\" $selected >$selection</option>";
}
}
$o .= '</select>';
return $o;
}
/**
* @param string $current optional, default empty
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function maritalStatus($current = "")
{
$o = '';
$select = [
'' => DI::l10n()->t('No answer'),
'Single' => DI::l10n()->t('Single'),
'Lonely' => DI::l10n()->t('Lonely'),
'In a relation' => DI::l10n()->t('In a relation'),
'Has crush' => DI::l10n()->t('Has crush'),
'Infatuated' => DI::l10n()->t('Infatuated'),
'Dating' => DI::l10n()->t('Dating'),
'Unfaithful' => DI::l10n()->t('Unfaithful'),
'Sex Addict' => DI::l10n()->t('Sex Addict'),
'Friends' => DI::l10n()->t('Friends'),
'Friends/Benefits' => DI::l10n()->t('Friends/Benefits'),
'Casual' => DI::l10n()->t('Casual'),
'Engaged' => DI::l10n()->t('Engaged'),
'Married' => DI::l10n()->t('Married'),
'Imaginarily married' => DI::l10n()->t('Imaginarily married'),
'Partners' => DI::l10n()->t('Partners'),
'Cohabiting' => DI::l10n()->t('Cohabiting'),
'Common law' => DI::l10n()->t('Common law'),
'Happy' => DI::l10n()->t('Happy'),
'Not looking' => DI::l10n()->t('Not looking'),
'Swinger' => DI::l10n()->t('Swinger'),
'Betrayed' => DI::l10n()->t('Betrayed'),
'Separated' => DI::l10n()->t('Separated'),
'Unstable' => DI::l10n()->t('Unstable'),
'Divorced' => DI::l10n()->t('Divorced'),
'Imaginarily divorced' => DI::l10n()->t('Imaginarily divorced'),
'Widowed' => DI::l10n()->t('Widowed'),
'Uncertain' => DI::l10n()->t('Uncertain'),
'It\'s complicated' => DI::l10n()->t('It\'s complicated'),
'Don\'t care' => DI::l10n()->t('Don\'t care'),
'Ask me' => DI::l10n()->t('Ask me'),
];
Hook::callAll('marital_selector', $select);
$o .= '<select name="marital" id="marital-select" size="1" >';
foreach ($select as $neutral => $selection) {
if ($selection !== 'NOTRANSLATION') {
$selected = (($neutral == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$neutral\" $selected >$selection</option>";
}
}
$o .= '</select>';
return $o;
}
} }

6
src/Model/Contact.php
View file

@ -721,8 +721,8 @@ class Contact
return; return;
} }
$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', $fields = ['name', 'photo', 'thumb', 'pdesc' => 'about', 'address', 'locality', 'region',
'country-name', 'gender', '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)) {
return; return;
@ -733,7 +733,7 @@ class Contact
$fields = ['name' => $profile['name'], 'nick' => $user['nickname'], $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
'gender' => $profile['gender'], 'contact-type' => $user['account-type'], 'gender' => '', 'contact-type' => $user['account-type'],
'xmpp' => $profile['xmpp']]; 'xmpp' => $profile['xmpp']];
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);

2
src/Model/GContact.php
View file

@ -1117,7 +1117,7 @@ class GContact
); );
$gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'], $gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'],
'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'], 'gender' => '', 'keywords' => $userdata['pub_keywords'],
'birthday' => $userdata['dob'], 'photo' => $userdata['photo'], 'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
"notify" => $userdata['notify'], 'url' => $userdata['url'], "notify" => $userdata['notify'], 'url' => $userdata['url'],
"hide" => ($userdata['hidewall'] || !$userdata['net-publish']), "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),

23
src/Model/Profile.php
View file

@ -121,13 +121,12 @@ class Profile
* *
* @param App $a * @param App $a
* @param string $nickname string * @param string $nickname string
* @param int $profile_id int
* @param array $profiledata array * @param array $profiledata array
* @param boolean $show_connect Show connect link * @param boolean $show_connect Show connect link
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function load(App $a, $nickname, $profile_id = 0, array $profiledata = [], $show_connect = true) public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true)
{ {
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]); $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
@ -371,7 +370,6 @@ class Profile
} }
$gender = !empty($profile['gender']) ? DI::l10n()->t('Gender:') : false; $gender = !empty($profile['gender']) ? DI::l10n()->t('Gender:') : false;
$marital = !empty($profile['marital']) ? DI::l10n()->t('Status:') : false;
$homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false; $homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false;
$about = !empty($profile['about']) ? DI::l10n()->t('About:') : false; $about = !empty($profile['about']) ? DI::l10n()->t('About:') : false;
$xmpp = !empty($profile['xmpp']) ? DI::l10n()->t('XMPP:') : false; $xmpp = !empty($profile['xmpp']) ? DI::l10n()->t('XMPP:') : false;
@ -450,10 +448,6 @@ class Profile
$p['gender'] = DI::l10n()->t($p['gender']); $p['gender'] = DI::l10n()->t($p['gender']);
} }
if (isset($p['marital'])) {
$p['marital'] = DI::l10n()->t($p['marital']);
}
if (isset($p['photo'])) { if (isset($p['photo'])) {
$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL); $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
} }
@ -475,7 +469,6 @@ class Profile
'$account_type' => $account_type, '$account_type' => $account_type,
'$location' => $location, '$location' => $location,
'$gender' => $gender, '$gender' => $gender,
'$marital' => $marital,
'$homepage' => $homepage, '$homepage' => $homepage,
'$about' => $about, '$about' => $about,
'$network' => DI::l10n()->t('Network:'), '$network' => DI::l10n()->t('Network:'),
@ -920,13 +913,6 @@ class Profile
(`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
(`profile`.`gender` LIKE ?) OR
(`profile`.`marital` LIKE ?) OR
(`profile`.`sexual` LIKE ?) OR
(`profile`.`about` LIKE ?) OR
(`profile`.`romance` LIKE ?) OR
(`profile`.`work` LIKE ?) OR
(`profile`.`education` LIKE ?) OR
(`profile`.`pub_keywords` LIKE ?) OR (`profile`.`pub_keywords` LIKE ?) OR
(`profile`.`prv_keywords` LIKE ?))", (`profile`.`prv_keywords` LIKE ?))",
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
@ -962,13 +948,6 @@ class Profile
(`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
(`profile`.`gender` LIKE ?) OR
(`profile`.`marital` LIKE ?) OR
(`profile`.`sexual` LIKE ?) OR
(`profile`.`about` LIKE ?) OR
(`profile`.`romance` LIKE ?) OR
(`profile`.`work` LIKE ?) OR
(`profile`.`education` LIKE ?) OR
(`profile`.`pub_keywords` LIKE ?) OR (`profile`.`pub_keywords` LIKE ?) OR
(`profile`.`prv_keywords` LIKE ?)) (`profile`.`prv_keywords` LIKE ?))
$order LIMIT ?,?", $order LIMIT ?,?",

2
src/Module/AllFriends.php
View file

@ -44,7 +44,7 @@ class AllFriends extends BaseModule
} }
DI::page()['aside'] = ""; DI::page()['aside'] = "";
Model\Profile::load($app, "", 0, Model\Contact::getDetailsByURL($contact["url"])); Model\Profile::load($app, "", Model\Contact::getDetailsByURL($contact["url"]));
$total = Model\GContact::countAllFriends(local_user(), $cid); $total = Model\GContact::countAllFriends(local_user(), $cid);

4
src/Module/Contact.php
View file

@ -957,7 +957,7 @@ class Contact extends BaseModule
$profiledata = Model\Contact::getDetailsByURL($contact['url']); $profiledata = Model\Contact::getDetailsByURL($contact['url']);
Model\Profile::load($a, '', 0, $profiledata, true); Model\Profile::load($a, '', $profiledata, true);
$o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update); $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
} }
@ -979,7 +979,7 @@ class Contact extends BaseModule
$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']); $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
} }
Model\Profile::load($a, '', 0, $profiledata, true); Model\Profile::load($a, '', $profiledata, true);
$o .= Model\Contact::getPostsFromUrl($contact['url']); $o .= Model\Contact::getPostsFromUrl($contact['url']);
} }

6
src/Module/Directory.php
View file

@ -137,10 +137,7 @@ class Directory extends BaseModule
$location = ''; $location = '';
} }
$gender = (!empty($profile['gender']) ? DI::l10n()->t('Gender:') : false);
$marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false);
$homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false); $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
$about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false);
$location_e = $location; $location_e = $location;
@ -160,11 +157,8 @@ class Directory extends BaseModule
'profile' => $profile, 'profile' => $profile,
'location' => $location_e, 'location' => $location_e,
'tags' => $contact['pub_keywords'], 'tags' => $contact['pub_keywords'],
'gender' => $gender,
'pdesc' => $pdesc, 'pdesc' => $pdesc,
'marital' => $marital,
'homepage' => $homepage, 'homepage' => $homepage,
'about' => $about,
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
]; ];

4
src/Module/HoverCard.php
View file

@ -21,16 +21,14 @@ class HoverCard extends BaseModule
if ((local_user()) && ($parameters['action'] ?? '') === 'view') { if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
// A logged in user views a profile of a user // A logged in user views a profile of a user
$nickname = $a->user['nickname']; $nickname = $a->user['nickname'];
$profile = $parameters['profile'];
} elseif (empty($parameters['action'])) { } elseif (empty($parameters['action'])) {
// Show the profile hovercard // Show the profile hovercard
$nickname = $parameters['profile']; $nickname = $parameters['profile'];
$profile = 0;
} else { } else {
throw new NotFoundException(DI::l10n()->t('No profile')); throw new NotFoundException(DI::l10n()->t('No profile'));
} }
Profile::load($a, $nickname, $profile); Profile::load($a, $nickname);
$page = DI::page(); $page = DI::page();

6
src/Module/NoScrape.php
View file

@ -25,17 +25,15 @@ class NoScrape extends BaseModule
if (isset($parameters['nick'])) { if (isset($parameters['nick'])) {
// Get infos about a specific nick (public) // Get infos about a specific nick (public)
$which = $parameters['nick']; $which = $parameters['nick'];
$profile = 0;
} elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') { } elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
// view infos about a known profile (needs a login) // view infos about a known profile (needs a login)
$which = $a->user['nickname']; $which = $a->user['nickname'];
$profile = $parameters['profile'];
} else { } else {
System::jsonError(403, 'Authentication required'); System::jsonError(403, 'Authentication required');
exit(); exit();
} }
Profile::load($a, $which, $profile); Profile::load($a, $nickname);
$json_info = [ $json_info = [
'addr' => $a->profile['addr'], 'addr' => $a->profile['addr'],
@ -114,7 +112,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', 'gender', 'marital', 'about']; $profile_fields = ['pdesc', '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];

3
src/Network/Probe.php
View file

@ -833,9 +833,6 @@ class Probe
if (!empty($profile['country'])) { if (!empty($profile['country'])) {
$loc['country-name'] = $profile['country']; $loc['country-name'] = $profile['country'];
} }
if (!empty($profile['hometown'])) {
$loc['locality'] = $profile['hometown'];
}
$location = Profile::formatLocation($loc); $location = Profile::formatLocation($loc);
if (!empty($location)) { if (!empty($location)) {
$data['location'] = $location; $data['location'] = $location;

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

@ -43,8 +43,6 @@
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}} {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}} {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}

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

@ -64,7 +64,7 @@
<option>temp</option> <option>temp</option>
</select> </select>
</div> </div>
<div id="profile-edit-hometown-end"></div> <div id="profile-edit-region-end"></div>
<div class="profile-edit-submit-wrapper"> <div class="profile-edit-submit-wrapper">
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/> <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
</div> </div>

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

@ -733,21 +733,15 @@ 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-pdesc-label,
#profile-edit-gender-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,
#profile-edit-region-label, #profile-edit-region-label,
#profile-edit-postal-code-label, #profile-edit-postal-code-label,
#profile-edit-country-name-label, #profile-edit-country-name-label,
#profile-edit-marital-label,
#profile-edit-sexual-label,
#profile-edit-politic-label,
#profile-edit-religion-label,
#profile-edit-pubkeywords-label, #profile-edit-pubkeywords-label,
#profile-edit-prvkeywords-label, #profile-edit-prvkeywords-label,
#profile-edit-homepage-label, #profile-edit-homepage-label {
#profile-edit-hometown-label {
float: left; float: left;
width: 175px; width: 175px;
} }
@ -755,17 +749,12 @@ input#dfrn-url {
#profile-edit-profile-name, #profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#profile-edit-pdesc, #profile-edit-pdesc,
#gender-select,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
#profile-edit-region, #profile-edit-region,
#profile-edit-postal-code, #profile-edit-postal-code,
#profile-edit-country-name, #profile-edit-country-name,
#marital-select,
#sexual-select,
#profile-edit-politic,
#profile-edit-religion,
#profile-edit-pubkeywords, #profile-edit-pubkeywords,
#profile-edit-prvkeywords, #profile-edit-prvkeywords,
#profile-in-dir-yes, #profile-in-dir-yes,
@ -842,7 +831,7 @@ input#dfrn-url {
} }
#profile-edit-homepage, #profile-edit-hometown { #profile-edit-homepage {
float: left; float: left;
margin-bottom: 35px; margin-bottom: 35px;
} }
@ -865,24 +854,17 @@ input#dfrn-url {
margin-bottom: 20px margin-bottom: 20px
} }
#profile-edit-profile-name-end,
#profile-edit-name-end, #profile-edit-name-end,
#profile-edit-pdesc-end, #profile-edit-pdesc-end,
#profile-edit-gender-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,
#profile-edit-region-end, #profile-edit-region-end,
#profile-edit-postal-code-end, #profile-edit-postal-code-end,
#profile-edit-country-name-end, #profile-edit-country-name-end,
#profile-edit-marital-end,
#profile-edit-sexual-end,
#profile-edit-politic-end,
#profile-edit-religion-end,
#profile-edit-pubkeywords-end, #profile-edit-pubkeywords-end,
#profile-edit-prvkeywords-end, #profile-edit-prvkeywords-end,
#profile-edit-homepage-end, #profile-edit-homepage-end,
#profile-edit-hometown-end,
#profile-in-dir-break, #profile-in-dir-break,
#profile-in-dir-end, #profile-in-dir-end,
#profile-in-netdir-break, #profile-in-netdir-break,
@ -909,10 +891,6 @@ input#dfrn-url {
} }
#gender-select, #marital-select, #sexual-select {
width: 220px;
}
#profile-edit-profile-name-wrapper .required { #profile-edit-profile-name-wrapper .required {
color: #FF0000; color: #FF0000;
float: left; float: left;
@ -1589,113 +1567,6 @@ blockquote.shared_content {
} }
#advanced-profile-name-wrapper,
#advanced-profile-gender-wrapper,
#advanced-profile-dob-wrapper,
#advanced-profile-age-wrapper,
#advanced-profile-marital-wrapper,
#advanced-profile-sexual-wrapper,
#advanced-profile-homepage-wrapper,
#advanced-profile-politic-wrapper,
#advanced-profile-religion-wrapper,
#advanced-profile-about-wrapper,
#advanced-profile-interest-wrapper,
#advanced-profile-contact-wrapper,
#advanced-profile-music-wrapper,
#advanced-profile-book-wrapper,
#advanced-profile-tv-wrapper,
#advanced-profile-film-wrapper,
#advanced-profile-romance-wrapper,
#advanced-profile-work-wrapper,
#advanced-profile-education-wrapper {
margin-top: 20px;
}
#advanced-profile-name-text,
#advanced-profile-gender-text,
#advanced-profile-dob-text,
#advanced-profile-age-text,
#advanced-profile-marital-text,
#advanced-profile-sexual-text,
#advanced-profile-homepage-text,
#advanced-profile-politic-text,
#advanced-profile-religion-text,
#advanced-profile-about-text,
#advanced-profile-interest-text,
#advanced-profile-contact-text,
#advanced-profile-music-text,
#advanced-profile-book-text,
#advanced-profile-tv-text,
#advanced-profile-film-text,
#advanced-profile-romance-text,
#advanced-profile-work-text,
#advanced-profile-education-text {
width: 300px;
float: left;
}
#advanced-profile-name-end,
#advanced-profile-gender-end,
#advanced-profile-dob-end,
#advanced-profile-age-end,
#advanced-profile-marital-end,
#advanced-profile-sexual-end,
#advanced-profile-homepage-end,
#advanced-profile-politic-end,
#advanced-profile-religion-end {
height: 10px;
}
#advanced-profile-about-end,
#advanced-profile-interest-end,
#advanced-profile-contact-end,
#advanced-profile-music-end,
#advanced-profile-book-end,
#advanced-profile-tv-end,
#advanced-profile-film-end,
#advanced-profile-romance-end,
#advanced-profile-work-end,
#advanced-profile-education-end {
}
#advanced-profile-name,
#advanced-profile-gender,
#advanced-profile-dob,
#advanced-profile-age,
#advanced-profile-marital,
#advanced-profile-sexual,
#advanced-profile-homepage,
#advanced-profile-politic,
#advanced-profile-religion {
float: left;
}
#advanced-profile-about,
#advanced-profile-interest,
#advanced-profile-contact,
#advanced-profile-music,
#advanced-profile-book,
#advanced-profile-tv,
#advanced-profile-film,
#advanced-profile-romance,
#advanced-profile-work,
#advanced-profile-education {
margin-top: 10px;
margin-left: 50px;
margin-right: 20px;
padding: 10px;
border: 1px solid #CCCCCC;
}
#advanced-profile-with {
float: left;
margin-left: 15px;
}
#contact-edit-wrapper { #contact-edit-wrapper {
margin-top: 10px; margin-top: 10px;
} }
@ -2446,14 +2317,14 @@ aside input[type='text'] {
margin-bottom: 25px; margin-bottom: 25px;
} }
.location-label, .gender-label, .marital-label, .homepage-label, .network-label { .location-label, .gender-label, .homepage-label, .network-label {
float: left; float: left;
text-align: right; text-align: right;
display: block; display: block;
width: 65px; width: 65px;
} }
.adr, .x-gender, .marital-text, .homepage-url, .x-network { .adr, .homepage-url, .x-network {
float: left; float: left;
display: block; display: block;
margin-left: 8px; margin-left: 8px;

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

@ -30,8 +30,6 @@
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}} {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl"}} {{include file="diaspora_vcard.tpl"}}

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

@ -115,13 +115,6 @@
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}} {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
{{if $marital}}
<div class="marital detail">
<span class="marital-label icon"><i class="fa fa-heart"></i></span>
<span class="marital-text icon">{{$profile.marital}}</span>
</div>
{{/if}}
{{if $homepage}} {{if $homepage}}
<div class="homepage detail"> <div class="homepage detail">
<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span> <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>

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

@ -1973,45 +1973,29 @@ ul.tabs li .active {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 7px; padding: 7px;
} }
#profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,
#profile-edit-gender-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,
#profile-edit-region-label, #profile-edit-region-label,
#profile-edit-postal-code-label, #profile-edit-postal-code-label,
#profile-edit-country-name-label, #profile-edit-country-name-label,
#profile-edit-marital-label,
#profile-edit-with-label,
#profile-edit-sexual-label,
#profile-edit-politic-label,
#profile-edit-religion-label,
#profile-edit-pubkeywords-label, #profile-edit-pubkeywords-label,
#profile-edit-prvkeywords-label, #profile-edit-prvkeywords-label,
#profile-edit-gender-select,
#profile-edit-homepage-label { #profile-edit-homepage-label {
float: left; float: left;
width: 175px; width: 175px;
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#gender-select,
#profile-edit-pdesc, #profile-edit-pdesc,
#profile-edit-gender,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
#profile-edit-region, #profile-edit-region,
#profile-edit-postal-code, #profile-edit-postal-code,
#profile-edit-country-name, #profile-edit-country-name,
#profile-edit-marital,
#profile-edit-with,
#profile-edit-sexual,
#profile-edit-politic,
#profile-edit-religion,
#profile-edit-pubkeywords, #profile-edit-pubkeywords,
#profile-edit-prvkeywords, #profile-edit-prvkeywords,
#profile-edit-homepage { #profile-edit-homepage {

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

@ -1973,45 +1973,29 @@ ul.tabs li .active {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 7px; padding: 7px;
} }
#profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,
#profile-edit-gender-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,
#profile-edit-region-label, #profile-edit-region-label,
#profile-edit-postal-code-label, #profile-edit-postal-code-label,
#profile-edit-country-name-label, #profile-edit-country-name-label,
#profile-edit-marital-label,
#profile-edit-with-label,
#profile-edit-sexual-label,
#profile-edit-politic-label,
#profile-edit-religion-label,
#profile-edit-pubkeywords-label, #profile-edit-pubkeywords-label,
#profile-edit-prvkeywords-label, #profile-edit-prvkeywords-label,
#profile-edit-gender-select,
#profile-edit-homepage-label { #profile-edit-homepage-label {
float: left; float: left;
width: 175px; width: 175px;
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#gender-select,
#profile-edit-pdesc, #profile-edit-pdesc,
#profile-edit-gender,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
#profile-edit-region, #profile-edit-region,
#profile-edit-postal-code, #profile-edit-postal-code,
#profile-edit-country-name, #profile-edit-country-name,
#profile-edit-marital,
#profile-edit-with,
#profile-edit-sexual,
#profile-edit-politic,
#profile-edit-religion,
#profile-edit-pubkeywords, #profile-edit-pubkeywords,
#profile-edit-prvkeywords, #profile-edit-prvkeywords,
#profile-edit-homepage { #profile-edit-homepage {

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

@ -1973,45 +1973,29 @@ ul.tabs li .active {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 7px; padding: 7px;
} }
#profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,
#profile-edit-gender-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,
#profile-edit-region-label, #profile-edit-region-label,
#profile-edit-postal-code-label, #profile-edit-postal-code-label,
#profile-edit-country-name-label, #profile-edit-country-name-label,
#profile-edit-marital-label,
#profile-edit-with-label,
#profile-edit-sexual-label,
#profile-edit-politic-label,
#profile-edit-religion-label,
#profile-edit-pubkeywords-label, #profile-edit-pubkeywords-label,
#profile-edit-prvkeywords-label, #profile-edit-prvkeywords-label,
#profile-edit-gender-select,
#profile-edit-homepage-label { #profile-edit-homepage-label {
float: left; float: left;
width: 175px; width: 175px;
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#gender-select,
#profile-edit-pdesc, #profile-edit-pdesc,
#profile-edit-gender,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
#profile-edit-region, #profile-edit-region,
#profile-edit-postal-code, #profile-edit-postal-code,
#profile-edit-country-name, #profile-edit-country-name,
#profile-edit-marital,
#profile-edit-with,
#profile-edit-sexual,
#profile-edit-politic,
#profile-edit-religion,
#profile-edit-pubkeywords, #profile-edit-pubkeywords,
#profile-edit-prvkeywords, #profile-edit-prvkeywords,
#profile-edit-homepage { #profile-edit-homepage {

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

@ -1267,45 +1267,29 @@ ul.tabs {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 7px; padding: 7px;
} }
#profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,
#profile-edit-gender-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,
#profile-edit-region-label, #profile-edit-region-label,
#profile-edit-postal-code-label, #profile-edit-postal-code-label,
#profile-edit-country-name-label, #profile-edit-country-name-label,
#profile-edit-marital-label,
#profile-edit-with-label,
#profile-edit-sexual-label,
#profile-edit-politic-label,
#profile-edit-religion-label,
#profile-edit-pubkeywords-label, #profile-edit-pubkeywords-label,
#profile-edit-prvkeywords-label, #profile-edit-prvkeywords-label,
#profile-edit-gender-select,
#profile-edit-homepage-label { #profile-edit-homepage-label {
float: left; float: left;
width: 175px; width: 175px;
padding-top: 7px; padding-top: 7px;
} }
#profile-edit-profile-name,
#profile-edit-name, #profile-edit-name,
#gender-select,
#profile-edit-pdesc, #profile-edit-pdesc,
#profile-edit-gender,
#profile-edit-dob, #profile-edit-dob,
#profile-edit-address, #profile-edit-address,
#profile-edit-locality, #profile-edit-locality,
#profile-edit-region, #profile-edit-region,
#profile-edit-postal-code, #profile-edit-postal-code,
#profile-edit-country-name, #profile-edit-country-name,
#profile-edit-marital,
#profile-edit-with,
#profile-edit-sexual,
#profile-edit-politic,
#profile-edit-religion,
#profile-edit-pubkeywords, #profile-edit-pubkeywords,
#profile-edit-prvkeywords, #profile-edit-prvkeywords,
#profile-edit-homepage { #profile-edit-homepage {

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

@ -49,8 +49,6 @@
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}} {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}} {{if $homepage}}
<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt> <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd> <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>

21
view/theme/smoothly/style.css
View file

@ -2046,20 +2046,6 @@ pre code {
/* = Profile = */ /* = Profile = */
/* =========== */ /* =========== */
.advanced-profile-content {
margin-top: 5px;
margin-bottom: 10px;
margin-left: 30px;
width: 60%;
}
.advanced-profile-label {
margin-top: 10px;
margin-bottom: 0px;
padding-bottom: 5px;
font-size: 18px;
}
div[id$="wrapper"] { div[id$="wrapper"] {
height: 100%; height: 100%;
} }
@ -2068,10 +2054,6 @@ div[id$="wrapper"] br {
clear: left; clear: left;
} }
#advanced-profile-with {
margin-left: 20px;
}
#profile-listing-desc, #profile-listing-desc,
#profile-listing-new-link-wrapper { #profile-listing-new-link-wrapper {
float: left; float: left;
@ -4524,7 +4506,6 @@ hr.line-dots {
.location, .location,
.location-label, .location-label,
.gender-label, .gender-label,
.marital-label,
.homepage-label, .homepage-label,
.network-label { .network-label {
float: left; float: left;
@ -4534,8 +4515,6 @@ hr.line-dots {
} }
.adr, .adr,
.x-gender,
.marital-text,
.homepage-url, .homepage-url,
.x-network { .x-network {
float: left; float: left;

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

@ -54,8 +54,6 @@
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}} {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}} {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}