From f8aa5912d4a00f8c3b4b7abcd843b5a6b11dc2e2 Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Wed, 22 Nov 2017 11:19:52 -0500
Subject: [PATCH] Updating list view

---
 templates/archive-programs.php | 83 ++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 33 deletions(-)

diff --git a/templates/archive-programs.php b/templates/archive-programs.php
index ff82ab7..55f5df2 100644
--- a/templates/archive-programs.php
+++ b/templates/archive-programs.php
@@ -572,12 +572,12 @@ if(($search_results && $search_results->RECORDCOUNT > 0)){
 						if($_GET['category'] == 'all'){
 							foreach($groups as $key=>$group){
 								if($key == 'all') continue;
-								echo '<h2 style="clear:left">'.$programTabIDs[$key].'</h2>';
+								echo '<h2 class="sorting-header">'.$programTabIDs[$key].'</h2>';
 								display($group);
 							}
 						}
 						else{
-							echo '<h2 style="clear:left">'.$programTabIDs[$_GET['category']].'</h2>';
+							echo '<h2 class="sorting-header">'.$programTabIDs[$_GET['category']].'</h2>';
 							display($posts);
 						}
 						?>
@@ -592,6 +592,10 @@ if(($search_results && $search_results->RECORDCOUNT > 0)){
 			<!-- Grid End --> 
 			<!-- List Start -->
 			<div class="tab-pane" id="tab2">
+					<?php if(!empty($posts)):
+					function displayList($posts = array()){
+						global $programs;
+						?>
 				<ol class="program-list-view" >
 					<li class="program-list <?php if($tags){ foreach($tags as $tag){echo ' '.strtolower(str_replace($search, $replace, $tag->name));} } ?>">
 						<ul id="badge-list" class="program-headers">
@@ -611,42 +615,55 @@ if(($search_results && $search_results->RECORDCOUNT > 0)){
 							</li>
 						</ul>
 					</li>
-					<?php if(!empty($posts)): foreach($posts as $post): setup_postdata($post); ?>
-					<?php $tags = get_the_tags(); 
-                    $search = array(" ", "/");
-                    $replace = array("", "-");
-					$terraid = get_post_meta( get_the_ID(), 'apply-link', true );
-					$terraid = explode('Program_ID=',$terraid);
-					$terraid = explode('&',$terraid[1]);
-					$terraid = $terraid[0];?>
-					<li class="program-list <?php if($tags){ foreach($tags as $tag){echo ' '.strtolower(str_replace($search, $replace, $tag->name));} } ?>">
-						<ul id="badge-list">
-							<a href="<?php the_permalink() ?>">
-							<li class="list-img">
-								<?php the_post_thumbnail('thumbnail');?>
-							</li>
-							<li class="list-title">
-								<?php the_title(); ?>
-							</li>
-							<li class="list-city">
-								<?php echo $programs[$terraid]->PROGRAM_CITY;//$key="program-city"; echo get_post_meta($post->ID, $key, true); ?>
-							</li>
-							<li class="list-country">
-								<?php echo $programs[$terraid]->PROGRAM_COUNTRY;//$key="program-country"; echo get_post_meta($post->ID, $key, true); ?>
-							</li>
-							<li class="list-region">
-								<?php echo $programs[$terraid]->PROGRAM_REGION;//$key="program-region"; echo get_post_meta($post->ID, $key, true); ?>
-							</li>
-							</a>
-						</ul>
-					</li>
-					<?php endforeach?>
+                    <?php
+						foreach($posts as $post){ ?>
+						<?php $tags = get_the_tags($post->ID); 
+                        $search = array(" ", "/");
+                        $replace = array("", "-");
+                        $terraid = get_post_meta( $post->ID, 'apply-link', true );
+                        $terraid = explode('Program_ID=',$terraid);
+                        $terraid = explode('&',$terraid[1]);
+                        $terraid = $terraid[0];?>
+                        <li class="program-list <?php if($tags){ foreach($tags as $tag){echo ' '.strtolower(str_replace($search, $replace, $tag->name));} } ?>">
+                            <ul id="badge-list">
+                                <a href="<?php echo get_the_permalink($post->ID) ?>">
+                                <li class="list-img">
+                                    <?php echo get_the_post_thumbnail($post->ID, 'thumbnail');?>
+                                </li>
+                                <li class="list-title">
+                                    <?php echo get_the_title($post->ID); ?>
+                                </li>
+                                <li class="list-city">
+                                    <?php echo $programs[$terraid]->PROGRAM_CITY;//$key="program-city"; echo get_post_meta($post->ID, $key, true); ?>
+                                </li>
+                                <li class="list-country">
+                                    <?php echo $programs[$terraid]->PROGRAM_COUNTRY;//$key="program-country"; echo get_post_meta($post->ID, $key, true); ?>
+                                </li>
+                                <li class="list-region">
+                                    <?php echo $programs[$terraid]->PROGRAM_REGION;//$key="program-region"; echo get_post_meta($post->ID, $key, true); ?>
+                                </li>
+                                </a>
+                            </ul>
+                        </li>
+                        <?php }
+						echo '</ol>';
+						} // end function displayList
+						if($_GET['category'] == 'all'){
+							foreach($groups as $key=>$group){
+								if($key == 'all') continue;
+								echo '<h2 class="sorting-header">'.$programTabIDs[$key].'</h2>';
+								displayList($group);
+							}
+						}
+						else{
+							echo '<h2 class="sorting-header">'.$programTabIDs[$_GET['category']].'</h2>';
+							displayList($posts);
+						}?>
 					<?php else: ?>
 					<p>
 						<?php _e('Sorry, no exchange programs are listed.'); ?>
 					</p>
 					<?php endif; ?>
-				</ol>
 			</div>
 			<!-- List End --> 
 		</div>