hobix 0.4 → 0.6

data/doc/rdoc/rdoc-style.css

@@ -0,0 +1,208 @@
+
+body {
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-size:   90%;
+    margin: 0;
+    margin-left: 40px;
+    padding: 0;
+    background: white;
+}
+
+h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
+h1 { font-size: 150%; }
+h2,h3,h4 { margin-top: 1em; }
+
+a { background: #eef; color: #039; text-decoration: none; }
+a:hover { background: #039; color: #eef; }
+
+/* Override the base stylesheet's Anchor inside a table cell */
+td > a {
+  background: transparent;
+  color: #039;
+  text-decoration: none;
+}
+
+/* and inside a section title */
+.section-title > a {
+  background: transparent;
+  color: #eee;
+  text-decoration: none;
+}
+
+/* === Structural elements =================================== */
+
+div#index {
+    margin: 0;
+    margin-left: -40px;
+    padding: 0;
+    font-size: 90%;
+}
+
+
+div#index a {
+    margin-left: 0.7em;
+}
+
+div#index .section-bar {
+   margin-left: 0px;
+   padding-left: 0.7em;
+   background: #ccc;
+   font-size: small;
+}
+
+
+div#classHeader, div#fileHeader {
+    width: auto;
+    color: white;
+    padding: 0.5em 1.5em 0.5em 1.5em;
+    margin: 0;
+    margin-left: -40px;
+    border-bottom: 3px solid #006;
+}
+
+div#classHeader a, div#fileHeader a {
+    background: inherit;
+    color: white;
+}
+
+div#classHeader td, div#fileHeader td {
+    background: inherit;
+    color: white;
+}
+
+
+div#fileHeader {
+    background: #057;
+}
+
+div#classHeader {
+    background: #048;
+}
+
+
+.class-name-in-header {
+  font-size:  180%;
+  font-weight: bold;
+}
+
+
+div#bodyContent {
+    padding: 0 1.5em 0 1.5em;
+}
+
+div#description {
+    padding: 0.5em 1.5em;
+    background: #efefef;
+    border: 1px dotted #999;
+}
+
+div#description h1,h2,h3,h4,h5,h6 {
+    color: #125;;
+    background: transparent;
+}
+
+div#validator-badges {
+    text-align: center;
+}
+div#validator-badges img { border: 0; }
+
+div#copyright {
+    color: #333;
+    background: #efefef;
+    font: 0.75em sans-serif;
+    margin-top: 5em;
+    margin-bottom: 0;
+    padding: 0.5em 2em;
+}
+
+
+/* === Classes =================================== */
+
+table.header-table {
+    color: white;
+    font-size: small;
+}
+
+.type-note {
+    font-size: small;
+    color: #DEDEDE;
+}
+
+.xxsection-bar {
+    background: #eee;
+    color: #333;
+    padding: 3px;
+}
+
+.section-bar {
+   color: #333;
+   border-bottom: 1px solid #999;
+    margin-left: -20px;
+}
+
+
+.section-title {
+    background: #79a;
+    color: #eee;
+    padding: 3px;
+    margin-top: 2em;
+    margin-left: -30px;
+    border: 1px solid #999;
+}
+
+.top-aligned-row {  vertical-align: top }
+.bottom-aligned-row { vertical-align: bottom }
+
+/* --- Context section classes ----------------------- */
+
+.context-row { }
+.context-item-name { font-family: monospace; font-weight: bold; color: black; }
+.context-item-value { font-size: small; color: #448; }
+.context-item-desc { color: #333; padding-left: 2em; }
+
+/* --- Method classes -------------------------- */
+.method-detail {
+    background: #efefef;
+    padding: 0;
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+    border: 1px dotted #ccc;
+}
+.method-heading {
+  color: black;
+  background: #ccc;
+  border-bottom: 1px solid #666;
+  padding: 0.2em 0.5em 0 0.5em;
+}
+.method-signature { color: black; background: inherit; }
+.method-name { font-weight: bold; }
+.method-args { font-style: italic; }
+.method-description { padding: 0 0.5em 0 0.5em; }
+
+/* --- Source code sections -------------------- */
+
+a.source-toggle { font-size: 90%; }
+div.method-source-code {
+    background: #262626;
+    color: #ffdead;
+    margin: 1em;
+    padding: 0.5em;
+    border: 1px dashed #999;
+    overflow: hidden;
+}
+
+div.method-source-code pre { color: #ffdead; overflow: hidden; }
+
+/* --- Ruby keyword styles --------------------- */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
+.ruby-constant  { color: #7fffd4; background: transparent; }
+.ruby-keyword { color: #00ffff; background: transparent; }
+.ruby-ivar    { color: #eedd82; background: transparent; }
+.ruby-operator  { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node    { color: #ffa07a; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp  { color: #ffa07a; background: transparent; }
+.ruby-value   { color: #7fffd4; background: transparent; }

data/git_hobix_update.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * This file should be placed in the htdocs of your actual blog repo
+ */
+if($_POST["payload"]) {
+  #run git pull
+  system("git pull origin master:master");
+  echo "Thank you, come again!";
+} else {
+  echo "Sorry, you don't come bearing gifts.\n\n";
+}
+?>
+

data/lib/hobix/base.rb

@@ -94,6 +94,7 @@ class BaseStorage < BasePlugin
             e.link = e.class.url_link e, @link, "html"
             e.created = Time.now
             e.modified = Time.now
+            e.updated = Time.now
             e.title = "This Ghostly Message From the Slime Will Soon Vanish!"
             e.tagline = "A temporary message, a tingling sensation, Hobix is up!!"
             e.author = author
@@ -304,7 +305,8 @@ class BaseContent
     _ :link
     _ :title,               :edit_as => :text, :search => :fulltext
     _ :created,             :edit_as => :datetime, :search => :prefix
-    _ :modified
+    _ :modified,            :show_as => :datetime
+    _ :updated,             :show_as => :datetime
     _ :tags,                :edit_as => :text, :search => :prefix
 
     def initialize; yield self if block_given?; end
@@ -395,7 +397,7 @@ class BaseContent
                 instance_eval %{
                     def @#{ f }.to_yaml( opts = {} )
                         s = self.to_str
-                        def s.to_yaml_style; :fold; end
+                        def s.to_yaml_style; :literal; end
                         s.to_yaml( opts )
                     end
                 }
@@ -446,7 +448,8 @@ class BaseEntry < BaseContent
     _ :author,              :req => true, :edit_as => :text, :search => :prefix
     _ :contributors,        :edit_as => :array, :search => :prefix
     _ :created,             :edit_as => :datetime, :search => :prefix
-    _ :modified
+    _ :modified,            :show_as => :datetime
+    _ :updated,             :show_as => :datetime
     _ :tags,                :edit_as => :text, :search => :prefix
     _ :content,             :edit_as => :textarea, :search => :fulltext, :text_processor => true
     _ :content_ratings,     :edit_as => :array

data/lib/hobix/bixwik.rb

@@ -42,9 +42,9 @@ module BixWik
 
     # Handler for templates with `index' prefix.  These pages simply
     # mirror the `HomePage' entry.
-    def skel_index( path_storage )
+    def skel_index( path_storage, section_path )
         homePage = path_storage.match( /^HomePage$/ ).first
-        page = Page.new( '/index' )
+        page = Page.new( 'index' )
         unless homePage
             homePage = Hobix::Storage::IndexEntry.new( path_storage.default_entry( authors.keys.first ) )
         end
@@ -56,32 +56,32 @@ module BixWik
     # Handler for templates with `list/index' prefix.  These templates will
     # receive IndexEntry objects for every entry in the system.  Only one
     # index page is requested by this handler.
-    def skel_recent_index( path_storage )
+    def skel_recent_index( path_storage, section_path )
         index_entries = storage.find( :all => true )
-        page = Page.new( '/list/index' )
+        page = Page.new( 'list/index' )
         page.timestamp = index_entries.first.created
-        page.updated = storage.last_modified( index_entries )
+        page.updated = storage.last_updated( index_entries )
         yield :page => page, :entries => index_entries
     end
 
     # Handler for templates with `recent/index' prefix.  These templates will
     # receive entries loaded by +Hobix::BaseStorage#lastn+.  Only one
     # index page is requested by this handler.
-    def skel_recent_index( path_storage )
+    def skel_recent_index( path_storage, section_path )
         index_entries = storage.lastn( @lastn || 120 )
-        page = Page.new( '/recent/index' )
+        page = Page.new( 'recent/index' )
         page.timestamp = index_entries.first.created
-        page.updated = storage.last_modified( index_entries )
+        page.updated = storage.last_updated( index_entries )
         yield :page => page, :entries => index_entries
     end
 
     # Handler for templates with `list/index' prefix.  These templates will
     # receive a list of all pages in the Wiki.
-    def skel_list_index( path_storage )
+    def skel_list_index( path_storage, section_path )
         all_pages = storage.all
-        page = Page.new( '/list/index' )
+        page = Page.new( 'list/index' )
         page.timestamp = all_pages.first.created
-        page.updated = storage.last_modified( all_pages )
+        page.updated = storage.last_updated( all_pages )
         yield :page => page, :entries => all_pages, :no_load => true
     end
 
@@ -193,7 +193,7 @@ def entry_content_erb
 end
 def sidebar_erb; nil; end
 def entry_footer_erb; %{
-  Revision from <%= ( entry.modified || entry.created ).strftime( "%B %d, %Y %H:%M" ) %> by <%= weblog.wiki_link( "authors/" + entry.author ) %> }
+  Revision from <%= ( entry.modified || entry.created ).strftime( "%d %B %Y at %H:%M" ) %> by <%= weblog.wiki_link( "authors/" + entry.author ) %> }
 end
 end
 end

data/lib/hobix/commandline.rb

@@ -109,13 +109,25 @@ module CommandLine
         require 'open-uri'
         c = ::Config::CONFIG.merge( config )
         eval(open("http://go.hobix.com/").read)
+
+      
+        # Now look at all blogs and delete entries/index.{hobix,search}
+        if @config['weblogs'].respond_to? :sort
+            blogs = @config['weblogs'].sort
+          blogs.each do |e|
+            weblog = Hobix::Weblog.load( e[1] )
+            puts "Removing index.search and index.hobix from #{weblog.entry_path}"
+            File.safe_unlink( File.join(weblog.entry_path, "index.search"),
+                              File.join(weblog.entry_path, "index.hobix"))
+          end
+        end
     end
 
     # List all your weblogs
     def blogs_weblog_explain; "List your weblogs."; end
     def blogs_weblog_args; []; end
     def blogs_weblog
-        if @config['weblogs'].respond_to? :sort
+        if @config['weblogs'].respond_to?( :sort ) && !@config['weblogs'].empty?
             blogs = @config['weblogs'].sort
             name_width = blogs.collect { |b| b[0].length }.max
             tabular( blogs, [[-name_width, 0, 'weblog-name'], [-40, 1, 'path']] )
@@ -433,6 +445,8 @@ module CommandLine
         else
             @config['post upgen'] = true
         end
+
+
         save_config
     end
 
@@ -463,8 +477,8 @@ module CommandLine
         puts "If you want to join an existing hobix weblog, we can do that now."
         puts "Each weblog needs a name and a path.  Use <ENTER> at any prompt"
         puts "to simply move on."
+        puts
         loop do
-            puts
             puts "Short name for weblog, used on the command line (i.e. hobix upgen blogName)."
             print ": "
             blogname = gets.strip
@@ -477,6 +491,8 @@ module CommandLine
                 break
             end
             add_weblog( blogname, blogpath )
+            puts
+            puts "** Add another weblog?"
         end
 
         puts "To setup more weblogs later, use: hobix add #{ add_weblog_args.join( ' ' ) }"

data/lib/hobix/comments.rb

@@ -45,14 +45,13 @@ append_def :entry_erb, %{
 
 def entry_comment_erb; %{
   <% entry_id = entry.id %>
-  <a name="comments"></a>
   <div id="comments">
   <% comments = weblog.storage.load_attached( entry_id, "comments" ) rescue [] %>
   <% comments.each do |comment| %>
   <div class="entry">
       <div class="entryAttrib">
           <div class="entryAuthor"><h3><%= comment.author %></h3></div>
-          <div class="entryTime">said on <%= comment.created.strftime( "<nobr>%d %b %Y</nobr> at <nobr>%I:%M %p</nobr>" ) %></div>
+          <div class="entryTime">said on <%= comment.created.strftime( "<nobr>%d %b %Y</nobr> at <nobr>%H:%M</nobr>" ) %></div>
       </div>
       <div class="entryContentOuter"><div class="entryContent"><%= comment.content.to_html %></div></div>
   </div>
@@ -61,15 +60,15 @@ def entry_comment_erb; %{
 
 def entry_comment_form_erb; %{
   <div class="entry">
-  <form id="userComment" method="post" action="/control/comment/<%= entry_id %>">
+  <form id="userComment" method="post" action="<%= weblog.expand_path( '/control/comment/' + entry_id )%>">
     <div class="entryAttrib">
        <div class="entryAuthor"><input name="<%= Hobix::Facets::Comments.form_field 'author' %>" type="textbox" size="15" maxlength="50" /></div>
-       <div id="liveTime" class="entryTime">said on <nobr>DD Mon YYYY</nobr> <nobr>at HH:MM AM</nobr></div>
+       <div id="liveTime" class="entryTime">said on <%= Time.now.strftime( "<nobr>%d %b %Y</nobr> at <nobr>%H:%M</nobr>")%></div>
     </div>
     <div class="entryContentOuter"><div class="entryContent">
        <textarea name="<%= Hobix::Facets::Comments.form_field 'content' %>" rows="6" cols="50"></textarea>
        <p><input type="button" name="pleasePreview" value="preview" 
-           onClick="new Ajax.Request('/control/preview', {parameters: Form.serialize('userComment'), onComplete: function(req) { $('textilePreview').innerHTML = req.responseText }})" />
+           onClick="new Ajax.Request( '<%= weblog.expand_path '/control/preview' %>', {parameters: Form.serialize('userComment'), onComplete: function(req) { $('textilePreview').innerHTML = req.responseText }})" />
           <input type="submit" name="<%= Hobix::Facets::Comments.form_field 'submit' %>" value="&gt;&gt;" />
           <small>* do <a href="javascript:quickRedReference();">fancy stuff</a> in your comment.</small>
        </p>

data/lib/hobix/entry.rb

@@ -31,8 +31,9 @@ module Hobix
 # tags::             A list of free-tagged categories.
 # author::           The author's username.
 # contributors::     An Array of contributors' usernames.
-# modified::         A modification time.
 # created::          The time the Entry was initially created.
+# modified::         A modification time.
+# updated::          Used internally to ensure an entry has been generated.
 # summary::          A brief description of this entry.  Can be used
 #                    for an abbreviated text of a long article.
 # content::          The full text of the entry.

data/lib/hobix/facets/comments.rb

@@ -54,13 +54,38 @@ class Comments < BaseFacet
                     c.ipaddress = app.remote_addr
                 end
 
-                # Save the comment, upgen
-                @weblog.storage.append_to_attachment( entry_id, 'comments', comment )
-                @weblog.regenerate :update
-
-                # Redirect
+               # A quick hack to try akismet content spam checking
+               if @weblog.requires.detect{ |i| i['hobix/plugin/akismet'] }         
+                   @akismet = Akismet.new(@weblog.link, AkismetKey.key)
+                   if @akismet.verifyAPIKey
+                       if @akismet.commentCheck(
+                               app.remote_addr,                            # remote IP
+                               app.get_request_header('User-Agent'),       # user agent
+                               app.get_request_header('Referer'),          # http referer
+                               '',                                         # permalink
+                               'comment',                                  # comment type
+                               app._POST['hobix_comment:author'].to_s,     # author name
+                               '',                                         # author email
+                               '',                                         # author url
+                               app._POST['hobix_comment:comment'].to_s,    # comment text
+                               {})                                         # other
+                           app.puts( "Sorry, that smelled like spam. If wasn't meant to, go back and try again" )
+                           return true
+                       end
+                   else
+                       # If the key does not verify, post the comment
+                       # but note the failure in the apache error logs.
+                       $stderr.puts( "Hobix: Akismet API key did not verify." )
+                   end
+               end
+                   
+               # Save the comment, upgen
+               @weblog.storage.append_to_attachment( entry_id, 'comments', comment )
+               @weblog.regenerate :update
+               
+               # Redirect
                 link = @weblog.output_entry_map[entry_id]
-                app.setup_redirection( 302, link[:page].link )
+                app.setup_redirection( 302, @weblog.expand_path( link[:page].link ) )
                 return true
             when "preview"
                 app.puts RedCloth.new( app._POST[Comments.form_field('content')] ).to_html

data/lib/hobix/linklist.rb

@@ -47,7 +47,7 @@ require 'yaml'
 module Hobix
 class LinkList < BaseEntry
 
-    _ :links,   [:req, :textarea]
+    _ :links,   :req => true, :edit_as => :textarea
 
     # Converts the link list into a RedCloth string for display
     # in templates.
@@ -59,6 +59,11 @@ class LinkList < BaseEntry
         )
     end
 
+    # Adds support for enumeration.
+    def each
+      @links.each { |title, url| yield title, url }
+    end
+
     # LinkLists currently output as YAML type family
     # !hobix.com,2004/linklist.
     yaml_type "tag:hobix.com,2004:linklist"

data/lib/hobix/out/atom.rb

@@ -15,6 +15,7 @@
 #++
 require 'hobix/base'
 require 'rexml/document'
+require 'erb'
 require 'uri'
 require 'cgi'
 
@@ -23,7 +24,9 @@ module Out
 module XmlQuick
     def x( title, txt, attrs = nil )
         e = REXML::Element.new title
-        e.text = txt if txt
+	e.attributes['xml:space'] = "preserve"
+        # self-quote to work around REXML quoting issues with HTML entities
+        REXML::Text.new ::ERB::Util.h( txt ), true, e, true if txt
         attrs.each { |a,b| e.attributes[a] = b } if attrs
         self << e
     end
@@ -37,52 +40,58 @@ class Atom < Hobix::BaseOutput
     end
     def load( file_name, vars )
         rssdoc = REXML::Document.new( <<EOXML )
-<feed version="0.3"
-  xmlns="http://purl.org/atom/ns#"
+<feed
+  xmlns="http://www.w3.org/2005/Atom"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xml:lang="en">
     <title></title>
     <link rel="alternate" type="text/html" href="" />
-    <modified></modified>
-    <tagline></tagline>
+    <link rel="self" type="application/atom+xml" href="" />
+    <updated></updated>
+    <subtitle></subtitle>
     <id></id>
-    <generator url="http://hobix.com/" version="#{ Hobix::VERSION }">Hobix</generator>
-    <copyright></copyright>
+    <generator uri="http://hobix.com/" version="#{ Hobix::VERSION }">Hobix</generator>
+    <rights></rights>
 </feed>
 EOXML
         uri = vars[:weblog].link
         rssdoc << REXML::XMLDecl.new
         rssdoc.elements['/feed/title'].text = vars[:weblog].title
-        rssdoc.elements['/feed/link'].attributes['href'] = vars[:weblog].link.to_s
-        rssdoc.elements['/feed/tagline'].text = vars[:weblog].tagline
-        rssdoc.elements['/feed/modified'].text = vars[:page].updated.strftime( "%Y-%m-%dT%H:%M:%SZ" )
+        alt_uri = vars[:weblog].link.to_s
+        REXML::XPath.first(rssdoc, '/atom:feed/atom:link[@rel="alternate"]', 
+          { 'atom' => 'http://www.w3.org/2005/Atom' }).attributes['href'] = alt_uri
+        self_uri = "#{vars[:weblog].link}#{vars[:page].link}"
+        REXML::XPath.first(rssdoc, '/atom:feed/atom:link[@rel="self"]', 
+          { 'atom' => 'http://www.w3.org/2005/Atom' }).attributes['href'] = self_uri
+        rssdoc.elements['/feed'].attributes['xml:base'] = self_uri
+        rssdoc.elements['/feed/subtitle'].text = vars[:weblog].tagline
+        rssdoc.elements['/feed/updated'].text = vars[:page].updated.strftime( "%Y-%m-%dT%H:%M:%SZ" )
         rssdoc.elements['/feed/id'].text = "tag:#{ uri.host },#{ Time.now.year }:blog#{ uri.path }"
-        rssdoc.elements['/feed/copyright'].text = vars[:weblog].copyright || "None"
+        rssdoc.elements['/feed/rights'].text = vars[:weblog].copyright || "None"
         ( vars[:entries] || [vars[:entry]] ).each do |e|
             ele = REXML::Element.new 'entry'
             ele.extend XmlQuick
+            ele.attributes['xml:base'] = e.link
             ele.x( 'title', e.title )
             ele.x( 'link', nil, {'rel' => 'alternate', 'type' => 'text/html', 'href' => e.link } )
             ele.x( 'id', "tag:#{ uri.host },#{ Time.now.year }:blog#{ CGI.escape(uri.path) }entry#{ CGI.escape( "/#{ e.id }" ) }" )
-            ele.x( 'issued', e.created.strftime( "%Y-%m-%dT%H:%M:%SZ" ) )
-            ele.x( 'modified', e.modified.strftime( "%Y-%m-%dT%H:%M:%SZ" ) )
+            ele.x( 'published', e.created.strftime( "%Y-%m-%dT%H:%M:%SZ" ) )
+            ele.x( 'updated', (e.modified || e.created).strftime( "%Y-%m-%dT%H:%M:%SZ" ) )
             ele.x( 'dc:subject', e.section_id )
-            e.tags.each do |t|
-                ele.x( 'dc:subject', t )
+            e.tags.find_all {|t| not (t.nil? or t == '') }.each do |t|
+                ele.x( 'category', '', { 'term' => t, 'scheme' => "http://hobix.com/tags" } )
             end
             ele.x( 'summary', 
                 e.summary.to_html.gsub( /img src="\//, "img src=\"#{ vars[:weblog].link }/" ),
-                {'type' => 'text/html', 'mode' => 'escaped'} ) if e.respond_to? :summary and e.summary
+                {'type' => 'html', 'mode' => 'escaped'} ) if e.respond_to? :summary and e.summary and !e.summary.empty?
             author = vars[:weblog].authors[e.author]
             ele_auth = REXML::Element.new 'author'
             ele_auth.extend XmlQuick
             ele_auth.x( 'name', author['name'] )
-            ele_auth.x( 'url', author['url'] ) if author['url']
+            ele_auth.x( 'uri', author['url'] ) if author['url']
             ele_auth.x( 'email', author['email'] ) if author['email']
             ele << ele_auth
-            ele.x( 'content',
-                e.content.to_html.gsub( /img src="\//, "img src=\"#{ vars[:weblog].link }/" ),
-                {'type' => 'text/html', 'mode' => 'escaped'} )
+            ele.x( 'content', e.content.to_html, {'type' => 'html'} )
             rssdoc.elements['/feed'].add ele
         end
         rssdoc.to_s

data/lib/hobix/out/quick.rb

@@ -189,7 +189,7 @@ class Quick < Hobix::BaseOutput
      %{ <div class="sidebarBox">
         <h2 class="sidebarTitle">Syndicate</h2>
         <ul>
-            <li><a href="<%= weblog.link %>/index.xml">RSS 2.0</a></li>
+            <li><a href="<%= weblog.link %>/index.atom">Atom 1.0</a></li>
         </ul>
         </div> }
     end
@@ -205,14 +205,15 @@ class Quick < Hobix::BaseOutput
     end
     def entries_erb
      %{ <% entries.each_day do |day, day_entries| %>
-            <a name="<%= day.strftime( "%Y%m%d" ) %>"></a>
             <+ day_header +>
             <% day_entries.each do |entry| %>
                 <+ entry +>
             <% end %>
         <% end %> }
     end
-    def day_header_erb; %{ <h2 class="dayHeader"><%= day.strftime( "%A, %B %d, %Y" ) %></h2> }; end
+    def day_header_erb; 
+      %{ <h2 class="dayHeader" id="<%= day.strftime( "day%Y%m%d" ) %>"><%= day.strftime( "%A, %B %d, %Y" ) %></h2> }; 
+    end
     def entry_erb
      %{ <div class="entry">
             <+ entry_title +>
@@ -228,7 +229,8 @@ class Quick < Hobix::BaseOutput
         %{ <div class="entryContent"><%= entry.content.to_html %></div> }
     end
     def entry_footer_erb
-     %{ posted by <%= weblog.authors[entry.author]['name'] %> | <a href="<%= entry.link %>"><%= entry.created.strftime( "%I:%M %p" ) %></a> }
+     %{ posted by <%= weblog.authors[entry.author]['name'] %> | 
+        <a href="<%= weblog.expand_path entry.id %>.html"><%= entry.created.strftime( "%I:%M %p" ) %></a> }
     end
     def head_tags_erb; end
     def css_erb; %{ @import "<%= weblog.expand_path "site.css" %>"; }; end
@@ -276,7 +278,7 @@ class QuickSummary < Quick
      %{ <div class="entryContent">
         <% if entry.respond_to? :summary and entry.summary %>
         <%= entry.summary.to_html %>
-        <p><a href="<%= entry.link %>">Continue to full post.</a></p>
+        <p><a href="<%= weblog.expand_path entry.id %>">Continue to full post.</a></p>
         <% else %>
         <%= entry.content.to_html %>
         <% end %>
@@ -289,7 +291,7 @@ class QuickArchive < Quick
         "quick-archive"
     end
     def entry_erb
-     %{ <h3 class="entryTitle"><a href="<%= entry.link %>"><%= entry.title %></a></h3> }
+     %{ <h3 class="entryTitle"><a href="<%= weblog.expand_path entry.id %>"><%= entry.title %></a></h3> }
     end
     def entries_erb
      %{ <div id="archives">