From 97530e4d5aa108e8cd0531d53f1f30c909f016e2 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 27 Dec 2010 21:00:53 +0000 Subject: moved profile fields language strings into core and update profile plugin details view git-svn-id: http://code.elgg.org/elgg/trunk@7729 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/profile/views/default/profile/css.php | 7 ++--- mod/profile/views/default/profile/details.php | 44 +++++++++++++++------------ 2 files changed, 27 insertions(+), 24 deletions(-) (limited to 'mod/profile/views') diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index f280db565..b2a3ff935 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -87,18 +87,17 @@ margin:0 0 7px 0; padding:2px 4px 2px 4px; } -#profile-details .aboutme_title { +.profile-aboutme-title { background-color:#f4f4f4; -webkit-border-radius: 4px; -moz-border-radius: 4px; margin:0 0 0px 0; padding:2px 4px 2px 4px; } -#profile-details .aboutme_contents { +.profile-aboutme-contents { padding:2px 0 0 3px; } -/* banned user full profile panel */ -#profile_content .banned_user { +.profile-banned-user { border:2px solid red; padding:4px 8px; -webkit-border-radius: 6px; diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php index b81db30fd..0afceec0b 100644 --- a/mod/profile/views/default/profile/details.php +++ b/mod/profile/views/default/profile/details.php @@ -6,41 +6,45 @@ $user = elgg_get_page_owner(); +$profile_fields = elgg_get_config('profile'); + echo '
'; echo "

{$user->name}

"; $even_odd = null; -if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0) { - foreach($vars['config']->profile as $shortname => $valtype) { - if ($shortname != "description") { - $value = $user->$shortname; - if (!empty($value)) { - //This function controls the alternating class - $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; - ?> -

- : +if (is_array($profile_fields) && sizeof($profile_fields) > 0) { + foreach ($profile_fields as $shortname => $valtype) { + if ($shortname == "description") { + // skip about me and put at bottom + continue; + } + $value = $user->$shortname; + if (!empty($value)) { + //This function controls the alternating class + $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + ?> +

+ : $user->$shortname)); ?> -

- + isBanned()) { - echo "
"; + echo "

"; echo elgg_echo('banned'); - echo "

"; + echo "

"; } else { - if ($vars['entity']->description) { - echo "

" . elgg_echo("profile:aboutme") . "

"; - echo "
" . elgg_view('output/longtext', array('value' => $vars['entity']->description)) . "
"; + if ($user->description) { + echo "

" . elgg_echo("profile:aboutme") . "

"; + echo "
"; + echo elgg_view('output/longtext', array('value' => $user->description)); + echo "
"; } } } -- cgit v1.2.3