0
@@ -66,4 +66,4 @@ module Admin
0
         @article = Article[params[:id]]
0
       end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -3,4 +3,4 @@ module Admin
0
     layout :admin
0
     before :login_required
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -23,4 +23,4 @@ module Admin
0
         @configuration = Configuration.current
0
       end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -20,4 +20,4 @@ module Admin
0
         login_required
0
       end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -48,4 +48,4 @@ module Admin
0
         @plugin = Plugin[params[:id]]
0
       end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -26,4 +26,4 @@ module Admin
0
       redirect_back_or_default('/')
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -48,4 +48,4 @@ module Admin
0
         @user = User[params[:id]]
0
       end    
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -46,4 +46,4 @@ class Application < Merb::Controller
0
   def self.include_plugin_views(plugin)
0
     self._template_roots << [File.join(Hooks::get_plugin_by_caller(plugin).path, "views"), :_template_location]
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -25,4 +25,4 @@ class Articles < Application
0
     #render_then_call(display(@article)) { Hooks::Events.after_show_article_request(@article, request) }
0
     display @article
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -15,4 +15,4 @@ class Exceptions < Application
0
   def not_acceptable
0
     render :format => :html
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -3,4 +3,4 @@ module Merb
0
     module ConfigurationsHelper
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -3,4 +3,4 @@ module Merb
0
     module DashboardHelper
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -1,4 +1,4 @@
0
 module Merb
0
   module ArticlesHelper
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -168,4 +168,4 @@ module Merb
0
       link_to author["name"], author["homepage"]
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -8,4 +8,4 @@ class Activity
0
   
0
   validates_present :message, :key => "uniq_msg"
0
 
0
-end
0
\ No newline at end of file
0
+end

0
@@ -162,4 +162,4 @@ class Article
0
         end
0
       end
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -41,4 +41,4 @@ class Configuration
0
     configuration = Configuration.create(:title => "My new Feather blog", :tag_line => "Feather rocks!", :about => "I rock, and so does my Feather blog", :about_formatter => "default", :permalink_format => "/:year/:month/:day/:title") if configuration.nil?
0
     configuration    
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -30,4 +30,4 @@ class PluginSetting
0
 
0
   end
0
 
0
-end
0
\ No newline at end of file
0
+end

0
@@ -56,4 +56,4 @@ class User
0
   def login=(value);
0
     attribute_set :login, value.downcase unless value.nil?
0
   end
0
-end
0
\ No newline at end of file
0
+end

0
@@ -3,4 +3,4 @@
0
   <td><%= render_relative_published_at(article) %></td>
0
   <td><%= article.user.name %></td>
0
   <td> <%= link_to "Edit", url(:edit_admin_article, article) %> | <%= link_to 'Delete', url(:delete_admin_article, article), {:method => :delete, :onclick => "return confirm('Are you sure?')"} %></td>
0
-</tr>
0
\ No newline at end of file
0
+</tr>

0
@@ -10,4 +10,4 @@
0
   <%= select_control :formatter, :collection => Hooks::Formatters.available_formatters, :selected => (@article.new_record? ? (self.current_user.default_formatter || "default") : @article.formatter) %>
0
 </p>
0
 
0
-<%= render_plugin_views "article_form_fields" %>
0
\ No newline at end of file
0
+<%= render_plugin_views "article_form_fields" %>

0
@@ -8,4 +8,4 @@
0
 <% form_for :article, :action => url(:admin_article, @article), :method => :put do %>
0
   <%= partial 'form' %>
0
   <%= submit_button 'Save Article' %> or <%= link_to 'Cancel', url(:admin_articles) %>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -31,4 +31,4 @@
0
 <div id="pagination">
0
   <%= merb_paginate @articles %>
0
   <%= page_entries_info @articles %>
0
-</div>
0
\ No newline at end of file
0
+</div>

0
@@ -10,4 +10,4 @@
0
   <%= submit_button 'Save Article' %> or <%= link_to 'Cancel', url(:admin_articles) %>
0
 <% end %>
0
 
0
-<%= link_to "Back to articles", url(:admin_articles) %>
0
\ No newline at end of file
0
+<%= link_to "Back to articles", url(:admin_articles) %>

0
@@ -26,4 +26,4 @@
0
 </p>
0
 
0
 <%= link_to "Edit article", url(:edit_admin_article, @article) %> |
0
-<%= link_to "Back to articles", url(:admin_articles) %>
0
\ No newline at end of file
0
+<%= link_to "Back to articles", url(:admin_articles) %>

0
@@ -64,4 +64,4 @@
0
   </td>
0
   </tr>
0
   </table>
0
-</div>
0
\ No newline at end of file
0
+</div>

0
@@ -5,4 +5,4 @@ $('configuration-about-formatter-display').innerHTML = "<%= @configuration.about
0
 $('configuration-permalink-format-display').innerHTML = "<%= @configuration.permalink_format %>";
0
 $('configuration-clear-cache-display').hide();
0
 $('configuration-clear-cache').show();
0
-$('blog_title').innerHTML = "<%= @configuration.title %>";
0
\ No newline at end of file
0
+$('blog_title').innerHTML = "<%= @configuration.title %>";

0
@@ -22,4 +22,4 @@
0
   <% @activity.each do |activity| %>
0
   <%= activity.message %>, <%= render_relative_date(activity.created_at) %><br />
0
   <% end %>
0
-</div>
0
\ No newline at end of file
0
+</div>

0
@@ -5,4 +5,4 @@
0
   <td><%= link_to plugin.homepage, plugin.homepage %></td>
0
   <td><%= plugin.active %></td>
0
   <td <%= link_to "View", url(:admin_plugin, plugin) %> | <%= link_to 'Delete', url(:delete_admin_plugin, plugin), {:method => :delete, :onclick => "return confirm('Are you sure?')"} %></td>
0
-</tr>
0
\ No newline at end of file
0
+</tr>

0
@@ -9,4 +9,4 @@
0
   <%= text_control :url, :size => 65, :label => 'URL:' %>
0
   <br /><br />
0
   <%= submit_button 'Install Plugin' %> or <%= link_to 'Cancel', url(:admin_plugins) %>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -33,4 +33,4 @@
0
   <div id="plugin_display"></div>
0
 </p>
0
 
0
-<%= link_to "Back to plugins", url(:admin_plugins) %>
0
\ No newline at end of file
0
+<%= link_to "Back to plugins", url(:admin_plugins) %>

0
@@ -5,4 +5,4 @@
0
   $('plugin_activated').hide();
0
   $('plugin_deactivated').show();
0
 <% end %>
0
-$('nav').innerHTML = '<%= render_menu %>';
0
\ No newline at end of file
0
+$('nav').innerHTML = '<%= render_menu %>';

0
@@ -9,4 +9,4 @@
0
 <%= checkbox_field :name => 'remember_me' %></label></p>
0
 
0
 <p><%= submit_button 'Log in' %></p>
0
-<% end -%>
0
\ No newline at end of file
0
+<% end -%>

0
@@ -4,4 +4,4 @@
0
   <td><%= user.email %></td>
0
   <td><%= user.time_zone %></td>
0
   <td> <%= link_to "Edit", url(:edit_admin_user, user) %> | <%= link_to 'Delete', url(:delete_admin_user, user), {:method => :delete, :onclick => "return confirm('Are you sure?')"} %></td>
0
-</tr>
0
\ No newline at end of file
0
+</tr>

0
@@ -24,4 +24,4 @@
0
   <p>
0
     <%= submit_button "Update" %> or <%= link_to('Cancel', url(:admin_users)) %>
0
   </p>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -21,4 +21,4 @@
0
   <p>
0
     <%= submit_button "Create" %> or <%= link_to('Cancel', url(:admin_users)) %>
0
   </p>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -15,4 +15,4 @@
0
 </p>
0
 
0
 <%= link_to "Edit user", url(:edit_admin_user, @user) %> |
0
-<%= link_to "Back to users", url(:admin_users) %>
0
\ No newline at end of file
0
+<%= link_to "Back to users", url(:admin_users) %>

0
@@ -16,4 +16,4 @@
0
   </ul>
0
 </div>
0
 <%= render_plugin_views @articles.nil? ? "after_article" : "after_article_in_list", :with => article %>
0
-<%= render_plugin_views "between_articles", :with => {:before => article, :after => @articles[@articles.index(article) + 1]} unless @articles.nil? || @articles[@articles.index(article) + 1].nil? %>
0
\ No newline at end of file
0
+<%= render_plugin_views "between_articles", :with => {:before => article, :after => @articles[@articles.index(article) + 1]} unless @articles.nil? || @articles[@articles.index(article) + 1].nil? %>

0
@@ -8,4 +8,4 @@
0
   <%= render_plugin_views "first_article_in_list", :with => {:first => @articles.first} %>
0
   <%= partial(:article, :with => @articles) %>
0
   <%= render_plugin_views "last_article_in_list", :with => {:last => @articles.last} %>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -2,4 +2,4 @@
0
   <%= @article.title %>
0
 <% end %>
0
 
0
-<%= partial(:article, :with => @article) %>
0
\ No newline at end of file
0
+<%= partial(:article, :with => @article) %>

0
@@ -77,4 +77,4 @@
0
       }
0
     }
0
   </script>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -77,4 +77,4 @@
0
       }
0
     }
0
   </script>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -77,4 +77,4 @@
0
       }
0
     }
0
   </script>
0
-<% end %>
0
\ No newline at end of file
0
+<% end %>

0
@@ -37,4 +37,4 @@
0
   </div>
0
   </div>
0
 </body>
0
-</html>
0
\ No newline at end of file
0
+</html>

0
@@ -1 +1 @@
0
-<%= catch_content :for_layout %>
0
\ No newline at end of file
0
+<%= catch_content :for_layout %>

0
@@ -55,4 +55,4 @@
0
   </div>
0
 </div>
0
 </body>
0
-</html>
0
\ No newline at end of file
0
+</html>

0
@@ -28,4 +28,4 @@
0
     <br style="clear: both;">
0
   </div>
0
 </body>
0
-</html>
0
\ No newline at end of file
0
+</html>

0
@@ -1 +1 @@
0
-<li><%= link_to archive[:name], month_url(archive[:year], archive[:month]) %> (<%= archive[:article_count] %>)</li>
0
\ No newline at end of file
0
+<li><%= link_to archive[:name], month_url(archive[:year], archive[:month]) %> (<%= archive[:article_count] %>)</li>

0
@@ -1,4 +1,4 @@
0
 <h4>Formatting Content</h4>
0
 <p>
0
 Feather can use plugins to format your content; by default however, it is rendered as you type it, with line breaks maintained within your post. Please consult the documentation for any third-party formatters you want to use to learn the specific syntax.
0
-</p>
0
\ No newline at end of file
0
+</p>

0
@@ -3,4 +3,4 @@ Merb::Config.use { |c|
0
   c[:exception_details] = true
0
   c[:reload_classes] = true
0
   c[:reload_time] = 0.5
0
-}
0
\ No newline at end of file
0
+}