From 541482ad407df887eca91ca2a4cb8ecb5ea4a645 Mon Sep 17 00:00:00 2001 From: jeremyfrench Date: Wed, 24 Aug 2011 16:33:30 +0100 Subject: [PATCH] Allow for flexible theming of prfofile fields rather than hard coded resolve #257 --- level_omega/appointment_field.tpl.php | 11 +- level_omega/block.tpl.php | 2 +- level_omega/page-user.tpl.php | 175 ---------------------- level_omega/template.php | 17 ++- level_omega/user-profile-category.tpl.php | 2 +- level_omega/user-profile-item.tpl.php | 4 +- level_omega/user-profile.tpl.php | 46 +----- 7 files changed, 22 insertions(+), 235 deletions(-) delete mode 100644 level_omega/page-user.tpl.php diff --git a/level_omega/appointment_field.tpl.php b/level_omega/appointment_field.tpl.php index 3fa086a..59cac4d 100644 --- a/level_omega/appointment_field.tpl.php +++ b/level_omega/appointment_field.tpl.php @@ -18,8 +18,9 @@ * */ ?> - -
> -

:

-

-
\ No newline at end of file + +
> +

:

+

+
+ \ No newline at end of file diff --git a/level_omega/block.tpl.php b/level_omega/block.tpl.php index bfa943a..008e1c4 100644 --- a/level_omega/block.tpl.php +++ b/level_omega/block.tpl.php @@ -33,6 +33,6 @@
- content ?> + content; ?>
\ No newline at end of file diff --git a/level_omega/page-user.tpl.php b/level_omega/page-user.tpl.php deleted file mode 100644 index e9e8a8f..0000000 --- a/level_omega/page-user.tpl.php +++ /dev/null @@ -1,175 +0,0 @@ - - - - - <?php print $head_title; ?> - - - - - - - - '; - print ''; - print ''; - // TODO: change this to be just http://levelbusiness.com - print ''; - } - if (arg(1) == 'person') { - global $base_root; - $path = $base_root . request_uri(); - print ''; - print ''; - print ''; - // TODO: change this to be just http://levelbusiness.com - print ''; - - } - ?> - - - - - -
- - -
- - - -
- -
- -
- - -
- -
- - -
- - - -
> - -
- - - -

- -
- - - - -
- - -
- - - -
- -
- - -
- -
- -
- -
- -
- - - - - - - -
- -
- - - -
- - - - \ No newline at end of file diff --git a/level_omega/template.php b/level_omega/template.php index 1f65ee5..d258c30 100644 --- a/level_omega/template.php +++ b/level_omega/template.php @@ -94,14 +94,6 @@ function level_omega_preprocess(&$vars, $hook) { $company_name = $vars['view']->result[0]->name; } } - if($vars['name'] == "director_profile") { - if ($vars['view']->result[0]->name) { - drupal_set_title($vars['view']->result[0]->name . ' director profile'); - global $director_name; - $director_name = $vars['view']->result[0]->name; - } - - } if ($vars['name'] == 'ch_solr_transactions') { // Get the date and set the title if the view is one of the main blocks @@ -363,6 +355,15 @@ function level_omega_apachesolr_unclick_link($facet_text, $path, $options = arra return apachesolr_l('
' . $facet_text . '
(remove)', $path, $options); } +function level_omega_preprocess_user_profile_item(&$variables) { + // Hide empty profile items + if ($variables['value'] == NULL) { + $variables['value'] = "N/A"; + } +} + + + function level_omega_form_element($element, $value) { // This is also used in the installer, pre-database setup. $t = get_t(); diff --git a/level_omega/user-profile-category.tpl.php b/level_omega/user-profile-category.tpl.php index 7670242..ef6c01a 100644 --- a/level_omega/user-profile-category.tpl.php +++ b/level_omega/user-profile-category.tpl.php @@ -28,6 +28,6 @@

-
+
>
diff --git a/level_omega/user-profile-item.tpl.php b/level_omega/user-profile-item.tpl.php index 2635249..7388865 100644 --- a/level_omega/user-profile-item.tpl.php +++ b/level_omega/user-profile-item.tpl.php @@ -24,5 +24,5 @@ ?>
>

-
-
+
+
\ No newline at end of file diff --git a/level_omega/user-profile.tpl.php b/level_omega/user-profile.tpl.php index 045b7b0..dd33849 100644 --- a/level_omega/user-profile.tpl.php +++ b/level_omega/user-profile.tpl.php @@ -41,50 +41,10 @@ */ ?> hide_profile): ?> - - -

name)); ?>profile_age['#value']); ?>

- -
- -
- content['linkedin_additional']['options']['#value']; ?> -
- content['identification'])): ?> -
-
-
content['identification']['profile_nationality']['#attributes']); ?>> -

content['identification']['profile_nationality']['#title']); ?>

-
content['identification']['profile_nationality']['#value']); ?>
-
- -
content['identification']['profile_date_of_birth']['#attributes']); ?>> -

Date of Birth

-
content['identification']['profile_date_of_birth']['#value']); ?>
-
- -
content['identification']['profile_age']['#attributes']); ?>> -

content['identification']['profile_age']['#title']); ?>

-
content['identification']['profile_age']['#value']); ?> years
-
-
+

name)); ?>profile_age['#value']); ?>

-
content['identification']['profile_occupation']['#attributes']); ?>> -

content['identification']['profile_occupation']['#title']); ?>

-
content['identification']['profile_occupation']['#value']); ?>
-
- -
content['identification']['profile_address']['#attributes']); ?>> -

content['identification']['profile_address']['#title']); ?>

-
content['identification']['profile_address']['#value']); ?>
-
-
- -
- -
- - +
+