From c607e658921d82969c59eff8dedaf53a3e3c06e1 Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Thu, 17 Dec 2015 15:24:54 -0500
Subject: [PATCH 1/2] UC People Update

---
 inc/people-grid.php  |  16 ++++
 inc/people-table.php |  14 ++++
 single-person.php    | 169 ++++++++++++++++++++++++++++++++++---------
 3 files changed, 166 insertions(+), 33 deletions(-)

diff --git a/inc/people-grid.php b/inc/people-grid.php
index 40278a1..5163dd0 100644
--- a/inc/people-grid.php
+++ b/inc/people-grid.php
@@ -54,6 +54,14 @@ if ( $the_query->have_posts() ) { ?>
 							}
 							echo '</p>';
 						};
+						if (in_array('department', $information_to_display)) {
+							echo '<p class="person-department">';
+							$departmentPieces = explode(";", get_field('department'));
+							foreach( $departmentPieces as $d ){
+								echo ( !empty($d) ? "<strong>{$d}</strong><br>": "" );
+							}
+							echo '</p>';
+						};
 						if (in_array('about', $information_to_display)) {
 							echo '<div class="person-about">';
 								the_field('about');
@@ -98,6 +106,11 @@ if ( $the_query->have_posts() ) { ?>
 								the_field('office_location');
 							echo '</p>';
 						};
+						if (in_array('campus', $information_to_display)) {
+							echo '<p class="person-campus">';
+								the_field('campus');
+							echo '</p>';
+						};
 						if (in_array('office_hours', $information_to_display)) {
 							echo '<p class="person-office_hours">';
 								the_field('office_hours');
@@ -107,6 +120,9 @@ if ( $the_query->have_posts() ) { ?>
 							echo '<p class="person-courses">';
 								the_field('courses');
 							echo '</p>';
+						};
+						if (in_array('url', $information_to_display)) {
+							echo '<p class="person-url"><a href="'.get_field('url').'">'.get_field('url').'</a></p>';
 						};	?>
 				</div><!-- /person -->
 			</div> <!-- /col -->
diff --git a/inc/people-table.php b/inc/people-table.php
index 06d84df..c936b76 100644
--- a/inc/people-table.php
+++ b/inc/people-table.php
@@ -90,6 +90,14 @@ if ( $the_query->have_posts() ) {
 					}					
 					echo '</td>';
 				}
+				if (in_array('department', $information_to_display)) {
+					echo '<td class="person-department">';
+					$departmentPieces = explode(";", get_field('department'));
+					foreach( $departmentPieces as $d ){
+						echo ( !empty($d) ? "<strong>{$d}</strong><br>": "" );
+					}					
+					echo '</td>';
+				}
 				createTextCell('about', 'about');
 				if (in_array('file', $information_to_display)) {
 					echo '<td class="person-file">';
@@ -112,8 +120,14 @@ if ( $the_query->have_posts() ) {
 					echo '</td>';
 				}
 				createTextCell('office_location', 'office_location');
+				createTextCell('campus', 'campus');
 				createTextCell('office_hours', 'office_hours');
 				createTextCell('courses', 'courses');
+				if (in_array('url', $information_to_display)) {
+					echo '<td class="person-url">';
+						echo '<a href="'.get_field('url').'">'.get_field('url').'</a>';
+					echo '</td>';
+				};
 				
 
 				
diff --git a/single-person.php b/single-person.php
index aefe8cc..1d06553 100644
--- a/single-person.php
+++ b/single-person.php
@@ -1,33 +1,136 @@
-<?php
-/**
- * 	Used for displaying the 'person' post type. 
- */
-
-get_header(); ?>
-<?php include('inc/sidebar-check.php')?>
-<div id="page-page">
-	<?php if (have_posts()) : while ( have_posts() ) : the_post(); ?>
-		<?php include('inc/submenu-check.php') ?>
-			<div class="row">
-				<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
-					<div id="primary" class="content-area subpage">
-						<main id="main" class="site-main" role="main">
-							<div class="row">
-								<?php 
-									$about = get_field('about');
-									if (strlen($about) > 0){
-										include('inc/person-with-about.php');
-									} else {
-										include('inc/person-no-about.php');
-									}
-								?>
-							</div>
-						</main>
-					</div>
-				</div>
-				<?php include('inc/sidebar-if-active.php')?>
-			</div>
-		<?php include('inc/submenu-closing-tags.php')?>
-	<?php endwhile; endif; // end of the loop. ?>
-</div>
-<?php get_footer(); ?>
+<?php
+/**
+ * 	Used for displaying the 'person' post type. 
+ */
+
+get_header(); ?>
+<?php include('inc/sidebar-check.php')?>
+<div id="page-page">
+	<?php if (have_posts()) : while ( have_posts() ) : the_post(); ?>
+		<?php include('inc/submenu-check.php') ?>
+			<div class="row">
+				<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
+					<div id="primary" class="content-area subpage">
+						<main id="main" class="site-main" role="main">
+							<div class="row">
+								<div class="col-sm-8">
+									<h1>
+									<?php 
+									the_field('first_name');
+									echo ' ';
+									if (get_field('middle_name')){
+										the_field('middle_name');
+										echo ' ';
+									};
+									the_field('field_last_name'); 
+									?></h1>
+									
+									<?php
+                                    $titlePieces = explode(";", get_field('title'));
+									foreach( $titlePieces as $t ){
+										echo ( !empty($t) ? '<p class="text-muted">'.$t.'</p>': '' );
+									}
+                                    $departmentPieces = explode(";", get_field('department'));
+									foreach( $departmentPieces as $d ){
+										echo ( !empty($d) ? '<p class="text-muted">'.$d.'</p>': '' );
+									}
+									?>
+									<hr/>
+									<?php the_field('about'); ?>
+								</div>
+								<div class="col-sm-4">
+									<?php if(get_the_post_thumbnail()){
+										echo '<div class="person-thumbnail">';
+										the_post_thumbnail();
+										echo '</div>';
+									};?>
+									<div>
+									<table class="table">
+										<legend class="sr-only">Contact Information</legend>
+										<?php 
+											/*
+											function displayField($field){
+												if (get_field($field)){
+													
+													$field_key = 'field_'.$field;
+													$field_obj = get_field_object($field_key);
+													$field_value = $field_obj['value'];
+													$field_label = $field_obj['label'];
+													echo '<h5>'.$field_label.'</h5>';
+													echo '<p class="person-'.$field.'">';
+													if ($field == 'email'){
+														echo '<a href="mailto:'.$field_value.'">';
+														the_field($field);
+														echo '</a>';
+													} else if ($field == 'file'){
+														$file = get_field($field);
+														$url= $file['url'];
+														echo '<a class="btn btn-default" href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
+														echo $file['title'];
+														echo '</a>';
+													} else {
+														the_field($field);
+													}
+													echo '</p><hr/>';
+												}
+											}
+											*/
+											function displayField($field){
+												if (get_field($field)){
+													
+													$field_key = 'field_'.$field;
+													$field_obj = get_field_object($field_key);
+													$field_value = $field_obj['value'];
+													$field_label = $field_obj['label'];
+													echo '<tr>';
+													if ($field == 'file'){
+														echo '<th>'.get_field('filelabel').'</th>';
+													} else {
+														echo '<th>'.$field_label.'</th>';
+													}
+													echo '<td class="person-'.$field.'">';
+													if ($field == 'email'){
+														echo '<a href="mailto:'.$field_value.'">';
+														the_field($field);
+														echo '</a>';
+													} else if ($field == 'file'){
+														$file = get_field($field);
+														$url= $file['url'];
+														echo '<a href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
+														echo $file['title'];
+														echo '</a>';
+													} else if ($field == 'mailing_address'){
+														echo str_replace(';','<br>',get_field('mailing_address'));
+													} else {
+														the_field($field);
+													}
+													echo '</td></tr>';
+												}
+											}
+											displayField('email');
+											displayField('phone');
+											displayField('phone_(alternate)');
+											displayField('fax');
+											displayField('file');
+											displayField('mailing_address');
+											displayField('office_location');
+											displayField('campus');
+											displayField('office_hours');
+											displayField('courses');
+											displayField('url');
+										?>
+										</table>
+									</div>
+								</div>
+							</div>
+							
+							
+						</main>
+					</div>
+				</div>
+				<?php include('inc/sidebar-if-active.php')?>
+			</div>
+		<?php include('inc/submenu-closing-tags.php')?>
+	<?php endwhile; endif; // end of the loop. ?>
+</div>
+<?php get_footer(); ?>

From 69e139d6acd704500363a6cc596515d2cd27c5b1 Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Thu, 17 Dec 2015 15:41:39 -0500
Subject: [PATCH 2/2] Fixing out of sync issue

---
 inc/person-info.php       |  48 ++++++++++++++++
 inc/person-no-about.php   |  46 ++-------------
 inc/person-with-about.php |  46 ++-------------
 single-person.php         | 117 +++-----------------------------------
 4 files changed, 65 insertions(+), 192 deletions(-)
 create mode 100644 inc/person-info.php

diff --git a/inc/person-info.php b/inc/person-info.php
new file mode 100644
index 0000000..b41b402
--- /dev/null
+++ b/inc/person-info.php
@@ -0,0 +1,48 @@
+	<table class="table">
+		<legend class="sr-only">Contact Information</legend>
+		<?php 
+			function displayField($field){
+				if (get_field($field)){
+					
+					$field_key = 'field_'.$field;
+					$field_obj = get_field_object($field_key);
+					$field_value = $field_obj['value'];
+					$field_label = $field_obj['label'];
+					echo '<tr>';
+					if ($field == 'file'){
+						echo '<th>'.get_field('filelabel').'</th>';
+					} else {
+						echo '<th>'.$field_label.'</th>';
+					}
+					echo '<td class="person-'.$field.'">';
+					if ($field == 'email'){
+						echo '<a href="mailto:'.$field_value.'">';
+						the_field($field);
+						echo '</a>';
+					} else if ($field == 'file'){
+						$file = get_field($field);
+						$url= $file['url'];
+						echo '<a href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
+						echo $file['title'];
+						echo '</a>';
+					} else if ($field == 'mailing_address'){
+						echo str_replace(';','<br>',get_field('mailing_address'));
+					} else {
+						the_field($field);
+					}
+					echo '</td></tr>';
+				}
+			}
+			displayField('email');
+			displayField('phone');
+			displayField('phone_(alternate)');
+			displayField('fax');
+			displayField('file');
+			displayField('mailing_address');
+			displayField('office_location');
+			displayField('campus');
+			displayField('office_hours');
+			displayField('courses');
+			displayField('url');
+		?>
+	</table>
\ No newline at end of file
diff --git a/inc/person-no-about.php b/inc/person-no-about.php
index 78d737a..7ec1704 100644
--- a/inc/person-no-about.php
+++ b/inc/person-no-about.php
@@ -21,46 +21,10 @@
 	foreach( $titlePieces as $t ){
 		echo ( !empty($t) ? '<p class="text-muted">'.$t.'</p>': '' );
 	}
+	$departmentPieces = explode(";", get_field('department'));
+	foreach( $departmentPieces as $d ){
+		echo ( !empty($d) ? '<p class="text-muted">'.$d.'</p>': '' );
+	}
 	?>
-	<table class="table">
-		<legend class="sr-only">Contact Information</legend>
-		<?php 
-			function displayField($field){
-				if (get_field($field)){
-					
-					$field_key = 'field_'.$field;
-					$field_obj = get_field_object($field_key);
-					$field_value = $field_obj['value'];
-					$field_label = $field_obj['label'];
-					echo '<tr><th>'.$field_label.'</th>';
-					echo '<td class="person-'.$field.'">';
-					if ($field == 'email'){
-						echo '<a href="mailto:'.$field_value.'">';
-						the_field($field);
-						echo '</a>';
-					} else if ($field == 'file'){
-						$file = get_field($field);
-						$url= $file['url'];
-						echo '<a href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
-						echo $file['title'];
-						echo '</a>';
-					} else if ($field == 'mailing_address'){
-						echo str_replace(';','<br>',get_field('mailing_address'));
-					} else {
-						the_field($field);
-					}
-					echo '</td></tr>';
-				}
-			}
-			displayField('email');
-			displayField('phone');
-			displayField('phone_(alternate)');
-			displayField('fax');
-			displayField('file');
-			displayField('mailing_address');
-			displayField('office_location');
-			displayField('office_hours');
-			displayField('courses');
-		?>
-	</table>
+<?php include('person-info.php'); ?>
 </div>
diff --git a/inc/person-with-about.php b/inc/person-with-about.php
index 1c87360..824aea5 100644
--- a/inc/person-with-about.php
+++ b/inc/person-with-about.php
@@ -14,6 +14,10 @@
 	foreach( $titlePieces as $t ){
 		echo ( !empty($t) ? '<p class="text-muted">'.$t.'</p>': '' );
 	}
+	$departmentPieces = explode(";", get_field('department'));
+	foreach( $departmentPieces as $d ){
+		echo ( !empty($d) ? '<p class="text-muted">'.$d.'</p>': '' );
+	}
 	?>
 	<hr/>
 	<?php the_field('about'); ?>
@@ -25,46 +29,6 @@
 		echo '</div>';
 	};?>
 	<div>
-	<table class="table">
-		<legend class="sr-only">Contact Information</legend>
-		<?php 
-			function displayField($field){
-				if (get_field($field)){
-					
-					$field_key = 'field_'.$field;
-					$field_obj = get_field_object($field_key);
-					$field_value = $field_obj['value'];
-					$field_label = $field_obj['label'];
-					echo '<tr><th>'.$field_label.'</th>';
-					echo '<td class="person-'.$field.'">';
-					if ($field == 'email'){
-						echo '<a href="mailto:'.$field_value.'">';
-						the_field($field);
-						echo '</a>';
-					} else if ($field == 'file'){
-						$file = get_field($field);
-						$url= $file['url'];
-						echo '<a href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
-						echo $file['title'];
-						echo '</a>';
-					} else if ($field == 'mailing_address'){
-						echo str_replace(';','<br>',get_field('mailing_address'));
-					} else {
-						the_field($field);
-					}
-					echo '</td></tr>';
-				}
-			}
-			displayField('email');
-			displayField('phone');
-			displayField('phone_(alternate)');
-			displayField('fax');
-			displayField('file');
-			displayField('mailing_address');
-			displayField('office_location');
-			displayField('office_hours');
-			displayField('courses');
-		?>
-	</table>
+<?php include('person-info.php'); ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/single-person.php b/single-person.php
index 1d06553..d11fc36 100644
--- a/single-person.php
+++ b/single-person.php
@@ -13,118 +13,15 @@ get_header(); ?>
 					<div id="primary" class="content-area subpage">
 						<main id="main" class="site-main" role="main">
 							<div class="row">
-								<div class="col-sm-8">
-									<h1>
-									<?php 
-									the_field('first_name');
-									echo ' ';
-									if (get_field('middle_name')){
-										the_field('middle_name');
-										echo ' ';
-									};
-									the_field('field_last_name'); 
-									?></h1>
-									
-									<?php
-                                    $titlePieces = explode(";", get_field('title'));
-									foreach( $titlePieces as $t ){
-										echo ( !empty($t) ? '<p class="text-muted">'.$t.'</p>': '' );
+								<?php 
+									$about = get_field('about');
+									if (strlen($about) > 0){
+										include('inc/person-with-about.php');
+									} else {
+										include('inc/person-no-about.php');
 									}
-                                    $departmentPieces = explode(";", get_field('department'));
-									foreach( $departmentPieces as $d ){
-										echo ( !empty($d) ? '<p class="text-muted">'.$d.'</p>': '' );
-									}
-									?>
-									<hr/>
-									<?php the_field('about'); ?>
-								</div>
-								<div class="col-sm-4">
-									<?php if(get_the_post_thumbnail()){
-										echo '<div class="person-thumbnail">';
-										the_post_thumbnail();
-										echo '</div>';
-									};?>
-									<div>
-									<table class="table">
-										<legend class="sr-only">Contact Information</legend>
-										<?php 
-											/*
-											function displayField($field){
-												if (get_field($field)){
-													
-													$field_key = 'field_'.$field;
-													$field_obj = get_field_object($field_key);
-													$field_value = $field_obj['value'];
-													$field_label = $field_obj['label'];
-													echo '<h5>'.$field_label.'</h5>';
-													echo '<p class="person-'.$field.'">';
-													if ($field == 'email'){
-														echo '<a href="mailto:'.$field_value.'">';
-														the_field($field);
-														echo '</a>';
-													} else if ($field == 'file'){
-														$file = get_field($field);
-														$url= $file['url'];
-														echo '<a class="btn btn-default" href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
-														echo $file['title'];
-														echo '</a>';
-													} else {
-														the_field($field);
-													}
-													echo '</p><hr/>';
-												}
-											}
-											*/
-											function displayField($field){
-												if (get_field($field)){
-													
-													$field_key = 'field_'.$field;
-													$field_obj = get_field_object($field_key);
-													$field_value = $field_obj['value'];
-													$field_label = $field_obj['label'];
-													echo '<tr>';
-													if ($field == 'file'){
-														echo '<th>'.get_field('filelabel').'</th>';
-													} else {
-														echo '<th>'.$field_label.'</th>';
-													}
-													echo '<td class="person-'.$field.'">';
-													if ($field == 'email'){
-														echo '<a href="mailto:'.$field_value.'">';
-														the_field($field);
-														echo '</a>';
-													} else if ($field == 'file'){
-														$file = get_field($field);
-														$url= $file['url'];
-														echo '<a href="'.$url.'"><span class="glyphicon glyphicon-save-file"></span> ';
-														echo $file['title'];
-														echo '</a>';
-													} else if ($field == 'mailing_address'){
-														echo str_replace(';','<br>',get_field('mailing_address'));
-													} else {
-														the_field($field);
-													}
-													echo '</td></tr>';
-												}
-											}
-											displayField('email');
-											displayField('phone');
-											displayField('phone_(alternate)');
-											displayField('fax');
-											displayField('file');
-											displayField('mailing_address');
-											displayField('office_location');
-											displayField('campus');
-											displayField('office_hours');
-											displayField('courses');
-											displayField('url');
-										?>
-										</table>
-									</div>
-								</div>
+								?>
 							</div>
-							
-							
 						</main>
 					</div>
 				</div>