{
return parent::map($callback);
}
+
+ /**
+ * @param callable|null $callback
+ * @param int $flag
+ * @return ProfileFields
+ */
+ public function filter(callable $callback = null, int $flag = 0)
+ {
+ return parent::filter($callback, $flag);
+ }
}
namespace Friendica\Module\Settings\Profile;
-use Friendica\Content\ContactSelector;
+use Friendica\Core\ACL;
use Friendica\Core\Hook;
+use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\Worker;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
-use Friendica\Model\Profile as ProfileModel;
+use Friendica\Model\Profile;
+use Friendica\Model\ProfileField;
use Friendica\Model\User;
use Friendica\Module\BaseSettingsModule;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
-use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
return;
}
- $profile = ProfileModel::getByUID(local_user());
+ $profile = Profile::getByUID(local_user());
if (!DBA::isResult($profile)) {
return;
}
return;
}
- $namechanged = $profile['username'] != $name;
+ $namechanged = $profile['name'] != $name;
$pdesc = Strings::escapeTags(trim($_POST['pdesc']));
- $gender = Strings::escapeTags(trim($_POST['gender']));
$address = Strings::escapeTags(trim($_POST['address']));
$locality = Strings::escapeTags(trim($_POST['locality']));
$region = Strings::escapeTags(trim($_POST['region']));
$country_name = Strings::escapeTags(trim($_POST['country_name']));
$pub_keywords = self::cleanKeywords(Strings::escapeTags(trim($_POST['pub_keywords'])));
$prv_keywords = self::cleanKeywords(Strings::escapeTags(trim($_POST['prv_keywords'])));
- $marital = Strings::escapeTags(trim($_POST['marital']));
- $howlong = Strings::escapeTags(trim($_POST['howlong']));
-
- $with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : '');
-
- if (!strlen($howlong)) {
- $howlong = DBA::NULL_DATETIME;
- } else {
- $howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
- }
-
- // linkify the relationship target if applicable
- if (strlen($with)) {
- if ($with != strip_tags($profile['with'])) {
- $contact_url = '';
- $lookup = $with;
- if (strpos($lookup, '@') === 0) {
- $lookup = substr($lookup, 1);
- }
- $lookup = str_replace('_', ' ', $lookup);
- if (strpos($lookup, '@') || (strpos($lookup, 'http://'))) {
- $contact_name = $lookup;
- $links = @Probe::lrdd($lookup);
- if (count($links)) {
- foreach ($links as $link) {
- if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
- $contact_url = $link['@attributes']['href'];
- }
- }
- }
- } else {
- $contact_name = $lookup;
-
- $contact = Contact::selectFirst(
- ['url', 'name'],
- ['? IN (`name`, `nick`) AND `uid` = ?', $lookup, local_user()]
- );
-
- if (DBA::isResult($contact)) {
- $contact_url = $contact['url'];
- $contact_name = $contact['name'];
- }
- }
-
- if ($contact_url) {
- $with = str_replace($lookup, '<a href="' . $contact_url . '">' . $contact_name . '</a>', $with);
- if (strpos($with, '@') === 0) {
- $with = substr($with, 1);
- }
- }
- } else {
- $with = $profile['with'];
- }
- }
-
- /// @TODO Not flexible enough for later expansion, let's have more OOP here
- $sexual = Strings::escapeTags(trim($_POST['sexual']));
$xmpp = Strings::escapeTags(trim($_POST['xmpp']));
$homepage = Strings::escapeTags(trim($_POST['homepage']));
if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
$homepage = 'http://' . $homepage;
}
- $hometown = Strings::escapeTags(trim($_POST['hometown']));
- $politic = Strings::escapeTags(trim($_POST['politic']));
- $religion = Strings::escapeTags(trim($_POST['religion']));
-
- $likes = Strings::escapeHtml(trim($_POST['likes']));
- $dislikes = Strings::escapeHtml(trim($_POST['dislikes']));
+ $hide_friends = intval(!empty($_POST['hide-friends']));
- $about = Strings::escapeHtml(trim($_POST['about']));
- $interest = Strings::escapeHtml(trim($_POST['interest']));
- $contact = Strings::escapeHtml(trim($_POST['contact']));
- $music = Strings::escapeHtml(trim($_POST['music']));
- $book = Strings::escapeHtml(trim($_POST['book']));
- $tv = Strings::escapeHtml(trim($_POST['tv']));
- $film = Strings::escapeHtml(trim($_POST['film']));
- $romance = Strings::escapeHtml(trim($_POST['romance']));
- $work = Strings::escapeHtml(trim($_POST['work']));
- $education = Strings::escapeHtml(trim($_POST['education']));
+ $profileFields = DI::profileField()->selectByUserId(local_user());
- $hide_friends = intval(!empty($_POST['hide-friends']));
+ $profileFields = DI::profileField()->updateCollectionFromForm(
+ local_user(),
+ $profileFields,
+ $_REQUEST['profile_field'],
+ $_REQUEST['profile_field_order']
+ );
- DI::pConfig()->set(local_user(), 'system', 'detailed_profile', intval(!empty($_POST['detailed_profile'])));
+ DI::profileField()->saveCollection($profileFields);
$result = DBA::update(
'profile',
[
'name' => $name,
'pdesc' => $pdesc,
- 'gender' => $gender,
'dob' => $dob,
'address' => $address,
'locality' => $locality,
'region' => $region,
'postal-code' => $postal_code,
'country-name' => $country_name,
- 'marital' => $marital,
- 'with' => $with,
- 'howlong' => $howlong,
- 'sexual' => $sexual,
'xmpp' => $xmpp,
'homepage' => $homepage,
- 'hometown' => $hometown,
- 'politic' => $politic,
- 'religion' => $religion,
'pub_keywords' => $pub_keywords,
'prv_keywords' => $prv_keywords,
- 'likes' => $likes,
- 'dislikes' => $dislikes,
- 'about' => $about,
- 'interest' => $interest,
- 'contact' => $contact,
- 'music' => $music,
- 'book' => $book,
- 'tv' => $tv,
- 'film' => $film,
- 'romance' => $romance,
- 'work' => $work,
- 'education' => $education,
'hide-friends' => $hide_friends,
],
[
'is-default' => true,
]
);
-
+
if ($result) {
info(DI::l10n()->t('Profile updated.'));
} else {
$o = '';
- $profile = ProfileModel::getByUID(local_user());
+ $profile = Profile::getByUID(local_user());
if (!DBA::isResult($profile)) {
throw new HTTPException\NotFoundException();
}
$a = DI::app();
+ $custom_fields = [];
+
+ $profileFields = DI::profileField()->selectByUserId(local_user());
+ foreach ($profileFields as $profileField) {
+ /** @var ProfileField $profileField */
+ $defaultPermissions = ACL::getDefaultUserPermissions($profileField->permissionset->toArray());
+
+ $custom_fields[] = [
+ 'id' => $profileField->id,
+ 'legend' => $profileField->label,
+ 'fields' => [
+ 'label' => ['profile_field[' . $profileField->id . '][label]', DI::l10n()->t('Label:'), $profileField->label, DI::l10n()->t('Empty the label to delete this profile field')],
+ 'value' => ['profile_field[' . $profileField->id . '][value]', DI::l10n()->t('Value:'), $profileField->value, DI::l10n()->t('BBCodes allowed')],
+ 'acl' => ACL::getFullSelectorHTML(
+ DI::page(),
+ $a->user,
+ false,
+ $defaultPermissions,
+ ['network' => Protocol::DFRN],
+ 'profile_field[' . $profileField->id . ']'
+ ),
+ ],
+ 'permissions' => DI::l10n()->t('Field Permissions'),
+ 'permdesc' => DI::l10n()->t("(click to open/close)"),
+ ];
+ };
+
+ $custom_fields[] = [
+ 'id' => 'new',
+ 'legend' => DI::l10n()->t('Add a new profile field'),
+ 'fields' => [
+ 'label' => ['profile_field[new][label]', DI::l10n()->t('Label:')],
+ 'value' => ['profile_field[new][value]', DI::l10n()->t('Value:'), '', DI::l10n()->t('BBCodes allowed')],
+ 'acl' => ACL::getFullSelectorHTML(
+ DI::page(),
+ $a->user,
+ false,
+ ['allow_cid' => []],
+ ['network' => Protocol::DFRN],
+ 'profile_field[new]'
+ ),
+ ],
+ 'permissions' => DI::l10n()->t('Field Permissions'),
+ 'permdesc' => DI::l10n()->t("(click to open/close)"),
+ ];
+
DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/index_head.tpl'), [
'$baseurl' => DI::baseUrl()->get(true),
]);
$personal_account = !in_array($a->user['page-flags'], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]);
- $detailed_profile =
- $personal_account
- && DI::pConfig()->get(local_user(), 'system', 'detailed_profile',
- DI::pConfig()->get(local_user(), 'system', 'detailled_profile')
- )
- ;
-
$tpl = Renderer::getMarkupTemplate('settings/profile/index.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$personal_account' => $personal_account,
- '$detailed_profile' => $detailed_profile,
-
- '$details' => [
- 'detailed_profile', //Name
- DI::l10n()->t('Show more profile fields:'), //Label
- $detailed_profile, //Value
- '', //Help string
- [DI::l10n()->t('No'), DI::l10n()->t('Yes')] //Off - On strings
- ],
'$form_security_token' => self::getFormSecurityToken('settings_profile'),
'$form_security_token_photo' => self::getFormSecurityToken('settings_profile_photo'),
'$profpic' => DI::l10n()->t('Change Profile Photo'),
'$profpiclink' => '/photos/' . $a->user['nickname'],
'$viewprof' => DI::l10n()->t('View this profile'),
- '$viewallprof' => DI::l10n()->t('View all profiles'),
- '$editvis' => DI::l10n()->t('Edit visibility'),
- '$cr_prof' => DI::l10n()->t('Create a new profile using these settings'),
- '$cl_prof' => DI::l10n()->t('Clone this profile'),
- '$del_prof' => DI::l10n()->t('Delete this profile'),
- '$lbl_basic_section' => DI::l10n()->t('Basic information'),
+ '$lbl_personal_section' => DI::l10n()->t('Personal'),
'$lbl_picture_section' => DI::l10n()->t('Profile picture'),
'$lbl_location_section' => DI::l10n()->t('Location'),
- '$lbl_preferences_section' => DI::l10n()->t('Preferences'),
- '$lbl_status_section' => DI::l10n()->t('Status information'),
- '$lbl_about_section' => DI::l10n()->t('Additional information'),
- '$lbl_interests_section' => DI::l10n()->t('Interests'),
- '$lbl_personal_section' => DI::l10n()->t('Personal'),
- '$lbl_relation_section' => DI::l10n()->t('Relation'),
'$lbl_miscellaneous_section' => DI::l10n()->t('Miscellaneous'),
+ '$lbl_custom_fields_section' => DI::l10n()->t('Custom Profile Fields'),
'$lbl_profile_photo' => DI::l10n()->t('Upload Profile Photo'),
- '$lbl_gender' => DI::l10n()->t('Your Gender:'),
- '$lbl_marital' => DI::l10n()->t('<span class="heart">♥</span> Marital Status:'),
- '$lbl_sexual' => DI::l10n()->t('Sexual Preference:'),
- '$lbl_ex2' => DI::l10n()->t('Example: fishing photography software'),
- '$default' => '<p id="profile-edit-default-desc">' . DI::l10n()->t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>',
'$baseurl' => DI::baseUrl()->get(true),
'$nickname' => $a->user['nickname'],
'$name' => ['name', DI::l10n()->t('Display name:'), $profile['name']],
'$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $profile['postal-code']],
'$country_name' => ['country_name', DI::l10n()->t('Country:'), $profile['country-name']],
'$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $a->user['timezone'])) . ')' : ''),
- '$gender' => DI::l10n()->t(ContactSelector::gender($profile['gender'])),
- '$marital' => ['selector' => ContactSelector::maritalStatus($profile['marital']), 'value' => DI::l10n()->t($profile['marital'])],
- '$with' => ['with', DI::l10n()->t('Who: (if applicable)'), strip_tags($profile['with']), DI::l10n()->t('Examples: cathy123, Cathy Williams, cathy@example.com')],
- '$howlong' => ['howlong', DI::l10n()->t('Since [date]:'), ($profile['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($profile['howlong']))],
- '$sexual' => ['selector' => ContactSelector::sexualPreference($profile['sexual']), 'value' => DI::l10n()->t($profile['sexual'])],
- '$about' => ['about', DI::l10n()->t('Tell us about yourself...'), $profile['about']],
'$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be propagated to your contacts so that they can follow you.')],
'$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $profile['homepage']],
- '$hometown' => ['hometown', DI::l10n()->t('Hometown:'), $profile['hometown']],
- '$politic' => ['politic', DI::l10n()->t('Political Views:'), $profile['politic']],
- '$religion' => ['religion', DI::l10n()->t('Religious Views:'), $profile['religion']],
'$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $profile['pub_keywords'], DI::l10n()->t('(Used for suggesting potential friends, can be seen by others)')],
'$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $profile['prv_keywords'], DI::l10n()->t('(Used for searching profiles, never shown to others)')],
- '$likes' => ['likes', DI::l10n()->t('Likes:'), $profile['likes']],
- '$dislikes' => ['dislikes', DI::l10n()->t('Dislikes:'), $profile['dislikes']],
- '$music' => ['music', DI::l10n()->t('Musical interests'), $profile['music']],
- '$book' => ['book', DI::l10n()->t('Books, literature'), $profile['book']],
- '$tv' => ['tv', DI::l10n()->t('Television'), $profile['tv']],
- '$film' => ['film', DI::l10n()->t('Film/dance/culture/entertainment'), $profile['film']],
- '$interest' => ['interest', DI::l10n()->t('Hobbies/Interests'), $profile['interest']],
- '$romance' => ['romance', DI::l10n()->t('Love/romance'), $profile['romance']],
- '$work' => ['work', DI::l10n()->t('Work/employment'), $profile['work']],
- '$education' => ['education', DI::l10n()->t('School/education'), $profile['education']],
- '$contact' => ['contact', DI::l10n()->t('Contact information and Social Networks'), $profile['contact']],
+ '$custom_fields' => $custom_fields,
]);
$arr = ['profile' => $profile, 'entry' => $o];
use Friendica\BaseRepository;
use Friendica\Collection;
use Friendica\Database\Database;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Util\DateTimeFormat;
use Psr\Log\LoggerInterface;
return parent::update($model);
}
+
+ /**
+ * @param int $uid User Id
+ * @param Collection\ProfileFields $profileFields Collection of existing profile fields
+ * @param array $profileFieldInputs Array of profile field form inputs indexed by profile field id
+ * @param array $profileFieldOrder List of profile field id in order
+ * @return Collection\ProfileFields
+ * @throws \Exception
+ */
+ public function updateCollectionFromForm(int $uid, Collection\ProfileFields $profileFields, array $profileFieldInputs, array $profileFieldOrder)
+ {
+ $aclFormatter = DI::aclFormatter();
+
+ // Returns an associative array of id => order values
+ $profileFieldOrder = array_flip($profileFieldOrder);
+
+ // Creation of the new field
+ if (!empty($profileFieldInputs['new']['label'])) {
+ $psid = $this->permissionSet->getIdFromACL(
+ $uid,
+ $aclFormatter->toString($profileFieldInputs['new']['contact_allow'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs['new']['group_allow'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs['new']['contact_deny'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs['new']['group_deny'] ?? '')
+ );
+
+ $newProfileField = $this->insert([
+ 'uid' => $uid,
+ 'label' => $profileFieldInputs['new']['label'],
+ 'value' => $profileFieldInputs['new']['value'],
+ 'psid' => $psid,
+ 'order' => $profileFieldOrder['new'],
+ ]);
+
+ $profileFieldInputs[$newProfileField->id] = $profileFieldInputs['new'];
+ $profileFieldOrder[$newProfileField->id] = $profileFieldOrder['new'];
+
+ $profileFields[] = $newProfileField;
+ }
+
+ unset($profileFieldInputs['new']);
+ unset($profileFieldOrder['new']);
+
+ // Prunes profile field whose label has been emptied
+ $profileFields = $profileFields->filter(function (Model\ProfileField $profileField) use (&$profileFieldInputs, &$profileFieldOrder) {
+ $keepModel = !isset($profileFieldInputs[$profileField->id]) || !empty($profileFieldInputs[$profileField->id]['label']);
+
+ if (!$keepModel) {
+ unset($profileFieldInputs[$profileField->id]);
+ unset($profileFieldOrder[$profileField->id]);
+ $this->delete($profileField);
+ }
+
+ return $keepModel;
+ });
+
+ // Regenerates the order values if items were deleted
+ $profileFieldOrder = array_flip(array_keys($profileFieldOrder));
+
+ // Update existing profile fields from form values
+ $profileFields = $profileFields->map(function (Model\ProfileField $profileField) use ($uid, $aclFormatter, &$profileFieldInputs, &$profileFieldOrder) {
+ if (isset($profileFieldInputs[$profileField->id]) && isset($profileFieldOrder[$profileField->id])) {
+ $psid = $this->permissionSet->getIdFromACL(
+ $uid,
+ $aclFormatter->toString($profileFieldInputs[$profileField->id]['contact_allow'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs[$profileField->id]['group_allow'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs[$profileField->id]['contact_deny'] ?? ''),
+ $aclFormatter->toString($profileFieldInputs[$profileField->id]['group_deny'] ?? '')
+ );
+
+ $profileField->psid = $psid;
+ $profileField->label = $profileFieldInputs[$profileField->id]['label'];
+ $profileField->value = $profileFieldInputs[$profileField->id]['value'];
+ $profileField->order = $profileFieldOrder[$profileField->id];
+
+ unset($profileFieldInputs[$profileField->id]);
+ unset($profileFieldOrder[$profileField->id]);
+ }
+
+ return $profileField;
+ });
+
+ return $profileFields;
+ }
}
--- /dev/null
+<fieldset>
+ <legend>{{$profile_field.legend}}</legend>
+
+ <input type="hidden" name="profile_field_order[]" value="{{$profile_field.id}}">
+
+ {{include file="field_input.tpl" field=$profile_field.fields.label}}
+
+ {{include file="field_textarea.tpl" field=$profile_field.fields.value}}
+ <details>
+ <summary>Permissions</summary>
+ {{$profile_field.fields.acl nofilter}}
+ </details>
+</fieldset>
\ No newline at end of file
-
<h1>{{$banner}}</h1>
{{$default nofilter}}
<div id="profile-edit-links">
-<ul>
-<li><a href="settings/profile/photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$nickname}}" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-</ul>
+
<li><a href="settings/profile/photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
+
<li><a href="profile/{{$nickname}}" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+ </ul>
</div>
<div id="profile-edit-links-end"></div>
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="settings/profiles" method="post" >
-<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-
-{{if $detailed_profile}}
-{{include file="field_yesno.tpl" field=$details}}
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender nofilter}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-{{$dob nofilter}}
-</div>
-<div id="profile-edit-dob-end"></div>
-
-{{$hide_friends nofilter}}
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
-<option selected="selected" >{{$country_name.2}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region.2}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital nofilter}} </label>
-{{$marital nofilter}}
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1}}" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual nofilter}}
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-xmpp-wrapper" >
-<label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
-</div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
-<div id="profile-edit-xmpp-end"></div>
-
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-{{$about.1}}
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-{{$interest.1}}
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest.2}}</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" >
-<p id="likes-jot-desc" >
-{{$likes.1}}
-</p>
-
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes.2}}</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" >
-<p id="dislikes-jot-desc" >
-{{$dislikes.1}}
-</p>
-
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes.2}}</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-{{$contact.1}}
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact.2}}</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-{{$music.1}}
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music.2}}</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-{{$book.1}}
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book.2}}</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-{{$tv.1}}
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv.2}}</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-{{$film.1}}
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film.2}}</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-{{$romance.1}}
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance.2}}</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-{{$work.1}}
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work.2}}</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-{{$education.1}}
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education.2}}</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-{{else}}
-{{if $personal_account}}
-{{include file="field_yesno.tpl" field=$details}}
-{{/if}}
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-{{if $personal_account}}
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender nofilter}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-{{$dob nofilter}}
-</div>
-<div id="profile-edit-dob-end"></div>
-{{/if}}
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-xmpp-wrapper" >
-<label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
-</div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
-<div id="profile-edit-xmpp-end"></div>
-
-
-{{$hide_friends nofilter}}
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
-<option selected="selected" >{{$country_name.1}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region.2}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-{{$about.1}}
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
- <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
- <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
- <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
- <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
- <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
- <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
- <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
- <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
- <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
- <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
- <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
- <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
- <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
- <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
- <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
- <input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
- <input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
- <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
- <input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
-
-{{/if}}
-</form>
-</div>
-<script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>
+<div id="profile-edit-wrapper">
+ <form id="profile-edit-form" name="form1" action="settings/profiles" method="post">
+ <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+ <div id="profile-edit-name-wrapper">
+ <label id="profile-edit-name-label" for="profile-edit-name">{{$name.1}} </label>
+ <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}"/>
+ </div>
+ <div id="profile-edit-name-end"></div>
+ <div id="profile-edit-pdesc-wrapper">
+ <label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label>
+ <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}"/>
+ </div>
+ <div id="profile-edit-pdesc-end"></div>
+ <div id="profile-edit-dob-wrapper">
+ {{$dob nofilter}}
+ </div>
+ <div id="profile-edit-dob-end"></div>
+ {{$hide_friends nofilter}}
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+ <div id="profile-edit-address-wrapper">
+ <label id="profile-edit-address-label" for="profile-edit-address">{{$address.1}} </label>
+ <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}"/>
+ </div>
+ <div id="profile-edit-address-end"></div>
+ <div id="profile-edit-locality-wrapper">
+ <label id="profile-edit-locality-label" for="profile-edit-locality">{{$locality.1}} </label>
+ <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}"/>
+ </div>
+ <div id="profile-edit-locality-end"></div>
+ <div id="profile-edit-postal-code-wrapper">
+ <label id="profile-edit-postal-code-label" for="profile-edit-postal-code">{{$postal_code.1}} </label>
+ <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}"/>
+ </div>
+ <div id="profile-edit-postal-code-end"></div>
+ <div id="profile-edit-country-name-wrapper">
+ <label id="profile-edit-country-name-label" for="profile-edit-country-name">{{$country_name.1}} </label>
+ <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
+ <option selected="selected">{{$country_name.2}}</option>
+ <option>temp</option>
+ </select>
+ </div>
+ <div id="profile-edit-country-name-end"></div>
+ <div id="profile-edit-region-wrapper">
+ <label id="profile-edit-region-label" for="profile-edit-region">{{$region.1}} </label>
+ <select name="region" id="profile-edit-region" onChange="Update_Globals();">
+ <option selected="selected">{{$region.2}}</option>
+ <option>temp</option>
+ </select>
+ </div>
+ <div id="profile-edit-hometown-end"></div>
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+ <div id="profile-edit-homepage-wrapper">
+ <label id="profile-edit-homepage-label" for="profile-edit-homepage">{{$homepage.1}} </label>
+ <input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}"/>
+ </div>
+ <div id="profile-edit-homepage-end"></div>
+ <div id="profile-edit-xmpp-wrapper">
+ <label id="profile-edit-xmpp-label" for="profile-edit-xmpp">{{$xmpp.1}} </label>
+ <input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}"/>
+ </div>
+ <div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
+ <div id="profile-edit-xmpp-end"></div>
+ <div id="profile-edit-pubkeywords-wrapper">
+ <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords">{{$pub_keywords.1}} </label>
+ <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}"/>
+ </div>
+ <div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
+ <div id="profile-edit-pubkeywords-end"></div>
+ <div id="profile-edit-prvkeywords-wrapper">
+ <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords">{{$prv_keywords.1}} </label>
+ <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}"/>
+ </div>
+ <div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
+ <div id="profile-edit-prvkeywords-end"></div>
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+
+ <h3>{{$lbl_custom_fields_section}}</h3>
+
+ {{foreach $custom_fields as $custom_field}}
+ {{include file="settings/profile/field/edit.tpl" profile_field=$custom_field}}
+ {{/foreach}}
+
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+ </form>
+</div>
+<script type="text/javascript">
+ Fill_Country('{{$country_name.2}}');
+ Fill_States('{{$region.2}}');
+</script>
--- /dev/null
+<fieldset>
+ <legend>{{$profile_field.legend}}</legend>
+
+ <input type="hidden" name="profile_field_order[]" value="{{$profile_field.id}}">
+
+ {{include file="field_input.tpl" field=$profile_field.fields.label}}
+
+ {{include file="field_textarea.tpl" field=$profile_field.fields.value}}
+
+ {{* Block for setting default permissions *}}
+ <p>
+ <a id="settings-default-perms-menu" class="settings-default-perms" data-toggle="modal" data-target="#profile-field-acl-{{$profile_field.id}}">{{$profile_field.permissions}} {{$profile_field.permdesc}}</a>
+ </p>
+
+ {{* We include the aclModal directly into the template since we cant use frio's default modal *}}
+ <div class="modal" id="profile-field-acl-{{$profile_field.id}}">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title">{{$profile_field.permissions}}</h4>
+ </div>
+ <div class="modal-body">
+ {{$profile_field.fields.acl nofilter}}
+ </div>
+ </div>
+ </div>
+ </div>
+</fieldset>
\ No newline at end of file
-
<div class="generic-page-wrapper">
{{include file="section_title.tpl" title=$banner}}
<form id="profile-edit-form" name="form1" action="" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
- {{* Some hints to characteristics of the current profile (if available) *}}
- <div class="section-content-info-wrapper">{{$default nofilter}}</div>
-
- {{if $personal_account}}
- <p>{{include file="field_yesno.tpl" field=$details}}</p>
- {{/if}}
-
- {{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}}
- {{if $detailed_profile}}
<div class="panel-group panel-group-settings" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
{{* The personal settings *}}
<div class="panel">
{{include file="field_input.tpl" field=$pdesc}}
- <div id="profile-edit-gender-wrapper" class="form-group field select">
- <label id="profile-edit-gender-label" for="gender-select">{{$lbl_gender}} </label>
- {{$gender nofilter}}
- </div>
- <div class="clear"></div>
-
{{$dob nofilter}}
{{$hide_friends nofilter}}
{{include file="field_input.tpl" field=$locality}}
-
{{include file="field_input.tpl" field=$postal_code}}
<div id="profile-edit-country-name-wrapper" class="form-group field select">
</div>
<div class="clear"></div>
- {{include file="field_input.tpl" field=$hometown}}
-
<div class="form-group pull-right">
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
</div>
</div>
- {{* The settings for relations *}}
+ {{* The miscellanous other settings *}}
<div class="panel">
- <div class="section-subtitle-wrapper" role="tab" id="relation">
+ <div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
<h4>
- <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="false" aria-controls="relation-collapse">
- {{$lbl_relation_section}}
+ <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="false" aria-controls="miscellaneous-collapse">
+ {{$lbl_miscellaneous_section}}
</a>
</h4>
</div>
- <div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+ <div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
<div class="section-content-tools-wrapper">
- <div id="profile-edit-marital-wrapper" class="form-group field select">
- <label id="profile-edit-marital-label" for="profile-edit-marital">{{$lbl_marital nofilter}}</label>
- {{$marital.selector nofilter}}
- </div>
- <div class="clear"></div>
+ {{include file="field_input.tpl" field=$homepage}}
- {{include file="field_input.tpl" field=$with}}
+ {{include file="field_input.tpl" field=$xmpp}}
- {{include file="field_input.tpl" field=$howlong}}
+ {{include file="field_input.tpl" field=$pub_keywords}}
- <div id="profile-edit-sexual-wrapper" class="form-group field select">
- <label id="profile-edit-sexual-label" for="sexual-select">{{$lbl_sexual}}</label>
- {{$sexual.selector nofilter}}
- </div>
- <div class="clear"></div>
+ {{include file="field_input.tpl" field=$prv_keywords}}
<div class="form-group pull-right">
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
{{* The miscellanous other settings *}}
<div class="panel">
- <div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
+ <div class="section-subtitle-wrapper" role="tab" id="custom-fields">
<h4>
- <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="false" aria-controls="miscellaneous-collapse">
- {{$lbl_miscellaneous_section}}
+ <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#custom-fields-collapse" aria-expanded="false" aria-controls="custom-fields-collapse">
+ {{$lbl_custom_fields_section}}
</a>
</h4>
</div>
- <div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+ <div id="custom-fields-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="custom-fields">
<div class="section-content-tools-wrapper">
- {{include file="field_input.tpl" field=$homepage}}
-
- {{include file="field_input.tpl" field=$xmpp}}
-
- {{include file="field_input.tpl" field=$pub_keywords}}
-
- {{include file="field_input.tpl" field=$prv_keywords}}
-
- {{include file="field_input.tpl" field=$politic}}
-
- {{include file="field_input.tpl" field=$religion}}
-
-
- {{include file="field_textarea.tpl" field=$about}}
-
- {{include file="field_textarea.tpl" field=$contact}}
-
- {{include file="field_textarea.tpl" field=$interest}}
-
- {{include file="field_textarea.tpl" field=$likes}}
-
- {{include file="field_textarea.tpl" field=$dislikes}}
-
- {{include file="field_textarea.tpl" field=$music}}
-
- {{include file="field_textarea.tpl" field=$book}}
-
- {{include file="field_textarea.tpl" field=$tv}}
-
- {{include file="field_textarea.tpl" field=$film}}
-
- {{include file="field_textarea.tpl" field=$romance}}
-
- {{include file="field_textarea.tpl" field=$work}}
-
- {{include file="field_textarea.tpl" field=$education}}
+ {{foreach $custom_fields as $custom_field}}
+ {{include file="settings/profile/field/edit.tpl" profile_field=$custom_field}}
+ {{/foreach}}
<div class="form-group pull-right">
<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
</div>
</div>
-
- {{else}}
- {{* if $detailed_profile not available a short version of the setting page is displayed *}}
- {{include file="field_input.tpl" field=$name}}
-
- {{if $personal_account}}
- <div id="profile-edit-gender-wrapper" class="form-group field select">
- <label id="profile-edit-gender-label" for="gender-select">{{$lbl_gender}} </label>
- {{$gender nofilter}}
- </div>
- <div class="clear"></div>
-
- {{$dob nofilter}}
-
- {{/if}}
-
- {{include file="field_input.tpl" field=$homepage}}
-
- {{include file="field_input.tpl" field=$xmpp}}
-
- {{$hide_friends nofilter}}
-
- {{include file="field_input.tpl" field=$address}}
-
- {{include file="field_input.tpl" field=$locality}}
-
- {{include file="field_input.tpl" field=$postal_code}}
-
- <div id="profile-edit-country-name-wrapper" class="form-group field select">
- <label id="profile-edit-country-name-label" for="profile-edit-country-name">{{$country_name.1}} </label>
- <select name="country_name" id="profile-edit-country-name" class="form-control" onChange="Fill_States('{{$region.2}}');">
- <option selected="selected">{{$country_name.2}}</option>
- <option>temp</option>
- </select>
- </div>
- <div class="clear"></div>
-
- <div id="profile-edit-region-wrapper" class="form-group field select">
- <label id="profile-edit-region-label" for="profile-edit-region">{{$region.1}} </label>
- <select name="region" id="profile-edit-region" class="form-control" onChange="Update_Globals();">
- <option selected="selected">{{$region.2}}</option>
- <option>temp</option>
- </select>
- </div>
- <div class="clear"></div>
-
- {{include file="field_input.tpl" field=$pub_keywords}}
-
- {{include file="field_input.tpl" field=$prv_keywords}}
-
- {{include file="field_textarea.tpl" field=$about}}
-
- <div class="form-group pull-right">
- <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
- </div>
- <div class="clear"></div>
-
- <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
- <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
- <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
- <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
- <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
- <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
- <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
- <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.value}}" />
- <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
- <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
- <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.value}}" />
- <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
- <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
- <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
- <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
- <input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
- <input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
- <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
- <input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
-
- {{/if}}
</form>
</div>
}
#profile-edit-wrapper .toggle-section-content {
background:#ededed;
- max-width:599px;
padding:5px;
}
<script>
- $(document).ready(function() {
-
- //$('.toggle-section-content + .toggle-section-content').hide();
- $('.js-section-toggler').click(function(){
- $('.toggle-section-content').hide();
- $(this).next('.toggle-section-content').toggle();
- });
-
- });
+ $(document).ready(function () {
+ //$('.toggle-section-content + .toggle-section-content').hide();
+ $('.js-section-toggler').click(function () {
+ $('.toggle-section-content').hide();
+ $(this).next('.toggle-section-content').toggle();
+ });
+ });
</script>
<h1>{{$banner}}</h1>
<div id="profile-edit-links">
-<ul>
- <li><a class="btn" href="profile/{{$nickname}}" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
-</ul>
+
<li><a class="btn" href="profile/{{$nickname}}" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+ </ul>
</div>
<div id="profile-edit-links-end"></div>
-{{$default nofilter}}
-
-<div id="profile-edit-wrapper" >
-
-<form enctype="multipart/form-data" action="settings/profile/photo" method="post">
- <input type="hidden" name="form_security_token" value="{{$form_security_token_photo}}">
- <input type="hidden" name="profile" value="{{$profile_name.2}}" />
-
- <!-- Profile picture -->
-{{if $detailed_profile}}
- <div class="toggle-section js-toggle-section">
- <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_picture_section}} »</a>
- <div class="js-section toggle-section-content hidden">
-{{/if}}
-
- <div id="profile-photo-upload-wrapper">
- <label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_profile_photo}}:</label>
- <input name="userfile" type="file" id="profile-photo-upload" size="48" />
- </div>
-
- <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
- </div>
- <div class="profile-edit-submit-end"></div>
-
-{{if $detailed_profile}}
- </div>
- </div>
-{{/if}}
-</form>
-
-<form id="profile-edit-form" name="form1" action="" method="post" >
- <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-
-{{if $detailed_profile}}
- <!-- Basic information -->
- <div class="toggle-section js-toggle-section">
- <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_basic_section}} »</a>
- <div class="js-section toggle-section-content hidden">
-
- {{include file="field_yesno.tpl" field=$details}}
-
- {{if $multi_profiles}}
- <div id="profile-edit-profile-name-wrapper" >
- <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
- <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
- </div>
- <div id="profile-edit-profile-name-end"></div>
- {{else}}
- <input type="hidden" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" />
- {{/if}}
-
- <div id="profile-edit-name-wrapper" >
- <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
- <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
- </div>
- <div id="profile-edit-name-end"></div>
-
- <div id="profile-edit-gender-wrapper" >
- <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
- {{$gender nofilter}}
- </div>
- <div id="profile-edit-gender-end"></div>
-
- <div id="profile-edit-pdesc-wrapper" >
- <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
- <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
- </div>
- <div id="profile-edit-pdesc-end"></div>
-
- <div id="profile-edit-xmpp-wrapper" >
- <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
- <input type="text" size="32" name="xmpp" id="profile-edit-xmpp" value="{{$xmpp.2}}" />
- </div>
- <div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
- <div id="profile-edit-xmpp-end"></div>
-
- <div id="profile-edit-homepage-wrapper" >
- <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
- <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
- </div>
- <div id="profile-edit-homepage-end"></div>
-
- <div id="profile-edit-dob-wrapper" >
- {{$dob nofilter}}
- </div>
- <div id="profile-edit-dob-end"></div>
-
- {{$hide_friends nofilter}}
-
- <div id="about-jot-wrapper">
- <div id="about-jot-desc">{{$about.1}}</div>
- <textarea rows="10" cols="72" id="profile-about-text" name="about" style="width:599px;">{{$about.2}}</textarea>
- </div>
- <div id="about-jot-end"></div>
-
- <div id="contact-jot-wrapper" >
- <div id="contact-jot-desc">{{$contact.1}}</div>
- <textarea rows="10" cols="72" id="contact-jot-text" name="contact" style="width:599px;">{{$contact.2}}</textarea>
- </div>
- <div id="contact-jot-end"></div>
-
- <div id="profile-edit-pubkeywords-wrapper" >
- <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
- <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
- </div>
- <div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
- <div id="profile-edit-pubkeywords-end"></div>
-
- <div id="profile-edit-prvkeywords-wrapper" >
- <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
- <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
- </div>
- <div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
- <div id="profile-edit-prvkeywords-end"></div>
-
- <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
- </div>
- <div class="profile-edit-submit-end"></div>
-
- </div>
- </div>
-
- <!-- About you -->
- <div class="toggle-section js-toggle-section">
- <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_about_section}} »</a>
- <div class="js-section toggle-section-content hidden">
-
- <div><b>{{$lbl_location_section}}</b></div>
-
- <div id="profile-edit-address-wrapper" >
- <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
- <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
- </div>
- <div id="profile-edit-address-end"></div>
-
- <div id="profile-edit-locality-wrapper" >
- <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
- <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
- </div>
- <div id="profile-edit-locality-end"></div>
-
- <div id="profile-edit-postal-code-wrapper" >
- <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
- <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
- </div>
- <div id="profile-edit-postal-code-end"></div>
-
- <div id="profile-edit-country-name-wrapper" >
- <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
- <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
- <option selected="selected" >{{$country_name.2}}</option>
- </select>
- </div>
- <div id="profile-edit-country-name-end"></div>
-
- <div id="profile-edit-region-wrapper" >
- <label id="profile-edit-region-label" for="profile-edit-region" >{{$region.2}} </label>
- <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
- <option selected="selected" >{{$region.2}}</option>
- </select>
- </div>
- <div id="profile-edit-region-end"></div>
-
- <div id="profile-edit-hometown-wrapper" >
- <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
- <input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
- </div>
- <div id="profile-edit-hometown-end"></div>
-
- <br>
-
- <div><b>{{$lbl_preferences_section}}</b></div>
-
- <div id="profile-edit-sexual-wrapper" >
- <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
- {{$sexual nofilter}}
- </div>
- <div id="profile-edit-sexual-end"></div>
-
- <div id="profile-edit-politic-wrapper" >
- <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
- <input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
- </div>
- <div id="profile-edit-politic-end"></div>
-
- <div id="profile-edit-religion-wrapper" >
- <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
- <input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
- </div>
- <div id="profile-edit-religion-end"></div>
-
- <div id="likes-jot-wrapper">
- <div id="likes-jot-desc">{{$likes.1}}</div>
- <textarea rows="10" cols="72" id="likes-jot-text" name="likes" style="width:599px;">{{$likes.2}}</textarea>
- </div>
- <div id="likes-jot-end"></div>
-
- <div id="dislikes-jot-wrapper">
- <div id="dislikes-jot-desc">{{$dislikes.1}}</div>
- <textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" style="width:599px;">{{$dislikes.2}}</textarea>
- </div>
- <div id="dislikes-jot-end"></div>
-
- <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
- </div>
- <div class="profile-edit-submit-end"></div>
-
- </div>
- </div>
-
- <!-- Status -->
- <div class="toggle-section js-toggle-section">
- <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_status_section}} »</a>
- <div class="js-section toggle-section-content hidden">
-
- <div id="profile-edit-marital-wrapper" >
- <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital nofilter}} </label>
- {{$marital nofilter}}
- </div>
- <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
- <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
- <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
- <input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.2}}" />
- <div id="profile-edit-marital-end"></div>
-
- <div id="romance-jot-wrapper" >
- <div id="romance-jot-desc">{{$romance.1}}</div>
- <textarea rows="10" cols="72" id="romance-jot-text" name="romance" style="width:599px;">{{$romance.2}}</textarea>
- </div>
- <div id="romance-jot-end"></div>
-
- <div id="work-jot-wrapper">
- <div id="work-jot-desc">{{$work.1}}</div>
- <textarea rows="10" cols="72" id="work-jot-text" name="work" style="width:599px;">{{$work.2}}</textarea>
- </div>
- <div id="work-jot-end"></div>
-
- <div id="education-jot-wrapper" >
- <div id="education-jot-desc">{{$education.1}}</div>
- <textarea rows="10" cols="72" id="education-jot-text" name="education" style="width:599px;">{{$education.2}}</textarea>
- </div>
- <div id="education-jot-end"></div>
-
- <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
- </div>
- <div class="profile-edit-submit-end"></div>
-
- </div>
- </div>
-
- <!-- Interests -->
- <div class="toggle-section js-toggle-section">
- <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_interests_section}} »</a>
- <div class="js-section toggle-section-content hidden">
-
- <div id="interest-jot-wrapper">
- <div id="interest-jot-desc">{{$interest.1}}</div>
- <textarea rows="10" cols="72" id="interest-jot-text" name="interest" style="width:599px;">{{$interest.2}}</textarea>
- </div>
- <div id="interest-jot-end"></div>
-
- <div id="music-jot-wrapper">
- <div id="music-jot-desc">{{$music.1}}</div>
- <textarea rows="10" cols="72" id="music-jot-text" name="music" style="width:599px;">{{$music.2}}</textarea>
- </div>
- <div id="music-jot-end"></div>
-
- <div id="book-jot-wrapper">
- <div id="book-jot-desc">{{$book.1}}</div>
- <textarea rows="10" cols="72" id="book-jot-text" name="book" style="width:599px;">{{$book.2}}</textarea>
- </div>
- <div id="book-jot-end"></div>
-
- <div id="tv-jot-wrapper">
- <div id="tv-jot-desc">{{$tv.1}}</div>
- <textarea rows="10" cols="72" id="tv-jot-text" name="tv" style="width:599px;">{{$tv.2}}</textarea>
- </div>
- <div id="tv-jot-end"></div>
-
- <div id="film-jot-wrapper">
- <div id="film-jot-desc">{{$film.1}}</div>
- <textarea rows="10" cols="72" id="film-jot-text" name="film" style="width:599px;">{{$film.2}}</textarea>
- </div>
- <div id="film-jot-end"></div>
-
- <div class="profile-edit-submit-wrapper" >
- <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
- </div>
- <div class="profile-edit-submit-end"></div>
-
- </div>
- </div>
-{{else}}
-
-{{if $personal_account}}
-{{include file="field_yesno.tpl" field=$details}}
-{{/if}}
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
+<div id="profile-edit-wrapper">
+ <form enctype="multipart/form-data" action="settings/profile/photo" method="post">
+ <input type="hidden" name="form_security_token" value="{{$form_security_token_photo}}">
+
+ <!-- Profile picture -->
+ <div class="toggle-section js-toggle-section">
+ <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_picture_section}} »</a>
+ <div class="js-section toggle-section-content hidden">
+
+ <div id="profile-photo-upload-wrapper">
+ <label id="profile-photo-upload-label" for="profile-photo-upload">{{$lbl_profile_photo}}:</label>
+ <input name="userfile" type="file" id="profile-photo-upload" size="48"/>
+ </div>
+
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+
+ </div>
+ </div>
+ </form>
+
+ <form id="profile-edit-form" name="form1" action="" method="post">
+ <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+
+ <!-- Basic information -->
+ <div class="toggle-section js-toggle-section">
+ <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_personal_section}} »</a>
+ <div class="js-section toggle-section-content hidden">
+
+ <div id="profile-edit-name-wrapper">
+ <label id="profile-edit-name-label" for="profile-edit-name">{{$name.1}} </label>
+ <input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}"/>
+ </div>
+ <div id="profile-edit-name-end"></div>
+
+ <div id="profile-edit-pdesc-wrapper">
+ <label id="profile-edit-pdesc-label" for="profile-edit-pdesc">{{$pdesc.1}} </label>
+ <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}"/>
+ </div>
+ <div id="profile-edit-pdesc-end"></div>
+
+ <div id="profile-edit-xmpp-wrapper">
+ <label id="profile-edit-xmpp-label" for="profile-edit-xmpp">{{$xmpp.1}} </label>
+ <input type="text" size="32" name="xmpp" id="profile-edit-xmpp" value="{{$xmpp.2}}"/>
+ </div>
+ <div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
+ <div id="profile-edit-xmpp-end"></div>
+
+ <div id="profile-edit-homepage-wrapper">
+ <label id="profile-edit-homepage-label" for="profile-edit-homepage">{{$homepage.1}} </label>
+ <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}"/>
+ </div>
+ <div id="profile-edit-homepage-end"></div>
+
+ <div id="profile-edit-dob-wrapper">
+ {{$dob nofilter}}
+ </div>
+ <div id="profile-edit-dob-end"></div>
+
+ {{$hide_friends nofilter}}
+
+ <div id="profile-edit-pubkeywords-wrapper">
+ <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords">{{$pub_keywords.1}} </label>
+ <input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}"/>
+ </div>
+ <div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
+ <div id="profile-edit-pubkeywords-end"></div>
+
+ <div id="profile-edit-prvkeywords-wrapper">
+ <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords">{{$prv_keywords.1}} </label>
+ <input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}"/>
+ </div>
+ <div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
+ <div id="profile-edit-prvkeywords-end"></div>
+
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+
+ </div>
+ </div>
+ <!-- About you -->
+ <div class="toggle-section js-toggle-section">
+ <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_location_section}} »</a>
+ <div class="js-section toggle-section-content hidden">
+
+ <div id="profile-edit-address-wrapper">
+ <label id="profile-edit-address-label" for="profile-edit-address">{{$address.1}} </label>
+ <input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}"/>
+ </div>
+ <div id="profile-edit-address-end"></div>
+
+ <div id="profile-edit-locality-wrapper">
+ <label id="profile-edit-locality-label" for="profile-edit-locality">{{$locality.1}} </label>
+ <input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}"/>
+ </div>
+ <div id="profile-edit-locality-end"></div>
+
+ <div id="profile-edit-postal-code-wrapper">
+ <label id="profile-edit-postal-code-label" for="profile-edit-postal-code">{{$postal_code.1}} </label>
+ <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}"/>
+ </div>
+ <div id="profile-edit-postal-code-end"></div>
+
+ <div id="profile-edit-country-name-wrapper">
+ <label id="profile-edit-country-name-label" for="profile-edit-country-name">{{$country_name.1}} </label>
+ <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
+ <option selected="selected">{{$country_name.2}}</option>
+ </select>
+ </div>
+ <div id="profile-edit-country-name-end"></div>
+
+ <div id="profile-edit-region-wrapper">
+ <label id="profile-edit-region-label" for="profile-edit-region">{{$region.1}} </label>
+ <select name="region" id="profile-edit-region" onChange="Update_Globals();">
+ <option selected="selected">{{$region.2}}</option>
+ </select>
+ </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>
+ <div class="profile-edit-submit-end"></div>
+ </div>
+ </div>
+ <!-- Interests -->
+ <div class="toggle-section js-toggle-section">
+ <a class="section-caption js-section-toggler" href="javascript:;">{{$lbl_custom_fields_section}} »</a>
+ <div class="js-section toggle-section-content hidden">
+ {{foreach $custom_fields as $custom_field}}
+ {{include file="settings/profile/field/edit.tpl" profile_field=$custom_field}}
+ {{/foreach}}
+
+ <div class="profile-edit-submit-wrapper">
+ <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}"/>
+ </div>
+ <div class="profile-edit-submit-end"></div>
+ </div>
+ </div>
+ </form>
</div>
-<div id="profile-edit-name-end"></div>
-
-{{if $personal_account}}
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender nofilter}}
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-{{$dob nofilter}}
-</div>
-<div id="profile-edit-dob-end"></div>
-{{/if}}
-
- <div id="profile-edit-xmpp-wrapper" >
- <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
- <input type="text" size="32" name="xmpp" id="profile-edit-xmpp" value="{{$xmpp.2}}" />
- </div>
- <div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
- <div id="profile-edit-xmpp-end"></div>
-
- <div id="profile-edit-homepage-wrapper" >
- <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
- <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
- </div>
- <div id="profile-edit-homepage-end"></div>
-
-{{$hide_friends nofilter}}
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$country_name.1}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region.2}}');">
-<option selected="selected" >{{$country_name.2}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$region.1}} </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >{{$region.2}}</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-{{$about.1}}
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
- <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
- <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact.2}}" />
- <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
- <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
- <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
- <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
- <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
- <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
- <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
- <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
- <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
- <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
- <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
- <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
- <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest.2}}" />
- <input type="hidden" id="music-jot-text" name="music" value="{{$music.2}}" />
- <input type="hidden" id="book-jot-text" name="book" value="{{$book.2}}" />
- <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv.2}}" />
- <input type="hidden" id="film-jot-text" name="film" value="{{$film.2}}" />
-
-{{/if}}
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>
+<script type="text/javascript">
+ Fill_Country('{{$country_name.2}}');
+ Fill_States('{{$region.2}}');
+</script>
projects / friendica.git / commitdiff