From d79d2ff5fe20f5eac2a959cbb3138788d9494904 Mon Sep 17 00:00:00 2001
From: Calande <jjc16105@ad.uconn.edu>
Date: Tue, 5 Apr 2016 13:23:17 -0400
Subject: [PATCH] Fixes for people link and external link

---
 inc/people-grid.php  | 58 +++++++++++++++++++++++---------------------
 inc/people-table.php |  9 ++++++-
 search.php           | 17 ++++++++++---
 single-person.php    |  3 ++-
 4 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/inc/people-grid.php b/inc/people-grid.php
index 2b37adc..774cd43 100644
--- a/inc/people-grid.php
+++ b/inc/people-grid.php
@@ -2,32 +2,35 @@
 $the_query = new WP_Query( $args );
 if ( $the_query->have_posts() ) { ?>
 	<div class="row">
-		<?php
+		<?php 
 		$person_count=1;
 		while ( $the_query->have_posts() ) {
 			$the_query->the_post();
-
-
+			
+			
 			?>
-
-
-
-
-
-
-
+			
+			
+			
+			
+			
+			
+			
 			<div class="col-sm-3 personcount-<?php echo $person_count ?>" id="person-<?php echo get_the_id(); ?>">
 				<div class="person">
-						<?php
-
-						echo '<a href="'. get_the_permalink().'" class="person-permalink">';
-
+						<?php 
+						$external_url = get_field('external_url');
+						if ( $external_url != "" ){
+							echo '<a href="'. $external_url .'" class="person-permalink" target="_blank">';
+						}else{
+							echo '<a href="'. get_the_permalink().'" class="person-permalink">';
+						}
 						if (in_array('photo', $information_to_display)) {
 							 echo '<div class="person-image">';
 								the_post_thumbnail('large');
 							echo '</div>';
 						};
-
+						
 						if (in_array('first_name', $information_to_display) || in_array('middle_name', $information_to_display) || in_array('last_name', $information_to_display)){
 							echo '<h4 class="person-name">';
 								if (in_array('first_name', $information_to_display)) {
@@ -42,10 +45,10 @@ if ( $the_query->have_posts() ) { ?>
 									the_field('last_name');
 								};
 							echo '</h4>';
-						};
-
+						};									
+						
 						echo '</a>';
-
+						
 						if (in_array('title', $information_to_display)) {
 							echo '<p class="person-title">';
 							$titlePieces = explode(";", get_field('title'));
@@ -74,7 +77,7 @@ if ( $the_query->have_posts() ) { ?>
 								echo '<p class="person-file">';
 									echo '<a href="'.$file['url'].'">'.$file['title'].'</a>';
 								echo '</p>';
-							}
+							}						
 						};
 						if (in_array('email', $information_to_display)) {
 							echo '<p class="person-email">';
@@ -126,17 +129,18 @@ if ( $the_query->have_posts() ) { ?>
 						};	?>
 				</div><!-- /person -->
 			</div> <!-- /col -->
-
-			<?php
-			// check to see if we need to close this row...
+	
+			<?php 
+			// check to see if we need to close this row... 
 			if ($person_count % 4 == 0){
-				// if this is the 4th, 8th, 16th, etc person...
-				echo '</div><!-- /row --><div class="row">';
+				// if this is the 4th, 8th, 16th, etc person... 
+				echo '</div><!-- /row --><div class="row">';		
 			}
-			$person_count++;
+			$person_count++;		
 		} //end of posts?>
 		</div><!-- last row -->
-<?php
+<?php 
 } else {
 	// no posts found
-}; ?>
\ No newline at end of file
+}; ?>
+	
\ No newline at end of file
diff --git a/inc/people-table.php b/inc/people-table.php
index aca6a2b..d99ffb0 100644
--- a/inc/people-table.php
+++ b/inc/people-table.php
@@ -68,7 +68,14 @@ if ( $the_query->have_posts() ) {
 					echo '</a></td>';
 				}
 				if (in_array('first_name', $information_to_display) || in_array('middle_name', $information_to_display) || in_array('last_name', $information_to_display)){
-					echo '<td class="person-name"><a href="'.get_the_permalink().'">';
+					echo '<td class="person-name">';
+					$external_url = get_field('external_url');
+					if ( $external_url != "" ){
+						echo '<a href="'.$external_url.'" target="_blank">';
+					}else{
+						echo '<a href="'.get_the_permalink().'">';
+					}
+						
 					if (in_array('first_name', $information_to_display)) {
 						the_field('first_name');
 						echo ' ';
diff --git a/search.php b/search.php
index 33069aa..31d7dc0 100644
--- a/search.php
+++ b/search.php
@@ -19,10 +19,19 @@ get_header(); ?>
 					</header><!-- .page-header -->
 
 					<?php /* Start the Loop */ ?>
-					<?php while ( have_posts() ) : the_post(); ?>
-	
-						<h3><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h3>
-						<p><?php the_excerpt(); ?></p>
+					<?php while ( have_posts() ) : the_post();?>
+						<?php
+							$url = get_field('external_url');
+							if( empty($url) ){
+								$url = '<a href="'.get_permalink().'">';
+							}else{
+								$url = '<a href="'.$url.'" target="_blank">';
+							}
+						?>
+
+						<h3><?php echo $url; ?><?php the_title();?></a></h3>
+
+						<?php  the_excerpt(); ?>	<!-- e.g. "All about jellyfish" -->
 
 					<?php endwhile; ?>
 
diff --git a/single-person.php b/single-person.php
index d11fc36..0fdc686 100644
--- a/single-person.php
+++ b/single-person.php
@@ -2,7 +2,8 @@
 /**
  * 	Used for displaying the 'person' post type. 
  */
-
+$external_url = get_field('external_url');
+if(!empty($external_url)) wp_redirect($external_url);
 get_header(); ?>
 <?php include('inc/sidebar-check.php')?>
 <div id="page-page">