@@ -66,4 +66,4 @@ module Admin @article = Article[params[:id]] end end -end \ No newline at end of file +end app/controllers/admin/articles.rb @@ -3,4 +3,4 @@ module Admin layout :admin before :login_required end -end \ No newline at end of file +end app/controllers/admin/base.rb @@ -23,4 +23,4 @@ module Admin @configuration = Configuration.current end end -end \ No newline at end of file +end app/controllers/admin/configurations.rb @@ -20,4 +20,4 @@ module Admin login_required end end -end \ No newline at end of file +end app/controllers/admin/dashboard.rb @@ -48,4 +48,4 @@ module Admin @plugin = Plugin[params[:id]] end end -end \ No newline at end of file +end app/controllers/admin/plugins.rb @@ -26,4 +26,4 @@ module Admin redirect_back_or_default('/') end end -end \ No newline at end of file +end app/controllers/admin/sessions.rb @@ -48,4 +48,4 @@ module Admin @user = User[params[:id]] end end -end \ No newline at end of file +end app/controllers/admin/users.rb @@ -46,4 +46,4 @@ class Application < Merb::Controller def self.include_plugin_views(plugin) self._template_roots << [File.join(Hooks::get_plugin_by_caller(plugin).path, "views"), :_template_location] end -end \ No newline at end of file +end app/controllers/application.rb @@ -25,4 +25,4 @@ class Articles < Application #render_then_call(display(@article)) { Hooks::Events.after_show_article_request(@article, request) } display @article end -end \ No newline at end of file +end app/controllers/articles.rb @@ -15,4 +15,4 @@ class Exceptions < Application def not_acceptable render :format => :html end -end \ No newline at end of file +end app/controllers/exceptions.rb @@ -3,4 +3,4 @@ module Merb module ConfigurationsHelper end end -end \ No newline at end of file +end app/helpers/admin/configurations_helper.rb @@ -3,4 +3,4 @@ module Merb module DashboardHelper end end -end \ No newline at end of file +end app/helpers/admin/dashboard_helper.rb @@ -1,4 +1,4 @@ module Merb module ArticlesHelper end -end \ No newline at end of file +end app/helpers/articles_helper.rb @@ -168,4 +168,4 @@ module Merb link_to author["name"], author["homepage"] end end -end \ No newline at end of file +end app/helpers/global_helpers.rb @@ -8,4 +8,4 @@ class Activity validates_present :message, :key => "uniq_msg" -end \ No newline at end of file +end app/models/activity.rb @@ -162,4 +162,4 @@ class Article end end end -end \ No newline at end of file +end app/models/article.rb @@ -41,4 +41,4 @@ class Configuration 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? configuration end -end \ No newline at end of file +end app/models/configuration.rb @@ -30,4 +30,4 @@ class PluginSetting end -end \ No newline at end of file +end app/models/plugin_setting.rb @@ -56,4 +56,4 @@ class User def login=(value); attribute_set :login, value.downcase unless value.nil? end -end \ No newline at end of file +end app/models/user.rb @@ -3,4 +3,4 @@ <td><%= render_relative_published_at(article) %></td> <td><%= article.user.name %></td> <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> -</tr> \ No newline at end of file +</tr> app/views/admin/articles/_article.html.erb @@ -10,4 +10,4 @@ <%= select_control :formatter, :collection => Hooks::Formatters.available_formatters, :selected => (@article.new_record? ? (self.current_user.default_formatter || "default") : @article.formatter) %> </p> -<%= render_plugin_views "article_form_fields" %> \ No newline at end of file +<%= render_plugin_views "article_form_fields" %> app/views/admin/articles/_form.html.erb @@ -8,4 +8,4 @@ <% form_for :article, :action => url(:admin_article, @article), :method => :put do %> <%= partial 'form' %> <%= submit_button 'Save Article' %> or <%= link_to 'Cancel', url(:admin_articles) %> -<% end %> \ No newline at end of file +<% end %> app/views/admin/articles/edit.html.erb @@ -31,4 +31,4 @@ <div id="pagination"> <%= merb_paginate @articles %> <%= page_entries_info @articles %> -</div> \ No newline at end of file +</div> app/views/admin/articles/index.html.erb @@ -10,4 +10,4 @@ <%= submit_button 'Save Article' %> or <%= link_to 'Cancel', url(:admin_articles) %> <% end %> -<%= link_to "Back to articles", url(:admin_articles) %> \ No newline at end of file +<%= link_to "Back to articles", url(:admin_articles) %> app/views/admin/articles/new.html.erb @@ -26,4 +26,4 @@ </p> <%= link_to "Edit article", url(:edit_admin_article, @article) %> | -<%= link_to "Back to articles", url(:admin_articles) %> \ No newline at end of file +<%= link_to "Back to articles", url(:admin_articles) %> app/views/admin/articles/show.html.erb @@ -64,4 +64,4 @@ </td> </tr> </table> -</div> \ No newline at end of file +</div> app/views/admin/configurations/show.html.erb @@ -5,4 +5,4 @@ $('configuration-about-formatter-display').innerHTML = "<%= @configuration.about $('configuration-permalink-format-display').innerHTML = "<%= @configuration.permalink_format %>"; $('configuration-clear-cache-display').hide(); $('configuration-clear-cache').show(); -$('blog_title').innerHTML = "<%= @configuration.title %>"; \ No newline at end of file +$('blog_title').innerHTML = "<%= @configuration.title %>"; app/views/admin/configurations/update.js.erb @@ -22,4 +22,4 @@ <% @activity.each do |activity| %> <%= activity.message %>, <%= render_relative_date(activity.created_at) %><br /> <% end %> -</div> \ No newline at end of file +</div> app/views/admin/dashboard/index.html.erb @@ -5,4 +5,4 @@ <td><%= link_to plugin.homepage, plugin.homepage %></td> <td><%= plugin.active %></td> <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> -</tr> \ No newline at end of file +</tr> app/views/admin/plugins/_plugin.html.erb @@ -9,4 +9,4 @@ <%= text_control :url, :size => 65, :label => 'URL:' %> <br /><br /> <%= submit_button 'Install Plugin' %> or <%= link_to 'Cancel', url(:admin_plugins) %> -<% end %> \ No newline at end of file +<% end %> app/views/admin/plugins/new.html.erb @@ -33,4 +33,4 @@ <div id="plugin_display"></div> </p> -<%= link_to "Back to plugins", url(:admin_plugins) %> \ No newline at end of file +<%= link_to "Back to plugins", url(:admin_plugins) %> app/views/admin/plugins/show.html.erb @@ -5,4 +5,4 @@ $('plugin_activated').hide(); $('plugin_deactivated').show(); <% end %> -$('nav').innerHTML = '<%= render_menu %>'; \ No newline at end of file +$('nav').innerHTML = '<%= render_menu %>'; app/views/admin/plugins/update.js.erb @@ -9,4 +9,4 @@ <%= checkbox_field :name => 'remember_me' %></label></p> <p><%= submit_button 'Log in' %></p> -<% end -%> \ No newline at end of file +<% end -%> app/views/admin/sessions/new.html.erb @@ -4,4 +4,4 @@ <td><%= user.email %></td> <td><%= user.time_zone %></td> <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> -</tr> \ No newline at end of file +</tr> app/views/admin/users/_user.html.erb @@ -24,4 +24,4 @@ <p> <%= submit_button "Update" %> or <%= link_to('Cancel', url(:admin_users)) %> </p> -<% end %> \ No newline at end of file +<% end %> app/views/admin/users/edit.html.erb @@ -21,4 +21,4 @@ <p> <%= submit_button "Create" %> or <%= link_to('Cancel', url(:admin_users)) %> </p> -<% end %> \ No newline at end of file +<% end %> app/views/admin/users/new.html.erb @@ -15,4 +15,4 @@ </p> <%= link_to "Edit user", url(:edit_admin_user, @user) %> | -<%= link_to "Back to users", url(:admin_users) %> \ No newline at end of file +<%= link_to "Back to users", url(:admin_users) %> app/views/admin/users/show.html.erb @@ -16,4 +16,4 @@ </ul> </div> <%= render_plugin_views @articles.nil? ? "after_article" : "after_article_in_list", :with => article %> -<%= render_plugin_views "between_articles", :with => {:before => article, :after => @articles[@articles.index(article) + 1]} unless @articles.nil? || @articles[@articles.index(article) + 1].nil? %> \ No newline at end of file +<%= render_plugin_views "between_articles", :with => {:before => article, :after => @articles[@articles.index(article) + 1]} unless @articles.nil? || @articles[@articles.index(article) + 1].nil? %> app/views/articles/_article.html.erb @@ -8,4 +8,4 @@ <%= render_plugin_views "first_article_in_list", :with => {:first => @articles.first} %> <%= partial(:article, :with => @articles) %> <%= render_plugin_views "last_article_in_list", :with => {:last => @articles.last} %> -<% end %> \ No newline at end of file +<% end %> app/views/articles/index.html.erb @@ -2,4 +2,4 @@ <%= @article.title %> <% end %> -<%= partial(:article, :with => @article) %> \ No newline at end of file +<%= partial(:article, :with => @article) %> app/views/articles/show.html.erb @@ -77,4 +77,4 @@ } } </script> -<% end %> \ No newline at end of file +<% end %> app/views/exceptions/internal_server_error.html.erb @@ -77,4 +77,4 @@ } } </script> -<% end %> \ No newline at end of file +<% end %> app/views/exceptions/not_acceptable.html.erb @@ -77,4 +77,4 @@ } } </script> -<% end %> \ No newline at end of file +<% end %> app/views/exceptions/not_found.html.erb @@ -37,4 +37,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> app/views/layout/admin.html.erb @@ -1 +1 @@ -<%= catch_content :for_layout %> \ No newline at end of file +<%= catch_content :for_layout %> app/views/layout/admin.js.erb @@ -55,4 +55,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> app/views/layout/application.html.erb @@ -28,4 +28,4 @@ <br style="clear: both;"> </div> </body> -</html> \ No newline at end of file +</html> app/views/layout/exceptions.html.erb @@ -1 +1 @@ -<li><%= link_to archive[:name], month_url(archive[:year], archive[:month]) %> (<%= archive[:article_count] %>)</li> \ No newline at end of file +<li><%= link_to archive[:name], month_url(archive[:year], archive[:month]) %> (<%= archive[:article_count] %>)</li> app/views/shared/_archive.html.erb @@ -1,4 +1,4 @@ <h4>Formatting Content</h4> <p> 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. -</p> \ No newline at end of file +</p> app/views/shared/_formatting_help.html.erb @@ -3,4 +3,4 @@ Merb::Config.use { |c| c[:exception_details] = true c[:reload_classes] = true c[:reload_time] = 0.5 -} \ No newline at end of file +} config/environments/development.rb @@ -2,4 +2,4 @@ Merb.logger.info("Loaded PRODUCTION Environment...") Merb::Config.use { |c| c[:exception_details] = false c[:reload_classes] = false -} \ No newline at end of file +} config/environments/production.rb @@ -3,4 +3,4 @@ Merb::Config.use { |c| c[:exception_details] = true c[:reload_classes] = true c[:reload_time] = 0.5 -} \ No newline at end of file +} config/environments/test.rb @@ -9,4 +9,4 @@ end # use Merb::Rack::Static, Merb.dir_for(:public) # this is our main merb application -run Merb::Rack::Application.new \ No newline at end of file +run Merb::Rack::Application.new config/rack.rb @@ -48,4 +48,4 @@ Merb::Router.prepare do |r| r.match('/').to(:controller => 'articles', :action =>'index') end -AuthenticatedSystem.add_routes \ No newline at end of file +AuthenticatedSystem.add_routes config/router.rb @@ -4,4 +4,4 @@ base = File.dirname(__FILE__) %w(authenticated_routes authenticated_system_controller authenticated_system_model authenticated_system_orm_map).each do |f| require File.join(base, f) -end \ No newline at end of file +end lib/authenticated_system/authenticated_dependencies.rb @@ -12,4 +12,4 @@ module AuthenticatedSystem end end end -end \ No newline at end of file +end lib/authenticated_system/authenticated_routes.rb @@ -134,4 +134,4 @@ end Merb::BootLoader.after_app_loads do Application.send(:include, AuthenticatedSystem::Controller) -end \ No newline at end of file +end lib/authenticated_system/authenticated_system_controller.rb @@ -74,4 +74,4 @@ module AuthenticatedSystem end -end \ No newline at end of file +end lib/authenticated_system/authenticated_system_model.rb @@ -31,4 +31,4 @@ module AuthenticatedSystem end end -end \ No newline at end of file +end lib/authenticated_system/authenticated_system_orm_map.rb @@ -17,4 +17,4 @@ module CacheHelper expire_page(:controller => '/', :action => article.permalink) end end -end \ No newline at end of file +end lib/cache_helper.rb @@ -17,4 +17,4 @@ module Database CORE.each { |c| c.auto_migrate! } end end -end \ No newline at end of file +end lib/database.rb @@ -40,4 +40,4 @@ module Hooks caller[1].split(":")[0] end end -end \ No newline at end of file +end lib/hooks.rb @@ -119,4 +119,4 @@ module Hooks end end end -end \ No newline at end of file +end lib/hooks/events.rb @@ -39,4 +39,4 @@ module Hooks end end end -end \ No newline at end of file +end lib/hooks/formatters.rb @@ -29,4 +29,4 @@ module Hooks end end end -end \ No newline at end of file +end lib/hooks/menu.rb @@ -65,4 +65,4 @@ module Hooks end end end -end \ No newline at end of file +end lib/hooks/view.rb @@ -7,4 +7,4 @@ class Padding number.to_s.length == 1 ? "0#{number}" : number.to_s end end -end \ No newline at end of file +end lib/padding.rb @@ -8,4 +8,4 @@ module PluginDependencies p.load unless p.loaded? end end -end \ No newline at end of file +end lib/plugin_dependencies.rb @@ -155,4 +155,4 @@ var Plugins = { onFailure: function() { alert('Something went wrong...') }, }); } -} \ No newline at end of file +} public/javascripts/admin.js @@ -24,4 +24,4 @@ var ArticleHelper = { Event.observe(window, 'load', function() { Event.observe('article_content', 'keypress', function() { ArticleHelper.resizeTextArea($('article_content')) }); -}); \ No newline at end of file +}); public/javascripts/application.js @@ -1085,4 +1085,4 @@ Element.Methods.visualEffect = function(element, effect, options) { return $(element); }; -Element.addMethods(); \ No newline at end of file +Element.addMethods(); public/javascripts/effects.js @@ -2512,4 +2512,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { } } -Element.addMethods(); \ No newline at end of file +Element.addMethods(); public/javascripts/prototype.js @@ -27,4 +27,4 @@ <br style="clear: both;"> </div> </body> -</html> \ No newline at end of file +</html> public/maintenance.html.unused @@ -1,4 +1,4 @@ #!/usr/bin/env ruby argv = ARGV + %w[-a fcgi] -Merb.start(argv) \ No newline at end of file +Merb.start(argv) public/merb.fcgi @@ -224,4 +224,4 @@ table.tabular tbody th, table.tabular tbody td { #pagination { padding: 10px; -} \ No newline at end of file +} public/stylesheets/admin.css @@ -39,4 +39,4 @@ pre { label { display: block; -} \ No newline at end of file +} public/stylesheets/application.css @@ -348,4 +348,4 @@ #footer li { margin: 0; padding: 0 0 0 1em; display: inline; -} \ No newline at end of file +} public/stylesheets/content.css @@ -90,4 +90,4 @@ table.trace tr td.line { width: 30px; text-align: right; padding-right: 4px; -} \ No newline at end of file +} public/stylesheets/exceptions.css @@ -44,4 +44,4 @@ body { height: 40px; margin: 10px 0 0; padding: 10px 0 0; clear:both; -} \ No newline at end of file +} public/stylesheets/layout.css @@ -142,4 +142,4 @@ ol.CodeRay li { white-space:pre; } .ts { color:#D70; font-weight:bold; } .ty { color:#339; font-weight:bold; } .v { color:#036; } -.xt { color:#444; } \ No newline at end of file +.xt { color:#444; } public/stylesheets/syntax.css @@ -10,4 +10,4 @@ class Hash def without(*args) self.dup.delete_if{ |k,v| args.include?(k)} end -end \ No newline at end of file +end spec/authenticated_system_spec_helper.rb @@ -34,4 +34,4 @@ module Admin end end end -end \ No newline at end of file +end spec/controllers/admin/articles_spec.rb @@ -18,4 +18,4 @@ module Admin end end end -end \ No newline at end of file +end spec/controllers/admin/configurations_spec.rb @@ -18,4 +18,4 @@ module Admin end end end -end \ No newline at end of file +end spec/controllers/admin/dashboard_spec.rb @@ -33,4 +33,4 @@ module Admin end end end -end \ No newline at end of file +end spec/controllers/admin/plugins_spec.rb @@ -95,4 +95,4 @@ module Admin auth_token user.remember_token end end -end \ No newline at end of file +end spec/controllers/admin/sessions_spec.rb @@ -55,4 +55,4 @@ module Admin end end end -end \ No newline at end of file +end spec/controllers/admin/users_spec.rb @@ -17,4 +17,4 @@ describe Articles do controller.should be_successful end end -end \ No newline at end of file +end spec/controllers/articles_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::ArticlesHelper do -end \ No newline at end of file +end spec/helpers/admin/articles_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::ConfigurationsHelper do -end \ No newline at end of file +end spec/helpers/admin/configurations_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::DashboardHelper do -end \ No newline at end of file +end spec/helpers/admin/dashboard_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::PluginsHelper do -end \ No newline at end of file +end spec/helpers/admin/plugins_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::SessionsHelper do -end \ No newline at end of file +end spec/helpers/admin/sessions_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') describe Merb::Admin::UsersHelper do -end \ No newline at end of file +end spec/helpers/admin/users_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') describe Merb::ArticlesHelper do -end \ No newline at end of file +end spec/helpers/articles_helper_spec.rb @@ -2,4 +2,4 @@ require File.join( File.dirname(__FILE__), "..", "spec_helper" ) describe Article do it "should have specs" -end \ No newline at end of file +end spec/models/article_spec.rb @@ -249,4 +249,4 @@ describe User, "remember_me" do @user.remember_token.should be_nil @user.remember_token_expires_at.should be_nil end -end \ No newline at end of file +end spec/models/user_spec.rb @@ -8,4 +8,4 @@ Spec::Runner.configure do |config| config.include(Merb::Test::ViewHelper) config.include(Merb::Test::RouteHelper) config.include(Merb::Test::ControllerHelper) -end \ No newline at end of file +end spec/spec_helper.rb @@ -5,4 +5,4 @@ module UserSpecHelper :password => "sekret", :password_confirmation => "sekret"} end -end \ No newline at end of file +end spec/user_spec_helper.rb c61c20ca9dd91f464d6942bf6744d9edaa87550d AJ Christensen aj@junglist.gen.nz http://github.com/aflatter/feather/commit/09afe3b2ba159d6f3e55ecbc9db620b0e685d565 09afe3b2ba159d6f3e55ecbc9db620b0e685d565 2008-06-23T20:38:05-07:00 2008-06-23T20:38:05-07:00 Updated *all* files excluding gems/ to have a \n and EOF to ensure compatibility with other editors apart from Textmate, and to avoid superfluous change messages regarding No-\n-at-end-of-line patch differentials in future. 22d65ae07968915cb2c28c24baaa0e91f3c0cc33 AJ Christensen aj@junglist.gen.nz