0
@@ -119,32 +119,32 @@ class Article < Content
0
   end
0
 
0
   protected
0
-  def create_permalink
0
-    self.permalink = title.strip.downcase \
0
-      .gsub(/['"]/, '')                   \
0
-      .gsub(/(\W|\ )+/, '-')              \
0
-      .chomp('-').reverse.chomp('-').reverse
0
-  end
0
-
0
-  def set_filter_from_user
0
-    self.filters = user.filters if filters.nil?
0
-  end
0
-
0
-  def save_assigned_sections
0
-    return if @new_sections.nil?
0
-    assigned_sections.each do |assigned_section|
0
-      @new_sections.delete(assigned_section.section_id.to_s) || assigned_section.destroy
0
+    def create_permalink
0
+      self.permalink = title.strip.downcase \
0
+        .gsub(/['"]/, '')                   \
0
+        .gsub(/(\W|\ )+/, '-')              \
0
+        .chomp('-').reverse.chomp('-').reverse
0
     end
0
     
0
-    if !@new_sections.blank?
0
-      Section.find(:all, :conditions => ['id in (?)', @new_sections]).each { |section| assigned_sections.create :section => section }
0
-      sections.reset
0
+    def set_filter_from_user
0
+      self.filters = user.filters if filters.nil?
0
+    end
0
+    
0
+    def save_assigned_sections
0
+      return if @new_sections.nil?
0
+      assigned_sections.each do |assigned_section|
0
+        @new_sections.delete(assigned_section.section_id.to_s) || assigned_section.destroy
0
+      end
0
+      
0
+      if !@new_sections.blank?
0
+        Section.find(:all, :conditions => ['id in (?)', @new_sections]).each { |section| assigned_sections.create :section => section }
0
+        sections.reset
0
+      end
0
+    
0
+      @new_sections = nil
0
+    end
0
+    
0
+    def body_for_mode(mode = :list)
0
+      (mode == :single ? excerpt_html.to_s + "\n\n" + body_html.to_s : (excerpt_html || body_html)).strip
0
     end
0
-
0
-    @new_sections = nil
0
-  end
0
-
0
-  def body_for_mode(mode = :list)
0
-    (mode == :single ? excerpt_html.to_s + "\n\n" + body_html.to_s : (excerpt_html || body_html)).strip
0
-  end
0
 end
0
\ No newline at end of file

0
@@ -1,9 +1,12 @@
0
 <tr class="<%= article.status %><%= " draft" if article.draft %>" id="article_<%= article.id %>">
0
   <td><%= image_tag "icons/#{status_icon[article.status][1]}", :class => "#{status_icon[article.status][0]} icon", :title => "This article is #{article.status}", :alt => "#{article.status}" %></td>
0
-  <td class="article_title"><%= link_to_article article %></td>
0
-  <td><span class="date"><%= published_at_for article %></span></td>
0
+  <td class="article_title"><%= link_to(article.title, {:action => 'edit', :id => article}) %></td>
0
   <td>
0
-    <%= link_to 'Comments', { :action => 'comments', :id => article } %>
0
-    <%= link_to_image('page_edit', { :action => 'edit', :id => article }, { :size => '16x16' }) %>
0
+    <% if article.comments.size == 0 %>
0
+      none
0
+    <% else %>
0
+      <%= link_to pluralize(article.comments.size, 'comment'), { :action => 'comments', :id => article } %>
0
+    <% end %>
0
   </td>
0
+  <td><span class="date"><%= published_at_for article %></span></td>
0
 </tr>
0
\ No newline at end of file

0
@@ -1,12 +1,12 @@
0
-<h2>Your Articles</h2>
0
-
0
+<% content_for :action_nav do %>
0
 <!-- begin action nav -->
0
-<div class="round" id="page-nav">
0
-  <ul id="act-nav">
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
     <li><%= link_to "Create new article", :action => "new" %></li>
0
   </ul>
0
 </div>
0
 <!-- /end action nav -->
0
+<% end %>
0
 
0
 <% if @drafts.any? -%>
0
 <ul id="drafts">
0
@@ -22,8 +22,8 @@
0
     <tr>
0
       <th scope="col" class="small-col">Status</th>
0
       <th scope="col">Article</th>
0
+      <th scope="col">Comments</th>
0
       <th scope="col">Published</th>
0
-      <th scope="col" class="small-col">Edit</th>
0
     </tr>
0
   </thead>
0
   <tbody id="articles">

0
@@ -1,4 +1,3 @@
0
-<h2>Manage your Assets and Resources</h2>
0
 <% form_for :resource, @resource, :url => { :action => 'create' } do |f| -%>
0
 <%= render :partial => 'form', :object => @resource, :locals => { 
0
   :title  => 'Create a new template',

0
@@ -1,14 +1,10 @@
0
 <% with_options :controller => 'articles', :id => event.article_id do |article| -%>
0
 <li id="event-<%= event.id %>" class="event-comment<%= " shade" if shaded %>">
0
+  <%= link_to_article event.article %> received a comment.
0
+  
0
   <span class="event-time"><%= event_time_for event, later %></span>
0
-  <blockquote><p><%= truncate strip_tags(event.body), 100 %></p></blockquote>
0
-  <%= link_to_article event.article %> was commented on.
0
+  <blockquote><p>&quot;<%= truncate strip_tags(event.body), 100 %>&quot;</p></blockquote>
0
   <span class="meta">
0
-    <strong>Article:</strong>
0
-    <%= article.link_to 'Comments', :action => 'comments' %> |
0
-    <%= article.link_to 'Preview',  :action => 'show' %> |
0
-    <%= link_to_image('page_edit', { :controller => 'articles', :action => 'edit', :id => event.article_id }, { :size => '16x16' }) %><br />
0
-    <strong>Event:</strong> <%= link_to_remote 'Delete', :url => { :action => 'delete', :id => event } %><br />
0
     by <%=h event.author %>
0
   </span>
0
 </li>

0
@@ -1,27 +1,19 @@
0
-
0
+<% content_for :action_nav do %>
0
 <!-- begin action nav -->
0
-<div class="round" id="page-nav">
0
-  <ul id="act-nav">
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
     <li><%= link_to "Create new article",  :controller => 'articles', :action => "new" %></li>
0
     <li><%= link_to "Create new section",  :controller => 'sections' %></li>
0
     <li><%= link_to "Update your account", :controller => 'users', :action => 'show', :id => current_user %></li>
0
   </ul>
0
 </div>
0
 <!-- /end action nav -->
0
-
0
-<!-- begin quickstats 
0
-<div id="stats">
0
-  <ul id="quick-stats" class="clear">
0
-    <li id="stat-comments" class="round"><div>23</div></li>
0
-  </ul>
0
-</div>
0
- /end quickstats -->
0
+<% end %>
0
 
0
 
0
 <!-- begin overview -->
0
 <div id="overview">
0
-  <%= link_to 'Subscribe via RSS', overview_url, :class => 'feed right' %>
0
-  <h3>Whats happening around <%= site.title %></h3>
0
+  <%= link_to 'Subscribe', overview_url, :class => 'feed right' %>
0
   
0
   <h4>Today <%= todays_short_date %></h4>
0
   <%= render_events @todays_events %>
0
@@ -39,7 +31,7 @@
0
 <% content_for :sidebar do %>
0
   <% if @articles.any? -%>
0
   <div class="sgroup">
0
-    <h3>Comments Needing Moderation</h3>
0
+    <h3>Comments awaiting your approval</h3>
0
     <ul class="slist">
0
     <% @articles.each do |article| -%>
0
       <li><%= link_to "<strong>(#{article.unapproved_comments.size})</strong> #{h(article.title)}", :controller => 'articles', :action => 'comments', :id => article.id, :filter => :unapproved %></li>
0
@@ -52,7 +44,7 @@
0
     <h3>Who done it</h3>
0
     <ul class="slist" id="activity">
0
       <% for user in @users %>
0
-        <li><%= link_to user.login, :controller => 'users', :action => 'show', :id => user.login %> showed up about <%= distance_of_time_in_words_to_now(user.updated_at) %> ago</li>
0
+        <li><%= link_to user.login, :controller => 'users', :action => 'show', :id => user.login %> showed up <%= distance_of_time_in_words_to_now(user.updated_at) %> ago</li>
0
       <% end %>
0
     </ul>
0
   </div>

0
@@ -1,4 +1,13 @@
0
-<h2>Edit Section</h2>
0
+<% content_for :action_nav do %>
0
+<!-- begin action nav -->
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
+    <li><%= link_to 'New Section', :action => 'index' %></li>
0
+  </ul>
0
+</div>
0
+<!-- /end action nav -->
0
+<% end %>
0
+
0
 <%= render :partial => 'form' %>
0
 
0
 <% content_for :sidebar do %>

0
@@ -1,4 +1,13 @@
0
-<h2>Sections</h2>
0
+<% content_for :action_nav do %>
0
+<!-- begin action nav -->
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
+    <li><%= link_to 'New Section', :action => 'index' %></li>
0
+  </ul>
0
+</div>
0
+<!-- /end action nav -->
0
+<% end %>
0
+
0
 <%= render :partial => 'form' %>
0
 
0
 <% content_for :sidebar do %>

0
@@ -1,4 +1,3 @@
0
-<h2>Control different parts of your website</h2>
0
 <%= form_tag :action => "update" %>
0
 <div id="general" class="setgroup">
0
   <h3>General site settings</h3>

0
@@ -1,4 +1,3 @@
0
-<h2>Update your template</h2>
0
 <div id="flash-notice" style="display:none"></div>
0
 <div id="template-container">
0
 <% form_remote_for :template, @tmpl, :url => { :action => 'update', :id => @tmpl }, 

0
@@ -1,11 +1,12 @@
0
-<h2>People on the inside</h2>
0
+<% content_for :action_nav do %>
0
 <!-- begin action nav -->
0
-<div id="page-nav" class="round">
0
-  <ul id="act-nav">
0
+<div id="page-nav">
0
+  <ul id="act-nav" class="clear">
0
     <li><%= link_to "Add new user", :action => "new" %></li>
0
   </ul>
0
 </div>
0
 <!-- /end action nav -->
0
+<% end %>
0
 
0
 <ul id="users">
0
 <% @users.each do |user| -%>

0
@@ -1,4 +1,3 @@
0
-<h2>Creating a new User</h2>
0
 <% form_for :user, @user, :url => { :action => 'create' }, :html => { :multipart => true } do |f| -%>
0
 <%= render :partial => 'form', :locals => { :f => f, :create  => true } %>
0
 <% end -%>

0
@@ -14,7 +14,7 @@ Rails::Initializer.class_eval do
0
   end
0
 end
0
 
0
-require 'vendor/RedCloth-3.0.4/lib/redcloth'
0
+require 'RedCloth-3.0.4/lib/redcloth'
0
 Rails::Initializer.run do |config|
0
   # Settings in config/environments/* take precedence those specified here
0
   

0
@@ -3,7 +3,7 @@
0
 # In the development environment your application's code is reloaded on
0
 # every request.  This slows down response time but is perfect for development
0
 # since you don't have to restart the webserver when you make code changes.
0
-config.cache_classes     = false
0
+config.cache_classes     = true
0
 
0
 # Log error messages when you accidentally call methods on nil.
0
 config.whiny_nils        = true
0
@@ -13,7 +13,7 @@ config.breakpoint_server = true
0
 
0
 # Show full error reports and disable caching
0
 config.action_controller.consider_all_requests_local = true
0
-config.action_controller.perform_caching             = false
0
+config.action_controller.perform_caching             = true
0
 
0
 # Don't care if the mailer can't send
0
 config.action_mailer.raise_delivery_errors = false

0
@@ -4,11 +4,11 @@
0
 server.port = 3000
0
 
0
 server.modules           = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi" )
0
-server.error-handler-404 = "/Users/rick/p/mephisto/trunk/dispatch.fcgi"
0
-server.document-root     = "/Users/rick/p/mephisto/trunk/public/"
0
+server.error-handler-404 = "/dispatch.fcgi"
0
+server.document-root     = CWD + "/public/"
0
 
0
-server.errorlog          = "/Users/rick/p/mephisto/trunk/log/lighttpd.error.log"
0
-accesslog.filename       = "/Users/rick/p/mephisto/trunk/log/lighttpd.access.log"
0
+server.errorlog          = CWD + "/log/lighttpd.error.log"
0
+accesslog.filename       = CWD + "/log/lighttpd.access.log"
0
 
0
 url.rewrite              = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
0
 
0
@@ -19,9 +19,9 @@ fastcgi.server = ( ".fcgi" =>
0
       (
0
         "min-procs" => 1, 
0
         "max-procs" => 1,
0
-        "socket"    => "/Users/rick/p/mephisto/trunk/log/fcgi.socket",
0
-        "bin-path"  => "/Users/rick/p/mephisto/trunk/public/dispatch.fcgi",
0
-        "bin-environment" => ( "RAILS_ENV" => "development" )
0
+        "socket"    => CWD + "/tmp/sockets/fcgi.socket",
0
+        "bin-path"  => CWD + "/public/dispatch.fcgi",
0
+        "bin-environment" => ( "RAILS_ENV" => "production" )
0
       )
0
   )
0
 )
0
@@ -38,3 +38,9 @@ mimetype.assign = (
0
   ".swf"        =>  "application/x-shockwave-flash",
0
   ".txt"        =>  "text/plain"
0
 )
0
+
0
+# Making sure file uploads above 64k always work when using IE or Safari
0
+# For more information, see http://trac.lighttpd.net/trac/ticket/360
0
+$HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" {
0
+  server.max-keep-alive-requests = 0
0
+}

0
@@ -1,4 +1,4 @@
0
-#!/opt/local/bin/ruby
0
+#!/usr/bin/env ruby
0
 #
0
 # You may specify the path to the FastCGI crash log (a log of unhandled
0
 # exceptions which forced the FastCGI instance to exit, great for debugging)

0
@@ -1,52 +1,57 @@
0
 html {
0
   margin: 0;
0
   padding: 0;
0
-  height: 100%;
0
 }
0
 
0
 body {
0
   margin: 0;
0
   text-align: center;
0
   padding: 0;
0
-  font: 1em/1.4em "Lucida Grande", Lucida, Helvetica, sans-serif;
0
-  background: #fff;
0
-  color: #000;
0
-  height: 100%;
0
+  font: normal 12px/1.5em "Lucida Grande", Lucida, Helvetica, sans-serif;
0
+  background: #99D3D5;
0
+  color: #333;
0
 }
0<