From d22b21c56f978d6b1ed42c9edde2a0214a16aef7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 16 Mar 2016 13:45:24 +0100 Subject: still more janitor work on profiles --- mod/profiles.php | 53 +++++--------- view/tpl/profile_edit.tpl | 174 +++++++--------------------------------------- 2 files changed, 42 insertions(+), 185 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index c135814a8..2ffe7da63 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -698,25 +698,6 @@ function profiles_content(&$a) { '$lbl_gender' => t('Your Gender'), '$lbl_marital' => t('Marital Status'), '$lbl_sexual' => t('Sexual Preference'), - '$lbl_homepage' => t('Homepage URL'), - '$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...'), - '$lbl_hobbies' => t('Hobbies/Interests'), - '$lbl_social' => t('Contact information and Social Networks'), - '$lbl_channels' => t('My other channels'), - '$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'], @@ -741,24 +722,24 @@ function profiles_content(&$a) { '$howlong' => array('howlong', t('Since (date)'), ($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']), - '$about' => $r[0]['about'], - '$homepage' => $r[0]['homepage'], + '$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' => $r[0]['politic'], - '$religion' => $r[0]['religion'], - '$keywords' => $r[0]['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'], - '$channels' => $r[0]['channels'], + '$politic' => array('politic', t('Political Views'), $r[0]['politic']), + '$religion' => array('religion', t('Religious Views'), $r[0]['religion']), + '$keywords' => array('keywords', t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')), + '$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']), + '$channels' => array('channels', t('My other channels'), $r[0]['channels']), '$extra_fields' => $extra_fields, )); diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 1929820cb..f7da969a2 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -18,7 +18,7 @@ - +
{{if $is_default}}
{{$default}}
@@ -38,14 +38,14 @@ {{if $fields.gender}}
- + {{if $advanced}} {{$gender}} {{else}} {{$gender_min}} {{/if}}
-
+
{{/if}} {{if $fields.dob}} @@ -111,204 +111,81 @@ {{/if}} {{if $fields.homepage}} -
- - -
-
+{{include file="field_input.tpl" field=$homepage}} {{/if}} {{if $fields.sexual}}
- + {{$sexual}}
-
+
{{/if}} {{if $fields.politic}} -
- - -
-
+{{include file="field_input.tpl" field=$politic}} {{/if}} {{if $fields.religion}} -
- - -
-
+{{include file="field_input.tpl" field=$religion}} {{/if}} {{if $fields.keywords}} -
- - -
-{{$lbl_pubdsc}} -
+{{include file="field_input.tpl" field=$keywords}} {{/if}} -

- {{if $fields.about}} -
-

-{{$lbl_about}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$about}} {{/if}} {{if $fields.contact}} -
-

-{{$lbl_social}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$contact}} {{/if}} {{if $fields.interest}} -
-

-{{$lbl_hobbies}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$interest}} {{/if}} {{if $fields.likes}} -
-

-{{$lbl_likes}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$likes}} {{/if}} {{if $fields.dislikes}} -
-

-{{$lbl_dislikes}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$dislikes}} {{/if}} {{if $fields.channels}} -
-

-{{$lbl_channels}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$channels}} {{/if}} {{if $fields.music}} -
-

-{{$lbl_music}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$music}} {{/if}} {{if $fields.book}} -
-

-{{$lbl_book}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$book}} {{/if}} {{if $fields.tv}} -
-

-{{$lbl_tv}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$tv}} {{/if}} {{if $fields.film}} -
-

-{{$lbl_film}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$film}} {{/if}} {{if $fields.romance}} -
-

-{{$lbl_love}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$romance}} {{/if}} {{if $fields.work}} -
-

-{{$lbl_work}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$work}} {{/if}} {{if $fields.education}} -
-

-{{$lbl_school}} -

- - - -
-
+{{include file="field_textarea.tpl" field=$education}} {{/if}} {{if $extra_fields}} @@ -317,11 +194,10 @@ {{/foreach}} {{/if}} -
- +
+
-
- +
-- cgit v1.2.3