gctools-outilsgc / gcconnex

mod/b_extended_profile_collab/start.php

Indentation +69 added lines, -69 removed lines

@@ -3,28 +3,28 @@ 
 elgg_register_event_handler('init', 'system', 'b_extended_profile_collab_init');
 
 function b_extended_profile_collab_init() {
-    // Register the endorsements js library
-    $url = 'mod/b_extended_profile_collab/js/endorsements/';
-    // js file containing code for edit, save, cancel toggles and the events that they trigger, plus more
-    elgg_register_js('gcconnex-profile', $url . "gcconnex-profile.js");
+	// Register the endorsements js library
+	$url = 'mod/b_extended_profile_collab/js/endorsements/';
+	// js file containing code for edit, save, cancel toggles and the events that they trigger, plus more
+	elgg_register_js('gcconnex-profile', $url . "gcconnex-profile.js");
 
 	// register the action for saving profile fields
 	$action_path = elgg_get_plugins_path() . 'b_extended_profile_collab/actions/b_extended_profile/';
 	elgg_register_action('b_extended_profile/edit_profile', $action_path . 'edit_profile.php');
 
 	// The new views used for the Opt-In section.
-    elgg_register_ajax_view('b_extended_profile/opt-in');
-    elgg_register_ajax_view('b_extended_profile/edit_opt-in');
+	elgg_register_ajax_view('b_extended_profile/opt-in');
+	elgg_register_ajax_view('b_extended_profile/edit_opt-in');
 
-    // Register the gcconnex profile css libraries
-    $css_url = 'mod/b_extended_profile_collab/css/gcconnex-profile.css';
-    elgg_register_css('gcconnex-css', $css_url);
+	// Register the gcconnex profile css libraries
+	$css_url = 'mod/b_extended_profile_collab/css/gcconnex-profile.css';
+	elgg_register_css('gcconnex-css', $css_url);
 
-    elgg_register_page_handler('email_change_confirmation', 'email_change_confirmation');
+	elgg_register_page_handler('email_change_confirmation', 'email_change_confirmation');
 }
 
 function email_change_confirmation($page) {
-    include elgg_get_plugins_path() . 'b_extended_profile_collab/pages/confirm.php';
+	include elgg_get_plugins_path() . 'b_extended_profile_collab/pages/confirm.php';
 }
 
 /**
@@ -36,17 +36,17 @@ 
  * @return string|false the validation code or false
  */
 function generate_email_code(ElggUser $user, $email) {
-    if (!($user instanceof ElggUser)) {
-        return false;
-    }
+	if (!($user instanceof ElggUser)) {
+		return false;
+	}
     
-    if (empty($email) && !is_email_address($email)) {
-        return false;
-    }
+	if (empty($email) && !is_email_address($email)) {
+		return false;
+	}
     
-    $site_secret = get_site_secret();
+	$site_secret = get_site_secret();
 
-    return hash_hmac('sha256', ($user->getGUID() . '|' . $email . '|' . $user->time_created), $site_secret);
+	return hash_hmac('sha256', ($user->getGUID() . '|' . $email . '|' . $user->time_created), $site_secret);
 }
 
 /**
@@ -55,67 +55,67 @@ 
  * @return void
  */
 function prepare_email_change($user_guid, $email) {
-    $user = get_user($user_guid);
+	$user = get_user($user_guid);
     
-    if (empty($user) || !is_email_address($email)) {
-        register_error(elgg_echo('email:save:fail'));
-        return;
-    }
+	if (empty($user) || !is_email_address($email)) {
+		register_error(elgg_echo('email:save:fail'));
+		return;
+	}
     
-    if (strcmp($email, $user->email) === 0) {
-        // no change is email address
-        return;
-    }
+	if (strcmp($email, $user->email) === 0) {
+		// no change is email address
+		return;
+	}
         
-    if (get_user_by_email($email)) {
-        register_error(elgg_echo('registration:dupeemail'));
-        return;
-    }
+	if (get_user_by_email($email)) {
+		register_error(elgg_echo('registration:dupeemail'));
+		return;
+	}
     
-    // generate validation code
-    $validation_code = generate_email_code($user, $email);
-    if (empty($validation_code)) {
-        return;
-    }
-    $site = elgg_get_site_entity();
-    $current_email = $user->email;
+	// generate validation code
+	$validation_code = generate_email_code($user, $email);
+	if (empty($validation_code)) {
+		return;
+	}
+	$site = elgg_get_site_entity();
+	$current_email = $user->email;
     
-    // make sure notification goes to new email
-    $user->email = $email;
-    $user->save();
+	// make sure notification goes to new email
+	$user->email = $email;
+	$user->save();
     
-    // build notification
-    $validation_url = elgg_normalize_url(elgg_http_add_url_query_elements('email_change_confirmation', array(
-        'u' => $user->getGUID(),
-        'c' => $validation_code,
-    )));
+	// build notification
+	$validation_url = elgg_normalize_url(elgg_http_add_url_query_elements('email_change_confirmation', array(
+		'u' => $user->getGUID(),
+		'c' => $validation_code,
+	)));
     
-    $subject = elgg_echo('email_change_confirmation:request:subject', array($site->name), 'en') . " | " . elgg_echo('email_change_confirmation:request:subject', array($site->name), 'fr');
-    $message = elgg_echo('email_change_confirmation:request:message', array(
-        $user->name,
-        $site->name,
-        $validation_url,
-    ));
+	$subject = elgg_echo('email_change_confirmation:request:subject', array($site->name), 'en') . " | " . elgg_echo('email_change_confirmation:request:subject', array($site->name), 'fr');
+	$message = elgg_echo('email_change_confirmation:request:message', array(
+		$user->name,
+		$site->name,
+		$validation_url,
+	));
 
-    if( elgg_is_active_plugin('cp_notifications') ){
-        $message = elgg_view('cp_notifications/site_template', array("cp_msg_title_en" => $subject, "cp_msg_title_fr" => elgg_echo('email_change_confirmation:request:subject', array($site->name), 'fr'), "cp_msg_description_en" => $message, "cp_msg_description_fr" => elgg_echo('email_change_confirmation:request:message', array($user->name, $site->name, $validation_url), 'fr')));
-    }
+	if( elgg_is_active_plugin('cp_notifications') ){
+		$message = elgg_view('cp_notifications/site_template', array("cp_msg_title_en" => $subject, "cp_msg_title_fr" => elgg_echo('email_change_confirmation:request:subject', array($site->name), 'fr'), "cp_msg_description_en" => $message, "cp_msg_description_fr" => elgg_echo('email_change_confirmation:request:message', array($user->name, $site->name, $validation_url), 'fr')));
+	}
 
-    if( elgg_is_active_plugin('phpmailer') ){
-        phpmailer_send($user->email, $user->name, $subject, $message);
-    } else {
-        mail($user->email, $subject, $message, cp_get_headers());
-    }
+	if( elgg_is_active_plugin('phpmailer') ){
+		phpmailer_send($user->email, $user->name, $subject, $message);
+	} else {
+		mail($user->email, $subject, $message, cp_get_headers());
+	}
 
-    // save the validation request
-    // but first revoke previous request
-    $user->deleteAnnotations('email_change_confirmation');
+	// save the validation request
+	// but first revoke previous request
+	$user->deleteAnnotations('email_change_confirmation');
     
-    $user->annotate('email_change_confirmation', $email, ACCESS_PRIVATE, $user->getGUID());
+	$user->annotate('email_change_confirmation', $email, ACCESS_PRIVATE, $user->getGUID());
     
-    // restore current email address
-    $user->email = $current_email;
-    $user->save();
+	// restore current email address
+	$user->email = $current_email;
+	$user->save();
     
-    system_message(elgg_echo('email_change_confirmation:request', array($email)));
+	system_message(elgg_echo('email_change_confirmation:request', array($email)));
 }

mod/b_extended_profile_collab/views/default/profile/details.php

Indentation +500 added lines, -500 removed lines

@@ -22,61 +22,61 @@ 
 echo '<div class="gcconnex-profile-name">';
 //edit button
 if ($user->canEdit()) {
-    echo '<a role="button" class="btn btn-primary gcconnex-edit-profile overlay-lnk" href="#editProfile">' . elgg_echo('gcconnex_profile:edit_profile') . ' <span class="wb-inv">' . elgg_echo('profile:contactinfo') . '</span></a><script>$(".gcconnex-edit-profile").on("click", function(){ $("#editProfile").focus(); });</script>';
-    echo '<!-- Modal -->
+	echo '<a role="button" class="btn btn-primary gcconnex-edit-profile overlay-lnk" href="#editProfile">' . elgg_echo('gcconnex_profile:edit_profile') . ' <span class="wb-inv">' . elgg_echo('profile:contactinfo') . '</span></a><script>$(".gcconnex-edit-profile").on("click", function(){ $("#editProfile").focus(); });</script>';
+	echo '<!-- Modal -->
 <div id="editProfile" class="wb-overlay modal-content overlay-def wb-popup-mid" tabindex="-1">
     <div class="">
         <div class="">
             <header class="modal-header profile-edit-header">';
-    echo '<h2 class="modal-title">' . elgg_echo('gcconnex_profile:basic:header') . '</h2>';
-    echo '</header>';
-    echo '<div class="panel-body overflow-body" style="padding-top: 15px; padding-bottom: 0;">';
-    echo '<div class="basic-profile-standard-field-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
+	echo '<h2 class="modal-title">' . elgg_echo('gcconnex_profile:basic:header') . '</h2>';
+	echo '</header>';
+	echo '<div class="panel-body overflow-body" style="padding-top: 15px; padding-bottom: 0;">';
+	echo '<div class="basic-profile-standard-field-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
 
-    $fields = array('Name', 'user_type', 'Federal', 'Provincial', 'Institution', 'University', 'College', 'Highschool', 'Municipal', 'International', 'NGO', 'Community', 'Business', 'Media', 'Retired', 'Other', 'Job', 'Location', 'Phone', 'Mobile', 'Email', 'Website');
+	$fields = array('Name', 'user_type', 'Federal', 'Provincial', 'Institution', 'University', 'College', 'Highschool', 'Municipal', 'International', 'NGO', 'Community', 'Business', 'Media', 'Retired', 'Other', 'Job', 'Location', 'Phone', 'Mobile', 'Email', 'Website');
 
-    foreach ($fields as $field) {
+	foreach ($fields as $field) {
 
-        // create a label and input box for each field on the basic profile (see $fields above)
-        $field = strtolower($field);
-        $value = htmlspecialchars_decode($user->get($field));
+		// create a label and input box for each field on the basic profile (see $fields above)
+		$field = strtolower($field);
+		$value = htmlspecialchars_decode($user->get($field));
         
-        if(in_array($field, array("federal", "institution", "provincial", "municipal", "international", "ngo", "community", "business", "media", "retired", "other"))) {
-            echo "<div class='form-group col-xs-12 occupation-choices' id='{$field}-wrapper'>";
-        } else if(in_array($field, array("university", "college", "highschool"))) {
-            echo "<div class='form-group col-xs-12 occupation-choices student-choices' id='{$field}-wrapper'>";
-        } else {
-            echo "<div class='form-group col-xs-12 {$field}'>";
-        }
-
-        // occupation input
-        if (strcmp($field, 'user_type') == 0) {
+		if(in_array($field, array("federal", "institution", "provincial", "municipal", "international", "ngo", "community", "business", "media", "retired", "other"))) {
+			echo "<div class='form-group col-xs-12 occupation-choices' id='{$field}-wrapper'>";
+		} else if(in_array($field, array("university", "college", "highschool"))) {
+			echo "<div class='form-group col-xs-12 occupation-choices student-choices' id='{$field}-wrapper'>";
+		} else {
+			echo "<div class='form-group col-xs-12 {$field}'>";
+		}
+
+		// occupation input
+		if (strcmp($field, 'user_type') == 0) {
             
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'options_values' => array(
-                    'academic' => elgg_echo('gcconnex-profile-card:academic'),
-                    'student' => elgg_echo('gcconnex-profile-card:student'),
-                    'federal' => elgg_echo('gcconnex-profile-card:federal'),
-                    'provincial' => elgg_echo('gcconnex-profile-card:provincial'),
-                    'municipal' => elgg_echo('gcconnex-profile-card:municipal'),
-                    'international' => elgg_echo('gcconnex-profile-card:international'),
-                    'ngo' => elgg_echo('gcconnex-profile-card:ngo'),
-                    'community' => elgg_echo('gcconnex-profile-card:community'),
-                    'business' => elgg_echo('gcconnex-profile-card:business'),
-                    'media' => elgg_echo('gcconnex-profile-card:media'),
-                    'retired' => elgg_echo('gcconnex-profile-card:retired'),
-                    'other' => elgg_echo('gcconnex-profile-card:other')
-                ),
-            ));
-
-            // jquery for the occupation dropdown - institution
-    ?>
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'options_values' => array(
+					'academic' => elgg_echo('gcconnex-profile-card:academic'),
+					'student' => elgg_echo('gcconnex-profile-card:student'),
+					'federal' => elgg_echo('gcconnex-profile-card:federal'),
+					'provincial' => elgg_echo('gcconnex-profile-card:provincial'),
+					'municipal' => elgg_echo('gcconnex-profile-card:municipal'),
+					'international' => elgg_echo('gcconnex-profile-card:international'),
+					'ngo' => elgg_echo('gcconnex-profile-card:ngo'),
+					'community' => elgg_echo('gcconnex-profile-card:community'),
+					'business' => elgg_echo('gcconnex-profile-card:business'),
+					'media' => elgg_echo('gcconnex-profile-card:media'),
+					'retired' => elgg_echo('gcconnex-profile-card:retired'),
+					'other' => elgg_echo('gcconnex-profile-card:other')
+				),
+			));
+
+			// jquery for the occupation dropdown - institution
+	?>
 
         <script>
             $(document).ready(function () {
@@ -141,337 +141,337 @@ 
 
     <?php
 
-        // federal input field
-        } else if ($field == 'federal') {
+		// federal input field
+		} else if ($field == 'federal') {
 
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
 
-            $obj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'federal_departments',
-            ));
-            $departments = get_entity($obj[0]->guid);
+			$obj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'federal_departments',
+			));
+			$departments = get_entity($obj[0]->guid);
             
-            $federal_departments = array();
-            if (get_current_language() == 'en'){
-                $federal_departments = json_decode($departments->federal_departments_en, true);
-            } else {
-                $federal_departments = json_decode($departments->federal_departments_fr, true);
-            }
-
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => ' gcconnex-basic-' . $field,
-                'value' => $value,
-                'options_values' => $federal_departments,
-            ));
+			$federal_departments = array();
+			if (get_current_language() == 'en'){
+				$federal_departments = json_decode($departments->federal_departments_en, true);
+			} else {
+				$federal_departments = json_decode($departments->federal_departments_fr, true);
+			}
+
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => ' gcconnex-basic-' . $field,
+				'value' => $value,
+				'options_values' => $federal_departments,
+			));
         
-        } else if (strcmp($field, 'institution') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $institution_list = array("university" => elgg_echo('gcconnex-profile-card:university'), "college" => elgg_echo('gcconnex-profile-card:college'), "highschool" => elgg_echo('gcconnex-profile-card:highschool'));
-
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'options_values' => $institution_list, 
-            ));
-
-        } else if (strcmp($field, 'university') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $uniObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'universities',
-            ));
-            $unis = get_entity($uniObj[0]->guid);
-
-            $universities = array();
-            if (get_current_language() == 'en'){
-                $universities = json_decode($unis->universities_en, true);
-            } else {
-                $universities = json_decode($unis->universities_fr, true);
-            }
-
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'options_values' => $universities, 
-            ));       
-
-        } else if (strcmp($field, 'college') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $colObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'colleges',
-            ));
-            $cols = get_entity($colObj[0]->guid);
-
-            $colleges = array();
-            if (get_current_language() == 'en'){
-                $colleges = json_decode($cols->colleges_en, true);
-            } else {
-                $colleges = json_decode($cols->colleges_fr, true);
-            }
-
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'options_values' => $colleges, 
-            ));       
-
-        // provincial input field
-        } else if ($field == 'provincial') {
-
-            echo "<label for='{$field}' class='col-sm-4 {$field}'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $provObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'provinces',
-            ));
-            $provs = get_entity($provObj[0]->guid);
-
-            $provincial_departments = array();
-            if (get_current_language() == 'en'){
-                $provincial_departments = json_decode($provs->provinces_en, true);
-            } else {
-                $provincial_departments = json_decode($provs->provinces_fr, true);
-            }
-
-            echo elgg_view('input/select', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => ' gcconnex-basic-' . $field,
-                'value' => $value,
-                'options_values' => $provincial_departments,
-            ));
-
-            echo "</div></div>";
-
-            $minObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'ministries',
-            ));
-            $mins = get_entity($minObj[0]->guid);
-
-            $ministries = array();
-            if (get_current_language() == 'en'){
-                $ministries = json_decode($mins->ministries_en, true);
-            } else {
-                $ministries = json_decode($mins->ministries_fr, true);
-            }
-
-            foreach($provincial_departments as $province => $name){
-                $prov_value = ($user->get('provincial') == $province) ? $user->get('ministry'): "";
-                $prov_id = str_replace(" ", "-", strtolower($province));
-                echo '<div class="form-group col-xs-12 occupation-choices provincial-choices" id="' . $prov_id . '-wrapper"><label for="' . $prov_id . '-choices" class="col-sm-4">' . elgg_echo('gcconnex_profile:basic:ministry') . '</label><div class="col-sm-8">';
-                echo elgg_view('input/select', array(
-                    'name' => 'ministry',
-                    'id' => $prov_id . '-choices',
-                    'class' => 'form-control gcconnex-basic-ministry',
-                    'value' => $prov_value,
-                    'options_values' => $ministries[$province],
-                ));
-                if($province != "Yukon"){ echo '</div></div>'; }
-            }
+		} else if (strcmp($field, 'institution') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$institution_list = array("university" => elgg_echo('gcconnex-profile-card:university'), "college" => elgg_echo('gcconnex-profile-card:college'), "highschool" => elgg_echo('gcconnex-profile-card:highschool'));
+
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'options_values' => $institution_list, 
+			));
+
+		} else if (strcmp($field, 'university') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$uniObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'universities',
+			));
+			$unis = get_entity($uniObj[0]->guid);
+
+			$universities = array();
+			if (get_current_language() == 'en'){
+				$universities = json_decode($unis->universities_en, true);
+			} else {
+				$universities = json_decode($unis->universities_fr, true);
+			}
+
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'options_values' => $universities, 
+			));       
+
+		} else if (strcmp($field, 'college') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$colObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'colleges',
+			));
+			$cols = get_entity($colObj[0]->guid);
+
+			$colleges = array();
+			if (get_current_language() == 'en'){
+				$colleges = json_decode($cols->colleges_en, true);
+			} else {
+				$colleges = json_decode($cols->colleges_fr, true);
+			}
+
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'options_values' => $colleges, 
+			));       
+
+		// provincial input field
+		} else if ($field == 'provincial') {
+
+			echo "<label for='{$field}' class='col-sm-4 {$field}'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$provObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'provinces',
+			));
+			$provs = get_entity($provObj[0]->guid);
+
+			$provincial_departments = array();
+			if (get_current_language() == 'en'){
+				$provincial_departments = json_decode($provs->provinces_en, true);
+			} else {
+				$provincial_departments = json_decode($provs->provinces_fr, true);
+			}
+
+			echo elgg_view('input/select', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => ' gcconnex-basic-' . $field,
+				'value' => $value,
+				'options_values' => $provincial_departments,
+			));
+
+			echo "</div></div>";
+
+			$minObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'ministries',
+			));
+			$mins = get_entity($minObj[0]->guid);
+
+			$ministries = array();
+			if (get_current_language() == 'en'){
+				$ministries = json_decode($mins->ministries_en, true);
+			} else {
+				$ministries = json_decode($mins->ministries_fr, true);
+			}
+
+			foreach($provincial_departments as $province => $name){
+				$prov_value = ($user->get('provincial') == $province) ? $user->get('ministry'): "";
+				$prov_id = str_replace(" ", "-", strtolower($province));
+				echo '<div class="form-group col-xs-12 occupation-choices provincial-choices" id="' . $prov_id . '-wrapper"><label for="' . $prov_id . '-choices" class="col-sm-4">' . elgg_echo('gcconnex_profile:basic:ministry') . '</label><div class="col-sm-8">';
+				echo elgg_view('input/select', array(
+					'name' => 'ministry',
+					'id' => $prov_id . '-choices',
+					'class' => 'form-control gcconnex-basic-ministry',
+					'value' => $prov_value,
+					'options_values' => $ministries[$province],
+				));
+				if($province != "Yukon"){ echo '</div></div>'; }
+			}
             
-        } else if (strcmp($field, 'municipal') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $munObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'municipal',
-            ));
-            $municipals = get_entity($munObj[0]->guid);
-
-            $municipal = array();
-            if (get_current_language() == 'en'){
-                $municipal = json_decode($municipals->other_en, true);
-            } else {
-                $municipal = json_decode($municipals->other_fr, true);
-            }
-
-            echo elgg_view('input/text', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'list' => $field . '-list'
-            ));
-
-            echo '<datalist id="municipal-list">';
-                if( !empty($municipal) ){
-                    foreach($municipal as $municipal_name => $value){
-                        echo '<option value="' . $municipal_name . '">' . $value . '</option>';
-                    }
-                }
-            echo '</datalist>';
-
-        } else if (strcmp($field, 'retired') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $deptObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'federal_departments',
-            ));
-            $depts = get_entity($deptObj[0]->guid);
-
-            $federal_departments = array();
-            if (get_current_language() == 'en'){
-                $federal_departments = json_decode($depts->federal_departments_en, true);
-            } else {
-                $federal_departments = json_decode($depts->federal_departments_fr, true);
-            }
-
-            echo elgg_view('input/text', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'list' => $field . '-list'
-            ));
-
-            echo '<datalist id="retired-list">';
-                if( !empty($federal_departments) ){
-                    foreach($federal_departments as $federal_name => $value){
-                        echo '<option value="' . $federal_name . '">' . $value . '</option>';
-                    }
-                }
-            echo '</datalist>';
-
-        } else if (strcmp($field, 'other') == 0) {
-
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">';
-
-            $otherObj = elgg_get_entities(array(
-                'type' => 'object',
-                'subtype' => 'other',
-            ));
-            $others = get_entity($otherObj[0]->guid);
-
-            $other = array();
-            if (get_current_language() == 'en'){
-                $other = json_decode($others->other_en, true);
-            } else {
-                $other = json_decode($others->other_fr, true);
-            }
-
-            echo elgg_view('input/text', array(
-                'name' => $field,
-                'id' => $field,
-                'class' => "gcconnex-basic-{$field}",
-                'value' => $value,
-                'list' => $field . '-list'
-            ));
-
-            echo '<datalist id="other-list">';
-                if( !empty($other) ){
-                    foreach($other as $other_name => $value){
-                        echo '<option value="' . $other_name . '">' . $value . '</option>';
-                    }
-                }
-            echo '</datalist>';
-
-        } else {
-
-            $params = array(
-                'name' => $field,
-                'id' => $field,
-                'class' => 'gcconnex-basic-'.$field,
-                'value' => $value,
-            );
-
-            // set up label and input field for the basic profile stuff
-            echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
-            echo '<div class="col-sm-8">'; // field wrapper for css styling
-            echo elgg_view("input/text", $params);
-
-        } // input field
-
-        echo '</div>'; //close div class = basic-profile-field
-        echo '</div>'; //close div class = basic-profile-field-wrapper
-
-    } // end for-loop
-
-    echo '</div>'; // close div class="basic-profile-standard-field-wrapper"
-    echo '<div class="basic-profile-social-media-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
-
-    // pre-populate the social media fields and their prepended link for user profiles
-
-    $fields = array('Facebook' => "http://www.facebook.com/",
-    'Google Plus' => "http://www.google.com/",
-    'GitHub' => "https://github.com/",
-    'Twitter' => "https://twitter.com/",
-    'Linkedin' => "http://ca.linkedin.com/in/",
-    'Pinterest' => "http://www.pinterest.com/",
-    'Tumblr' => "https://www.tumblr.com/blog/",
-    'Instagram' => "http://instagram.com/",
-    'Flickr' => "http://flickr.com/",
-    'Youtube' => "http://www.youtube.com/");
-
-    foreach ($fields as $field => $field_link) { // create a label and input box for each social media field on the basic profile
-
-        echo '<div class="basic-profile-field-wrapper social-media-field-wrapper">'; //field wrapper for css styling
-
-        $field = str_replace(' ', '-', $field); // create a css friendly version of the section name
-        $field = strtolower($field);
-
-        if ($field == "google-plus") { $field = "google"; }
-        $value = $user->get($field);
-
-        echo '<div class="input-group">'; // input wrapper for prepended link and input box, excludes the input label
-        echo '<label for="' . $field . 'Input" class="input-group-addon clearfix">' . $field_link . "</label>"; // prepended link
-
-        // setup the input for this field
-        $placeholder = "test";
-        if ($field == "facebook") { $placeholder = "User.Name"; }
-        if ($field == "google") { $placeholder = "############"; }
-        if ($field == "github") { $placeholder = "User"; }
-        if ($field == "twitter") { $placeholder = "@user"; }
-        if ($field == "linkedin") { $placeholder = "CustomURL"; }
-        if ($field == "pinterest") { $placeholder = "Username"; }
-        if ($field == "tumblr") { $placeholder = "Username"; }
-        if ($field == "instagram") { $placeholder = "@user"; }
-        if ($field == "flickr") { $placeholder = "Username"; }
-        if ($field == "youtube") { $placeholder = "Username"; }
-
-        $params = array(
-            'name' => $field,
-            'id' => $field . 'Input',
-            'class' => 'editProfileFields gcconnex-basic-field gcconnex-social-media gcconnex-basic-' . $field,
-            'placeholder' => $placeholder,
-            'value' => $value
-        );
-
-        echo elgg_view("input/text", $params); // input field
-
-        echo '</div>'; // close div class="input-group"
-        echo '</div>'; // close div class = basic-profile-field-wrapper
-    }
-
-    echo '</div>'; // close div class="basic-profile-social-media-wrapper"
-    echo '
+		} else if (strcmp($field, 'municipal') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$munObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'municipal',
+			));
+			$municipals = get_entity($munObj[0]->guid);
+
+			$municipal = array();
+			if (get_current_language() == 'en'){
+				$municipal = json_decode($municipals->other_en, true);
+			} else {
+				$municipal = json_decode($municipals->other_fr, true);
+			}
+
+			echo elgg_view('input/text', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'list' => $field . '-list'
+			));
+
+			echo '<datalist id="municipal-list">';
+				if( !empty($municipal) ){
+					foreach($municipal as $municipal_name => $value){
+						echo '<option value="' . $municipal_name . '">' . $value . '</option>';
+					}
+				}
+			echo '</datalist>';
+
+		} else if (strcmp($field, 'retired') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$deptObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'federal_departments',
+			));
+			$depts = get_entity($deptObj[0]->guid);
+
+			$federal_departments = array();
+			if (get_current_language() == 'en'){
+				$federal_departments = json_decode($depts->federal_departments_en, true);
+			} else {
+				$federal_departments = json_decode($depts->federal_departments_fr, true);
+			}
+
+			echo elgg_view('input/text', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'list' => $field . '-list'
+			));
+
+			echo '<datalist id="retired-list">';
+				if( !empty($federal_departments) ){
+					foreach($federal_departments as $federal_name => $value){
+						echo '<option value="' . $federal_name . '">' . $value . '</option>';
+					}
+				}
+			echo '</datalist>';
+
+		} else if (strcmp($field, 'other') == 0) {
+
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">';
+
+			$otherObj = elgg_get_entities(array(
+				'type' => 'object',
+				'subtype' => 'other',
+			));
+			$others = get_entity($otherObj[0]->guid);
+
+			$other = array();
+			if (get_current_language() == 'en'){
+				$other = json_decode($others->other_en, true);
+			} else {
+				$other = json_decode($others->other_fr, true);
+			}
+
+			echo elgg_view('input/text', array(
+				'name' => $field,
+				'id' => $field,
+				'class' => "gcconnex-basic-{$field}",
+				'value' => $value,
+				'list' => $field . '-list'
+			));
+
+			echo '<datalist id="other-list">';
+				if( !empty($other) ){
+					foreach($other as $other_name => $value){
+						echo '<option value="' . $other_name . '">' . $value . '</option>';
+					}
+				}
+			echo '</datalist>';
+
+		} else {
+
+			$params = array(
+				'name' => $field,
+				'id' => $field,
+				'class' => 'gcconnex-basic-'.$field,
+				'value' => $value,
+			);
+
+			// set up label and input field for the basic profile stuff
+			echo "<label for='{$field}' class='col-sm-4'>" . elgg_echo("gcconnex_profile:basic:{$field}")."</label>";
+			echo '<div class="col-sm-8">'; // field wrapper for css styling
+			echo elgg_view("input/text", $params);
+
+		} // input field
+
+		echo '</div>'; //close div class = basic-profile-field
+		echo '</div>'; //close div class = basic-profile-field-wrapper
+
+	} // end for-loop
+
+	echo '</div>'; // close div class="basic-profile-standard-field-wrapper"
+	echo '<div class="basic-profile-social-media-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
+
+	// pre-populate the social media fields and their prepended link for user profiles
+
+	$fields = array('Facebook' => "http://www.facebook.com/",
+	'Google Plus' => "http://www.google.com/",
+	'GitHub' => "https://github.com/",
+	'Twitter' => "https://twitter.com/",
+	'Linkedin' => "http://ca.linkedin.com/in/",
+	'Pinterest' => "http://www.pinterest.com/",
+	'Tumblr' => "https://www.tumblr.com/blog/",
+	'Instagram' => "http://instagram.com/",
+	'Flickr' => "http://flickr.com/",
+	'Youtube' => "http://www.youtube.com/");
+
+	foreach ($fields as $field => $field_link) { // create a label and input box for each social media field on the basic profile
+
+		echo '<div class="basic-profile-field-wrapper social-media-field-wrapper">'; //field wrapper for css styling
+
+		$field = str_replace(' ', '-', $field); // create a css friendly version of the section name
+		$field = strtolower($field);
+
+		if ($field == "google-plus") { $field = "google"; }
+		$value = $user->get($field);
+
+		echo '<div class="input-group">'; // input wrapper for prepended link and input box, excludes the input label
+		echo '<label for="' . $field . 'Input" class="input-group-addon clearfix">' . $field_link . "</label>"; // prepended link
+
+		// setup the input for this field
+		$placeholder = "test";
+		if ($field == "facebook") { $placeholder = "User.Name"; }
+		if ($field == "google") { $placeholder = "############"; }
+		if ($field == "github") { $placeholder = "User"; }
+		if ($field == "twitter") { $placeholder = "@user"; }
+		if ($field == "linkedin") { $placeholder = "CustomURL"; }
+		if ($field == "pinterest") { $placeholder = "Username"; }
+		if ($field == "tumblr") { $placeholder = "Username"; }
+		if ($field == "instagram") { $placeholder = "@user"; }
+		if ($field == "flickr") { $placeholder = "Username"; }
+		if ($field == "youtube") { $placeholder = "Username"; }
+
+		$params = array(
+			'name' => $field,
+			'id' => $field . 'Input',
+			'class' => 'editProfileFields gcconnex-basic-field gcconnex-social-media gcconnex-basic-' . $field,
+			'placeholder' => $placeholder,
+			'value' => $value
+		);
+
+		echo elgg_view("input/text", $params); // input field
+
+		echo '</div>'; // close div class="input-group"
+		echo '</div>'; // close div class = basic-profile-field-wrapper
+	}
+
+	echo '</div>'; // close div class="basic-profile-social-media-wrapper"
+	echo '
 
     </div>
             <div class="panel-footer text-right profile-edit-footer">
@@ -490,62 +490,62 @@ 
 echo '</div>'; // close div class="gcconnex-profile-name"
 //actions dropdown
 if (elgg_get_page_owner_guid() != elgg_get_logged_in_user_guid()) {
-    $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
-    $builder = new ElggMenuBuilder($menu);
-    $menu = $builder->getMenu();
-    $actions = elgg_extract('action', $menu, array());
-    $admin = elgg_extract('admin', $menu, array());
-    $profile_actions = '';
-
-    // cyu - GCCON-151 : Add colleague in FR not there (inconsistent FR and EN menu layout) & other issues
-    if (elgg_is_logged_in() && $actions) {
-        $btn_friend_request = '';
-        foreach ($actions as $action) {
-
-            if (strcmp($action->getName(),'add_friend') == 0 || strcmp($action->getName(),'remove_friend') == 0) {
-                if (!check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID())) {
-                    if ($user->isFriend() && strcmp($action->getName(),'remove_friend') == 0) {
-                        $btn_friend_request = $action->getContent();
-                        $btn_friend_request_link = $action->getHref();
-                    }
-                    if (!$user->isFriend() && strcmp($action->getName(),'add_friend') == 0) {
-                        $btn_friend_request = $action->getContent(array('class' => 'asdfasdasfad'));
-                        $btn_friend_request_link = $action->getHref();
-                    }
-                }
-            } else {
-
-                if (check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID()) && strcmp($action->getName(),'friend_request') == 0) {
-                    $btn_friend_request_link = $action->getHref();
-                    $btn_friend_request = $action->getContent();
-                } else
-                    $profile_actions .= '<li>' . $action->getContent(array('class' => 'gcconnex-basic-profile-actions')) . '</li>';
-            }
-        }
-    }
-    if(elgg_is_logged_in()){
-        echo "<button type='button' class='btn btn-primary' onclick='location.href=\"{$btn_friend_request_link}\"'>{$btn_friend_request}</button>"; // cyu - added button and removed from actions toggle
-
-        echo $add . '<div class="btn-group"><button type="button" class="btn btn-custom mrgn-rght-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	$menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
+	$builder = new ElggMenuBuilder($menu);
+	$menu = $builder->getMenu();
+	$actions = elgg_extract('action', $menu, array());
+	$admin = elgg_extract('admin', $menu, array());
+	$profile_actions = '';
+
+	// cyu - GCCON-151 : Add colleague in FR not there (inconsistent FR and EN menu layout) & other issues
+	if (elgg_is_logged_in() && $actions) {
+		$btn_friend_request = '';
+		foreach ($actions as $action) {
+
+			if (strcmp($action->getName(),'add_friend') == 0 || strcmp($action->getName(),'remove_friend') == 0) {
+				if (!check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID())) {
+					if ($user->isFriend() && strcmp($action->getName(),'remove_friend') == 0) {
+						$btn_friend_request = $action->getContent();
+						$btn_friend_request_link = $action->getHref();
+					}
+					if (!$user->isFriend() && strcmp($action->getName(),'add_friend') == 0) {
+						$btn_friend_request = $action->getContent(array('class' => 'asdfasdasfad'));
+						$btn_friend_request_link = $action->getHref();
+					}
+				}
+			} else {
+
+				if (check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID()) && strcmp($action->getName(),'friend_request') == 0) {
+					$btn_friend_request_link = $action->getHref();
+					$btn_friend_request = $action->getContent();
+				} else
+					$profile_actions .= '<li>' . $action->getContent(array('class' => 'gcconnex-basic-profile-actions')) . '</li>';
+			}
+		}
+	}
+	if(elgg_is_logged_in()){
+		echo "<button type='button' class='btn btn-primary' onclick='location.href=\"{$btn_friend_request_link}\"'>{$btn_friend_request}</button>"; // cyu - added button and removed from actions toggle
+
+		echo $add . '<div class="btn-group"><button type="button" class="btn btn-custom mrgn-rght-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     ' . elgg_echo('profile:actions') . ' <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu pull-right clearfix">';
-        echo $profile_actions;
-        echo '</ul></div>';
-    }
+		echo $profile_actions;
+		echo '</ul></div>';
+	}
 }
 
 // if admin, display admin links
 $admin_links = '';
 if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) {
-    $text = elgg_echo('admin:options');
+	$text = elgg_echo('admin:options');
 
-    foreach ($admin as $menu_item) {
-        $admin_links .= '<li>' . elgg_view('navigation/menu/elements/item', array('item' => $menu_item)) . '</li>';
-    }
+	foreach ($admin as $menu_item) {
+		$admin_links .= '<li>' . elgg_view('navigation/menu/elements/item', array('item' => $menu_item)) . '</li>';
+	}
 
-    echo '<div class="pull-right btn-group"><button type="button" class="btn btn-custom pull-right dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' .
-    $text .  '<span class="caret"></span>
+	echo '<div class="pull-right btn-group"><button type="button" class="btn btn-custom pull-right dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' .
+	$text .  '<span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu pull-right clearfix">' . $admin_links . '</ul></div>';
 }
@@ -560,92 +560,92 @@ 
 
 // if user is public servant
 if(strcmp($user->user_type, 'federal') == 0 ) {
-    $deptObj = elgg_get_entities(array(
-        'type' => 'object',
-        'subtype' => 'federal_departments',
-    ));
-    $depts = get_entity($deptObj[0]->guid);
-
-    $federal_departments = array();
-    if (get_current_language() == 'en'){
-        $federal_departments = json_decode($depts->federal_departments_en, true);
-    } else {
-        $federal_departments = json_decode($depts->federal_departments_fr, true);
-    }
-
-    echo '<h3 class="mrgn-tp-0">' . $user->job . '</h3>';
-    echo '<div class="gcconnex-profile-dept">' . $federal_departments[$user->federal] . '</div>';
+	$deptObj = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => 'federal_departments',
+	));
+	$depts = get_entity($deptObj[0]->guid);
+
+	$federal_departments = array();
+	if (get_current_language() == 'en'){
+		$federal_departments = json_decode($depts->federal_departments_en, true);
+	} else {
+		$federal_departments = json_decode($depts->federal_departments_fr, true);
+	}
+
+	echo '<h3 class="mrgn-tp-0">' . $user->job . '</h3>';
+	echo '<div class="gcconnex-profile-dept">' . $federal_departments[$user->federal] . '</div>';
 
 // otherwise if user is student or academic
 } else if (strcmp($user->user_type, 'student') == 0 || strcmp($user->user_type, 'academic') == 0 ) {
-    echo '<h3 class="mrgn-tp-0">'.elgg_echo("gcconnex-profile-card:{$user->user_type}", array($user->user_type)).'</h3>';
-    $institution = ($user->institution == 'university') ? $user->university : ($user->institution == 'college' ? $user->college : $user->highschool);
-    $job = ($user->job != "") ? $user->job : "";
-    echo '<div class="gcconnex-profile-dept">' . ($institution != "default_invalid_value" ? $institution : $job) . '</div>';
+	echo '<h3 class="mrgn-tp-0">'.elgg_echo("gcconnex-profile-card:{$user->user_type}", array($user->user_type)).'</h3>';
+	$institution = ($user->institution == 'university') ? $user->university : ($user->institution == 'college' ? $user->college : $user->highschool);
+	$job = ($user->job != "") ? $user->job : "";
+	echo '<div class="gcconnex-profile-dept">' . ($institution != "default_invalid_value" ? $institution : $job) . '</div>';
 
 // otherwise if user is provincial employee
 } else if (strcmp($user->user_type, 'provincial') == 0 ) {
-    $provObj = elgg_get_entities(array(
-        'type' => 'object',
-        'subtype' => 'provinces',
-    ));
-    $provs = get_entity($provObj[0]->guid);
-
-    $provinces = array();
-    if (get_current_language() == 'en'){
-        $provinces = json_decode($provs->provinces_en, true);
-    } else {
-        $provinces = json_decode($provs->provinces_fr, true);
-    }
-
-    $minObj = elgg_get_entities(array(
-        'type' => 'object',
-        'subtype' => 'ministries',
-    ));
-    $mins = get_entity($minObj[0]->guid);
-
-    $ministries = array();
-    if (get_current_language() == 'en'){
-        $ministries = json_decode($mins->ministries_en, true);
-    } else {
-        $ministries = json_decode($mins->ministries_fr, true);
-    }
-
-    echo '<h3 class="mrgn-tp-0">' . elgg_echo("gcconnex-profile-card:{$user->user_type}") . '</h3>';
-    echo '<div class="gcconnex-profile-job">' . $user->job . '</div>';
-    $provString = $provinces[$user->provincial];
-    if($user->ministry && $user->ministry !== "default_invalid_value"){ $provString .= ' / ' . $ministries[$user->provincial][$user->ministry]; }
-    echo '<div class="gcconnex-profile-dept">' . $provString . '</div>';
+	$provObj = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => 'provinces',
+	));
+	$provs = get_entity($provObj[0]->guid);
+
+	$provinces = array();
+	if (get_current_language() == 'en'){
+		$provinces = json_decode($provs->provinces_en, true);
+	} else {
+		$provinces = json_decode($provs->provinces_fr, true);
+	}
+
+	$minObj = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => 'ministries',
+	));
+	$mins = get_entity($minObj[0]->guid);
+
+	$ministries = array();
+	if (get_current_language() == 'en'){
+		$ministries = json_decode($mins->ministries_en, true);
+	} else {
+		$ministries = json_decode($mins->ministries_fr, true);
+	}
+
+	echo '<h3 class="mrgn-tp-0">' . elgg_echo("gcconnex-profile-card:{$user->user_type}") . '</h3>';
+	echo '<div class="gcconnex-profile-job">' . $user->job . '</div>';
+	$provString = $provinces[$user->provincial];
+	if($user->ministry && $user->ministry !== "default_invalid_value"){ $provString .= ' / ' . $ministries[$user->provincial][$user->ministry]; }
+	echo '<div class="gcconnex-profile-dept">' . $provString . '</div>';
 
 // otherwise show basic info
 } else {
-    echo '<h3 class="mrgn-tp-0">' . elgg_echo("gcconnex-profile-card:{$user->user_type}") . '</h3>';
-    echo '<div class="gcconnex-profile-job">' . $user->job . '</div>';
-    echo '<div class="gcconnex-profile-dept">' . $user->{$user->user_type} . '</div>';
+	echo '<h3 class="mrgn-tp-0">' . elgg_echo("gcconnex-profile-card:{$user->user_type}") . '</h3>';
+	echo '<div class="gcconnex-profile-job">' . $user->job . '</div>';
+	echo '<div class="gcconnex-profile-dept">' . $user->{$user->user_type} . '</div>';
 }
 
 echo '<div class="gcconnex-profile-location">' . $user->location . '</div>';
 echo '<div class="gcconnex-profile-contact-info">';
 
 if ($user->phone != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-phone fa-lg"></i> ' . $user->phone . '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-phone fa-lg"></i> ' . $user->phone . '</p>';
 }
 
 if ($user->mobile != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-mobile fa-lg"></i> ' . $user->mobile . '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-mobile fa-lg"></i> ' . $user->mobile . '</p>';
 }
 
 if ($user->email != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-envelope fa-lg"></i> <a href="mailto:' . $user->email . '">' . $user->email . '</a></p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-envelope fa-lg"></i> <a href="mailto:' . $user->email . '">' . $user->email . '</a></p>';
 }
 
 if ($user->website != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-globe fa-lg"></i> ';
-    echo elgg_view('output/url', array(
-        'href' => $user->website,
-        'text' => $user->website
-    ));
-    echo '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-globe fa-lg"></i> ';
+	echo elgg_view('output/url', array(
+		'href' => $user->website,
+		'text' => $user->website
+	));
+	echo '</p>';
 }
 
 echo '</div></div>'; // close div class="gcconnex-profile-contact-info"
@@ -656,22 +656,22 @@ 
 echo '<div class="gcconnex-profile-social-media-links mrgn-bttm-sm mrgn-lft-md">';
 foreach ($social as $media) {
 
-    if ($link = $user->get($media)) {
+	if ($link = $user->get($media)) {
 
-        if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook";}
-        if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus";}
-        if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github";}
-        if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter";}
-        if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin";}
-        if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest";}
-        if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr";}
-        if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram";}
-        if ($media == 'flickr') { $link = "http://flickr.com/" . $link; $class = "fa-flickr"; }
-        if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube";}
+		if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook";}
+		if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus";}
+		if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github";}
+		if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter";}
+		if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin";}
+		if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest";}
+		if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr";}
+		if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram";}
+		if ($media == 'flickr') { $link = "http://flickr.com/" . $link; $class = "fa-flickr"; }
+		if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube";}
 
-        echo '<a href="' . $link . '" target="_blank"><i class="socialMediaIcons fa ' . $class . ' fa-2x"></i></a>';
+		echo '<a href="' . $link . '" target="_blank"><i class="socialMediaIcons fa ' . $class . ' fa-2x"></i></a>';
 
-    }
+	}
 }
 echo '</div>'; // close div class="gcconnex-profile-social-media-links"
 echo '</div>';
@@ -688,16 +688,16 @@ 
 
 $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
-    $profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
-    foreach ($actions as $action) {
-        $profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
-    }
-    $profile_actions .= '</ul>';
+	$profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
+	foreach ($actions as $action) {
+		$profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
+	}
+	$profile_actions .= '</ul>';
 }
 
 // content links
 $content_menu_title = elgg_echo('gcconnex_profile:user_content');
 $content_menu = elgg_view_menu('owner_block', array(
-    'entity' => elgg_get_page_owner_entity(),
-    'class' => 'profile-content-menu',
+	'entity' => elgg_get_page_owner_entity(),
+	'class' => 'profile-content-menu',
 ));

mod/b_extended_profile_collab/views/default/profile/wrapper.php

Indentation +152 added lines, -152 removed lines

@@ -25,18 +25,18 @@ 
 
     <div class="gcconnex-profile-wire-post">
         <?php $user = get_user(elgg_get_page_owner_guid());
-            $params = array(
-                'type' => 'object',
-                'subtype' => 'thewire',
-                'owner_guid' => $user->guid,
-                'limit' => 1,
-            );
-        $latest_wire = elgg_get_entities($params);
-        if ($latest_wire && count($latest_wire) > 0) {
-            //echo '<img class="profile-icons double-quotes" src="' . elgg_get_site_url() . 'mod/b_extended_profile/img/double-quotes.png">';
-            //echo elgg_view("profile/status", array("entity" => $user));
-        }
-        ?>
+			$params = array(
+				'type' => 'object',
+				'subtype' => 'thewire',
+				'owner_guid' => $user->guid,
+				'limit' => 1,
+			);
+		$latest_wire = elgg_get_entities($params);
+		if ($latest_wire && count($latest_wire) > 0) {
+			//echo '<img class="profile-icons double-quotes" src="' . elgg_get_site_url() . 'mod/b_extended_profile/img/double-quotes.png">';
+			//echo elgg_view("profile/status", array("entity" => $user));
+		}
+		?>
     </div>
 
    <?php //echo elgg_get_context();
@@ -48,59 +48,59 @@ 
     <div class="b_extended_profile">
         <?php
 
-        echo '<div>';
-
-        //add additional tabs
-        echo elgg_view('profile/profile_tab_menu');
-
-        echo '<div class="tab-content">';
-        if (empty($_GET['pg']))  {
-            $pg = '';
-            echo '<div role="tabpanel" class="tab-pane active" tabindex="-1" id="profile-display">';
-        }
-        else{
-            $pg = $_GET['pg'];
-            echo '<div role="tabpanel" class="tab-pane " tabindex="-1" id="profile-display">';
-        }
-
-        if ( has_content($user, 'description') ) {
-            init_ajax_block(elgg_echo('gcconnex_profile:about_me'), 'about-me', $user);
-            echo elgg_view('b_extended_profile/about-me');
-            finit_ajax_block('about-me');
-        }
-
-        if ( has_content($user, 'education') ) {
-            init_ajax_block(elgg_echo('gcconnex_profile:education'), 'education', $user);
-            echo elgg_view('b_extended_profile/education');
-            finit_ajax_block('education');
-        }
-
-        if ( has_content($user, 'work') ) {
-            init_ajax_block(elgg_echo('gcconnex_profile:experience'), 'work-experience', $user);
-            echo elgg_view('b_extended_profile/work-experience');
-            finit_ajax_block('work-experience');
-        }
-
-        //if(elgg_is_logged_in()){
-            if ( has_content($user, 'gc_skills') ) {
-                init_ajax_block(elgg_echo('gcconnex_profile:gc_skills'), 'skills', $user);
-                echo elgg_view('b_extended_profile/skills');
-                finit_ajax_block('skills');
-            }
-        //}
-
-        /*
+		echo '<div>';
+
+		//add additional tabs
+		echo elgg_view('profile/profile_tab_menu');
+
+		echo '<div class="tab-content">';
+		if (empty($_GET['pg']))  {
+			$pg = '';
+			echo '<div role="tabpanel" class="tab-pane active" tabindex="-1" id="profile-display">';
+		}
+		else{
+			$pg = $_GET['pg'];
+			echo '<div role="tabpanel" class="tab-pane " tabindex="-1" id="profile-display">';
+		}
+
+		if ( has_content($user, 'description') ) {
+			init_ajax_block(elgg_echo('gcconnex_profile:about_me'), 'about-me', $user);
+			echo elgg_view('b_extended_profile/about-me');
+			finit_ajax_block('about-me');
+		}
+
+		if ( has_content($user, 'education') ) {
+			init_ajax_block(elgg_echo('gcconnex_profile:education'), 'education', $user);
+			echo elgg_view('b_extended_profile/education');
+			finit_ajax_block('education');
+		}
+
+		if ( has_content($user, 'work') ) {
+			init_ajax_block(elgg_echo('gcconnex_profile:experience'), 'work-experience', $user);
+			echo elgg_view('b_extended_profile/work-experience');
+			finit_ajax_block('work-experience');
+		}
+
+		//if(elgg_is_logged_in()){
+			if ( has_content($user, 'gc_skills') ) {
+				init_ajax_block(elgg_echo('gcconnex_profile:gc_skills'), 'skills', $user);
+				echo elgg_view('b_extended_profile/skills');
+				finit_ajax_block('skills');
+			}
+		//}
+
+		/*
          * MODIFIED CODE
          * Constructs the opt-in section according to the original plugin methodology.
          */
-        if(elgg_is_active_plugin('missions') && $user->opt_in_missions == 'gcconnex_profile:opt:yes') {
-            echo elgg_view('missions/completed-missions');
-        }
-        /*
+		if(elgg_is_active_plugin('missions') && $user->opt_in_missions == 'gcconnex_profile:opt:yes') {
+			echo elgg_view('missions/completed-missions');
+		}
+		/*
          * END MODIFIED CODE
          */
 
-        /*
+		/*
         if ( has_content($user, 'english') || has_content($user, 'french') ) {
             init_ajax_block(elgg_echo('gcconnex_profile:sle'), 'languages', $user);
             echo elgg_view('b_extended_profile/languages');
@@ -108,104 +108,104 @@ 
         }
         */
 
-        /*
+		/*
          * MODIFIED CODE
          * Constructs the opt-in section according to the original plugin methodology.
          */
-        if(has_content($user, 'opt-in')) {
-            init_ajax_block(elgg_echo('gcconnex_profile:opt:opt-in'), 'opt-in', $user);
-            echo elgg_view('b_extended_profile/opt-in');
-            finit_ajax_block('opt-in');
-        }
-        /*
+		if(has_content($user, 'opt-in')) {
+			init_ajax_block(elgg_echo('gcconnex_profile:opt:opt-in'), 'opt-in', $user);
+			echo elgg_view('b_extended_profile/opt-in');
+			finit_ajax_block('opt-in');
+		}
+		/*
          * END MODIFIED CODE
          */
 
-        // create the div wrappers and edit/save/cancel toggles for each profile section
-
-            echo '</div>'; //close div id=#profile-display
-
-            if (empty($_GET['pg']))  {
-                $pg = '';
-                echo '<div role="tabpanel" class="tab-pane clearfix" tabindex="-1" id="splashboard">';
-            }
-            else{
-                $pg = $_GET['pg'];
-                echo '<div role="tabpanel" class="tab-pane active clearfix" tabindex="-1" id="splashboard">';
-            }
-
-                echo '<h2 class="wb-inv">'.$user->name."'s widgets</h2>";
-
-                $num_columns = elgg_extract('num_columns', $vars, 2);
-                $show_add_widgets = elgg_extract('show_add_widgets', $vars, true);
-                $exact_match = elgg_extract('exact_match', $vars, false);
-                $show_access = elgg_extract('show_access', $vars, true);
-
-                $owner = elgg_get_page_owner_entity();
-
-                $widget_types = elgg_get_widget_types();
-
-                $context = elgg_get_context();
-                elgg_push_context('widgets');
-
-                $widgets = elgg_get_widgets($owner->guid, $context);
-
-                if (elgg_can_edit_widget_layout($context)) {
-
-                    $params = array(
-                        'widgets' => $widgets,
-                        'context' => $context,
-                        'exact_match' => $exact_match,
-                        'show_access' => $show_access,
-                    );
-                    echo elgg_view('page/layouts/widgets/add_panel', $params);
-                }
-                if (elgg_can_edit_widget_layout($context)) {
-                    if ($show_add_widgets) {
-                        echo elgg_view('page/layouts/widgets/add_button');
-                    }
-
-                    $params = array(
-                        'widgets' => $widgets,
-                        'context' => $context,
-                        'exact_match' => $exact_match,
-                    );
-                    echo elgg_view('page/layouts/widgets/add_panel', $params);
-                }
-                $widget_class = "elgg-col-1of{$num_columns}";
-                for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
-                    if (isset($widgets[$column_index])) {
-                        $column_widgets = $widgets[$column_index];
-                    } else {
-                        $column_widgets = array();
-                    }
-
-                    echo "<div class=\"$widget_class elgg-widgets col-sm-6 col-xs-12 widget-area-col\" id=\"elgg-widget-col-$column_index\">";
-                    if (sizeof($column_widgets) > 0) {
-                        foreach ($column_widgets as $widget) {
-                            if (array_key_exists($widget->handler, $widget_types)) {
-                                echo elgg_view_entity($widget, array('show_access' => $show_access));
-                            }
-                        }
-                    }
-                    echo '</div>';
-                }
-                elgg_pop_context();
-            echo '</div>'; // close div id="splashboard"
-
-
-            echo '<div role="tabpanel" class="tab-pane" tabindex="-1" id="portfolio">';
-
-                init_ajax_block(elgg_echo('gcconnex_profile:portfolio'), 'portfolio', $user);
-                echo elgg_view('b_extended_profile/portfolio'); // call the proper view for the section
-                finit_ajax_block('portfolio');
-            echo '</div>'; // close div id="#portfolio"
-
-            //add tab panels with preview content
-            echo elgg_view('profile/tab-content');
-
-            echo '</div>'; // close div class="tab-content'
-        echo '</div>'; // close div role="tabpanel"
-        ?>
+		// create the div wrappers and edit/save/cancel toggles for each profile section
+
+			echo '</div>'; //close div id=#profile-display
+
+			if (empty($_GET['pg']))  {
+				$pg = '';
+				echo '<div role="tabpanel" class="tab-pane clearfix" tabindex="-1" id="splashboard">';
+			}
+			else{
+				$pg = $_GET['pg'];
+				echo '<div role="tabpanel" class="tab-pane active clearfix" tabindex="-1" id="splashboard">';
+			}
+
+				echo '<h2 class="wb-inv">'.$user->name."'s widgets</h2>";
+
+				$num_columns = elgg_extract('num_columns', $vars, 2);
+				$show_add_widgets = elgg_extract('show_add_widgets', $vars, true);
+				$exact_match = elgg_extract('exact_match', $vars, false);
+				$show_access = elgg_extract('show_access', $vars, true);
+
+				$owner = elgg_get_page_owner_entity();
+
+				$widget_types = elgg_get_widget_types();
+
+				$context = elgg_get_context();
+				elgg_push_context('widgets');
+
+				$widgets = elgg_get_widgets($owner->guid, $context);
+
+				if (elgg_can_edit_widget_layout($context)) {
+
+					$params = array(
+						'widgets' => $widgets,
+						'context' => $context,
+						'exact_match' => $exact_match,
+						'show_access' => $show_access,
+					);
+					echo elgg_view('page/layouts/widgets/add_panel', $params);
+				}
+				if (elgg_can_edit_widget_layout($context)) {
+					if ($show_add_widgets) {
+						echo elgg_view('page/layouts/widgets/add_button');
+					}
+
+					$params = array(
+						'widgets' => $widgets,
+						'context' => $context,
+						'exact_match' => $exact_match,
+					);
+					echo elgg_view('page/layouts/widgets/add_panel', $params);
+				}
+				$widget_class = "elgg-col-1of{$num_columns}";
+				for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
+					if (isset($widgets[$column_index])) {
+						$column_widgets = $widgets[$column_index];
+					} else {
+						$column_widgets = array();
+					}
+
+					echo "<div class=\"$widget_class elgg-widgets col-sm-6 col-xs-12 widget-area-col\" id=\"elgg-widget-col-$column_index\">";
+					if (sizeof($column_widgets) > 0) {
+						foreach ($column_widgets as $widget) {
+							if (array_key_exists($widget->handler, $widget_types)) {
+								echo elgg_view_entity($widget, array('show_access' => $show_access));
+							}
+						}
+					}
+					echo '</div>';
+				}
+				elgg_pop_context();
+			echo '</div>'; // close div id="splashboard"
+
+
+			echo '<div role="tabpanel" class="tab-pane" tabindex="-1" id="portfolio">';
+
+				init_ajax_block(elgg_echo('gcconnex_profile:portfolio'), 'portfolio', $user);
+				echo elgg_view('b_extended_profile/portfolio'); // call the proper view for the section
+				finit_ajax_block('portfolio');
+			echo '</div>'; // close div id="#portfolio"
+
+			//add tab panels with preview content
+			echo elgg_view('profile/tab-content');
+
+			echo '</div>'; // close div class="tab-content'
+		echo '</div>'; // close div role="tabpanel"
+		?>
     </div>
 </div>

mod/b_extended_profile_collab/views/default/profile/tab-content.php

Indentation +154 added lines, -154 removed lines

@@ -8,164 +8,164 @@
 $user_display_name = elgg_get_page_owner_entity()->name;
 foreach($fields as $field){
 
-    echo '<div role="tabpanel" tabindex="-1" class="tab-pane fade-in" id="' . strtolower($field) . '">';
-
-    $options = array(
-        'type' => 'object',
-        'subtype' => strtolower($field),
-        'container_guid' => elgg_get_page_owner_entity()->guid,
-        'limit' => 5,
-        'full_view' => false,
-        'pagination' => false,
-        'distinct' => false,
-    );
-
-    $content = elgg_list_entities($options);
-
-        //fix field to allow proper URLs
-        //pick appropriate messages
-        switch($field){
-            case 'File':
-                $title = elgg_echo('file:user', array($user_display_name));
-                $add = elgg_echo('file:add');
-                $message = elgg_echo('file:none');
-                break;
-            case 'Blog':
-                $title = elgg_echo('blog:title:user_blogs', array($user_display_name));
-                $add = elgg_echo('blog:add');
-                $message = elgg_echo('blog:noblogs');
-                break;
-            case 'Bookmarks':
-                $title = elgg_echo('bookmarks:owner', array($user_display_name));
-                $add = elgg_echo('bookmarks:add');
-                $message = elgg_echo('bookmarks:none');
-                break;
-            case 'Thewire':
-                $title = elgg_echo('thewire:user', array($user_display_name));
-                $message = elgg_echo('thewire:noposts');
-                break;
-            case 'page_top':
-                $title = elgg_echo('pages:owner', array($user_display_name));
-                $add = elgg_echo('pages:add');
-                $message = elgg_echo('pages:none');
-                $field = "pages";
-                break;
-            case 'task_top':
-                $title = elgg_echo('tasks:user', array($user_display_name));
-                $add = elgg_echo('tasks:add');
-                $message = elgg_echo('tasks:none');
-                $field = "tasks";
-                break;
-            case 'Poll':
-                $title = elgg_echo('polls:user', array($user_display_name));
-                $add = elgg_echo('polls:add');
-                $message = elgg_echo('polls:none');
-                $field = "polls";
-                break;
-            case 'Album':
-                $title = elgg_echo('album:user', array($user_display_name));
-                $add = elgg_echo('photos:add');
-                $message = elgg_echo('tidypics:widget:no_albums');
-                $field = "photos";
-                break;
-            case 'question':
-                $title = elgg_echo('questions:owner', array($user_display_name));
-                $add = elgg_echo('questions:add');
-                $message = elgg_echo('questions:none');
-                $field = 'questions';
-                break;
-            case 'etherpad':
-                $title = elgg_echo('etherpad:owner', array($user_display_name));
-                $add = elgg_echo('etherpad:add');
-                $message = elgg_echo('etherpad:none');
-                $field = 'docs';
-                break;
-        }
-
-        if(elgg_get_page_owner_entity()->canEdit()){
-
-            echo '<h2 class="wb-invisible" tabindex="-1">'.$title.'</h2>';
-
-            //dont display add button on The Wire panel
-            if($field == 'Thewire'){
-                //do nothing
-            } else {
-
-                //display add button
-            echo '<div class="text-right">';
-                $action = strtolower($field) . "/add/" . elgg_get_page_owner_entity()->guid;
-               $addButton = elgg_view('output/url', array(
-                    'href' => $action,
-                    'text' => $add,
-                    'is_trusted' => true,
-                    'class' => 'btn btn-primary',
-                ));
-
-                //for files we want an additional add folder button
-                if($field == 'File' && elgg_get_plugin_setting("user_folder_structure", "file_tools") == 'yes'){
-                  //create new foldr button
-                    $new_folder = elgg_view('output/url', array(
-                      'name' => 'new_folder',
-                      'text' => elgg_echo("file_tools:new:title"),
-                      'href' => "#",
-                      "id" => "file_tools_list_new_folder_toggle",
-                      'class' => 'btn btn-default mrgn-rght-sm',
-                    ));
-
-                    //add new folder to add button
-                    $addButton = $new_folder.$addButton;
-                }
-
-                echo $addButton;
-            echo '</div>';
-
-            }
-        }
-
-        if(!$content){
-            echo '<div class="mrgn-lft-sm mrgn-bttm-md">' . $message . '</div>';
-        } else {
-            echo $content;
-        }
-
-        $url = strtolower($field) . "/owner/" . elgg_get_page_owner_entity()->username;
-        $more_link = elgg_view('output/url', array(
-            'href' => $url,
-            'text' => elgg_echo('link:view:all'),
-            'is_trusted' => true,
-            'class' => 'text-center btn btn-default center-block',
-        ));
-
-        echo '<div class="panel-footer text-right">' . $more_link . '</div>';
-    echo '</div>';
+	echo '<div role="tabpanel" tabindex="-1" class="tab-pane fade-in" id="' . strtolower($field) . '">';
+
+	$options = array(
+		'type' => 'object',
+		'subtype' => strtolower($field),
+		'container_guid' => elgg_get_page_owner_entity()->guid,
+		'limit' => 5,
+		'full_view' => false,
+		'pagination' => false,
+		'distinct' => false,
+	);
+
+	$content = elgg_list_entities($options);
+
+		//fix field to allow proper URLs
+		//pick appropriate messages
+		switch($field){
+			case 'File':
+				$title = elgg_echo('file:user', array($user_display_name));
+				$add = elgg_echo('file:add');
+				$message = elgg_echo('file:none');
+				break;
+			case 'Blog':
+				$title = elgg_echo('blog:title:user_blogs', array($user_display_name));
+				$add = elgg_echo('blog:add');
+				$message = elgg_echo('blog:noblogs');
+				break;
+			case 'Bookmarks':
+				$title = elgg_echo('bookmarks:owner', array($user_display_name));
+				$add = elgg_echo('bookmarks:add');
+				$message = elgg_echo('bookmarks:none');
+				break;
+			case 'Thewire':
+				$title = elgg_echo('thewire:user', array($user_display_name));
+				$message = elgg_echo('thewire:noposts');
+				break;
+			case 'page_top':
+				$title = elgg_echo('pages:owner', array($user_display_name));
+				$add = elgg_echo('pages:add');
+				$message = elgg_echo('pages:none');
+				$field = "pages";
+				break;
+			case 'task_top':
+				$title = elgg_echo('tasks:user', array($user_display_name));
+				$add = elgg_echo('tasks:add');
+				$message = elgg_echo('tasks:none');
+				$field = "tasks";
+				break;
+			case 'Poll':
+				$title = elgg_echo('polls:user', array($user_display_name));
+				$add = elgg_echo('polls:add');
+				$message = elgg_echo('polls:none');
+				$field = "polls";
+				break;
+			case 'Album':
+				$title = elgg_echo('album:user', array($user_display_name));
+				$add = elgg_echo('photos:add');
+				$message = elgg_echo('tidypics:widget:no_albums');
+				$field = "photos";
+				break;
+			case 'question':
+				$title = elgg_echo('questions:owner', array($user_display_name));
+				$add = elgg_echo('questions:add');
+				$message = elgg_echo('questions:none');
+				$field = 'questions';
+				break;
+			case 'etherpad':
+				$title = elgg_echo('etherpad:owner', array($user_display_name));
+				$add = elgg_echo('etherpad:add');
+				$message = elgg_echo('etherpad:none');
+				$field = 'docs';
+				break;
+		}
+
+		if(elgg_get_page_owner_entity()->canEdit()){
+
+			echo '<h2 class="wb-invisible" tabindex="-1">'.$title.'</h2>';
+
+			//dont display add button on The Wire panel
+			if($field == 'Thewire'){
+				//do nothing
+			} else {
+
+				//display add button
+			echo '<div class="text-right">';
+				$action = strtolower($field) . "/add/" . elgg_get_page_owner_entity()->guid;
+			   $addButton = elgg_view('output/url', array(
+					'href' => $action,
+					'text' => $add,
+					'is_trusted' => true,
+					'class' => 'btn btn-primary',
+				));
+
+				//for files we want an additional add folder button
+				if($field == 'File' && elgg_get_plugin_setting("user_folder_structure", "file_tools") == 'yes'){
+				  //create new foldr button
+					$new_folder = elgg_view('output/url', array(
+					  'name' => 'new_folder',
+					  'text' => elgg_echo("file_tools:new:title"),
+					  'href' => "#",
+					  "id" => "file_tools_list_new_folder_toggle",
+					  'class' => 'btn btn-default mrgn-rght-sm',
+					));
+
+					//add new folder to add button
+					$addButton = $new_folder.$addButton;
+				}
+
+				echo $addButton;
+			echo '</div>';
+
+			}
+		}
+
+		if(!$content){
+			echo '<div class="mrgn-lft-sm mrgn-bttm-md">' . $message . '</div>';
+		} else {
+			echo $content;
+		}
+
+		$url = strtolower($field) . "/owner/" . elgg_get_page_owner_entity()->username;
+		$more_link = elgg_view('output/url', array(
+			'href' => $url,
+			'text' => elgg_echo('link:view:all'),
+			'is_trusted' => true,
+			'class' => 'text-center btn btn-default center-block',
+		));
+
+		echo '<div class="panel-footer text-right">' . $more_link . '</div>';
+	echo '</div>';
 }
 
 //event calendar tab
 echo '<div role="tabpanel" tabindex="-1" class="tab-pane fade-in" id="events">';
-    echo '<div class="clearfix">';
-    echo '<h2 class="wb-invisible" tabindex="-1">'.elgg_echo('event_calendar:listing_title:mine', array($user_display_name)).'</h2>';
-    if(elgg_is_active_plugin('event_calendar')){
-        $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(), 5);
-    }
-
-    if(!$events){
-        echo '<div class="mrgn-lft-sm mrgn-bttm-md">' . elgg_echo('event_calendar:no_events_found') . '</div>';
-    }
-
-    foreach($events as $event) {
-        echo elgg_view("object/event_calendar", array('entity' => $event));
-    }
-
-    $date = date('Y-m-d'/*, strtotime("-1 days")*/);
-    $event_url = "event_calendar/owner/". elgg_get_page_owner_entity()->username;
-    $viewall_link = elgg_view('output/url', array(
-        'href' => $event_url,
-        'text' => elgg_echo('link:view:all'),
-        'is_trusted' => true,
-        'class' => 'text-center btn btn-default center-block',
-    ));
-    echo '</div>';
-    echo "<div class=\"elgg-widget-more  panel-footer text-right\">$viewall_link</div>";
+	echo '<div class="clearfix">';
+	echo '<h2 class="wb-invisible" tabindex="-1">'.elgg_echo('event_calendar:listing_title:mine', array($user_display_name)).'</h2>';
+	if(elgg_is_active_plugin('event_calendar')){
+		$events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(), 5);
+	}
+
+	if(!$events){
+		echo '<div class="mrgn-lft-sm mrgn-bttm-md">' . elgg_echo('event_calendar:no_events_found') . '</div>';
+	}
+
+	foreach($events as $event) {
+		echo elgg_view("object/event_calendar", array('entity' => $event));
+	}
+
+	$date = date('Y-m-d'/*, strtotime("-1 days")*/);
+	$event_url = "event_calendar/owner/". elgg_get_page_owner_entity()->username;
+	$viewall_link = elgg_view('output/url', array(
+		'href' => $event_url,
+		'text' => elgg_echo('link:view:all'),
+		'is_trusted' => true,
+		'class' => 'text-center btn btn-default center-block',
+	));
+	echo '</div>';
+	echo "<div class=\"elgg-widget-more  panel-footer text-right\">$viewall_link</div>";
 echo '</div>';
 elgg_pop_context();
 ?>
\ No newline at end of file

mod/b_extended_profile_collab/views/default/b_extended_profile/skills.php

Indentation +167 added lines, -167 removed lines

@@ -10,21 +10,21 @@ 
 
 // if skills isn't empty, display them so that the user can use them as a guide
 if ($user->skills != NULL && $user->skillsupgraded == NULL) {
-    if(elgg_get_logged_in_user_entity() == elgg_get_page_owner_entity()){
-        echo '<div class="gcconnex-old-skills">';
-        echo '<div class="gcconnex-old-skills-message">' . elgg_echo('gcconnex_profile:gc_skill:leftover') . '</div>';
-        echo '<div class="gcconnex-old-skills-display">';
+	if(elgg_get_logged_in_user_entity() == elgg_get_page_owner_entity()){
+		echo '<div class="gcconnex-old-skills">';
+		echo '<div class="gcconnex-old-skills-message">' . elgg_echo('gcconnex_profile:gc_skill:leftover') . '</div>';
+		echo '<div class="gcconnex-old-skills-display">';
 
-        if (is_array($user->skills)) {
-            foreach ($user->skills as $oldskill)
-                echo $oldskill . '<br>';
-        }
+		if (is_array($user->skills)) {
+			foreach ($user->skills as $oldskill)
+				echo $oldskill . '<br>';
+		}
 
-        echo '</div><br>'; // close div class="gcconnex-old-skills-display
-        echo '<span class="gcconnex-old-skills-stop-showing gcconnex-profile-button" onclick="removeOldSkills()">Stop showing me this message.</span>';
-        echo '</div>'; // close div class="gcconnex-old-skills"
+		echo '</div><br>'; // close div class="gcconnex-old-skills-display
+		echo '<span class="gcconnex-old-skills-stop-showing gcconnex-profile-button" onclick="removeOldSkills()">Stop showing me this message.</span>';
+		echo '</div>'; // close div class="gcconnex-old-skills"
 
-    }
+	}
 
 }
 
@@ -33,164 +33,164 @@ 
 echo '<div class="gcconnex-profile-skills-display">';
 echo '<div class="gcconnex-skills-skills-list-wrapper">';
 if (elgg_is_logged_in()){
-    //elgg_get_logged_in_user_entity()->isFriendsWith($user->guid)
-    //if ( elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid() ) {
-    if((elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) && ($user->skill_access == ACCESS_PUBLIC || elgg_get_logged_in_user_entity()->isFriendsWith($user->guid) ) && ($user->skill_access != ACCESS_PRIVATE))
-        echo '<div class="gcconnex-skill-limit">' . elgg_echo('gcconnex_profile:gc_skill:click') . '</div>';
-    //}
+	//elgg_get_logged_in_user_entity()->isFriendsWith($user->guid)
+	//if ( elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid() ) {
+	if((elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) && ($user->skill_access == ACCESS_PUBLIC || elgg_get_logged_in_user_entity()->isFriendsWith($user->guid) ) && ($user->skill_access != ACCESS_PRIVATE))
+		echo '<div class="gcconnex-skill-limit">' . elgg_echo('gcconnex_profile:gc_skill:click') . '</div>';
+	//}
 }
 
 if ($user->canEdit() && ($skill_guids == NULL || empty($skill_guids))) {
-    echo elgg_echo('gcconnex_profile:gc_skill:empty');
+	echo elgg_echo('gcconnex_profile:gc_skill:empty');
 }
 else {
-    echo '<div class="gcconnex-skill-limit hidden">' . elgg_echo('gcconnex_profile:gc_skill:limit') . '</div>';
-    if (!(is_array($skill_guids))) {
-        $skill_guids = array($skill_guids);
-    }
+	echo '<div class="gcconnex-skill-limit hidden">' . elgg_echo('gcconnex_profile:gc_skill:limit') . '</div>';
+	if (!(is_array($skill_guids))) {
+		$skill_guids = array($skill_guids);
+	}
 // if the skill list isn't empty, and a logged-in user is viewing this page... show skills
-    elgg_set_ignore_access(true);
-    //if (elgg_is_logged_in()) {
+	elgg_set_ignore_access(true);
+	//if (elgg_is_logged_in()) {
 
-
-        for ($i=0; $i<20; $i++) {
-
-            $skill_guid = $skill_guids[$i];
-            //error_log(get_entity($skill_guid));
-            if ($skill = get_entity($skill_guid)) {
-
-                $skill_class = str_replace(' ', '-', strtolower($skill->title));
-                $endorsements = $skill->endorsements;
-                $endorse_count = count($skill->endorsements);
-
-                if (!(is_array($endorsements))) {
-                    $endorsements = array($endorsements);
-                }
-
-                if ($user->skill_access == ACCESS_PUBLIC || $user->skill_access == ACCESS_LOGGED_IN){
-                    if (!elgg_is_logged_in() || elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
-                        echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
-                        echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                        echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-                    }else{
-                        if (in_array(elgg_get_logged_in_user_guid(), $endorsements) == false || empty($endorsements)) {
-                            // user has not yet endorsed this skill for this user.. present the option to endorse
-
-                            echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer  gcconnex-endorsement-add clearfix" tabIndex="0" onclick="addEndorsement(this)" title="Endorse / Valider" style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
-                            echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                            echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-
-                        } else {
-                            // user has endorsed this skill for this user.. present the option to retract endorsement
-
-                            echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer gcconnex-endorsement-retract clearfix" tabIndex="0" onclick="retractEndorsement(this)" title="Retract"  style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
-                            echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                            echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-                        }
-                    }
-                    echo '</div>'; // close div class="skill-container"
-
-                    if($endorse_count > 0){
-                        echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
-                        echo list_avatars(array(
-                            'guids' => $skill->endorsements,
-                            'size' => 'tiny',
-                            'limit' => 4,
-                            'id' => "myModal" . $i,
-                            'skill_guid' => $skill_guid
-                        ));
-
-                        echo '</div>'; // close div class="gcconnex-skill-endorsements"
-                    }
-                    echo '</div>'; // close div class=gcconnex-skill-entry
-                }
-                if ($user->skill_access == ACCESS_FRIENDS){
-                    if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
-                        echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
-
-                        echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                        echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-                        echo '</div>'; // close div class="skill-container"
-
-                        if($endorse_count > 0){
-                            echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
-                            echo list_avatars(array(
-                                'guids' => $skill->endorsements,
-                                'size' => 'tiny',
-                                'limit' => 4,
-                                'id' => "myModal" . $i,
-                                'skill_guid' => $skill_guid
-                            ));
-
-                            echo '</div>'; // close div class="gcconnex-skill-endorsements"
-                        }
-                        echo '</div>'; // close div class=gcconnex-skill-entry
-
-                    }elseif(elgg_is_logged_in()&& elgg_get_logged_in_user_entity()->isFriendsWith($user->guid)){
-                        if (in_array(elgg_get_logged_in_user_guid(), $endorsements) == false || empty($endorsements)) {
-                            // user has not yet endorsed this skill for this user.. present the option to endorse
-
-                            echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer  gcconnex-endorsement-add clearfix" tabIndex="0" onclick="addEndorsement(this)" title="Endorse / Valider" style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
-
-                            echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                            echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-                        } else {
-                            // user has endorsed this skill for this user.. present the option to retract endorsement
-
-                            echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer gcconnex-endorsement-retract clearfix" tabIndex="0" onclick="retractEndorsement(this)" title="Retract"  style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
-
-                            echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                            echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-                        }
-                        echo '</div>'; // close div class="skill-container"
-
-                        if($endorse_count > 0){
-                            echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
-                            echo list_avatars(array(
-                                'guids' => $skill->endorsements,
-                                'size' => 'tiny',
-                                'limit' => 4,
-                                'id' => "myModal" . $i,
-                                'skill_guid' => $skill_guid
-                            ));
-
-                            echo '</div>'; // close div class="gcconnex-skill-endorsements"
-                        }
-                        echo '</div>'; // close div class=gcconnex-skill-entry
-                    }
-
-                }
-                if ($user->skill_access == ACCESS_PRIVATE){
-                    if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
-                        echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
-
-                        echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
-                        echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
-
-                        echo '</div>'; // close div class="skill-container"
-
-                        if($endorse_count > 0){
-                            echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
-                            echo list_avatars(array(
-                                'guids' => $skill->endorsements,
-                                'size' => 'tiny',
-                                'limit' => 4,
-                                'id' => "myModal" . $i,
-                                'skill_guid' => $skill_guid
-                            ));
-
-                            echo '</div>'; // close div class="gcconnex-skill-endorsements"
-                        }
-                        echo '</div>'; // close div class=gcconnex-skill-entry
-
-                    }
-                }
-                /*if ( elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid() ) {
+
+		for ($i=0; $i<20; $i++) {
+
+			$skill_guid = $skill_guids[$i];
+			//error_log(get_entity($skill_guid));
+			if ($skill = get_entity($skill_guid)) {
+
+				$skill_class = str_replace(' ', '-', strtolower($skill->title));
+				$endorsements = $skill->endorsements;
+				$endorse_count = count($skill->endorsements);
+
+				if (!(is_array($endorsements))) {
+					$endorsements = array($endorsements);
+				}
+
+				if ($user->skill_access == ACCESS_PUBLIC || $user->skill_access == ACCESS_LOGGED_IN){
+					if (!elgg_is_logged_in() || elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
+						echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
+						echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+						echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+					}else{
+						if (in_array(elgg_get_logged_in_user_guid(), $endorsements) == false || empty($endorsements)) {
+							// user has not yet endorsed this skill for this user.. present the option to endorse
+
+							echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer  gcconnex-endorsement-add clearfix" tabIndex="0" onclick="addEndorsement(this)" title="Endorse / Valider" style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
+							echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+							echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+
+						} else {
+							// user has endorsed this skill for this user.. present the option to retract endorsement
+
+							echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer gcconnex-endorsement-retract clearfix" tabIndex="0" onclick="retractEndorsement(this)" title="Retract"  style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
+							echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+							echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+						}
+					}
+					echo '</div>'; // close div class="skill-container"
+
+					if($endorse_count > 0){
+						echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
+						echo list_avatars(array(
+							'guids' => $skill->endorsements,
+							'size' => 'tiny',
+							'limit' => 4,
+							'id' => "myModal" . $i,
+							'skill_guid' => $skill_guid
+						));
+
+						echo '</div>'; // close div class="gcconnex-skill-endorsements"
+					}
+					echo '</div>'; // close div class=gcconnex-skill-entry
+				}
+				if ($user->skill_access == ACCESS_FRIENDS){
+					if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
+						echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
+
+						echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+						echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+						echo '</div>'; // close div class="skill-container"
+
+						if($endorse_count > 0){
+							echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
+							echo list_avatars(array(
+								'guids' => $skill->endorsements,
+								'size' => 'tiny',
+								'limit' => 4,
+								'id' => "myModal" . $i,
+								'skill_guid' => $skill_guid
+							));
+
+							echo '</div>'; // close div class="gcconnex-skill-endorsements"
+						}
+						echo '</div>'; // close div class=gcconnex-skill-entry
+
+					}elseif(elgg_is_logged_in()&& elgg_get_logged_in_user_entity()->isFriendsWith($user->guid)){
+						if (in_array(elgg_get_logged_in_user_guid(), $endorsements) == false || empty($endorsements)) {
+							// user has not yet endorsed this skill for this user.. present the option to endorse
+
+							echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer  gcconnex-endorsement-add clearfix" tabIndex="0" onclick="addEndorsement(this)" title="Endorse / Valider" style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
+
+							echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+							echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+						} else {
+							// user has endorsed this skill for this user.. present the option to retract endorsement
+
+							echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '">        <div class="skill-container pointer gcconnex-endorsement-retract clearfix" tabIndex="0" onclick="retractEndorsement(this)" title="Retract"  style="display:inline-block" data-guid="' . $skill->guid . '" data-skill="' . $skill->title . '">';
+
+							echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+							echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+						}
+						echo '</div>'; // close div class="skill-container"
+
+						if($endorse_count > 0){
+							echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
+							echo list_avatars(array(
+								'guids' => $skill->endorsements,
+								'size' => 'tiny',
+								'limit' => 4,
+								'id' => "myModal" . $i,
+								'skill_guid' => $skill_guid
+							));
+
+							echo '</div>'; // close div class="gcconnex-skill-endorsements"
+						}
+						echo '</div>'; // close div class=gcconnex-skill-entry
+					}
+
+				}
+				if ($user->skill_access == ACCESS_PRIVATE){
+					if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()){
+						echo '<div tabindex="-1" class="gcconnex-skill-entry clearfix" data-guid="' . $skill_guid . '"><div class="skill-container clearfix" style="display:inline-block">';
+
+						echo '<div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
+						echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . $endorse_count . '<span class="gc-endorse-skill wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:endorsement').'</span></div>';
+
+						echo '</div>'; // close div class="skill-container"
+
+						if($endorse_count > 0){
+							echo '<div class="gcconnex-skill-endorsements clearfix" style="display:inline-block"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:who').'</span>';
+							echo list_avatars(array(
+								'guids' => $skill->endorsements,
+								'size' => 'tiny',
+								'limit' => 4,
+								'id' => "myModal" . $i,
+								'skill_guid' => $skill_guid
+							));
+
+							echo '</div>'; // close div class="gcconnex-skill-endorsements"
+						}
+						echo '</div>'; // close div class=gcconnex-skill-entry
+
+					}
+				}
+				/*if ( elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid() ) {
 
                     if (in_array(elgg_get_logged_in_user_guid(), $endorsements) == false || empty($endorsements)) {
                         // user has not yet endorsed this skill for this user.. present the option to endorse
@@ -209,11 +209,11 @@ 
                     echo '<div class="gcconnex-endorsements-count gcconnex-endorsements-count-' . $skill_class . '">' . count($skill->endorsements) . '</div><div class="gcconnex-endorsements-skill" data-type="skill">' . $skill->title . '</div>';
                 }*/
 
-            }
-        }
+			}
+		}
 
-    //}
-    elgg_set_ignore_access(false);
+	//}
+	elgg_set_ignore_access(false);
 }
 
 echo '</div>';

mod/b_extended_profile_collab/views/default/b_extended_profile/work-experience.php

Indentation +51 added lines, -51 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if (elgg_is_xhr()) {
-    $user_guid = $_GET["guid"];
+	$user_guid = $_GET["guid"];
 }
 else {
-    $user_guid = elgg_get_page_owner_guid();
+	$user_guid = elgg_get_page_owner_guid();
 }
 
 $user = get_user($user_guid);
@@ -12,66 +12,66 @@ 
 echo '<div class="gcconnex-profile-work-experience-display pull-left clearfix">';
 
 if ($user->canEdit() && ($work_experience_guid == NULL || empty($work_experience_guid))) {
-    echo elgg_echo('gcconnex_profile:experience:empty');
+	echo elgg_echo('gcconnex_profile:experience:empty');
 }
 else {
-    if (!(is_array($work_experience_guid))) {
-        $work_experience_guid = array($work_experience_guid);
-    }
+	if (!(is_array($work_experience_guid))) {
+		$work_experience_guid = array($work_experience_guid);
+	}
 
-    usort($work_experience_guid, "sortDate");
+	usort($work_experience_guid, "sortDate");
 
-    foreach ($work_experience_guid as $guid) {
+	foreach ($work_experience_guid as $guid) {
 
-        if ($experience = get_entity($guid)) {
-            echo '<div class="gcconnex-profile-label work-experience-title">' . htmlspecialchars_decode($experience->title) . '</div>';
-            echo '<div class="gcconnex-profile-label work-experience-organization">' . htmlspecialchars_decode($experience->organization) . '</div>';
+		if ($experience = get_entity($guid)) {
+			echo '<div class="gcconnex-profile-label work-experience-title">' . htmlspecialchars_decode($experience->title) . '</div>';
+			echo '<div class="gcconnex-profile-label work-experience-organization">' . htmlspecialchars_decode($experience->organization) . '</div>';
 
-            $cal_month = array(
-                1 => elgg_echo('gcconnex_profile:month:january'),
-                2 => elgg_echo('gcconnex_profile:month:february'),
-                3 => elgg_echo('gcconnex_profile:month:march'),
-                4 => elgg_echo('gcconnex_profile:month:april'),
-                5 => elgg_echo('gcconnex_profile:month:may'),
-                6 => elgg_echo('gcconnex_profile:month:june'),
-                7 => elgg_echo('gcconnex_profile:month:july'),
-                8 => elgg_echo('gcconnex_profile:month:august'),
-                9 => elgg_echo('gcconnex_profile:month:september'),
-                10 => elgg_echo('gcconnex_profile:month:october'),
-                11 => elgg_echo('gcconnex_profile:month:november'),
-                12 => elgg_echo('gcconnex_profile:month:december')
-            );
-            echo '<div class="gcconnex-profile-work-experience-display gcconnex-work-experience-' . $experience->guid . '">';
-            echo '<div class="gcconnex-profile-label timeStamp mrgn-tp-sm">';
+			$cal_month = array(
+				1 => elgg_echo('gcconnex_profile:month:january'),
+				2 => elgg_echo('gcconnex_profile:month:february'),
+				3 => elgg_echo('gcconnex_profile:month:march'),
+				4 => elgg_echo('gcconnex_profile:month:april'),
+				5 => elgg_echo('gcconnex_profile:month:may'),
+				6 => elgg_echo('gcconnex_profile:month:june'),
+				7 => elgg_echo('gcconnex_profile:month:july'),
+				8 => elgg_echo('gcconnex_profile:month:august'),
+				9 => elgg_echo('gcconnex_profile:month:september'),
+				10 => elgg_echo('gcconnex_profile:month:october'),
+				11 => elgg_echo('gcconnex_profile:month:november'),
+				12 => elgg_echo('gcconnex_profile:month:december')
+			);
+			echo '<div class="gcconnex-profile-work-experience-display gcconnex-work-experience-' . $experience->guid . '">';
+			echo '<div class="gcconnex-profile-label timeStamp mrgn-tp-sm">';
 
-            if ($experience->not_applicable != 'true') {
-                echo $cal_month[$experience->startdate] . ' ' . $experience->startyear . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:to').' </span>';
-            }
+			if ($experience->not_applicable != 'true') {
+				echo $cal_month[$experience->startdate] . ' ' . $experience->startyear . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:to').' </span>';
+			}
 
-            if ($experience->ongoing == 'true') {
-                echo elgg_echo('gcconnex_profile:experience:present');
-            } else {
-                echo $cal_month[$experience->enddate] . ' ' . $experience->endyear;
-            }
+			if ($experience->ongoing == 'true') {
+				echo elgg_echo('gcconnex_profile:experience:present');
+			} else {
+				echo $cal_month[$experience->enddate] . ' ' . $experience->endyear;
+			}
 
-            echo '</div>';
-            echo '<div class="gcconnex-profile-label work-experience-responsibilities mrgn-tp-md">' . $experience->responsibilities . '</div>';
-            echo '<div class="gcconnex-profile-label work-experience-colleagues">';
+			echo '</div>';
+			echo '<div class="gcconnex-profile-label work-experience-responsibilities mrgn-tp-md">' . $experience->responsibilities . '</div>';
+			echo '<div class="gcconnex-profile-label work-experience-colleagues">';
 
-            $colleagues = $experience->colleagues;
-            if (!(is_array($colleagues))) {
-                $colleagues = array($colleagues);
-            }
-            echo list_avatars(array(
-                'guids' => $colleagues,
-                'size' => 'small',
-                'limit' => 0,
-            ));
+			$colleagues = $experience->colleagues;
+			if (!(is_array($colleagues))) {
+				$colleagues = array($colleagues);
+			}
+			echo list_avatars(array(
+				'guids' => $colleagues,
+				'size' => 'small',
+				'limit' => 0,
+			));
 
-            echo '</div>'; // close div class="gcconnex-profile-label work-experience-colleagues"
-            echo '</div>';
-        }
-    }
+			echo '</div>'; // close div class="gcconnex-profile-label work-experience-colleagues"
+			echo '</div>';
+		}
+	}
 }
 
 echo '</div>'; // close div class="gcconnex-profile-work-experience-display

mod/b_extended_profile_collab/views/default/b_extended_profile/education.php

Indentation +37 added lines, -37 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 if (elgg_is_xhr()) {
-    $user_guid = $_GET["guid"];
+	$user_guid = $_GET["guid"];
 }else {
-    $user_guid = elgg_get_page_owner_guid();
+	$user_guid = elgg_get_page_owner_guid();
 }
 
 $user = get_user($user_guid);
@@ -12,48 +12,48 @@ 
 echo '<div class="gcconnex-profile-education-display ">';
 
 if ($user->canEdit() && ($education_guid == NULL || empty($education_guid))) {
-    echo elgg_echo('gcconnex_profile:education:empty');
+	echo elgg_echo('gcconnex_profile:education:empty');
 
 }else {
 
-    if (!(is_array($education_guid))) {
-        $education_guid = array($education_guid);
-    }
-    usort($education_guid, "sortDate");
+	if (!(is_array($education_guid))) {
+		$education_guid = array($education_guid);
+	}
+	usort($education_guid, "sortDate");
 
-    foreach ($education_guid as $guid) {
+	foreach ($education_guid as $guid) {
 
-        if ($education = get_entity($guid)) {
+		if ($education = get_entity($guid)) {
 
-            echo '<div class="gcconnex-profile-education-display gcconnex-education-' . $education->guid . '">';
-            echo '<div class="gcconnex-profile-label education-school">' . htmlspecialchars_decode($education->school) . '</div>';
-            echo '<div class="gcconnex-profile-label education-degree">' . htmlspecialchars_decode($education->degree) . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:for').' </span>' . htmlspecialchars_decode($education->field) . '</div>';
+			echo '<div class="gcconnex-profile-education-display gcconnex-education-' . $education->guid . '">';
+			echo '<div class="gcconnex-profile-label education-school">' . htmlspecialchars_decode($education->school) . '</div>';
+			echo '<div class="gcconnex-profile-label education-degree">' . htmlspecialchars_decode($education->degree) . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:for').' </span>' . htmlspecialchars_decode($education->field) . '</div>';
             
-            $cal_month = array(
-                    1 => elgg_echo('gcconnex_profile:month:january'),
-                    2 => elgg_echo('gcconnex_profile:month:february'),
-                    3 => elgg_echo('gcconnex_profile:month:march'),
-                    4 => elgg_echo('gcconnex_profile:month:april'),
-                    5 => elgg_echo('gcconnex_profile:month:may'),
-                    6 => elgg_echo('gcconnex_profile:month:june'),
-                    7 => elgg_echo('gcconnex_profile:month:july'),
-                    8 => elgg_echo('gcconnex_profile:month:august'),
-                    9 => elgg_echo('gcconnex_profile:month:september'),
-                    10 => elgg_echo('gcconnex_profile:month:october'),
-                    11 => elgg_echo('gcconnex_profile:month:november'),
-                    12 => elgg_echo('gcconnex_profile:month:december')
-                );
-            echo '<div class="gcconnex-profile-label timeStamp">' . $cal_month[$education->startdate] . ', ' . $education->startyear . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:to').' </span>';
-
-            if ($education->ongoing == 'true') {
-                echo elgg_echo('gcconnex_profile:education:present');
-            } else {
-                echo $cal_month[$education->enddate] . ', ' . $education->endyear;
-            }
-            echo '</div>';
-            echo '</div>';
-        }
-    }
+			$cal_month = array(
+					1 => elgg_echo('gcconnex_profile:month:january'),
+					2 => elgg_echo('gcconnex_profile:month:february'),
+					3 => elgg_echo('gcconnex_profile:month:march'),
+					4 => elgg_echo('gcconnex_profile:month:april'),
+					5 => elgg_echo('gcconnex_profile:month:may'),
+					6 => elgg_echo('gcconnex_profile:month:june'),
+					7 => elgg_echo('gcconnex_profile:month:july'),
+					8 => elgg_echo('gcconnex_profile:month:august'),
+					9 => elgg_echo('gcconnex_profile:month:september'),
+					10 => elgg_echo('gcconnex_profile:month:october'),
+					11 => elgg_echo('gcconnex_profile:month:november'),
+					12 => elgg_echo('gcconnex_profile:month:december')
+				);
+			echo '<div class="gcconnex-profile-label timeStamp">' . $cal_month[$education->startdate] . ', ' . $education->startyear . '<span aria-hidden="true"> - </span><span class="wb-invisible"> '.elgg_echo('profile:content:to').' </span>';
+
+			if ($education->ongoing == 'true') {
+				echo elgg_echo('gcconnex_profile:education:present');
+			} else {
+				echo $cal_month[$education->enddate] . ', ' . $education->endyear;
+			}
+			echo '</div>';
+			echo '</div>';
+		}
+	}
 }
 
 echo '</div>'; // close div class="gcconnex-profile-education-display"

mod/b_extended_profile_collab/views/default/b_extended_profile/edit_opt-in.php

Indentation +37 added lines, -37 removed lines

@@ -48,14 +48,14 @@ 
 	}*/
     
     
-                $opt_in_set = array($user->opt_in_missions, $user->opt_in_swap, $user->opt_in_mentored, $user->opt_in_mentoring, $user->opt_in_shadowed, $user->opt_in_shadowing, $user->opt_in_jobshare, $user->opt_in_pcSeek, $user->opt_in_pcCreate, $user->opt_in_ssSeek, $user->opt_in_ssCreate, $user->opt_in_rotation, $user->opt_in_assignSeek, $user->opt_in_assignCreate, $user->opt_in_deploySeek, $user->opt_in_deployCreate, $user->opt_in_missionCreate, $user->opt_in_casual_seek, $user->opt_in_casual_create, $user->opt_in_student_seek, $user->opt_in_student_create);
-    //Nick - Loop through array of selected things and change their value to match the meta data        
+				$opt_in_set = array($user->opt_in_missions, $user->opt_in_swap, $user->opt_in_mentored, $user->opt_in_mentoring, $user->opt_in_shadowed, $user->opt_in_shadowing, $user->opt_in_jobshare, $user->opt_in_pcSeek, $user->opt_in_pcCreate, $user->opt_in_ssSeek, $user->opt_in_ssCreate, $user->opt_in_rotation, $user->opt_in_assignSeek, $user->opt_in_assignCreate, $user->opt_in_deploySeek, $user->opt_in_deployCreate, $user->opt_in_missionCreate, $user->opt_in_casual_seek, $user->opt_in_casual_create, $user->opt_in_student_seek, $user->opt_in_student_create);
+	//Nick - Loop through array of selected things and change their value to match the meta data        
 foreach($opt_in_set as $k => $v){
-    if($v == 'gcconnex_profile:opt:yes'){
-        $opt_in_set[$k]  = true;
-    }else{
-        $opt_in_set[$k]  = false;   
-    }
+	if($v == 'gcconnex_profile:opt:yes'){
+		$opt_in_set[$k]  = true;
+	}else{
+		$opt_in_set[$k]  = false;   
+	}
 }
     
 	/*if($user->opt_in_peer_coached == 'gcconnex_profile:opt:yes') {
@@ -154,23 +154,23 @@ 
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 	<li class="clearfix pull-left mrgn-lft-md">
 		                <?php
-		                	echo elgg_view("input/checkbox", array(
-						        'name' => 'casualseek_check',
-						        'checked' => $opt_in_set[17],
-						        'id' => 'gcconnex-opt-in-casualseek-check',
-			                    'label' => elgg_echo('gcconnex_profile:opt:seeking') 
-			               	));
-		                ?>
+							echo elgg_view("input/checkbox", array(
+								'name' => 'casualseek_check',
+								'checked' => $opt_in_set[17],
+								'id' => 'gcconnex-opt-in-casualseek-check',
+								'label' => elgg_echo('gcconnex_profile:opt:seeking') 
+						   	));
+						?>
                 	</li>
 	                <li class="clearfix pull-left mrgn-lft-md">
 		                <?php
-		                	echo elgg_view("input/checkbox", array(
-						        'name' => 'casualcreate_check',
-						        'checked' => $opt_in_set[18],
-						        'id' => 'gcconnex-opt-in-casualcreate-check',
-			                    'label' => elgg_echo('gcconnex_profile:opt:offering')
-			            	));
-		                ?>
+							echo elgg_view("input/checkbox", array(
+								'name' => 'casualcreate_check',
+								'checked' => $opt_in_set[18],
+								'id' => 'gcconnex-opt-in-casualcreate-check',
+								'label' => elgg_echo('gcconnex_profile:opt:offering')
+							));
+						?>
                 	</li>
                 </ul>
             </li>
@@ -179,23 +179,23 @@ 
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 	<li class="clearfix pull-left mrgn-lft-md">
 		                <?php
-		                	echo elgg_view("input/checkbox", array(
-						        'name' => 'studentseek_check',
-						        'checked' => $opt_in_set[19],
-						        'id' => 'gcconnex-opt-in-studentseek-check',
-			                    'label' => elgg_echo('gcconnex_profile:opt:seeking') 
-			               	));
-		                ?>
+							echo elgg_view("input/checkbox", array(
+								'name' => 'studentseek_check',
+								'checked' => $opt_in_set[19],
+								'id' => 'gcconnex-opt-in-studentseek-check',
+								'label' => elgg_echo('gcconnex_profile:opt:seeking') 
+						   	));
+						?>
                 	</li>
 	                <li class="clearfix pull-left mrgn-lft-md">
 		                <?php
-		                	echo elgg_view("input/checkbox", array(
-						        'name' => 'studentcreate_check',
-						        'checked' => $opt_in_set[20],
-						        'id' => 'gcconnex-opt-in-studentcreate-check',
-			                    'label' => elgg_echo('gcconnex_profile:opt:offering')
-			            	));
-		                ?>
+							echo elgg_view("input/checkbox", array(
+								'name' => 'studentcreate_check',
+								'checked' => $opt_in_set[20],
+								'id' => 'gcconnex-opt-in-studentcreate-check',
+								'label' => elgg_echo('gcconnex_profile:opt:offering')
+							));
+						?>
                 	</li>
                 </ul>
             </li>
@@ -341,7 +341,7 @@ 
 								'id' => 'gcconnex-opt-in-mentored-check',
 								'label' => elgg_echo('gcconnex_profile:opt:mentored'),
 							));
-		                ?>
+						?>
 		            </li>
 
 		            <li class="clearfix pull-left mrgn-lft-md">
@@ -352,7 +352,7 @@ 
 								'id' => 'gcconnex-opt-in-mentoring-check',
 								'label' => elgg_echo('gcconnex_profile:opt:mentoring'),
 							));
-		                ?>
+						?>
 		            </li>
                 </ul>
             </li>

mod/b_extended_profile_collab/views/default/b_extended_profile/opt-in.php

Indentation +8 added lines, -8 removed lines

@@ -14,10 +14,10 @@ 
 	 */
 
 	if (elgg_is_xhr()) {
-    	$user_guid = $_GET["guid"];
+		$user_guid = $_GET["guid"];
 	}
 	else {
-    	$user_guid = elgg_get_logged_in_user_guid();
+		$user_guid = elgg_get_logged_in_user_guid();
 	}
 	
 	// Gets the opt_in_set from the user's profile.
@@ -32,7 +32,7 @@ 
 	}
 	else {
 		echo '<div class="gcconnex-profile-opt-in-display-table" style="margin: 10px;">';
-        echo '<div class="col-sm-6 "><h3 class="h4 mrgn-tp-0">'. elgg_echo('gcconnex_profile:opt:career').'</h3>';
+		echo '<div class="col-sm-6 "><h3 class="h4 mrgn-tp-0">'. elgg_echo('gcconnex_profile:opt:career').'</h3>';
 		echo '<ul class="list-unstyled">';
 				echo '<li class="left-col casual-tooltip" title="' . elgg_echo('gcconnex_profile:opt:casual_tooltip') . '">' . elgg_echo('gcconnex_profile:opt:casual_seek');
 				echo '<span class="mrgn-lft-md">' . elgg_echo($user->opt_in_casual_seek) . '</span></li>';
@@ -70,13 +70,13 @@ 
         
 				
         */       
-        echo '</ul></div>';
+		echo '</ul></div>';
         
-        echo '<div class="col-sm-6 "><h3 class="h4 mrgn-tp-0">'. elgg_echo('gcconnex_profile:opt:development').'</h3>';
-        echo '<ul class="list-unstyled">';
+		echo '<div class="col-sm-6 "><h3 class="h4 mrgn-tp-0">'. elgg_echo('gcconnex_profile:opt:development').'</h3>';
+		echo '<ul class="list-unstyled">';
                 
 				
-                echo '<li class="left-col">' . elgg_echo('gcconnex_profile:opt:mentored');
+				echo '<li class="left-col">' . elgg_echo('gcconnex_profile:opt:mentored');
 				echo '<span class="mrgn-lft-md">' . elgg_echo($user->opt_in_mentored) . '</span></li>';
 				echo '<li class="left-col">' . elgg_echo('gcconnex_profile:opt:mentoring');
 				echo '<span class="mrgn-lft-md">' . elgg_echo($user->opt_in_mentoring) . '</span></li>';
@@ -103,7 +103,7 @@ 
                 
         
                 
-                echo '</ul></div>';
+				echo '</ul></div>';
 			/*echo '</tr><tr>';
 				echo '<div class="left-col">' . elgg_echo('gcconnex_profile:opt:peer_coached') . '</div>';
 				echo '<div>' . elgg_echo($user->opt_in_peer_coached) . '</div>';