typo 3.99.2 → 3.99.3

data/log/development.log-4

@@ -0,0 +1,174 @@
+
+
+Processing ArticlesController#index (for 127.0.0.1 at 2006-07-08 00:17:23) [GET]
+  Parameters: {"action"=>"index", "controller"=>"articles"}
+  Blog Load (0.001571)   SELECT * FROM blogs ORDER BY id LIMIT 1
+  Trigger Load (0.001660)   SELECT * FROM triggers WHERE (due_at <= '2006-07-08 00:17:23') 
+  SQL (0.005065)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'users'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+  SQL (0.001335)   SELECT count(*) AS count_all FROM users 
+  SQL (0.003723)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'blogs'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+  SQL (0.005265)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'contents'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+  Article Count (3.383297)   SELECT COUNT(DISTINCT contents.id) FROM contents LEFT OUTER JOIN articles_categories ON articles_categories.article_id = contents.id LEFT OUTER JOIN categories ON categories.id = articles_categories.category_id LEFT OUTER JOIN articles_tags ON articles_tags.article_id = contents.id LEFT OUTER JOIN tags ON tags.id = articles_tags.tag_id WHERE (published = 't' AND contents.created_at < '2006-07-08 00:17:23' AND blog_id = 1) AND ( (contents."type" = 'Article' ) ) 
+  SQL (0.004491)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'categories'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+  SQL (0.005264)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'tags'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+  Article Load IDs For Limited Eager Loading (0.016903)   SELECT id FROM contents WHERE (published = 't' AND contents.created_at < '2006-07-08 00:17:23' AND blog_id = 1) AND ( (contents."type" = 'Article' ) ) ORDER BY contents.published_at DESC LIMIT 15 OFFSET 0
+  Article Load Including Associations (0.150279)   SELECT contents."id" AS t0_r0, contents."title" AS t0_r1, contents."author" AS t0_r2, contents."body" AS t0_r3, contents."body_html" AS t0_r4, contents."extended" AS t0_r5, contents."excerpt" AS t0_r6, contents."keywords" AS t0_r7, contents."created_at" AS t0_r8, contents."updated_at" AS t0_r9, contents."extended_html" AS t0_r10, contents."user_id" AS t0_r11, contents."permalink" AS t0_r12, contents."guid" AS t0_r13, contents."text_filter_id" AS t0_r14, contents."whiteboard" AS t0_r15, contents."comments_count" AS t0_r16, contents."trackbacks_count" AS t0_r17, contents."type" AS t0_r18, contents."article_id" AS t0_r19, contents."email" AS t0_r20, contents."url" AS t0_r21, contents."ip" AS t0_r22, contents."blog_name" AS t0_r23, contents."name" AS t0_r24, contents."published" AS t0_r25, contents."allow_pings" AS t0_r26, contents."allow_comments" AS t0_r27, contents."blog_id" AS t0_r28, contents."published_at" AS t0_r29, categories."id" AS t1_r0, categories."name" AS t1_r1, categories."position" AS t1_r2, categories."is_primary" AS t1_r3, categories."permalink" AS t1_r4, tags."id" AS t2_r0, tags."name" AS t2_r1, tags."created_at" AS t2_r2, tags."updated_at" AS t2_r3, tags."display_name" AS t2_r4 FROM contents LEFT OUTER JOIN articles_categories ON articles_categories.article_id = contents.id LEFT OUTER JOIN categories ON categories.id = articles_categories.category_id LEFT OUTER JOIN articles_tags ON articles_tags.article_id = contents.id LEFT OUTER JOIN tags ON tags.id = articles_tags.tag_id WHERE (published = 't' AND contents.created_at < '2006-07-08 00:17:23' AND blog_id = 1) AND ( (contents."type" = 'Article' ) ) AND contents.id IN ('1640', '562', '561', '560', '559', '558', '557', '556', '555', '554', '553', '552', '551', '550', '549') ORDER BY contents.published_at DESC 
+Rendering  within ../../themes/scribbish/layouts/default
+Rendering articles/index
+  Blog Load (0.002095)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.002659)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+  Blog Load (0.001452)   SELECT * FROM blogs ORDER BY id LIMIT 1
+Rendered articles/_article (0.07813)
+  Blog Load (0.001730)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.002122)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01851)
+  Blog Load (0.002361)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001859)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01787)
+  Blog Load (0.002031)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001887)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.13746)
+  Blog Load (0.001752)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.002257)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01825)
+  Blog Load (0.001933)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.155534)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.26178)
+  Blog Load (0.001735)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.002489)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01920)
+  Blog Load (0.002814)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001888)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.13118)
+  Blog Load (0.001763)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001945)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01881)
+  Blog Load (0.002165)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001878)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01625)
+  Blog Load (0.003068)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001868)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01773)
+  Blog Load (0.001745)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.002177)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01745)
+  Blog Load (0.001913)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001883)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.12971)
+  Blog Load (0.002062)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001928)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01989)
+  Blog Load (0.001737)   SELECT * FROM blogs WHERE (blogs.id = 1) LIMIT 1
+  User Load (0.001901)   SELECT * FROM users WHERE (users.id = 1) LIMIT 1
+Rendered articles/_article (0.01962)
+Rendered articles/_search (0.00467)
+Start rendering component ({:controller=>SidebarController, :action=>"display_plugins"}): 
+
+
+Processing SidebarController#display_plugins (for 127.0.0.1 at 2006-07-08 00:17:28)
+  Blog Load (0.001420)   SELECT * FROM blogs ORDER BY id LIMIT 1
+  Trigger Load (0.001471)   SELECT * FROM triggers WHERE (due_at <= '2006-07-08 00:17:28') 
+  Sidebar Load (0.005570)   SELECT * FROM sidebars WHERE (active_position is not null) ORDER BY active_position 
+  SQL (0.005188)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'sidebars'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+Rendering sidebar/display_plugins
+Start rendering component ({:controller=>Plugins::Sidebars::TagController, :action=>"index", :layout=>false}): 
+
+
+Processing TagController#index (for 127.0.0.1 at 2006-07-08 00:17:28)
+  Blog Load (0.001579)   SELECT * FROM blogs ORDER BY id LIMIT 1
+  Trigger Load (0.001495)   SELECT * FROM triggers WHERE (due_at <= '2006-07-08 00:17:28') 
+  Tag Load (0.045230)   
+ SELECT tags.id, tags.name, tags.display_name, COUNT(articles_tags.article_id) AS article_counter
+ FROM tags tags LEFT OUTER JOIN articles_tags articles_tags
+ ON articles_tags.tag_id = tags.id
+ LEFT OUTER JOIN contents articles
+ ON articles_tags.article_id = articles.id
+ WHERE articles.published = 't'
+ GROUP BY tags.id, tags.name, tags.display_name
+ ORDER BY article_counter DESC
+ LIMIT 20
+ 
+Rendering plugins/sidebars/tag/content
+Completed in 0.18452 (5 reqs/sec) | Rendering: 0.12484 (67%) | DB: 0.04830 (26%) | 200 OK [http://localhost/]
+
+
+End of component rendering
+BENCHMARK: display_plugins: tag (0.18900)
+Rendered sidebar/_sidebar (0.18990)
+Start rendering component ({:controller=>Plugins::Sidebars::ArchivesController, :action=>"index", :layout=>false}): 
+
+
+Processing ArchivesController#index (for 127.0.0.1 at 2006-07-08 00:17:28)
+  Blog Load (0.001800)   SELECT * FROM blogs ORDER BY id LIMIT 1
+  Trigger Load (0.001495)   SELECT * FROM triggers WHERE (due_at <= '2006-07-08 00:17:28') 
+  Content Load (0.023723)   select count(*) as count, extract(year from published_at)||' '||lpad(extract(month from published_at),2,'0') as date from contents where type='Article' and published = 't' and published_at < '2006-07-08 00:17:28' group by date order by date desc limit '10'
+  SQL (0.004369)    SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
+ FROM pg_attribute a LEFT JOIN pg_attrdef d
+ ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+ WHERE a.attrelid = 'contents'::regclass
+ AND a.attnum > 0 AND NOT a.attisdropped
+ ORDER BY a.attnum
+
+Rendering plugins/sidebars/archives/content
+Completed in 0.18893 (5 reqs/sec) | Rendering: 0.00836 (4%) | DB: 0.03139 (16%) | 200 OK [http://localhost/]
+
+
+End of component rendering
+BENCHMARK: display_plugins: archives (0.19216)
+Rendered sidebar/_sidebar (0.19309)
+Start rendering component ({:controller=>Plugins::Sidebars::StaticController, :action=>"index", :layout=>false}): 
+
+
+Processing StaticController#index (for 127.0.0.1 at 2006-07-08 00:17:28)
+  Blog Load (0.001424)   SELECT * FROM blogs ORDER BY id LIMIT 1
+  Trigger Load (0.002276)   SELECT * FROM triggers WHERE (due_at <= '2006-07-08 00:17:28') 
+Rendering plugins/sidebars/static/content
+Completed in 0.13924 (7 reqs/sec) | Rendering: 0.00240 (1%) | DB: 0.00370 (2%) | 200 OK [http://localhost/]
+
+
+End of component rendering
+BENCHMARK: display_plugins: static (0.14366)
+Rendered sidebar/_sidebar (0.14466)
+BENCHMARK: display_plugins (0.53017)
+Completed in 0.56401 (1 reqs/sec) | Rendering: 0.53488 (94%) | DB: 0.23028 (40%) | 200 OK [http://localhost/]
+
+
+End of component rendering
+  Article Load (0.011033)   SELECT * FROM contents WHERE (published = 't' AND created_at > '2006-07-08 00:17:23') AND ( (contents."type" = 'Article' ) ) ORDER BY created_at ASC LIMIT 1
+Completed in 5.79087 (0 reqs/sec) | Rendering: 1.89160 (32%) | DB: 3.58989 (61%) | 200 OK [http://localhost/]

data/public/javascripts/typo.js

@@ -68,6 +68,14 @@ function complete(request) {
   if (request.status == 200) { commentAdded() };  
 }
 
+function popup(mylink, windowname)
+{
+  if (! window.focus) return true;
+  var href;
+  window.open(mylink, windowname, 'width=400,height=500,scrollbars=yes');
+  return false;
+}
+
 register_onload(function() {
   if ($('commentform')) {
 	var _author = getCookie('author');

data/test/fixtures/contents.yml

@@ -119,6 +119,7 @@ comment3:
   body: Zzzzzz
   created_at: 2005-01-01 02:00:07
   updated_at: 2005-01-01 02:00:07
+  published_at: 2005-01-01 02:00:07
   guid: 4534564564564567
 
 trackback1:
@@ -133,6 +134,7 @@ trackback1:
   excerpt: This is an excerpt
   created_at: 2005-01-01 03:00:00
   updated_at: 2005-01-01 03:00:00
+  published_at: 2005-01-01 03:00:00
   guid: dsafsadffsdsf
 
 trackback2:
@@ -174,6 +176,7 @@ first_page:
   body: ho ho ho
   created_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
+  updated_at: 2005-05-05 01:00:00
   user_id: 1
   published: true
 
@@ -184,6 +187,7 @@ another_page:
   name: page/two
   title: Another Page Title
   body: another body for yet another page
+  updated_at: 2005-05-05 01:00:00
   created_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
   user_id: 1
@@ -198,6 +202,7 @@ markdown_page:
   text_filter_id: 1
   body: this is *markdown*.
   created_at: 2005-05-05 01:00:00
+  updated_at: 2005-05-05 01:00:00
   published_at: 2005-05-05 01:00:00
   user_id: 1
   published: true

data/test/functional/articles_controller_test.rb

@@ -480,10 +480,10 @@ class ArticlesControllerTest < Test::Unit::TestCase
                     :body       => "The future is cool!",
                     :keywords   => "future",
                     :published  => true,
-                    :created_at => Time.now + 12.minutes)
+                    :published_at => Time.now + 12.minutes)
     get :index
     assert_equal @article, assigns(:articles).first
-    assert @response.lifetime <= 12.minutes
+    assert @response.lifetime.to_i <= 12.minutes
   end
 
   def test_search

data/test/functional/xml_controller_test.rb

@@ -338,6 +338,14 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body, :todo
   end
+  
+  # TODO(laird): make this more robust
+  def test_sitemap
+    get :feed, :format => 'googlesitemap', :type => 'sitemap'
+    
+    assert_response :success
+    assert_xml @response.body
+  end
 
   def assert_rss20(items)
     assert_equal 1, get_xpath(%{/rss[@version="2.0"]/channel[count(child::item)=#{items}]}).size, "RSS 2.0 feed has wrong number of channel/item nodes"

data/test/test_helper.rb

@@ -2,6 +2,8 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
+$TESTING = true
+
 User.salt = 'change-me'
 
 class Test::Unit::TestCase

data/themes/scribbish/CONTRIBUTORS

@@ -0,0 +1,2 @@
+Michael Gorsuch <michael@styledbits.com>
+Michele Campeotto <micampe@micampe.it>

data/themes/scribbish/about.markdown

@@ -0,0 +1,9 @@
+### Scribbish-2.0 by [packagethief][1]
+
+Scribbish is both a typo theme, and a starting point (think scaffolding) for new Themes. Its layout standardizes on a simple xhtml structure, blog entries are formatted using the [hAtom microformat specification][2], and styles are separated into individual files which are included in the correct order, making it easier to control the cascade and to figure out 'what-goes-where'. Use it as-is, or copy it to make new themes.
+
+[More information and latest version][3]
+
+[1]: http://quotedprintable.com/
+[2]: http://microformats.org/wiki/hatom
+[3]: http://quotedprintable.com/pages/scribbish

data/themes/scribbish/layouts/default.rhtml

@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title><%=h page_title %></title>
+  <%= page_header %>
+  <%= stylesheet_link_tag '/stylesheets/theme/application.css', :media => 'all' %>
+</head>
+
+<body>
+<div id="container">
+  <div id="header">
+    <h1><span><%= link_to this_blog.blog_name, { :controller => '/' } %></span></h1>
+    <h2><%= this_blog.blog_subtitle %></h2>
+  </div>
+
+  <div id="page">
+    <div id="content">
+      <%= @content_for_layout %>
+      <%= javascript_tag 'show_dates_as_local_time()' %>
+    </div>
+
+    <div id="sidebar">
+      <!-- search -->
+      <%= render :partial => 'search' %>
+
+      <!-- sidebar components -->
+      <%= render_sidebars %>
+    </div>
+    <br style="clear:both;" />
+  </div>
+
+  <div id="footer">
+    <hr />
+    <p><%= link_to this_blog.blog_name, { :controller => '/' } %></p>
+    <ul>
+      <li>powered by <%= link_to 'typo', 'http://typosphere.org' %> /
+          styled with <%= link_to 'scribbish', 'http://quotedprintable.com/pages/scribbish' %></li>
+    </ul>
+  </div>
+</div>
+</body>
+</html>

data/themes/scribbish/stylesheets/application.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------
+ Application.css
+ Imports all stylesheets; sets defaults for bare elements
+ --------------------------------------------------------------*/
+
+@import 'layout.css';
+@import 'content.css';
+
+@media print { #sidebar { display:none; }
+               #content { float: none; width:90%; }
+               #content pre { color: #000; background: #eee; }
+               #content form.comments { display:none; } }
+
+body {
+	background: url(/images/theme/background.gif) repeat-x left top;
+	font: normal 12px "lucida grande", verdana, arial, helvetica, sans-serif;
+}
+
+input,
+textarea { font: normal 12px "bitstream vera sans", verdana, sans-serif; }
+
+abbr  { border: none; }
+cite  { font-style: normal; }
+a img { border: none; padding: 0; margin: 0; }
+
+a:link,  a:visited { color: #930; }
+a:hover, a:active  { color: #fff; background: #000; }

data/themes/scribbish/stylesheets/content.css

@@ -0,0 +1,400 @@
+/*--------------------------------------------------------------
+ Header
+ --------------------------------------------------------------*/
+
+#header { 
+	background: url(/images/theme/header_shadow.gif) repeat-x left bottom;
+}
+
+#header a:link,
+#header a:visited { 
+	color:#000;
+	text-decoration: none;
+}
+
+#header a:hover,
+#header a:active {
+	color:#930; background: transparent;
+	text-decoration: none;
+}
+
+#header h1 {
+	font: bold 400% georgia, serif; 
+	letter-spacing: -1px; 
+	margin: 0;
+	float: left; 
+}
+
+#header h2 {
+	font: normal 12px verdana, arial, sans-serif;  
+	margin: 2.5em 0 0 0.8em;
+	float: left; 
+}
+
+/*--------------------------------------------------------------
+ Content
+ --------------------------------------------------------------*/
+
+#content {}
+
+#content h1,
+#content h2,
+#content h3,
+#content h4,
+#content h5 { 
+	font-family: "lucidamac bold", "lucida grande", arial, sans-serif; 
+	letter-spacing: -1px;
+}
+
+#content h1 { 
+	font-size: 24px;
+	margin: 0 0 0.3em;	
+}
+
+#content h2 { 
+	font-size: 22px;
+	margin: 0 0 0.3em;	
+}
+
+#content h3 { 
+	font-size: 20px;
+	margin: 1.2em 0 0.3em;	
+}
+
+#content h4 { 
+	font-size: 18px;
+	margin: 1.2em 0 0.3em;	
+	border-bottom: 1px dotted #bbb;
+}
+
+#content h5 {
+	font-size: 18px;
+	background: #ffd;
+	margin: 1.2em 0 0.3em;	
+	border-bottom: 1px dotted #aaa;
+}
+
+#content p {
+	line-height: 15px; 
+	margin: 0 0 1.2em;
+}
+
+#content ul,
+#content ol {
+	margin: 1em;
+	padding:0;
+}
+
+#content ul {
+	list-style-type: square;
+}
+
+#content li {
+	line-height: 15px; 
+	margin: 0 0 0 1em; padding: 0;
+}
+
+#content blockquote {
+	color: #555;
+	border-left: 5px solid #ccc; 
+	margin: 1.3em 1em; padding: 0 1em;
+}
+
+#content code { 
+	font: normal 12px "bitstream vera sans mono", monaco "lucida console", "courier new", courier, serif;
+}
+
+#content pre {
+	color: #63FF00;
+	background: #000;
+	overflow: auto;
+	font: normal 12px "bitstream vera sans mono", monaco "lucida console", "courier new", courier, serif;
+	margin: 0.9em 0; padding: 8px;
+}
+
+/* Article Entries - class names based on http://microformats.org/wiki/hatom] */
+#content .atomentry { 
+	margin: 0 0 3em 0;
+}
+
+#content .atomentry .title {
+	font-size: 24px;
+	line-height: 94%;
+	letter-spacing: -1.5px; 
+	margin: 0;
+}
+
+#content .atomentry .title a:link,
+#content .atomentry .title a:visited { 
+	color: #930;
+	text-decoration: none;
+}
+
+#content .atomentry .title a:hover,
+#content .atomentry .title a:active { 
+	color: #000;
+	background: transparent;
+}
+
+#content .atomentry .title .comment_count { display: none; }
+
+#content .atomentry .author {
+	color: #bbb;
+	font: normal 16px/14px "lucidamac bold", "lucida grande", arial, verdana, sans-serif;
+	letter-spacing: -1px;
+	margin: 0 0 1em;
+}
+
+#content .atomentry .author cite a,
+#content .atomentry .author cite a:hover { /* author mailto: link (if any) */
+	color: #aaa; background: transparent;
+	text-decoration: none;
+}
+
+#content .atomentry .author abbr { /* posted date */
+	font-weight: bold;
+	color: #aaa;
+}
+
+#content .atomentry .content {}
+
+#content .atomentry ul.meta { 
+	font-size: 10px;
+	background: #eee;
+	margin: 0; padding: 5px;
+	border: 1px solid #ddd;
+	list-style-type: none;
+}
+
+#content .atomentry ul.meta li { 
+	line-height: 13px;
+	margin: 0; padding: 0;
+}
+
+#content .atomentry .meta a:link,
+#content .atomentry .meta a:visited {
+	color: #555;
+}
+
+#content .atomentry .meta a:hover,
+#content .atomentry .meta a:active  {
+	color: #fff;
+}
+
+
+/* Comments and Trackbacks */
+#content ol.comments,
+#content ol.trackbacks {
+	list-style-type: none;
+	margin: 0; padding: 0;
+}
+
+#content .comment,
+#content .trackback {
+	border: 2px solid #ddd;
+	margin: 0 0 1.5em; padding: 1em;
+}
+
+#content .comment.preview { 
+	background: #ffc;
+	border: 3px solid #fab444;
+}
+
+#content .comment   .author,
+#content .trackback .author { 
+	font-weight: bold;
+	margin-bottom: 1em;
+}
+
+#content .comment   .author cite,
+#content .trackback .author cite {
+	font-size: 16px;
+	letter-spacing: -1px;
+}
+
+#content .comment   .author abbr, 
+#content .trackback .author abbr { color: #999; }
+
+#content .comment .author .gravatar { 
+	margin: 0 0 0.5em 0.5em;
+	float: right; 
+}
+
+/* uncomment to enable a default gravatar
+#content .comment .author div {
+	margin: 0 0 0.5em 0.5em;
+ 	width: 60px; height: 60px;
+	background: url(/images/theme/gravatar.gif) no-repeat left top;
+	float: right; 
+}*/
+
+
+#content form.comments {
+	background: #f2f2f2;
+	border-top: 1px solid #ddd;
+	padding: 1em 0.5em;
+}
+
+#content form.comments fieldset { 
+	border: none;
+}
+
+#content form.comments legend { 
+	display: none;
+}
+
+#content form.comments label { 
+	font-weight: bold;
+}
+
+#content form.comments textarea { 
+	width: 90%; height: 150px;
+	padding: 3px;
+}
+
+/*--------------------------------------------------------------
+ Sidebar
+ --------------------------------------------------------------*/
+#sidebar {
+	font-size: 11px; 
+}
+
+#sidebar h3 { 
+	font: bold 14px "lucidamac bold", "lucida grande", verdana, arial, helvetica, sans-serif;
+	margin: 0 0 0.5em;
+}
+
+#sidebar h3 a:link,
+#sidebar h3 a:visited {
+	color: #000; text-decoration: none;
+}
+
+#sidebar h3 a:hover,
+#sidebar h3 a:active {
+	background: transparent; text-decoration: underline;
+}
+
+#sidebar ul {
+	list-style-type: none; 
+	margin: 0 0 2em; padding: 0;
+}
+
+#sidebar li { 
+	margin: 0;
+	padding: 1px 0;
+}
+
+#sidebar em { font-style: normal; }
+
+/* Live-search and results */
+#sidebar .search p { 
+	margin: 0;
+}
+
+#sidebar .search p input {
+	font-size: 11px; width: 92%;
+}
+
+#sidebar .search .loading {
+	background: url(/images/theme/spinner.gif) no-repeat left 50%;
+	margin: 1em 0; padding: 0 0 0 20px;
+	height: 15px;
+}
+
+#sidebar .search .results { 
+	margin: 0 0 1.25em;
+}
+
+#sidebar .search .results h3 {
+	margin-top: 1em;
+}
+
+#sidebar .search .results p { 
+	font: bold 14px "lucidamac bold", "lucida grande", verdana, arial, helvetica, sans-serif;
+	margin: 0 0 0.5em;
+}
+
+#sidebar .search .results ul { 
+	margin: 0; padding: 3px;
+}
+
+#sidebar .search .results li { background: #ffc; padding: 0.2em; }
+
+#sidebar .search .results a:link,
+#sidebar .search .results a:visited {
+	color: #222;
+}
+
+#sidebar .search .results a:hover, 
+#sidebar .search .results a:active  {
+	color: #fff;
+}
+
+/* Flickr sidebar-node */
+#sidebar #flickr {
+	margin: 0 0 2em;
+	float: right;
+}
+
+#sidebar #flickr div {
+	margin: 0 0 5px;
+	border: 1px solid #ddd;
+	float: right;
+	clear: both;
+}
+
+#sidebar #flickr img { 
+	border: 4px solid #fff;
+	display: block;
+}
+        
+#sidebar #flickr img:hover {
+	border: 4px solid #ffc;
+}
+        
+#sidebar #flickr a { 
+	border: none;
+}
+
+/*--------------------------------------------------------------
+ Footer
+ --------------------------------------------------------------*/
+
+#footer {
+	border-top: 1px solid #ccc; 
+	font-size: 90%; 
+}
+
+#footer a:link,
+#footer a:visited { 
+	color: #000;
+}
+
+#footer a:hover,
+#footer a:active { 
+	color: #fff;
+	background: #000;
+}
+
+#footer hr {
+	display: none;
+}
+
+#footer p {
+	width: 40%;
+	float: left; 
+	margin: 0; padding: 0; 
+}
+
+#footer ul {
+	width: 40%;
+	margin: 0; padding: 0;
+	list-style-type: none; 
+	text-align: right; 
+	float: right; 
+}
+
+#footer li {
+	margin: 0; padding: 0 0 0 1em;
+	display: inline; 
+}