M content/.htaccess → content/.htaccess

@@ -48,9 +48,12 @@ 
 # Rewrite rules.
 <IfModule mod_rewrite.c>
   RewriteEngine on
-	RewriteRule ^(rss|atom)/$ /$1.xml [L]
-	RewriteRule ^tags/(.+)/(rss|atom)/$ /tags/$1/$2.xml [L]
   RewriteRule ^$ /home/index.html [L]
+	RewriteRule ^(rss|atom)/?$ /$1.xml [L]
+	RewriteRule ^tags/([^/\.]+)/(rss|atom)/?$ /tags/$1/$2.xml [L]
+	RewriteRule ^(articles|blog|entries|tags)/?$ /archives/ [L,R=301]
+	RewriteRule ^articles/view/([^/\.]+)/?$ /articles/$1/ [L,R=301]
+	RewriteRule ^(blog|entries|archives|tags)/([^/\.]+)/?$ /articles/$2/ [L,R=301]
 </IfModule>
 
 

M content/css/_elements.sass → content/css/_elements.sass

@@ -21,7 +21,6 @@ p
     line-height: 1.5em
     margin: 1em 0
 
-
 blockquote, .note
   font-family: Georgia, Serif
   color: #555
@@ -142,8 +141,9 @@ &.article-meta
     float: left
     list-style-type: none
     border-left: 3px solid #ccc
-    padding-left: 1em
+    padding-left: 0.5em
     margin-left: 0.5em
+    margin-bottom: 1em
 
   &.article-buttons
     text-align: center

M layouts/article_buttons.erb → layouts/article_buttons.erb

@@ -6,14 +6,14 @@ var dzone_url = '<%= url_for @item %>';
 	var dzone_title = '<%= @item[:title]%>';
 	var dzone_blurb = '<%= @item[:summary] if @item[:summary] %>';
 	var dzone_style = '2';
-	var digg_url = 'WEBSITE_URL';
+	var digg_url = '<%= url_for @item %>';
 	var digg_skin = 'compact';
 	var digg_window = 'new';
 	var tweetmeme_style = 'compact';
 </script>
 <ul class="article-buttons">
-	<li><script type="text/javascript" src="http://www.reddit.com/button.js?t=1"></script></li>
 	<li><script type="text/javascript" src="http://tweetmeme.com/i/scripts/button.js"></script></li>
+	<li><script type="text/javascript" src="http://www.reddit.com/button.js?t=1"></script></li>
 	<li><script type="text/javascript" src="http://widgets.dzone.com/links/widgets/zoneit.js"></script> </li>
 	<li><script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script></li>
 </ul>

M layouts/default.erb → layouts/default.erb

@@ -60,14 +60,6 @@ <% 	case @item[:type]
 								when 'article' then%>
 								<div id="content-header">
 								<%= render 'article_meta', :article => @item %>
-								<div class="share">
-					<a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_120_16.gif" width="120" height="16" alt="Share/Save/Bookmark"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl=location.href;a2a_onclick=1;a2a_prioritize=["delicious","stumbleupon","friendfeed","twitter","dzone","digg","reddit","slashdot","facebook","newsvine","sphere","ping"];</script>
-					<% if @item[:feed] then %>
-					<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
-					<a class="a2a_dd" href="http://www.addtoany.com/subscribe?linkname=&amp;linkurl=http%3A%2F%2Fwww.h3rald.com%2Frss%2F"><img src="http://static.addtoany.com/buttons/subscribe_120_16.gif" width="120" height="16" alt="Subscribe"/></a><script type="text/javascript">a2a_linkname=document.title;a2a_linkurl="http://www.h3rald.com<%= @item[:feed] %>rss/";a2a_onclick=1;</script><script type="text/javascript" src="http://static.addtoany.com/menu/feed.js"></script>
-					<% end %>
-				</div>
-								<%= render 'article_buttons' %>
 								</div>
 						<% end %>
 						<hr />