Merge pull request #3 from baa17005/master

AUR-432 changes to links
weblab · Apr 20, 2017 · 98d84e4 · 98d84e4
2 parents fa217fc + d259ddb
commit 98d84e4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/grandchild-functions.php b/grandchild-functions.php
@@ -606,6 +606,8 @@ function program_archive_page_template( $archive_template ) {
 			'layout' => 'vertical',
 			'toggle' => 0,
 			'return_format' => 'value',
+			'allow_custom' => 0,
+			'save_custom' => 0,
 		),
 		array (
 			'key' => 'field_589b67cd3cc1f',
@@ -636,6 +638,8 @@ function program_archive_page_template( $archive_template ) {
 			'layout' => 'vertical',
 			'toggle' => 0,
 			'return_format' => 'value',
+			'allow_custom' => 0,
+			'save_custom' => 0,
 		),
 		array (
 			'key' => 'field_58a3644c7c370',
@@ -703,6 +707,7 @@ function program_archive_page_template( $archive_template ) {
 			'tabs' => 'all',
 			'toolbar' => 'full',
 			'media_upload' => 1,
+			'delay' => 0,
 		),
 		array (
 			'key' => 'field_589b66f5d6681',
@@ -723,6 +728,24 @@ function program_archive_page_template( $archive_template ) {
 			'append' => '',
 			'maxlength' => '',
 		),
+		array (
+			'key' => 'field_58f7c4f744bd9',
+			'label' => 'Email',
+			'name' => 'email',
+			'type' => 'email',
+			'instructions' => '',
+			'required' => 0,
+			'conditional_logic' => 0,
+			'wrapper' => array (
+				'width' => '',
+				'class' => '',
+				'id' => '',
+			),
+			'default_value' => '',
+			'placeholder' => '',
+			'prepend' => '',
+			'append' => '',
+		),
 		array (
 			'key' => 'field_589b64ce3c849',
 			'label' => 'Degrees',

diff --git a/templates/archive-programs.php b/templates/archive-programs.php
@@ -78,21 +78,27 @@
                                 </a>
                             </div>
                             <div class="program-name-wrap <?php echo 'color-'.get_post_meta( get_the_ID(), 'areas_of_interest_color', true ); ?>">  <!------------  (Josh it up) - Add a class name here so I can change the color of the box -------------->
-                                <a class="program-name" href="<?php echo get_post_meta( get_the_ID(), 'program_url', true ); ?>">
+                                <a class="program-name" href="<?php echo get_post_meta( get_the_ID(), 'program_url', true ); ?>" target="_blank">
                                     <?php the_title(); ?>
                                 </a>
                             </div> 
                             <div class="details-wrap <?php echo 'color-'.get_post_meta( get_the_ID(), 'areas_of_interest_color', true ); ?>"> <!------------  (Josh it up) - Add the same class name from above so I can change the color of the box -------------->
                                 <div class="department-website"> 
-                                    <a href="<?php echo get_post_meta( get_the_ID(), 'program_url', true ); ?>">Department Website</a>
-                                </div>
-                                <div class="concentrations">
-                                    <a data-toggle="modal" data-target="#concentrations<?php the_ID(); ?>">View Concentrations</a> <!------------  (Josh it up) - Opens modal -------------->
-                                </div>
+                                    <a href="<?php echo get_post_meta( get_the_ID(), 'program_url', true ); ?>" target="_blank">Department Website</a>
+                                </div> 
+								<?php $concentrationsExist = get_post_meta( get_the_ID(), 'concentrations', true ); 
+									if(!empty($concentrationsExist)):
+								?>     
+                                <div class="concentrations">     								                     
+								    <a href="#" data-toggle="modal" data-target="#concentrations<?php the_ID(); ?>">View Concentrations</a>                                							
+                                </div> 
+								<?php endif; ?>	
                                 <div class="phone-number">
                                     <p><?php echo get_post_meta( get_the_ID(), 'phone_number', true ); ?></p>
                                 </div>
-
+                                 <div class="email">
+                                    <p><a href="mailto:<?php echo get_post_meta( get_the_ID(), 'email', true ); ?>"><?php echo get_post_meta( get_the_ID(), 'email', true ); ?></a></p>
+                                </div>                                
                                 <p class="degrees">
 									<?php echo get_post_meta( get_the_ID(), 'degrees', true ); ?>
                                 </p>
@@ -116,6 +122,8 @@
 <?php if(!empty($posts)): ?>
 	<?php
     foreach($posts as $post): setup_postdata($post); ?>
+  	<?php $concentrationsExist = get_post_meta( get_the_ID(), 'concentrations', true ); 
+		if(!empty($concentrationsExist)): ?>     
         <div class="modal fade" id="concentrations<?php the_ID(); ?>" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
           <div class="modal-dialog" role="document">
             <div class="modal-content">
@@ -134,6 +142,7 @@
             </div>
           </div>
         </div>
+       <?php endif; ?>
     <?php endforeach;?>	
 <?php endif; ?>
 <?php get_footer(); ?>