Merge branch 'IDI-104'

jhung · Jun 3, 2013 · 4e69814 · 4e69814
2 parents 48f660b + cdf6835
commit 4e69814
Show file tree

Hide file tree

Showing 41 changed files with 69 additions and 4 deletions.
diff --git a/front-page.php b/front-page.php
@@ -34,6 +34,7 @@
 	<div class="fl-col-flex4 front-cols">
 		<?php
 		$the_query = new WP_Query( array('posts_per_page'=>2) ); 
+
 		while ($the_query->have_posts()): 
 			$the_query->the_post(); 		
 			global $more; 

diff --git a/images/arrow_sm_blue_right.png b/images/arrow_sm_blue_right.png
diff --git a/images/circle_check_white.png b/images/circle_check_white.png
diff --git a/images/gear_white.png b/images/gear_white.png
diff --git a/images/idi_logo.jpg b/images/idi_logo.jpg
diff --git a/images/mail.png b/images/mail.png
diff --git a/images/people/Darren-Lawless.jpg b/images/people/Darren-Lawless.jpg
diff --git a/images/people/Deb-Fels.jpg b/images/people/Deb-Fels.jpg
diff --git a/images/people/Francois-Desjardins.jpg b/images/people/Francois-Desjardins.jpg
diff --git a/images/people/Jutta-Treviranus.jpg b/images/people/Jutta-Treviranus.jpg
diff --git a/images/people/Matt-Ratto.jpg b/images/people/Matt-Ratto.jpg
diff --git a/images/people/Robert-Luke.png b/images/people/Robert-Luke.png
diff --git a/images/people/Ron-Owston.jpg b/images/people/Ron-Owston.jpg
diff --git a/images/phone.png b/images/phone.png
diff --git a/images/themes/arrow_sm_black_right.png b/images/themes/arrow_sm_black_right.png
diff --git a/images/themes/arrow_sm_yellow_right.png b/images/themes/arrow_sm_yellow_right.png
diff --git a/images/themes/circle_check_black.png b/images/themes/circle_check_black.png
diff --git a/images/themes/circle_check_yellow.png b/images/themes/circle_check_yellow.png
diff --git a/images/themes/footer_sep_black.png b/images/themes/footer_sep_black.png
diff --git a/images/themes/footer_sep_white.png b/images/themes/footer_sep_white.png
diff --git a/images/themes/footer_sep_yellow.png b/images/themes/footer_sep_yellow.png
diff --git a/images/themes/idi_logo_black.png b/images/themes/idi_logo_black.png
diff --git a/images/themes/idi_logo_white.png b/images/themes/idi_logo_white.png
diff --git a/images/themes/idi_logo_yellow.png b/images/themes/idi_logo_yellow.png
diff --git a/images/themes/mail_black.png b/images/themes/mail_black.png
diff --git a/images/themes/mail_yellow.png b/images/themes/mail_yellow.png
diff --git a/images/themes/phone_black.png b/images/themes/phone_black.png
diff --git a/images/themes/phone_yellow.png b/images/themes/phone_yellow.png
diff --git a/images/themes/triangle_down_blackpng.png b/images/themes/triangle_down_blackpng.png
diff --git a/images/themes/triangle_down_yellow.png b/images/themes/triangle_down_yellow.png
diff --git a/images/themes/triangle_up_black.png b/images/themes/triangle_up_black.png
diff --git a/images/themes/triangle_up_yellow.png b/images/themes/triangle_up_yellow.png
diff --git a/images/themes/twitter_bird_black.png b/images/themes/twitter_bird_black.png
diff --git a/images/themes/twitter_bird_white.png b/images/themes/twitter_bird_white.png
diff --git a/images/themes/twitter_bird_yellow.png b/images/themes/twitter_bird_yellow.png
diff --git a/images/tilebg.jpg b/images/tilebg.jpg
diff --git a/images/triangle_up_white.png b/images/triangle_up_white.png
diff --git a/index.php b/index.php
@@ -8,12 +8,11 @@
         <?php if(have_posts()) : ?><?php while(have_posts()) : the_post(); ?>
 
         <div class="post">
-        <h3><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
-        <div class="date"><?php the_time('F jS, Y') ?></div>
-
+        <div class="date"><?php the_time('F jS, Y') ?></div>        
+        <h3><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3> 
             <div class="entry">
                 <?php the_post_thumbnail(); ?>
-                <?php the_content(); ?>                
+                <?php the_content("<div class='fl-site-read-more'>read more</div>"); ?>                
             </div>
         </div>
 		<?php endwhile; ?>

diff --git a/sidebar-news.php b/sidebar-news.php
@@ -17,6 +17,26 @@
 		?>
 		</ul>
 
+		<?php
+		query_posts('tag=video&posts_per_page=5'); // query to show posts tagged video;
+		if (have_posts()) :
+		?>
+		<h3>Recent Videos</h3>
+		<ul>
+		<?php
+		   while (have_posts()) :
+		      the_post(); ?>
+		<li>
+		      <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a>
+		</li>
+		<?php
+			endwhile;
+		endif;
+		wp_reset_query();
+		?>
+		</ul>
+
+
 	</div>
 
 	<?php get_template_part("mailing-list-form"); ?>

diff --git a/sidebar-pagebits.php b/sidebar-pagebits.php
@@ -0,0 +1,10 @@
+<?php 
+$sboptions = array(
+     'order' => 'title-content-widgets', 
+     'before_title' => '', 
+     'after_title' => '', 
+     'before_content' => '',  
+     'after_content' => ''); 
+coresidebar($sboptions);
+
+?>
diff --git a/style.css b/style.css
@@ -75,6 +75,14 @@ a:focus,
     margin-right: auto;
 }
 
+/* Main Navigation - current item, parent item */
+/*
+.fl-site-nav-main .current-menu-item a, 
+.fl-site-nav-main .current-page-ancestor a  {
+	color: #008cbb;
+	padding-bottom: 9px;	
+*/
+
 /* Page-wide styles */
 html {
     height: 100%;
@@ -1781,3 +1789,30 @@ a.idi-project-link {
 .idi-workshops-sidebar {
     margin-top: 6em;
 }
+
+/* Style to accomodate the Video Player */
+.entry .fl-videoPlayer-main {
+    height: 22.5em;
+}
+
+.entry .fl-videoPlayer-video-element {
+    background-color: #000000;
+}
+
+.entry .fl-videoPlayer-video-element,
+.entry .fl-videoPlayer-video-play,
+.entry .fl-videoPlayer-overlay {
+    max-width: 27.75em;
+}
+
+:-moz-full-screen .fl-videoPlayer-video-element,
+:-moz-full-screen .fl-videoPlayer-video-play,
+:-moz-full-screen .fl-videoPlayer-overlay { 
+    max-width: none;
+}
+
+:-webkit-full-screen .fl-videoPlayer-video-element,
+:-webkit-full-screen .fl-videoPlayer-video-play,
+:-webkit-full-screen .fl-videoPlayer-overlay { 
+    max-width: none;
+}