frio + core: some restructure in profiles.php + frio template for profiles settings

7 years ago · 3a9a9e6a1c
parent 30056dd22d
commit 3a9a9e6a1c
15 changed files with 856 additions and 457 deletions
--- a/include/datetime.php
+++ b/include/datetime.php
@ -162,7 +162,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 * @brief Wrapper for date selector, tailored for use in birthday fields.
 *
 * @param string $dob Date of Birth
- * @return string
+ * @return string Formatted html
 */
 function dob($dob) {
 	list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
@ -175,7 +175,18 @@ function dob($dob) {
 	else
 		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));

-	$o = '<input type="text" name="dob" value="' . $value . '" placeholder="' . t('YYYY-MM-DD or MM-DD') . '" />';
+	$age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
+
+	$o = replace_macros(get_markup_template("field_input.tpl"), array(
+		'$field' => array(
+			'dob',
+			t('Birthday:'),
+			$value,
+			(((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
+			'',
+			'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
+		)
+	));

 //	if ($dob && $dob != '0000-00-00')
 //		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');
--- a/mod/profiles.php
+++ b/mod/profiles.php
@ -255,7 +255,7 @@ function profiles_post(&$a) {
 					if(count($links)) {
 						foreach($links as $link) {
 							if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
-            	       			$prf = $link['@attributes']['href'];
+								$prf = $link['@attributes']['href'];
 							}
 						}
 					}
@ -304,8 +304,8 @@ function profiles_post(&$a) {
 		$sexual = notags(trim($_POST['sexual']));
 		$homepage = notags(trim($_POST['homepage']));
 		if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
-		    // neither http nor https in URL, add them
-		    $homepage = 'http://'.$homepage;
+			// neither http nor https in URL, add them
+			$homepage = 'http://'.$homepage;
 		}
 		$hometown = notags(trim($_POST['hometown']));
 		$politic = notags(trim($_POST['politic']));
@ -663,25 +663,29 @@ function profiles_content(&$a) {
 			'$detailled_profile' => $detailled_profile,

 			'$details' => array(
-                                'detailled_profile', //Name
-                                t('Show more profile fields:'), //Label
-                                $detailled_profile, //Value
-                                '', //Help string
-                                array(t('No'),t('Yes')) //Off - On strings
-                        ),
-
-			'$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
-			'$form_security_token' => get_form_security_token("profile_edit"),
-			'$form_security_token_photo' => get_form_security_token("profile_photo"),
-			'$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
-			'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
-			'$banner' => t('Edit Profile Details'),
-			'$submit' => t('Submit'),
-			'$profpic' => t('Change Profile Photo'),
-			'$viewprof' => t('View this profile'),
-			'$cr_prof' => t('Create a new profile using these settings'),
-			'$cl_prof' => t('Clone this profile'),
-			'$del_prof' => t('Delete this profile'),
+				'detailled_profile', //Name
+				t('Show more profile fields:'), //Label
+				$detailled_profile, //Value
+				'', //Help string
+				array(t('No'),t('Yes')) //Off - On strings
+			),
+
+			'$multi_profiles'		=> feature_enabled(local_user(),'multi_profiles'),
+			'$form_security_token'		=> get_form_security_token("profile_edit"),
+			'$form_security_token_photo'	=> get_form_security_token("profile_photo"),
+			'$profile_clone_link'		=> ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
+			'$profile_drop_link'		=> 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
+
+			'$profile_action' => t('Profile Actions'),
+			'$banner'	=> t('Edit Profile Details'),
+			'$submit'	=> t('Submit'),
+			'$profpic'	=> t('Change Profile Photo'),
+			'$viewprof'	=> t('View this profile'),
+			'$editvis' 	=> t('Edit visibility'),
+			'$cr_prof'	=> t('Create a new profile using these settings'),
+			'$cl_prof'	=> t('Clone this profile'),
+			'$del_prof'	=> t('Delete this profile'),
+
 			'$lbl_basic_section' => t('Basic information'),
 			'$lbl_picture_section' => t('Profile picture'),
 			'$lbl_location_section' => t('Location'),
@ -689,81 +693,58 @@ function profiles_content(&$a) {
 			'$lbl_status_section' => t('Status information'),
 			'$lbl_about_section' => t('Additional information'),
 			'$lbl_interests_section' => t('Interests'),
+			'$lbl_personal_section' => t('Personal'),
+			'$lbl_relation_section' => t('Relation'),
+			'$lbl_miscellaneous_section' => t('Miscellaneous'),
+
 			'$lbl_profile_photo' => t('Upload Profile Photo'),
-			'$lbl_profname' => t('Profile Name:'),
-			'$lbl_fullname' => t('Your Full Name:'),
-			'$lbl_title' => t('Title/Description:'),
 			'$lbl_gender' => t('Your Gender:'),
-			'$lbl_bd'       => t("Birthday :"),
-			'$lbl_address' => t('Street Address:'),
-			'$lbl_city' => t('Locality/City:'),
-			'$lbl_zip' => t('Postal/Zip Code:'),
-			'$lbl_country' => t('Country:'),
-			'$lbl_region' => t('Region/State:'),
 			'$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'),
-			'$lbl_with' => t("Who: \x28if applicable\x29"),
-			'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
-			'$lbl_howlong' => t('Since [date]:'),
 			'$lbl_sexual' => t('Sexual Preference:'),
-			'$lbl_homepage' => t('Homepage URL:'),
-			'$lbl_hometown' => t('Hometown:'),
-			'$lbl_politic' => t('Political Views:'),
-			'$lbl_religion' => t('Religious Views:'),
-			'$lbl_pubkey' => t('Public Keywords:'),
-			'$lbl_prvkey' => t('Private Keywords:'),
-			'$lbl_likes' => t('Likes:'),
-			'$lbl_dislikes' => t('Dislikes:'),
 			'$lbl_ex2' => t('Example: fishing photography software'),
-			'$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
-			'$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
-			'$lbl_about' => t('Tell us about yourself...'),
-			'$lbl_hobbies' => t('Hobbies/Interests'),
-			'$lbl_social' => t('Contact information and Social Networks'),
-			'$lbl_music' => t('Musical interests'),
-			'$lbl_book' => t('Books, literature'),
-			'$lbl_tv' => t('Television'),
-			'$lbl_film' => t('Film/dance/culture/entertainment'),
-			'$lbl_love' => t('Love/romance'),
-			'$lbl_work' => t('Work/employment'),
-			'$lbl_school' => t('School/education'),
+
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
 			'$baseurl' => $a->get_baseurl(true),
 			'$profile_id' => $r[0]['id'],
-			'$profile_name' => $r[0]['profile-name'],
+			'$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'),
+			'$is_default'   => $is_default,
 			'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
-			'$name' => $r[0]['name'],
-			'$pdesc' => $r[0]['pdesc'],
+			'$name' => array('name', t('Your Full Name:'), $r[0]['name']),
+			'$pdesc' => array('pdesc', t('Title/Description:'), $r[0]['pdesc']),
 			'$dob' => dob($r[0]['dob']),
 			'$hide_friends' => $hide_friends,
-			'$address' => $r[0]['address'],
-			'$locality' => $r[0]['locality'],
-			'$region' => $r[0]['region'],
-			'$postal_code' => $r[0]['postal-code'],
-			'$country_name' => $r[0]['country-name'],
+			'$address' => array('address', t('Street Address:'), $r[0]['address']),
+			'$locality' => array('locality', t('Locality/City:'), $r[0]['locality']),
+			'$region' => array('region', t('Region/State:'), $r[0]['region']),
+			'$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
+			'$country_name' => array('country_name', t('Country:'), $r[0]['country-name']),
 			'$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
 			'$gender' => gender_selector($r[0]['gender']),
 			'$marital' => marital_selector($r[0]['marital']),
-			'$with' => strip_tags($r[0]['with']),
-			'$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
+			'$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
+			'$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
 			'$sexual' => sexpref_selector($r[0]['sexual']),
-			'$about' => $r[0]['about'],
-			'$homepage' => $r[0]['homepage'],
-			'$hometown' => $r[0]['hometown'],
-			'$politic' => $r[0]['politic'],
-			'$religion' => $r[0]['religion'],
-			'$pub_keywords' => $r[0]['pub_keywords'],
-			'$prv_keywords' => $r[0]['prv_keywords'],
-			'$likes' => $r[0]['likes'],
-			'$dislikes' => $r[0]['dislikes'],
-			'$music' => $r[0]['music'],
-			'$book' => $r[0]['book'],
-			'$tv' => $r[0]['tv'],
-			'$film' => $r[0]['film'],
-			'$interest' => $r[0]['interest'],
-			'$romance' => $r[0]['romance'],
-			'$work' => $r[0]['work'],
-			'$education' => $r[0]['education'],
-			'$contact' => $r[0]['contact']
+			'$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
+			'$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),
+			'$hometown' => array('hometown', t('Hometown:'), $r[0]['hometown']),
+			'$politic' => array('politic', t('Political Views:'), $r[0]['politic']),
+			'$religion' => array('religion', t('Religious Views:'), $r[0]['religion']),
+			'$pub_keywords' => array('pub_keywords', t('Public Keywords:'), $r[0]['pub_keywords'], t("\x28Used for suggesting potential friends, can be seen by others\x29")),
+			'$prv_keywords' => array('prv_keywords', t('Private Keywords:'), $r[0]['prv_keywords'], t("\x28Used for searching profiles, never shown to others\x29")),
+			'$likes' => array('likes', t('Likes:'), $r[0]['likes']),
+			'$dislikes' => array('dislikes', t('Dislikes:'), $r[0]['dislikes']),
+			'$music' => array('music', t('Musical interests'), $r[0]['music']),
+			'$book' => array('book', t('Books, literature'), $r[0]['book']),
+			'$tv' => array('tv', t('Television'), $r[0]['tv']),
+			'$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
+			'$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
+			'$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
+			'$work' => array('work', t('Work/employment'), $r[0]['work']),
+			'$education' => array('education', t('School/education'), $r[0]['education']),
+			'$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
+
+			//eigene
+
 		));

 		$arr = array('profile' => $r[0], 'entry' => $o);
@ -791,19 +772,9 @@ function profiles_content(&$a) {
 			local_user());
 		if(count($r)) {

-			$tpl_header = get_markup_template('profile_listing_header.tpl');
-			$o .= replace_macros($tpl_header,array(
-				'$header' => t('Edit/Manage Profiles'),
-				'$chg_photo' => t('Change profile photo'),
-				'$cr_new' => t('Create New Profile'),
-				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
-			));
-
-
 			$tpl = get_markup_template('profile_entry.tpl');
-
 			foreach($r as $rr) {
-				$o .= replace_macros($tpl, array(
+				$profiles .= replace_macros($tpl, array(
 					'$photo' => $a->remove_baseurl($rr['thumb']),
 					'$id' => $rr['id'],
 					'$alt' => t('Profile Image'),
@ -812,6 +783,15 @@ function profiles_content(&$a) {
 						: '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
 				));
 			}
+
+			$tpl_header = get_markup_template('profile_listing_header.tpl');
+			$o .= replace_macros($tpl_header,array(
+				'$header' => t('Edit/Manage Profiles'),
+				'$chg_photo' => t('Change profile photo'),
+				'$cr_new' => t('Create New Profile'),
+				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
+				'$profiles' => $profiles
+			));
 		}
 		return $o;
 	}
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@ -1,6 +1,6 @@
 	
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+		<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
 	</div>
--- a/view/templates/profile_edit.tpl
+++ b/view/templates/profile_edit.tpl
@ -24,20 +24,20 @@
 {{if $detailled_profile}}
 {{include file="field_yesno.tpl" field=$details}}
 <div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name|escape:'html'}}" /><div class="required">*</div>
+<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|escape:'html'}}" /><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" >{{$lbl_fullname}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-name-end"></div>

 <div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>

@ -49,10 +49,7 @@
 <div id="profile-edit-gender-end"></div>

 <div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
+{{$dob}}
 </div>
 <div id="profile-edit-dob-end"></div>

@ -65,45 +62,45 @@


 <div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-address-end"></div>

 <div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality|escape:'html'}}" />
+<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|escape:'html'}}" />
 </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" >{{$lbl_zip}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code|escape:'html'}}" />
+<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|escape:'html'}}" />
 </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" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
+<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" >{{$lbl_region}} </label>
+<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}}</option>
+<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" >{{$lbl_hometown}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>

@ -116,10 +113,10 @@
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
 {{$marital}}
 </div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong|escape:'html'}}" />
+<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|escape:'html'}}" />

 <div id="profile-edit-marital-end"></div>

@ -132,33 +129,33 @@


 <div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>

 <div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-politic-end"></div>

 <div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-religion-end"></div>

 <div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords|escape:'html'}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<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|escape:'html'}}" />
+</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" >{{$lbl_prvkey}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords|escape:'html'}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<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|escape:'html'}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>


@ -169,10 +166,10 @@

 <div id="about-jot-wrapper" >
 <p id="about-jot-desc" >
-{{$lbl_about}}
+{{$about.1}}
 </p>

-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>

 </div>
 <div id="about-jot-end"></div>
@ -180,10 +177,10 @@

 <div id="interest-jot-wrapper" >
 <p id="interest-jot-desc" >
-{{$lbl_hobbies}}
+{{$interest.1}}
 </p>

-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest.2}}</textarea>

 </div>
 <div id="interest-jot-end"></div>
@ -191,10 +188,10 @@

 <div id="likes-jot-wrapper" >
 <p id="likes-jot-desc" >
-{{$lbl_likes}}
+{{$likes.1}}
 </p>

-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes.2}}</textarea>

 </div>
 <div id="likes-jot-end"></div>
@ -202,10 +199,10 @@

 <div id="dislikes-jot-wrapper" >
 <p id="dislikes-jot-desc" >
-{{$lbl_dislikes}}
+{{$dislikes.1}}
 </p>

-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes.2}}</textarea>

 </div>
 <div id="dislikes-jot-end"></div>
@ -213,10 +210,10 @@

 <div id="contact-jot-wrapper" >
 <p id="contact-jot-desc" >
-{{$lbl_social}}
+{{$contact.1}}
 </p>

-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact.2}}</textarea>

 </div>
 <div id="contact-jot-end"></div>
@ -230,20 +227,20 @@

 <div id="music-jot-wrapper" >
 <p id="music-jot-desc" >
-{{$lbl_music}}
+{{$music.1}}
 </p>

-<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
+<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" >
-{{$lbl_book}}
+{{$book.1}}
 </p>

-<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book.2}}</textarea>

 </div>
 <div id="book-jot-end"></div>
@ -252,10 +249,10 @@

 <div id="tv-jot-wrapper" >
 <p id="tv-jot-desc" >
-{{$lbl_tv}} 
+{{$tv.1}} 
 </p>

-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv.2}}</textarea>

 </div>
 <div id="tv-jot-end"></div>
@ -264,10 +261,10 @@

 <div id="film-jot-wrapper" >
 <p id="film-jot-desc" >
-{{$lbl_film}}
+{{$film.1}}
 </p>

-<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
+<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film.2}}</textarea>

 </div>
 <div id="film-jot-end"></div>
@ -281,10 +278,10 @@

 <div id="romance-jot-wrapper" >
 <p id="romance-jot-desc" >
-{{$lbl_love}}
+{{$romance.1}}
 </p>

-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance.2}}</textarea>

 </div>
 <div id="romance-jot-end"></div>
@ -293,10 +290,10 @@

 <div id="work-jot-wrapper" >
 <p id="work-jot-desc" >
-{{$lbl_work}}
+{{$work.1}}
 </p>

-<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work.2}}</textarea>

 </div>
 <div id="work-jot-end"></div>
@ -305,10 +302,10 @@

 <div id="education-jot-wrapper" >
 <p id="education-jot-desc" >
-{{$lbl_school}} 
+{{$education.1}} 
 </p>

-<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education.2}}</textarea>

 </div>
 <div id="education-jot-end"></div>
@ -325,14 +322,14 @@
 {{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" >{{$lbl_profname}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name|escape:'html'}}" /><div class="required">*</div>
+<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|escape:'html'}}" /><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" >{{$lbl_fullname}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-name-end"></div>

@ -344,77 +341,74 @@
 <div id="profile-edit-gender-end"></div>

 <div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
+{{$dob}}
 </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" >{{$lbl_homepage}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>

 {{$hide_friends}}

 <div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address|escape:'html'}}" />
+<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|escape:'html'}}" />
 </div>
 <div id="profile-edit-address-end"></div>

 <div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality|escape:'html'}}" />
+<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|escape:'html'}}" />
 </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" >{{$lbl_zip}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code|escape:'html'}}" />
+<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|escape:'html'}}" />
 </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" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
+<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" >{{$lbl_region}} </label>
+<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}}</option>
+<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" >{{$lbl_pubkey}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords|escape:'html'}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<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|escape:'html'}}" />
+</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" >{{$lbl_prvkey}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords|escape:'html'}}" />
-</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<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|escape:'html'}}" />
+</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" >
-{{$lbl_about}}
+{{$about.1}}
 </p>

-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about.2}}</textarea>

 </div>
 <div id="about-jot-end"></div>
@ -424,25 +418,25 @@
 </div>
 <div class="profile-edit-submit-end"></div>

-        <input type="hidden" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
-        <input type="hidden" id="contact-jot-text" name="contact" value="{{$contact}}" />
-        <input type="hidden" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
-        <input type="hidden" name="politic" id="profile-edit-politic" value="{{$politic}}" />
-        <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion}}" />
-        <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes}}" />
-        <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes}}" />
-        <input type="hidden" name="with" id="profile-edit-with" value="{{$with}}" />
-        <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong}}" />
-        <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance}}" />
-        <input type="hidden" id="work-jot-text" name="work" value="{{$work}}" />
-        <input type="hidden" id="education-jot-text" name="education" value="{{$education}}" />
-        <input type="hidden" id="interest-jot-text" name="interest" value="{{$interest}}" />
-        <input type="hidden" id="music-jot-text" name="music" value="{{$music}}" />
-        <input type="hidden" id="book-jot-text" name="book" value="{{$book}}" />
-        <input type="hidden" id="tv-jot-text" name="tv" value="{{$tv}}" />
-        <input type="hidden" id="film-jot-text" name="film" value="{{$film}}" />
+        <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="with" id="profile-edit-with" value="{{$with.2}}" />
+        <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.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}}');Fill_States('{{$region}}');</script>
+<script type="text/javascript">Fill_Country('{{$country_name.2}}');Fill_States('{{$region.2}}');</script>
--- a/view/templates/profile_entry.tpl
+++ b/view/templates/profile_entry.tpl
@ -1,12 +1,12 @@

-
 <div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
-<div class="profile-listing-visible">{{$visible}}</div>
+	<div class="profile-listing-photo-wrapper" >
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+	</div>
+	<div class="profile-listing-photo-end"></div>
+	<div class="profile-listing-name" id="profile-listing-name-{{$id}}">
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
+	</div>
+	<div class="profile-listing-visible">{{$visible}}</div>
 </div>
 <div class="profile-listing-end"></div>
-
--- a/view/templates/profile_listing_header.tpl
+++ b/view/templates/profile_listing_header.tpl
@ -1,9 +1,14 @@

 <h1>{{$header}}</h1>
+
 <p id="profile-listing-desc" class="button" >
-<a href="profile_photo" >{{$chg_photo}}</a>
+	<a href="profile_photo" >{{$chg_photo}}</a>
 </p>
+
 <div id="profile-listing-new-link-wrapper" class="button" >
-<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
+	<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
 </div>

+<div id="profile-listing-profiles">
+	{{$profiles}}
+</div>
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@ -1681,12 +1681,13 @@ ul.dropdown-menu li:hover {
 /* PAGES */

 /* Profile-page */
-#profile-page, .photos-content-wrapper, .settings-content-wrapper,
+.generic-page-wrapper ,#profile-page, .settings-content-wrapper,
 .contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
 .events-content-wrapper, .message-content-wrapper, .apps-content-wrapper, 
-.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
+.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper,
+.profile_photo-content-wrapper, photos-content-wrapper {
    min-height: calc(100vh - 150px);
    padding: 15px;
    padding-bottom: 20px;
@ -1884,6 +1885,58 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
 #poke-wrapper-end {
    clear: both;
 }
+
+/* Profiles Page */
+.profile-listing-table {
+    display: table;
+    width: 100%;
+}
+.profile-listing-row {
+    display: table-row;
+}
+.profile-listing-cell {
+    display: table-cell;
+}
+.profile-listing-photo {
+    width: 48px;
+    height: 48px;
+    margin: 10px 0px;
+}
+#profile-listing-new-link-wrapper {
+    margin-bottom: 20px;
+}
+.profiles-content-wrapper #profile-edit-wrapper {
+    margin-left: -15px;
+    margin-right: -15px;
+}
+.profiles-content-wrapper #profile-edit-wrapper > .panel {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+.profiles-content-wrapper #profile-photo-upload-section {
+    display: none;
+    margin-left: -15px;
+    margin-right: -15px;
+    margin-top: 15px;
+    padding: 15px;
+}
+#profile-photo-upload-close {
+    font-size: 14px;
+}
+
+/* Settings */
+.section-subtitle-wrapper {
+    padding: 1px 10px;
+}
+.panel .section-subtitle-wrapper a.accordion-toggle:before {
+    font-family: FontAwesome;
+    content: "\f0d7";
+    padding-right: 5px;
+}
+.panel .section-subtitle-wrapper a.accordion-toggle.collapsed:before {
+    font-family: FontAwesome;
+    content: "\f0da";
+}
 /*
 * Overwriting for transparency and other colors
 */
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@ -1,7 +1,7 @@

 <div id="id_{{$field.0}}_wrapper" class="form-group field input">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}}type="text"{{/if}} value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{/if}} aria-describedby="{{$field.0}}_tip">
+	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
 	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
 	<div class="clear"></div>
 </div>
--- a/view/theme/frio/templates/field_textarea.tpl
+++ b/view/theme/frio/templates/field_textarea.tpl
@ -0,0 +1,7 @@
+
+	<div class="form-group field textarea">
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
+		<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+		<div class="clear"></div>
+	</div>
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@ -0,0 +1,331 @@
+
+<div class="generic-page-wrapper">
+	{{include file="section_title.tpl" title=$banner}}
+
+	{{* The actions dropdown which can performed to the current profile *}}
+	<div id="profile-edit-links">
+		<ul class="nav nav-pills preferences">
+			<li class="dropdown pull-right">
+				<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
+							<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
+				</a>
+				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
+					<li role="menuitem"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+					<li role="menuitem"><a id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+					{{if ! $is_default}}
+					<li class="nav-item"><a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil"  aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
+					</li>
+					{{/if}}
+					<li role="separator" class="divider"></li>
+					<li role="menuitem"><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
+					{{if $profile_clone_link}}
+					<li role="separator"class="divider"></li>
+					<li role="menuitem"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
+					{{/if}}
+					{{if !$is_default}}
+					<li role="separator" class="divider"></li>
+					<li role="menuitem"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
+					{{/if}}
+				</ul>
+			</li>
+
+		</ul>
+	</div>
+
+	<div id="profile-edit-links-end"></div>
+
+	<form enctype="multipart/form-data" action="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}}" />
+
+		<div id="profile-photo-upload-section" class="panel">
+			<a id="profile-photo-upload-close" class="close pull-right" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-times" aria-hidden="true"></i></a>
+			<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 pull-right" >
+				<button type="submit" name="submit" class="profile-edit-submit-butto btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+			</div>
+			<div class="clear"></div>
+		</div>
+	</form>
+
+	{{* Most of the Variables used below are arrays in the following style
+		0 => Some kind of identifier (e.g. for the ID)
+		1 => The label description
+		2 => The input values
+		3 => The additional help text (if available)
+	*}}
+
+	<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		{{* Some hints to characteristics of the current profile (if available) *}}
+		{{if $is_default}}
+		<div class="section-content-info-wrapper">{{$default}}</div>
+		{{/if}}
+
+		{{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}}
+		{{if $detailled_profile}}
+		<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
+			{{* The personal settings *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="personal">
+					<h4>
+						<a class="accordion-toggle" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+							{{$lbl_personal_section}}
+						</a>
+					</h4>
+				</div>
+				{{* for the $detailled_profile we use bootstraps collapsable panel-groups to have expandable groups *}}
+				<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_yesno.tpl" field=$details}}
+
+						{{include file="field_input.tpl" field=$profile_name}}
+
+						{{include file="field_input.tpl" field=$name}}
+
+						{{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}}
+						</div>
+						<div class="clear"></div>
+
+						{{$dob}}
+
+						{{$hide_friends}}
+
+						<div class="form-group pull-right" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The location settings *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="location">
+					<h4>
+						<a class="accordion-toggle" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+							{{$lbl_location_section}}
+						</a>
+					</h4>
+				</div>
+				<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+					<div class="section-content-tools-wrapper">
+						{{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=$hometown}}
+
+						<div class="form-group pull-right" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The settings for relations *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="relation">
+					<h4>
+						<a class="accordion-toggle" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+							{{$lbl_relation_section}}
+						</a>
+					</h4>
+				</div>
+				<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+					<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}}</label>
+								{{$marital}}
+						</div>
+						<div class="clear"></div>
+
+						{{include file="field_input.tpl" field=$with}}
+
+						{{include file="field_input.tpl" field=$howlong}}
+
+						<div id="profile-edit-sexual-wrapper" class="form-group field select" >
+							<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
+							{{$sexual}}
+						</div>
+						<div class="clear"></div>
+
+						<div class="form-group pull-right" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The miscellanous other settings *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
+					<h4>
+						<a class="accordion-toggle" data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+							{{$lbl_miscellaneous_section}}
+						</a>
+					</h4>
+				</div>
+				<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_input.tpl" field=$homepage}}
+
+						{{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}}
+
+						<div class="form-group pull-right" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		{{else}}
+		{{* if $detailled_profile not available a short version of the setting page is displayed *}}
+		{{if $personal_account}}
+		{{include file="field_yesno.tpl" field=$details}}
+		{{/if}}
+
+		{{include file="field_input.tpl" field=$profile_name}}
+
+		{{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}}
+		</div>
+		<div class="clear"></div>
+
+		{{$dob}}
+
+		{{/if}}
+
+		{{include file="field_input.tpl" field=$homepage}}
+
+		{{$hide_friends}}
+
+		{{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="with" id="profile-edit-with" value="{{$with.2}}" />
+		<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.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>
--- a/view/theme/frio/templates/profile_entry.tpl
+++ b/view/theme/frio/templates/profile_entry.tpl
@ -0,0 +1,15 @@
+
+<div class="profile-listing-row" >
+	<div class="profile-listing-cell" >
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+	</div>
+	<div class="profile-listing-photo-end"></div>
+	<div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
+		<a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
+	</div>
+	<div class="profile-listing-cell">
+		{{$visible}}
+	</div>
+</div>
+<div class="profile-listing-end"></div>
+
--- a/view/theme/frio/templates/profile_listing_header.tpl
+++ b/view/theme/frio/templates/profile_listing_header.tpl
@ -0,0 +1,15 @@
+
+<div class="gerneric-page-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+
+	<div class="section-content-wrapper">
+		<div id="profile-listing-new-link-wrapper" class="button" >
+			<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
+		</div>
+		<div id="profile-listing-profiles" class="profile-listing-table">
+			{{$profiles}}
+		</div>
+	</div>
+</div>
--- a/view/theme/frost-mobile/templates/profile_edit.tpl
+++ b/view/theme/frost-mobile/templates/profile_edit.tpl
@ -21,20 +21,20 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>

 <div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_fullname}} </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_title}} </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.2}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>

@ -46,10 +46,7 @@
 <div id="profile-edit-gender-end"></div>

 <div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
-<div id="profile-edit-dob" >
-{{$dob}} {{$age}}
-</div>
+{{$dob}}
 </div>
 <div id="profile-edit-dob-end"></div>

@ -62,45 +59,45 @@


 <div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_city}} </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_zip}} </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_country}} </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
-<option selected="selected" >{{$country_name}}</option>
+<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" >{{$lbl_region}} </label>
+<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}}</option>
+<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" >{{$lbl_hometown}} </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>

@ -113,10 +110,10 @@
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
 {{$marital}}
 </div>
-<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
+<input type="text" size="28" 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="28" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.2}}" />

 <div id="profile-edit-marital-end"></div>

@ -129,33 +126,33 @@


 <div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>

 <div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_religion}} </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
+<input type="text" size="28" 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" >{{$lbl_pubkey}} </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
+<input type="text" size="28" 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>