From 45f1b2a052a4abc1d6d730d20c6eea44e7709c7f Mon Sep 17 00:00:00 2001
From: Michael Francis <edude03@gmail.com>
Date: Mon, 20 Jun 2011 22:10:57 -0400
Subject: Created new feed view

---
 views/Users/feed.html.php | 83 ++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 45 deletions(-)

(limited to 'views/Users')

diff --git a/views/Users/feed.html.php b/views/Users/feed.html.php
index d37b0a6..6554fce 100644
--- a/views/Users/feed.html.php
+++ b/views/Users/feed.html.php
@@ -1,45 +1,38 @@
-<h1>Welcome <?= $user->username ?></h1>
-<div class="post">
-<?= $this->form->create(null, array('action' => 'post')); ?>
-	<?= $this->form->field('body', array('type' => 'textarea')); ?>
-	<?= $this->form->submit('Post!'); ?>
-<?= $this->form->end(); ?>
-</div>
-<h2> Here are some posts:</h2>
-
-<?php if($feed): ?>
-<?php foreach ($feed as $post): ?>
-<div class="date">
-				<span class="month"><a href="#" title="">Nov</a></span>
-				<span class="day"><a href="#" title="">8</a></span>
-			</div> <!-- .date -->
-			
-			
-
-			<div class="post post-link">
-				<!--<h3><a href="#" title="http://" >My favorite web site</a></h3>-->
-				
-				<p><?php echo $post->body ?></p>
-				
-			
-				
-				<div class="postmeta">
-					
-					<p class="posttime"><a href="#" title="http://demo.tumblr.com/post/234/my-favorite-web-site">Posted <?=date('m/d/y', $post->datetime->sec) ?></a></p>
-					
-
-					
-					<p class="notes"><a href="#" title="http://demo.tumblr.com/post/234/my-favorite-web-site#permalink-notes">1,256 notes</a></p>
-					
-
-					
-					
-					
-				</div> <!-- .postmeta -->
-			</div> <!-- .post -->
-			<div class="clear newpost"></div>
-<?php endforeach; ?>
-<?php else: ?>
-<p>Woops! You have no posts, why not post something and get the party started!</p>
-<?php endif; ?>
- 
\ No newline at end of file
+<!-- page container -->
+<!-- page title -->
+<h2 class="ribbon blue full" >About Us <span>A bit about our company</span> </h2>
+<div class="triangle-ribbon blue" ></div>
+<br class="cl" >
+	<!-- sidebar -->
+	<aside> 
+		<ul class="sidebar-nav" >
+			<li class="first current" ><a href="#" >Feed</a></li>
+			<li class="" ><a href="#" >Direct Message</a></li>
+		</ul>
+	</aside>
+	<!-- Page Content -->
+	<div id="page-content" class="two-col container_12" >
+		<?php foreach($feed as $post) { ?>
+		<div class="grid_4"><img class="inlinepic" src="/img/about.jpg" alt="" /></div>
+		<div class="grid_8">
+			<h4><?= $post->username ?></h4>
+			<p><?php echo $post->body; ?> </p>
+			<h5 class="inline">Skills:</h5>
+			<ul class="tags">
+			<li>HTML</li>
+			<li>CSS</li>
+			<li>JS/jQuery</li>
+			</ul>
+			<h5 class="inline">Social:</h5>
+			<ul class="social">
+			<li><a href="#"><img class="tooltip" src="/img/social/16/twitter.png" title="Follow me on Twitter" alt="twitter" /></a></li>
+			<li><a href="#"><img class="tooltip" src="/img/social/16/facebook.png" title="My Facebook profile" alt="facebook" /></a></li>
+			<li><a href="#"><img class="tooltip" src="/img/social/16/linkedin.png" title="My LinkedIn profile" alt="linkedin" /></a></li>
+			<li><a href="#"><img class="tooltip" src="/img/social/16/skype.png" title="Call me on Skype" alt="skype" /></a></li>
+			</ul>
+		</div>
+		<br class="cl">
+	<?php } ?>
+	</div>
+ <br class="cl" />
+    <br class="cl" />
\ No newline at end of file
-- 
cgit v1.2.3