diff --git a/include/datetime.php b/include/datetime.php index ace1ad14f..57b2b6d37 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -129,7 +129,7 @@ function dob($dob) { else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); - $o = ''; + $o = ''; // 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'); diff --git a/include/profile_selectors.php b/include/profile_selectors.php index a80677cb3..9f993f803 100644 --- a/include/profile_selectors.php +++ b/include/profile_selectors.php @@ -7,7 +7,7 @@ function gender_selector($current="",$suffix="") { call_hooks('gender_selector', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); @@ -24,7 +24,7 @@ function gender_selector_min($current="",$suffix="") { call_hooks('gender_selector_min', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); @@ -44,7 +44,7 @@ function sexpref_selector($current="",$suffix="") { call_hooks('sexpref_selector', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); @@ -62,7 +62,7 @@ function sexpref_selector_min($current="",$suffix="") { call_hooks('sexpref_selector_min', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); @@ -81,7 +81,7 @@ function marital_selector($current="",$suffix="") { call_hooks('marital_selector', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); @@ -98,7 +98,7 @@ function marital_selector_min($current="",$suffix="") { call_hooks('marital_selector_min', $select); - $o .= ""; foreach($select as $selection) { if($selection !== 'NOTRANSLATION') { $selected = (($selection == $current) ? ' selected="selected" ' : ''); diff --git a/mod/profiles.php b/mod/profiles.php index fe45f1b92..57d3561b1 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -695,28 +695,28 @@ function profiles_content(&$a) { '$exportable' => feature_enabled(local_channel(),'profile_export'), '$lbl_import' => t('Import profile from file'), '$lbl_export' => t('Export profile to file'), - '$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('♥ Marital Status:'), - '$lbl_with' => t("Who: \x28if applicable\x29"), + '$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('♥ Marital Status'), + '$lbl_with' => t("Who (if applicable)"), '$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('Keywords:'), - '$lbl_likes' => t('Likes:'), - '$lbl_dislikes' => t('Dislikes:'), + '$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('Keywords'), + '$lbl_likes' => t('Likes'), + '$lbl_dislikes' => t('Dislikes'), '$lbl_ex2' => t('Example: fishing photography software'), '$lbl_pubdsc' => t("Used in directory listings"), '$lbl_about' => t('Tell us about yourself...'), diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css index 35ef73cec..ea063c64e 100644 --- a/view/css/mod_profiles.css +++ b/view/css/mod_profiles.css @@ -19,7 +19,7 @@ #profile-edit-links-end { clear: both; - margin-bottom: 15px; +/* margin-bottom: 15px; */ } .profile-listing-photo { @@ -43,9 +43,11 @@ width: 175px; margin-left: 50px; - margin-bottom: 20px; +/* margin-bottom: 20px; */ } +/* + #profile-edit-profile-name-label, #profile-edit-name-label, #profile-edit-pdesc-label, @@ -138,11 +140,13 @@ #hide-friends-end { clear: both; } +*/ - +/* #gender-select, #marital-select, #sexual-select { width: 220px; } +*/ #profile-edit-profile-name-wrapper .required { color: #FF0000; diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 229a84ae6..1eb1ae271 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,8 +1,6 @@ -
{{if $is_default}} -

{{$default}}

-{{/if}} +
-

{{$banner}}

+

{{$banner}}

@@ -21,33 +19,37 @@ +{{if $is_default}} +

{{$default}}

+{{/if}} +
-
- -
*
+
+ +
-
+
- +
{{if $fields.pdesc}} -
+
- +
{{/if}} {{if $fields.gender}} -
+
{{if $advanced}} {{$gender}} @@ -59,7 +61,7 @@ {{/if}} {{if $fields.dob}} -
+
{{$dob}} {{$age}} @@ -76,60 +78,60 @@
{{if $fields.address}} -
+
- +
{{/if}} {{if $fields.locality}} -
+
- +
{{/if}} {{if $fields.postal_code}} -
+
- +
{{/if}} {{if $fields.region}} -
+
- +
{{/if}} {{if $fields.country_name}} -
+
- +
{{/if}} {{if $fields.hometown}} -
+
- +
{{/if}} -
+
{{if $fields.marital }} -
+
{{if $advanced}} {{$marital}} @@ -140,27 +142,27 @@
{{if $fields.with}} - +
{{/if}} {{if $fields.howlong}} - +
{{/if}}
{{/if}} - +

{{if $fields.homepage}} -
+
- +
{{/if}} {{if $fields.sexual}} -
+
{{$sexual}}
@@ -168,49 +170,51 @@ {{/if}} {{if $fields.politic}} -
+
- +
{{/if}} {{if $fields.religion}} -
+
- +
{{/if}} {{if $fields.keywords}} -
+
- -
{{$lbl_pubdsc}}
+ +
+{{$lbl_pubdsc}}
{{/if}} +

{{if $fields.about}} -
+

{{$lbl_about}}

- +
{{/if}} {{if $fields.contact}} -
+

{{$lbl_social}}

- +
@@ -218,96 +222,96 @@ {{if $fields.interest}} -
+

{{$lbl_hobbies}}

- +
{{/if}} {{if $fields.likes}} -
+

{{$lbl_likes}}

- +
{{/if}} {{if $fields.dislikes}} -
+

{{$lbl_dislikes}}

- +
{{/if}} {{if $fields.channels}} -
+

{{$lbl_channels}}

- +
{{/if}} {{if $fields.music}} -
+

{{$lbl_music}}

- +
{{/if}} {{if $fields.book}} -
+

{{$lbl_book}}

- +
{{/if}} {{if $fields.tv}} -
+

{{$lbl_tv}}

- +
{{/if}} {{if $fields.film}} -
+

{{$lbl_film}}

- +
@@ -315,36 +319,36 @@ {{if $fields.romance}} -
+

{{$lbl_love}}

- +
{{/if}} {{if $fields.work}} -
+

{{$lbl_work}}

- +
{{/if}} {{if $fields.education}} -
+

{{$lbl_school}}

- +