@@ -21,7 +21,7 @@ module BlikiContent self.methods.sort.each do |m| content_plugins = self.send(m, content_plugins) if m =~ /^plugin_/ end - RDiscount.new(content_plugins).to_html + RDiscount.new(content_plugins).to_html.chomp end def link "/#{self.year}/#{self.month}/#{self.day}/#{self.nicetitle}/" models/content.rb @@ -1,16 +1,14 @@ -<h2>Everything tagged with ‘<%= @tag %>’ on <%= Sinatra.options.name %>:</h2> -<div class="group"> -<% @posts.each do |post| %> - <h2 class="title"><%= link_to post.title, post.link %></h2> - <small>A <%= post.class.to_s.downcase %> published on <%= post.date %>, filed under <%= tag_list post.tags %></small> -<% end %> -</div> - -<% if !@archives.nil? %> -<div class="group"> - <h2>More...</h2> - <% @archives.each do |post| %><h3><%= link_to post.title, post.link %> (<%= post.date %>)</h3><% end %> -</div> -<% end %> - -<div class="admin"><a href="/new" accesskey="n">new</a></div> \ No newline at end of file + <h2>Everything tagged with ‘<%= @tag %>’ on <%= Sinatra.options.name %>:</h2> + <div class="group"> + <% @posts.each do |post| %> + <h2 class="title"><%= link_to post.title, post.link %></h2> + <small>A <%= post.class.to_s.downcase %> published on <%= post.date %>, filed under <%= tag_list post.tags %></small> + <% end %> + </div> + <% if !@archives.nil? %> + <div class="group"> + <h2>More...</h2> + <% @archives.each do |post| %><h3><%= link_to post.title, post.link %> (<%= post.date %>)</h3><% end %> + </div> + <% end %> + <div class="admin"><a href="/new" accesskey="n">new</a></div> \ No newline at end of file themes/default/archive.erb @@ -1,23 +1,24 @@ -<div class="group"> + <div class="group"> <% @posts.each do |post| %> - <div class="<%= post.class.to_s.downcase %>"> - <h2 class="title"><%= link_to post.title, post.link %></h2> - <small>posted on <%= post.date %>, filed under <%= tag_list post.tags %></small> - <div class="body"> - <%= post.content %> - </div> - <%= "<p><a href='#{post.link}#disqus_thread'>View Comments</a></p>" if Sinatra.options.use_comments %> - </div> + <div class="<%= post.class.to_s.downcase %>"> + <h2 class="title"><%= link_to post.title, post.link %></h2> + <small>posted on <%= post.date %>, filed under <%= tag_list post.tags %></small> + <div class="body"> + <%= post.content %> + </div> + <%= "<p><a href='#{post.link}#disqus_thread'>View Comments</a></p>" if Sinatra.options.use_comments %> + </div> + <!-- .post --> <% end %> -</div> - + </div> + <!-- .group --> <% if !@archives.nil? %> -<div class="group"> - <h2>archives...</h2> - <% @archives.each do |post| %> - <h3><%= link_to post.title, post.link %> (<%= post.date %>)</h3> - <% end %> -</div> + <div class="group"> + <h2>archives...</h2> + <% @archives.each do |post| %> + <h3><%= link_to post.title, post.link %> (<%= post.date %>)</h3> + <% end %> + </div> + <!-- .group --> <% end %> - -<div class="admin"><a href="/new" accesskey="n">new</a></div> \ No newline at end of file + <div class="admin"><a href="/new" accesskey="n">new</a></div> \ No newline at end of file themes/default/home.erb @@ -13,11 +13,13 @@ <div id="content"> <%= yield %> </div> + <!-- #content --> <div id="about"> <h4>about</h4> <p>this is the home of <%= Sinatra.options.author_name %>.</p> <h4>i talk about <%= tag_list @tags %></h4> </div> + <!-- #about --> <div id="footer">powered by <%= link_to "bliki", "http://github.com/bomberstudios/bliki" %></div> <%= reinvigorate unless development? %> </body> themes/default/layout.erb 80322603360df768d7472e2ecdd4da92909721c4 Ale Muñoz bomberstudios@gmail.com http://github.com/bomberstudios/bliki/commit/1e1deb7693b10809296c2a3e00b55673470eeb82 1e1deb7693b10809296c2a3e00b55673470eeb82 2008-12-28T23:40:08-08:00 2008-12-28T23:40:08-08:00 Formatted templates so that the final HTML is properly indented (yes, I care about those things :) 03e7dda66c0658fc00f6866560b54882b263235e Ale Muñoz bomberstudios@gmail.com