Merge branch 'master' of https://github.com/travisward/AgriFlex

AgriLife · Apr 4, 2012 · 7d7bff4 · 7d7bff4
2 parents b6b2a85 + 312accb
commit 7d7bff4
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 54 deletions.
diff --git a/functions.php b/functions.php
@@ -1144,59 +1144,6 @@ function agrilife_search_groupby($groupby){
 */
 
 
-// Custom query shortcode
-function myLoop($atts, $content = null) {
-	extract(shortcode_atts(array(
-		"pagination" => 'true',
-		"query" => '',
-		"category" => '',
-	), $atts));
-	global $wp_query,$paged,$post;
-	$temp = $wp_query;
-	$wp_query= null;
-	$wp_query = new WP_Query();
-	if($pagination == 'true'){
-		$query .= '&paged='.$paged;
-	}
-	if(!empty($category)){
-		$query .= '&category_name='.$category;
-	}
-	if(!empty($query)){
-		$query .= $query;
-	}
-	$wp_query->query($query);
-	ob_start();
-	?>
-
-	<?php while ($wp_query->have_posts()) : $wp_query->the_post(); ?>
-	 <div class="featured-wrap" id="featured-wrapper-<?php echo $count;?>">
-			<h3 class="entry-title"><a href="<?php the_permalink();?>"><?php echo get_the_title(); ?></a></h3>
-			<p><a class="feature-img-date" href="<?php the_permalink();?>">
-			<?php if ( get_post_type() == 'post' ){ ?>
- 				<span class="date"><?php echo get_the_date('m/d'); ?></span>
-			<?php }
-			if ( has_post_thumbnail() ) {
-  the_post_thumbnail('featured-mediabox'); 
-} else  { 
-	echo '<img src="'.get_bloginfo("template_url").'/images/AgriLife-default-post-image.png" alt="AgriLife Logo" title="AgriLife" />'; 
-	}
-	?></a></p>
-		<?php the_excerpt();?>
-			</div><!-- end .featured-wrap -->
-			<?php endwhile;  wp_reset_query; ?>	
-	<?php if(pagination == 'true'){ ?>
-	<div class="navigation">
-	  <div class="alignleft"><?php previous_posts_link('« Previous') ?></div>
-	  <div class="alignright"><?php next_posts_link('More »') ?></div>
-	</div>
-	<?php } ?>
-	<?php $wp_query = null; $wp_query = $temp;
-	$content = ob_get_contents();
-	ob_end_clean();
-	return $content;
-}
-add_shortcode("loop", "myLoop");
-
 // College specific content for drop-down
 function college_top_level_section() {
     do_action('college_top_level_section');

diff --git a/includes/shortcodes.php b/includes/shortcodes.php
@@ -3,6 +3,17 @@
 // Shortcodes
 // -----------------------------------------------------------------------------
 // Custom shortcodes
+//
+// 1. [children]
+// 2. [gallery_home]
+// 3. [sm-directory]
+// 4. [loop]
+//
+//
+
+// Allow shortcodes to execute in widgets
+add_filter('widget_text', 'do_shortcode');
+
 
 
 /**
@@ -21,7 +32,7 @@ function child_pages_shortcode() {
 
 
 /**
- * The Home Gallery shortcode.
+ * The Home Gallery shortcode. [gallery_home]
  *
  * This implements the functionality of the jQuery Gallery Shortcode for the Home template
  *
@@ -199,4 +210,61 @@ function sm_dir_shortcode() {
 }
 add_shortcode('sm-directory', 'sm_dir_shortcode');
 
+
+
+/**
+ * The custom post query shortcode. [loop]
+ */
+function myLoop($atts, $content = null) {
+	extract(shortcode_atts(array(
+		"pagination" => 'true',
+		"query" => '',
+		"category" => '',
+	), $atts));
+	global $wp_query,$paged,$post;
+	$temp = $wp_query;
+	$wp_query= null;
+	$wp_query = new WP_Query();
+	if($pagination == 'true'){
+		$query .= '&paged='.$paged;
+	}
+	if(!empty($category)){
+		$query .= '&category_name='.$category;
+	}
+	if(!empty($query)){
+		$query .= $query;
+	}
+	$wp_query->query($query);
+	ob_start();
+	?>
+
+	<?php while ($wp_query->have_posts()) : $wp_query->the_post(); ?>
+	 <div class="featured-wrap" id="featured-wrapper-<?php echo $count;?>">
+			<h3 class="entry-title"><a href="<?php the_permalink();?>"><?php echo get_the_title(); ?></a></h3>
+			<p><a class="feature-img-date" href="<?php the_permalink();?>">
+			<?php if ( get_post_type() == 'post' ){ ?>
+ 				<span class="date"><?php echo get_the_date('m/d'); ?></span>
+			<?php }
+			if ( has_post_thumbnail() ) {
+  the_post_thumbnail('featured-mediabox'); 
+} else  { 
+	echo '<img src="'.get_bloginfo("template_url").'/images/AgriLife-default-post-image.png" alt="AgriLife Logo" title="AgriLife" />'; 
+	}
+	?></a></p>
+		<?php the_excerpt();?>
+			</div><!-- end .featured-wrap -->
+			<?php endwhile;  wp_reset_query; ?>	
+	<?php if(pagination == 'true'){ ?>
+	<div class="navigation">
+	  <div class="alignleft"><?php previous_posts_link('« Previous') ?></div>
+	  <div class="alignright"><?php next_posts_link('More »') ?></div>
+	</div>
+	<?php } ?>
+	<?php $wp_query = null; $wp_query = $temp;
+	$content = ob_get_contents();
+	ob_end_clean();
+	return $content;
+}
+add_shortcode("loop", "myLoop");
+
 ?>