From 370a007ee215d2889d9bf760b0247678c08d31ac Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 13 Mar 2016 21:19:15 +0100 Subject: more janitor work on profiles --- mod/profiles.php | 24 +++----- view/css/mod_profiles.css | 154 ---------------------------------------------- view/tpl/profile_edit.tpl | 51 +++++---------- 3 files changed, 23 insertions(+), 206 deletions(-) delete mode 100644 view/css/mod_profiles.css diff --git a/mod/profiles.php b/mod/profiles.php index f6d75bb7e..209a7a32d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -641,7 +641,7 @@ function profiles_content(&$a) { $hide_friends = array( 'hide_friends', - t('Hide your contact/friend list from viewers of this profile?'), + t('Hide your connections list from viewers of this profile'), $r[0]['hide_friends'], '', array(t('No'),t('Yes')) @@ -696,18 +696,12 @@ function profiles_content(&$a) { '$lbl_import' => t('Import profile from file'), '$lbl_export' => t('Export profile to file'), '$lbl_gender' => t('Your Gender'), - '$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'), @@ -737,22 +731,22 @@ function profiles_content(&$a) { '$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', t('Country'), $r[0]['country_name']), '$gender' => gender_selector($r[0]['gender']), '$gender_min' => gender_selector_min($r[0]['gender']), '$marital' => marital_selector($r[0]['marital']), - '$marital_min' => marital_selector_min($r[0]['marital']), + '$marital_min' => marital_selector_min($r[0]['marital']), '$with' => $r[0]['with'], '$howlong' => ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), '$sexual' => sexpref_selector($r[0]['sexual']), - '$sexual_min' => sexpref_selector_min($r[0]['sexual']), + '$sexual_min' => sexpref_selector_min($r[0]['sexual']), '$about' => $r[0]['about'], '$homepage' => $r[0]['homepage'], - '$hometown' => $r[0]['hometown'], + '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']), '$politic' => $r[0]['politic'], '$religion' => $r[0]['religion'], '$keywords' => $r[0]['keywords'], diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css deleted file mode 100644 index ea063c64e..000000000 --- a/view/css/mod_profiles.css +++ /dev/null @@ -1,154 +0,0 @@ -#profile-edit-default-desc { - background: none repeat scroll 0 0 orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; -} - -#profile-edit-clone-link-wrapper { - float: left; - margin-left: 50px; - margin-bottom: 20px; - width: 300px; -} - - -#profile-listing-desc, #profile-stuff-link, #profile-listing-new-link-wrapper { - margin: 15px 10px 15px 0; -} - -#profile-edit-links-end { - clear: both; -/* margin-bottom: 15px; */ -} - -.profile-listing-photo { - border: none; -} - -.profile-edit-submit-wrapper { - margin-top: 20px; - margin-bottom: 20px; -} - -#profile-photo-link-select-wrapper { - margin-top: 2em; -} - -#profile-photo-submit-wrapper { - margin-top: 10px; -} - -#profile-edit-with-label, #profile-edit-howlong-label { - - width: 175px; - margin-left: 50px; -/* margin-bottom: 20px; */ -} - -/* - -#profile-edit-profile-name-label, -#profile-edit-name-label, -#profile-edit-pdesc-label, -#profile-edit-gender-label, -#profile-edit-dob-label, -#profile-edit-address-label, -#profile-edit-locality-label, -#profile-edit-region-label, -#profile-edit-postal-code-label, -#profile-edit-country-name-label, -#profile-edit-marital-label, -#profile-edit-sexual-label, -#profile-edit-politic-label, -#profile-edit-religion-label, -#profile-edit-pubkeywords-label, -#profile-edit-prvkeywords-label, -#profile-edit-homepage-label, -#profile-edit-hometown-label { - float: left; - width: 175px; -} - -#profile-edit-profile-name, -#profile-edit-name, -#profile-edit-pdesc, -#gender-select, -#profile-edit-dob, -#profile-edit-address, -#profile-edit-locality, -#profile-edit-region, -#profile-edit-postal-code, -#profile-edit-country-name, -#marital-select, -#sexual-select, -#profile-edit-politic, -#profile-edit-religion, -#profile-edit-pubkeywords, -#profile-edit-prvkeywords, -#profile-in-dir-yes, -#profile-in-dir-no, -#profile-in-netdir-yes, -#profile-in-netdir-no, -#hide-wall-yes, -#hide-wall-no, -#hide-friends-yes, -#hide-friends-no { - float: left; - margin-bottom: 20px; -} - - -#profile-edit-pdesc-desc, -#profile-edit-pubkeywords-desc, -#profile-edit-prvkeywords-desc { - float: left; - margin-left: 20px; -} - - -#profile-edit-homepage, #profile-edit-hometown { - float: left; - margin-bottom: 35px; -} - -#profile-edit-profile-name-end, -#profile-edit-name-end, -#profile-edit-pdesc-end, -#profile-edit-gender-end, -#profile-edit-dob-end, -#profile-edit-address-end, -#profile-edit-locality-end, -#profile-edit-region-end, -#profile-edit-postal-code-end, -#profile-edit-country-name-end, -#profile-edit-marital-end, -#profile-edit-sexual-end, -#profile-edit-politic-end, -#profile-edit-religion-end, -#profile-edit-pubkeywords-end, -#profile-edit-prvkeywords-end, -#profile-edit-homepage-end, -#profile-edit-hometown-end, -#profile-in-dir-break, -#profile-in-dir-end, -#profile-in-netdir-break, -#profile-in-netdir-end, -#hide-wall-break, -#hide-wall-end, -#hide-friends-break, -#hide-friends-end { - clear: both; -} -*/ - -/* -#gender-select, #marital-select, #sexual-select { - width: 220px; -} -*/ - -#profile-edit-profile-name-wrapper .required { - color: #FF0000; - float: left; -} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index f3f3efd6f..779e1aca3 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -54,63 +54,39 @@ {{include file="field_checkbox.tpl" field=$hide_friends}} -
- +
+
-
+
{{if $fields.address}} -
- - -
-
+{{include file="field_input.tpl" field=$address}} {{/if}} {{if $fields.locality}} -
- - -
-
+{{include file="field_input.tpl" field=$locality}} {{/if}} {{if $fields.postal_code}} -
- - -
-
+{{include file="field_input.tpl" field=$postal_code}} {{/if}} {{if $fields.region}} -
- - -
-
+{{include file="field_input.tpl" field=$region}} {{/if}} {{if $fields.country_name}} -
- - -
-
+{{include file="field_input.tpl" field=$country_name}} {{/if}} {{if $fields.hometown}} -
- - -
-
+{{include file="field_input.tpl" field=$hometown}} {{/if}} -
- +
+
-
+
{{if $fields.marital }}
@@ -121,6 +97,7 @@ {{$marital_min}} {{/if}}
+
{{if $fields.with}} @@ -134,7 +111,7 @@ {{/if}}
{{/if}} -

+ {{if $fields.homepage}}
-- cgit v1.2.3