Merge branch 'IDI-116' into development

Conflicts: style.css
jhung · Jul 16, 2013 · fae4c17 · fae4c17
2 parents a224bbb + 2797b3b
commit fae4c17
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 22 deletions.
diff --git a/front-page.php b/front-page.php
@@ -57,13 +57,12 @@
  		<?php endwhile; ?>
 
 		<div class="fl-col">
-			<?php get_template_part('tweets', 'aegisprog') ?>
-			<?php get_template_part('tweets', 'SNOWocad') ?>
-
+			<?php idi_display_twitter_feed('aegisproj'); ?>
+			<?php idi_display_twitter_feed('SNOWocad'); ?>
 		</div>
 
 		<div class="fl-col">
-			<?php get_template_part('tweets', 'FluidProject') ?>
+			<?php idi_display_twitter_feed('FluidProject'); ?>
 
 			<div class="idi-box">
 				<div class="idi-mailing-list">

diff --git a/functions.php b/functions.php
@@ -128,4 +128,32 @@ function panel_login_fail( $username ) {
     }
 }
 
+function idi_display_twitter_feed($twitter_un) {
+    require_once("wp-content/plugins/twitteroauth/twitteroauth/twitteroauth.php");
+    $num_tweets = 1;
+    $consumerkey = "luK78NyRjDEmMVhi6sgIw";
+    $consumersecret = "E6bY0ShFmtibIqWU0oHokCVZKYtPEvZcNyACBPzYqo";
+    $accesstoken = "123905660-DBVNC6meqlD4KgZrQcAuynwYaMxJsLqLiyrtkArR";
+    $accesstokensecret = "UhlTPgNowuNOsC0Oaw89PM29PcVRD4N14sAdkAUk";
+    $connection = new TwitterOAuth($consumerkey, $consumersecret, $accesstoken, $accesstokensecret);
+    $tweets = array_filter($connection->get("https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name=".$twitter_un."&count=".$num_tweets));
+
+	echo '<div class="idi-box idi-highlight-box twitter-feed-group">
+				<div class="idi-box-text">
+					<a class="twitter-follow-button" rel="external nofollow" href="http://twitter.com/'.$twitter_un.'" title="Follow @'.$twitter_un.'">@'.$twitter_un.'</a>
+					<ul>
+	';
+	if(!empty($tweets)){
+	        foreach($tweets as $tweet) {
+                echo '<li class="tweet">'.$tweet->text.
+                '<div class="tweet-date">'.substr($tweet->created_at, 0, 16).'</div></li>';
+            }
+    } else{
+        echo "<p>no tweets found</p>";
+    }
+	echo '</ul>
+				</div>
+			</div>';
+}
+
 ?>
diff --git a/style.css b/style.css
@@ -884,6 +884,8 @@ h3,
     list-style: none;
 }
 .twitter-feed-group .tweet-date {
+    margin-top: 0.5em;
+    color: #959595;
     font-style: italic;
     text-decoration: none;
 }

diff --git a/tweets-FluidProject.php b/tweets-FluidProject.php
diff --git a/tweets-SNOWocad.php b/tweets-SNOWocad.php
diff --git a/tweets-aegisprog.php b/tweets-aegisprog.php