From 1f6ba7297e2baf50e58addd832fd892c8ad64e56 Mon Sep 17 00:00:00 2001 From: scott Date: Sat, 6 Mar 2010 03:00:55 -0500 Subject: [PATCH] removing temp files --- app/controllers/application_controller.rb~ | 11 ---- app/views/layouts/application.html.erb~ | 25 --------- public/stylesheets/style.css~ | 61 ---------------------- 3 files changed, 97 deletions(-) delete mode 100644 app/controllers/application_controller.rb~ delete mode 100644 app/views/layouts/application.html.erb~ delete mode 100644 public/stylesheets/style.css~ diff --git a/app/controllers/application_controller.rb~ b/app/controllers/application_controller.rb~ deleted file mode 100644 index 5263147..0000000 --- a/app/controllers/application_controller.rb~ +++ /dev/null @@ -1,11 +0,0 @@ -# Filters added to this controller apply to all controllers in the application. -# Likewise, all the methods added will be available for all controllers. - -class ApplicationController < ActionController::Base - before_filter :authenticate - include Clearance::Authentication - #helper :all # include all helpers, all the time - protect_from_forgery # See ActionController::RequestForgeryProtection for details - # Scrub sensitive parameters from your log - # filter_parameter_logging :password -end diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ deleted file mode 100644 index ccca291..0000000 --- a/app/views/layouts/application.html.erb~ +++ /dev/null @@ -1,25 +0,0 @@ - - - <%= csrf_meta_tag %> - <%= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js", - "http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", - :defaults %> - <%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %> - <%= yield :head %> - - - - <% flash.each_key do |flash_key| %> -
- <%=h flash[flash_key] %> -
- <% end %> -
-
- <%= yield %> -
-
- - diff --git a/public/stylesheets/style.css~ b/public/stylesheets/style.css~ deleted file mode 100644 index 9067560..0000000 --- a/public/stylesheets/style.css~ +++ /dev/null @@ -1,61 +0,0 @@ -* { - margin:0; - padding:0; -} - -h1 { - margin-top:10px -} - -div.flash { - width:1000px; - margin-left:auto; - margin-right:auto; - padding:5px; - background-color:white; - margin-top:20px; -} - -div#flash_error { - color:red; - border:red 5px solid; -} - -div#flash_notice { - color:blue; - border:blue 5px solid; -} - -div#flash_success { - color:green; - border:green 5px solid; -} - - -table.task_list tr.odd{ - background-color:#ddd; -} - -table.task_list tr.even{ - -} - -body { - background-color:gray; -} - -div#header { - width:1000px; - margin-left:auto; - margin-right:auto; - font-size:24; - font-weight:bold; -} - -div#wrapper { - margin-left:auto; - margin-right:auto; - width:1000px; - margin-top:30px; - background-color:white; -}