mirror of
https://github.com/friendica/friendica
synced 2024-12-23 12:00:16 +00:00
Merge pull request #8190 from MrPetovan/task/profile-tidings
Deprecated profile fields cleanup
This commit is contained in:
Philipp
GitHub
commit
353dddaf15
31 changed files with 45 additions and 574 deletions
|
|
@ -1181,54 +1181,6 @@ Mutually exclusive with <code>link</code>.
|
|||
<td></td>
|
||||
</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>
|
||||
<td><code>public_keywords</code></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>
|
||||
</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>
|
||||
<td><code>homepage</code></td>
|
||||
<td>String (URL)</td>
|
||||
<td></td>
|
||||
</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>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -695,9 +695,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
|
|||
### src/Content/ContactSelector.php
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -16,29 +16,29 @@ Table profile
|
|||
| region | | varchar(255) | NO | | | |
|
||||
| postal-code | | varchar(32) | NO | | | |
|
||||
| country-name | | varchar(255) | NO | | | |
|
||||
| hometown | | varchar(255) | NO | MUL | | |
|
||||
| gender | | varchar(32) | NO | | | |
|
||||
| marital | | varchar(255) | NO | | | |
|
||||
| with | | text | NO | | NULL | |
|
||||
| howlong | | datetime | NO | | 0001-01-01 00:00:00 | |
|
||||
| sexual | | varchar(255) | NO | | | |
|
||||
| politic | | varchar(255) | NO | | | |
|
||||
| religion | | varchar(255) | NO | | | |
|
||||
| hometown | Deprecated | varchar(255) | NO | MUL | | |
|
||||
| gender | Deprecated | varchar(32) | NO | | | |
|
||||
| marital | Deprecated | varchar(255) | NO | | | |
|
||||
| with | Deprecated | text | NO | | NULL | |
|
||||
| howlong | Deprecated | datetime | NO | | 0001-01-01 00:00:00 | |
|
||||
| sexual | Deprecated | varchar(255) | NO | | | |
|
||||
| politic | Deprecated | varchar(255) | NO | | | |
|
||||
| religion | Deprecated | varchar(255) | NO | | | |
|
||||
| pub_keywords | | text | NO | | NULL | |
|
||||
| prv_keywords | | text | NO | | NULL | |
|
||||
| likes | | text | NO | | NULL | |
|
||||
| dislikes | | text | NO | | NULL | |
|
||||
| about | | text | NO | | NULL | |
|
||||
| summary | | varchar(255) | NO | | | |
|
||||
| music | | text | NO | | NULL | |
|
||||
| book | | text | NO | | NULL | |
|
||||
| tv | | text | NO | | NULL | |
|
||||
| film | | text | NO | | NULL | |
|
||||
| interest | | text | NO | | NULL | |
|
||||
| romance | | text | NO | | NULL | |
|
||||
| work | | text | NO | | NULL | |
|
||||
| education | | text | NO | | NULL | |
|
||||
| contact | | text | NO | | NULL | |
|
||||
| likes | Deprecated | text | NO | | NULL | |
|
||||
| dislikes | Deprecated | text | NO | | NULL | |
|
||||
| about | Deprecated | text | NO | | NULL | |
|
||||
| summary | Deprecated | varchar(255) | NO | | | |
|
||||
| music | Deprecated | text | NO | | NULL | |
|
||||
| book | Deprecated | text | NO | | NULL | |
|
||||
| tv | Deprecated | text | NO | | NULL | |
|
||||
| film | Deprecated | text | NO | | NULL | |
|
||||
| interest | Deprecated | text | NO | | NULL | |
|
||||
| romance | Deprecated | text | NO | | NULL | |
|
||||
| work | Deprecated | text | NO | | NULL | |
|
||||
| education | Deprecated | text | NO | | NULL | |
|
||||
| contact | Deprecated | text | NO | | NULL | |
|
||||
| homepage | | varchar(255) | NO | | | |
|
||||
| photo | | varchar(255) | NO | | | |
|
||||
| thumb | | varchar(255) | NO | | | |
|
||||
|
|
|
|||
|
|
@ -408,9 +408,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
|
|||
### src/Content/ContactSelector.php
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function common_content(App $a)
|
|||
|
||||
if (DBA::isResult($contact)) {
|
||||
DI::page()['aside'] = "";
|
||||
Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
|
||||
Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"]));
|
||||
}
|
||||
} else {
|
||||
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ function crepair_content(App $a)
|
|||
|
||||
if (DBA::isResult($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.');
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ function follow_content(App $a)
|
|||
|
||||
$profiledata = Contact::getDetailsByURL($ret['url']);
|
||||
if ($profiledata) {
|
||||
Profile::load($a, '', 0, $profiledata, false);
|
||||
Profile::load($a, '', $profiledata, false);
|
||||
}
|
||||
|
||||
if ($gcontact_id <> 0) {
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ function unfollow_content(App $a)
|
|||
]);
|
||||
|
||||
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')]);
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class ContactSelector
|
|||
/**
|
||||
* @param string $current current
|
||||
* @param boolean $disabled optional, default false
|
||||
* @return object
|
||||
* @return string
|
||||
*/
|
||||
public static function pollInterval($current, $disabled = false)
|
||||
{
|
||||
|
|
@ -47,7 +47,7 @@ class ContactSelector
|
|||
/**
|
||||
* @param string $profile Profile URL
|
||||
* @return string Server URL
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function getServerURLForProfile($profile)
|
||||
{
|
||||
|
|
@ -147,7 +147,7 @@ class ContactSelector
|
|||
* @param string $network network
|
||||
* @param string $profile optional, default empty
|
||||
* @return string
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function networkToIcon($network, $profile = "")
|
||||
{
|
||||
|
|
@ -195,138 +195,4 @@ class ContactSelector
|
|||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -721,8 +721,8 @@ class Contact
|
|||
return;
|
||||
}
|
||||
|
||||
$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
|
||||
'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish'];
|
||||
$fields = ['name', 'photo', 'thumb', 'pdesc' => 'about', 'address', 'locality', 'region',
|
||||
'country-name', 'pub_keywords', 'xmpp', 'net-publish'];
|
||||
$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
|
||||
if (!DBA::isResult($profile)) {
|
||||
return;
|
||||
|
|
@ -733,7 +733,7 @@ class Contact
|
|||
$fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
|
||||
'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
|
||||
'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
|
||||
'gender' => $profile['gender'], 'contact-type' => $user['account-type'],
|
||||
'gender' => '', 'contact-type' => $user['account-type'],
|
||||
'xmpp' => $profile['xmpp']];
|
||||
|
||||
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
|
||||
|
|
|
|||
|
|
@ -1117,7 +1117,7 @@ class GContact
|
|||
);
|
||||
|
||||
$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'],
|
||||
"notify" => $userdata['notify'], 'url' => $userdata['url'],
|
||||
"hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
|
||||
|
|
|
|||
|
|
@ -121,13 +121,12 @@ class Profile
|
|||
*
|
||||
* @param App $a
|
||||
* @param string $nickname string
|
||||
* @param int $profile_id int
|
||||
* @param array $profiledata array
|
||||
* @param boolean $show_connect Show connect link
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @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]);
|
||||
|
||||
|
|
@ -371,7 +370,6 @@ class Profile
|
|||
}
|
||||
|
||||
$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;
|
||||
$about = !empty($profile['about']) ? DI::l10n()->t('About:') : false;
|
||||
$xmpp = !empty($profile['xmpp']) ? DI::l10n()->t('XMPP:') : false;
|
||||
|
|
@ -450,10 +448,6 @@ class Profile
|
|||
$p['gender'] = DI::l10n()->t($p['gender']);
|
||||
}
|
||||
|
||||
if (isset($p['marital'])) {
|
||||
$p['marital'] = DI::l10n()->t($p['marital']);
|
||||
}
|
||||
|
||||
if (isset($p['photo'])) {
|
||||
$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
|
||||
}
|
||||
|
|
@ -475,7 +469,6 @@ class Profile
|
|||
'$account_type' => $account_type,
|
||||
'$location' => $location,
|
||||
'$gender' => $gender,
|
||||
'$marital' => $marital,
|
||||
'$homepage' => $homepage,
|
||||
'$about' => $about,
|
||||
'$network' => DI::l10n()->t('Network:'),
|
||||
|
|
@ -920,13 +913,6 @@ class Profile
|
|||
(`profile`.`locality` LIKE ?) OR
|
||||
(`profile`.`region` 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`.`prv_keywords` LIKE ?))",
|
||||
$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
|
||||
|
|
@ -962,13 +948,6 @@ class Profile
|
|||
(`profile`.`locality` LIKE ?) OR
|
||||
(`profile`.`region` 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`.`prv_keywords` LIKE ?))
|
||||
$order LIMIT ?,?",
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class AllFriends extends BaseModule
|
|||
}
|
||||
|
||||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -957,7 +957,7 @@ class Contact extends BaseModule
|
|||
|
||||
$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);
|
||||
}
|
||||
|
||||
|
|
@ -979,7 +979,7 @@ class Contact extends BaseModule
|
|||
$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']);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -137,10 +137,7 @@ class Directory extends BaseModule
|
|||
$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);
|
||||
$about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false);
|
||||
|
||||
$location_e = $location;
|
||||
|
||||
|
|
@ -160,11 +157,8 @@ class Directory extends BaseModule
|
|||
'profile' => $profile,
|
||||
'location' => $location_e,
|
||||
'tags' => $contact['pub_keywords'],
|
||||
'gender' => $gender,
|
||||
'pdesc' => $pdesc,
|
||||
'marital' => $marital,
|
||||
'homepage' => $homepage,
|
||||
'about' => $about,
|
||||
'photo_menu' => $photo_menu,
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -21,16 +21,14 @@ class HoverCard extends BaseModule
|
|||
if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
|
||||
// A logged in user views a profile of a user
|
||||
$nickname = $a->user['nickname'];
|
||||
$profile = $parameters['profile'];
|
||||
} elseif (empty($parameters['action'])) {
|
||||
// Show the profile hovercard
|
||||
$nickname = $parameters['profile'];
|
||||
$profile = 0;
|
||||
} else {
|
||||
throw new NotFoundException(DI::l10n()->t('No profile'));
|
||||
}
|
||||
|
||||
Profile::load($a, $nickname, $profile);
|
||||
Profile::load($a, $nickname);
|
||||
|
||||
$page = DI::page();
|
||||
|
||||
|
|
|
|||
|
|
@ -25,17 +25,15 @@ class NoScrape extends BaseModule
|
|||
if (isset($parameters['nick'])) {
|
||||
// Get infos about a specific nick (public)
|
||||
$which = $parameters['nick'];
|
||||
$profile = 0;
|
||||
} elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') {
|
||||
// view infos about a known profile (needs a login)
|
||||
$which = $a->user['nickname'];
|
||||
$profile = $parameters['profile'];
|
||||
} else {
|
||||
System::jsonError(403, 'Authentication required');
|
||||
exit();
|
||||
}
|
||||
|
||||
Profile::load($a, $which, $profile);
|
||||
Profile::load($a, $nickname);
|
||||
|
||||
$json_info = [
|
||||
'addr' => $a->profile['addr'],
|
||||
|
|
@ -114,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', 'gender', 'marital', 'about'];
|
||||
$profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name'];
|
||||
foreach ($profile_fields as $field) {
|
||||
if (!empty($a->profile[$field])) {
|
||||
$json_info["$field"] = $a->profile[$field];
|
||||
|
|
|
|||
|
|
@ -833,9 +833,6 @@ class Probe
|
|||
if (!empty($profile['country'])) {
|
||||
$loc['country-name'] = $profile['country'];
|
||||
}
|
||||
if (!empty($profile['hometown'])) {
|
||||
$loc['locality'] = $profile['hometown'];
|
||||
}
|
||||
$location = Profile::formatLocation($loc);
|
||||
if (!empty($location)) {
|
||||
$data['location'] = $location;
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
|
||||
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
||||
|
||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</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 $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<option>temp</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="profile-edit-hometown-end"></div>
|
||||
<div id="profile-edit-region-end"></div>
|
||||
<div class="profile-edit-submit-wrapper">
|
||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -733,21 +733,15 @@ input#dfrn-url {
|
|||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-gender-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
#profile-edit-region-label,
|
||||
#profile-edit-postal-code-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-prvkeywords-label,
|
||||
#profile-edit-homepage-label,
|
||||
#profile-edit-hometown-label {
|
||||
#profile-edit-homepage-label {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
|
|
@ -755,17 +749,12 @@ input#dfrn-url {
|
|||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#profile-edit-pdesc,
|
||||
#gender-select,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
#profile-edit-region,
|
||||
#profile-edit-postal-code,
|
||||
#profile-edit-country-name,
|
||||
#marital-select,
|
||||
#sexual-select,
|
||||
#profile-edit-politic,
|
||||
#profile-edit-religion,
|
||||
#profile-edit-pubkeywords,
|
||||
#profile-edit-prvkeywords,
|
||||
#profile-in-dir-yes,
|
||||
|
|
@ -842,7 +831,7 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
|
||||
#profile-edit-homepage, #profile-edit-hometown {
|
||||
#profile-edit-homepage {
|
||||
float: left;
|
||||
margin-bottom: 35px;
|
||||
}
|
||||
|
|
@ -865,24 +854,17 @@ input#dfrn-url {
|
|||
margin-bottom: 20px
|
||||
}
|
||||
|
||||
#profile-edit-profile-name-end,
|
||||
#profile-edit-name-end,
|
||||
#profile-edit-pdesc-end,
|
||||
#profile-edit-gender-end,
|
||||
#profile-edit-dob-end,
|
||||
#profile-edit-address-end,
|
||||
#profile-edit-locality-end,
|
||||
#profile-edit-region-end,
|
||||
#profile-edit-postal-code-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-prvkeywords-end,
|
||||
#profile-edit-homepage-end,
|
||||
#profile-edit-hometown-end,
|
||||
#profile-in-dir-break,
|
||||
#profile-in-dir-end,
|
||||
#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 {
|
||||
color: #FF0000;
|
||||
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 {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -2446,14 +2317,14 @@ aside input[type='text'] {
|
|||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
|
||||
.location-label, .gender-label, .homepage-label, .network-label {
|
||||
float: left;
|
||||
text-align: right;
|
||||
display: block;
|
||||
width: 65px;
|
||||
}
|
||||
|
||||
.adr, .x-gender, .marital-text, .homepage-url, .x-network {
|
||||
.adr, .homepage-url, .x-network {
|
||||
float: left;
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
|
||||
{{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">♥</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}}
|
||||
|
||||
{{include file="diaspora_vcard.tpl"}}
|
||||
|
|
|
|||
|
|
@ -115,13 +115,6 @@
|
|||
|
||||
{{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}}
|
||||
<div class="homepage detail">
|
||||
<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
|
||||
|
|
|
|||
|
|
@ -1973,45 +1973,29 @@ ul.tabs li .active {
|
|||
background-color: #FFEEEE;
|
||||
padding: 7px;
|
||||
}
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-gender-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
#profile-edit-region-label,
|
||||
#profile-edit-postal-code-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-prvkeywords-label,
|
||||
#profile-edit-gender-select,
|
||||
#profile-edit-homepage-label {
|
||||
float: left;
|
||||
width: 175px;
|
||||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#gender-select,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-gender,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
#profile-edit-region,
|
||||
#profile-edit-postal-code,
|
||||
#profile-edit-country-name,
|
||||
#profile-edit-marital,
|
||||
#profile-edit-with,
|
||||
#profile-edit-sexual,
|
||||
#profile-edit-politic,
|
||||
#profile-edit-religion,
|
||||
#profile-edit-pubkeywords,
|
||||
#profile-edit-prvkeywords,
|
||||
#profile-edit-homepage {
|
||||
|
|
|
|||
|
|
@ -1973,45 +1973,29 @@ ul.tabs li .active {
|
|||
background-color: #FFEEEE;
|
||||
padding: 7px;
|
||||
}
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-gender-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
#profile-edit-region-label,
|
||||
#profile-edit-postal-code-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-prvkeywords-label,
|
||||
#profile-edit-gender-select,
|
||||
#profile-edit-homepage-label {
|
||||
float: left;
|
||||
width: 175px;
|
||||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#gender-select,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-gender,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
#profile-edit-region,
|
||||
#profile-edit-postal-code,
|
||||
#profile-edit-country-name,
|
||||
#profile-edit-marital,
|
||||
#profile-edit-with,
|
||||
#profile-edit-sexual,
|
||||
#profile-edit-politic,
|
||||
#profile-edit-religion,
|
||||
#profile-edit-pubkeywords,
|
||||
#profile-edit-prvkeywords,
|
||||
#profile-edit-homepage {
|
||||
|
|
|
|||
|
|
@ -1973,45 +1973,29 @@ ul.tabs li .active {
|
|||
background-color: #FFEEEE;
|
||||
padding: 7px;
|
||||
}
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-gender-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
#profile-edit-region-label,
|
||||
#profile-edit-postal-code-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-prvkeywords-label,
|
||||
#profile-edit-gender-select,
|
||||
#profile-edit-homepage-label {
|
||||
float: left;
|
||||
width: 175px;
|
||||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#gender-select,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-gender,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
#profile-edit-region,
|
||||
#profile-edit-postal-code,
|
||||
#profile-edit-country-name,
|
||||
#profile-edit-marital,
|
||||
#profile-edit-with,
|
||||
#profile-edit-sexual,
|
||||
#profile-edit-politic,
|
||||
#profile-edit-religion,
|
||||
#profile-edit-pubkeywords,
|
||||
#profile-edit-prvkeywords,
|
||||
#profile-edit-homepage {
|
||||
|
|
|
|||
|
|
@ -1267,45 +1267,29 @@ ul.tabs {
|
|||
background-color: #FFEEEE;
|
||||
padding: 7px;
|
||||
}
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
#profile-edit-gender-label,
|
||||
#profile-edit-dob-label,
|
||||
#profile-edit-address-label,
|
||||
#profile-edit-locality-label,
|
||||
#profile-edit-region-label,
|
||||
#profile-edit-postal-code-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-prvkeywords-label,
|
||||
#profile-edit-gender-select,
|
||||
#profile-edit-homepage-label {
|
||||
float: left;
|
||||
width: 175px;
|
||||
padding-top: 7px;
|
||||
}
|
||||
#profile-edit-profile-name,
|
||||
#profile-edit-name,
|
||||
#gender-select,
|
||||
#profile-edit-pdesc,
|
||||
#profile-edit-gender,
|
||||
#profile-edit-dob,
|
||||
#profile-edit-address,
|
||||
#profile-edit-locality,
|
||||
#profile-edit-region,
|
||||
#profile-edit-postal-code,
|
||||
#profile-edit-country-name,
|
||||
#profile-edit-marital,
|
||||
#profile-edit-with,
|
||||
#profile-edit-sexual,
|
||||
#profile-edit-politic,
|
||||
#profile-edit-religion,
|
||||
#profile-edit-pubkeywords,
|
||||
#profile-edit-prvkeywords,
|
||||
#profile-edit-homepage {
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@
|
|||
|
||||
{{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">♥</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>
|
||||
|
|
|
|||
|
|
@ -2046,20 +2046,6 @@ pre code {
|
|||
/* = 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"] {
|
||||
height: 100%;
|
||||
}
|
||||
|
|
@ -2068,10 +2054,6 @@ div[id$="wrapper"] br {
|
|||
clear: left;
|
||||
}
|
||||
|
||||
#advanced-profile-with {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
#profile-listing-desc,
|
||||
#profile-listing-new-link-wrapper {
|
||||
float: left;
|
||||
|
|
@ -4524,7 +4506,6 @@ hr.line-dots {
|
|||
.location,
|
||||
.location-label,
|
||||
.gender-label,
|
||||
.marital-label,
|
||||
.homepage-label,
|
||||
.network-label {
|
||||
float: left;
|
||||
|
|
@ -4534,8 +4515,6 @@ hr.line-dots {
|
|||
}
|
||||
|
||||
.adr,
|
||||
.x-gender,
|
||||
.marital-text,
|
||||
.homepage-url,
|
||||
.x-network {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@
|
|||
|
||||
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
||||
|
||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</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 $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue