From 426bb9ea99e7ec1a136fceee6f585c95de5851c1 Mon Sep 17 00:00:00 2001
From: Andrew Davidson <amdavidson@UZI.local>
Date: Thu, 10 Sep 2009 23:49:31 +0800
Subject: [PATCH] version 0.2 prep... need to be more diligent about my commits

---
 _activity_feed.php | 71 +++++++++++++++++++++++++++++-----------------
 main.css           | 27 +++++++++++-------
 theme.php          |  3 +-
 3 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/_activity_feed.php b/_activity_feed.php
index 98284e4..158a38c 100644
--- a/_activity_feed.php
+++ b/_activity_feed.php
@@ -27,8 +27,9 @@
 
 
             <?php if ($item->get_feed_domain() == $this->config->item('base_url')): ?>
-            <!-- this item is a sweetcron post -->
-              <div class="item">
+            	<!-- this item is a sweetcron post -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/dev_60.png" /></a></div>
+				<div class="item">
               	<p class="date"><?php echo $item->get_human_date()?></p>
 		        		<p class="source">I posted this at amdavidson.me</p>
 	            	<p class="title"><a href="<?php echo $item->get_original_permalink()?>">
@@ -37,8 +38,8 @@
 
 
             <?php elseif ($item->get_feed_domain() == 'twitter.com'): ?>
-            <!-- this item came from twitter -->
-
+            	<!-- this item came from twitter -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/chat_60.png" /></a></div>
 	            <div class="item">
             		<p class="date"><?php echo $item->get_human_date()?></p>
             		<?php 
@@ -51,7 +52,7 @@
             			endif;
             		?>
             		
-                <p class="quote"><a href="<?php echo $item->get_original_permalink()?>"><span class="quote">&#8220;</span></a><?php echo preg_replace('/\#([a-zA-Z0-9_]{1,25})?/', "<a class=\"hash\" href=\"http://hashtags.org/tag/$1\">#$1</a>", preg_replace('/\@([a-zA-Z0-9_]{1,15})?/', "<a class=\"name\" href=\"http://twitter.com/$1\">@$1</a>", $item->get_title())); ?></p>
+                <p class="quote"><a href="<?php echo $item->get_original_permalink()?>"></a><?php echo preg_replace('/\#([a-zA-Z0-9_]{1,25})?/', "<a class=\"hash\" href=\"http://hashtags.org/tag/$1\">#$1</a>", preg_replace('/\@([a-zA-Z0-9_]{1,15})?/', "<a class=\"name\" href=\"http://twitter.com/$1\">@$1</a>", $item->get_title())); ?></p>
                 
 								<?php if ($twitter_username != "amdavidson"): ?>
  	               <p class="attribution">By <a href="http://twitter.com/<?php echo $twitter_username ?>">@<?php echo $twitter_username ?></a></p>
@@ -60,7 +61,8 @@
 
             			
             <?php elseif ($item->get_feed_domain() == 'vimeo.com'): ?>
-	          <!-- this item came from Vimeo -->
+	          	<!-- this item came from Vimeo -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/video_60.png" /></a></div>
 	            <div class="item">
 	            	<p class="date"><?php echo $item->get_human_date()?></p>
 	            	
@@ -74,7 +76,8 @@
 
 
             <?php elseif ($item->get_feed_domain() == 'youtube.com'): ?>
-	          <!-- this item came from youtube -->
+	          	<!-- this item came from youtube -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/video_60.png" /></a></div>
 	            <div class="item">
 	            	<p class="date"><?php echo $item->get_human_date()?></p>
 		            <p class="source">I favorited a video on YouTube</p>
@@ -82,39 +85,52 @@
 
 
             <?php elseif ($item->get_feed_domain() == 'flickr.com'): ?>
-            <!-- this item came from flickr -->
+            	<!-- this item came from flickr -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/photo_60.png" /></a></div>
             	<div class="item">
 	            	<p class="date"><?php echo $item->get_human_date()?></p>
  	           		<p class="source">I posted a photo to Flickr</p>
-		            <div class="photo" style="background: url(<?php echo $item->item_data['flickr_com']['image']['m'] ?>) center center no-repeat;"></div>
- 	           		<p class="photo_title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p>
-		            <div class="caption"><?php echo $item->get_content()?></div>
+ 	           		<p class="title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p>
+					<img src="<?php echo $item->item_data['flickr_com']['image']['m']?>">
+		            <div class="content"><?php echo $item->get_content()?></div>
 	            
 
 
             <?php elseif ($item->get_feed_domain() == 'delicious.com'): ?>
-            <!-- this item came from delicious.com -->
+            	<!-- this item came from delicious.com -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/link_60.png" /></a></div>
 	            <div class="item">
 	            	<p class="date"><?php echo $item->get_human_date()?></p>
 	            	<p class="source">I saved a link to Delicious</p>
 								<p class="title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p>
-	            	<p class="content"><?php echo strip_tags($item->get_content())?></p>
+
+
+	            <?php elseif ($item->get_feed_domain() == 'pinboard.in'): ?>
+	            	<!-- this item came from pinboard -->
+	              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/link_60.png" /></a></div>
+		            <div class="item">
+		            	<p class="date"><?php echo $item->get_human_date()?></p>
+		            	<p class="source">I saved a link to Pinboard</p>
+									<p class="title"><a href="<?php echo $item->get_original_permalink()?>"><?php echo $item->get_title()?></a></p>
+
 
             
 
             <?php elseif ($item->get_feed_domain() == 'last.fm'): ?>
-	          <!-- this item came from last.fm -->
+  	            <!-- this item came from last.fm -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/music_60.png" /></a></div>
 	            <div class="item">            
 	        		<p class="date"><?php echo $item->get_human_date()?></p>
 	        		<p class="source">I loved this track on last.fm</p>
-							<div class="albumart"><a href="<?php echo $item->item_data['album_url']?>"><img src="<?php echo $item->item_data['image_url_small'] ?>" /></a></div>
+				<div class="albumart"><a href="<?php echo $item->item_data['album_url']?>"><img height="64" width="64" src="<?php echo $item->item_data['image_url_small'] ?>" /></a></div>
             	<div class="song_text">
-								<a href="<?php echo $item->item_data['artist_url'] ?>"><?php echo $item->item_data['artist']?></a> - <a href="<?php echo $item->item_data['track_url']?>"><?php echo $item->item_data['track_title']?></a>
-							</div>
+						<a href="<?php echo $item->item_data['artist_url'] ?>"><?php echo $item->item_data['artist']?></a> - <a href="<?php echo $item->item_data['track_url']?>"><?php echo $item->item_data['track_title']?></a>
+				</div>
 
 
             <?php elseif ($item->get_feed_domain() == 'amdavidson.com'): ?>
-						<!-- this item came from amdavidson.com -->
+				<!-- this item came from amdavidson.com -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/post_60.png" /></a></div>
 	            <div class="item">
 		        		<p class="date"><?php echo $item->get_human_date()?></p>
 		        		<p class="source">I posted this at AMDavidson.com</p>
@@ -124,17 +140,19 @@
 
 
             <?php elseif ($item->get_feed_domain() == 'andr3w.net'): ?>
-						<!-- this item came from andr3w.net -->
-		          <div class="item">
-		        		<p class="date"><?php echo $item->get_human_date()?></p>
-		        		<p class="source">I posted this at andr3w.net</p>
-	            	<p class="title"><a href="<?php echo $item->get_original_permalink()?>">
-	            		<?php echo $item->get_title()?></a></p>
-	            	<p class="content"><?php echo word_limiter(strip_tags($item->get_content()), 150)?></p>
+				<!-- this item came from andr3w.net -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/post_60.png" /></a></div>
+		        <div class="item">
+		        	<p class="date"><?php echo $item->get_human_date()?></p>
+		        	<p class="source">I posted this at andr3w.net</p>
+	              <p class="title"><a href="<?php echo $item->get_original_permalink()?>">
+	            	<?php echo $item->get_title()?></a></p>
+	              <p class="content"><?php echo word_limiter(strip_tags($item->get_content()), 150)?></p>
 
 
             <?php elseif ($item->get_feed_domain() == 'andromi.info'): ?>
-						<!-- this item came from andromi.info -->
+				<!-- this item came from andromi.info -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/post_60.png" /></a></div>
 	            <div class="item">
 		        		<p class="date"><?php echo $item->get_human_date()?></p>
 		        		<p class="source">I posted this at Andromi.info</p>
@@ -146,6 +164,7 @@
             <?php else: ?>
 		        <!-- this item came from an unknown source -->
 		        <!-- This theme is only rudimentally prepared to handle this. -->
+              	<div class="type"><a href="<?php echo $item->get_original_permalink()?>"><img src="<?php echo $this->config->item('theme_folder')?>/icons/blank_60.png" /></a></div>
 	            <div class="item">
 		        		<p class="date"><?php echo $item->get_human_date()?></p>
 	            	<p class="title"><a href="<?php echo $item->get_original_permalink()?>">
diff --git a/main.css b/main.css
index e28a4ea..0035504 100644
--- a/main.css
+++ b/main.css
@@ -34,25 +34,28 @@ body {
 }
 
 #header {
-	width: 500px;
+	width: 600px;
 	margin: 0 auto;
 	text-align: center;
 	margin-bottom: 50px;
 }
 
 #footer {
-	width: 500px;
+	width: 600px;
 	margin: 25px auto 10px auto;
 	text-align: center;
 }
 
 #activity {
-	width: 500px;
-	margin: 0px auto 25px auto;
+	width: 600px;
+	margin-top: 0px;
+	margin-bottom: 25px;
+	margin-left:auto;
+	margin-right:auto;
 }
 
 #static {
-	width: 500px;
+	width: 600px;
 	margin: 0 auto;
 	margin-bottom: 50px;
 }
@@ -60,12 +63,19 @@ body {
 /* Classed Blocks */
 
 div.pagination {
-	width: 500px;
+	width: 600px;
 	margin: 0 auto;
 	text-align: center;
 	padding-bottom: 15px;	
 }
 
+div.type {
+	width: 70px;
+	margin: 0px;
+	float: left;
+	text-align: right;
+}
+
 div.item {
 	width: 500px;
 	margin: 20px auto 40px auto;
@@ -81,12 +91,9 @@ div.photo {
 
 div.video {
 	width: 450px;
-	margin: 0 auto;
-	text-align: center;
 }
 
 div.caption {
-	text-align: center;
 	margin: 10px auto 5px auto;
 	width: 450px;
 }
@@ -95,7 +102,6 @@ div.albumart {
 	height:100px;
 	width:100px;
 	float:left;
-	text-align:center;
 }
 
 div.songtext {
@@ -131,7 +137,6 @@ p.content {
 	text-transform: lowercase;
 	line-height: 1.2em;
 	font-size: 1em;
-	margin-left:50px;
 }
 
 p.date {
diff --git a/theme.php b/theme.php
index 0d4c461..5162d91 100644
--- a/theme.php
+++ b/theme.php
@@ -23,8 +23,7 @@
 <div id="static">
 	<p class="title">simply helvetica</p>
 	<p class="content">After being thouroughly disappointed by the themes available for the very neat <a href="http://sweetcron.com">SweetCron</a> software, I decided to code my own. </p>
-	<p class="content">I'm no expert in design, nor am I even very well versed in it. This is my attempt at a very simple, typography based design. The sole font used on the page is Helvetica and it's my first time ever trying to pay careful attention to the typography of my designs, rather than just the font face.</p>
-	<p class="content">I'm sure things will change here as I fumble my way through creating a cohesive design. As things do change though, I'll be updating this page, with new versions.</p>
+	<p class="content">I'm no expert in design, nor am I even very well versed in it. I'm sure things will change here as I fumble my way through creating a cohesive design. As things do change though, I'll be updating this page with new versions.</p>
 	<p class="content">I'm chosing to license it as <a href="http://www.gnu.org/copyleft/gpl.html">GPL3</a>, so feel free to use it, and change it around and do whatever you'd like, as long as you license your theme similarly.</p>
 	<p class="content">If you do end up using this theme, please email me, it'd be great to hear that someone else got something out of it. <a href="mailto:theme@amdavidson.me">theme@amdavidson.me</a></p>