[Streamlined][873] updated sports app to Rails 2.1
0 views
Skip to first unread message
svn-str...@thinkrelevance.com
Jun 16, 2008, 5:40:10 PM6/16/08
to streamli...@googlegroups.com
- Revision
- 873
- Author
- matthew
- Date
- 2008-06-16 17:40:10 -0400 (Mon, 16 Jun 2008)
Log Message
updated sports app to Rails 2.1
Modified Paths
- edge/samples/sports/CHANGELOG
- edge/samples/sports/app/views/layouts/streamlined.rhtml
- edge/samples/sports/config/boot.rb
- edge/samples/sports/config/environment.rb
- edge/samples/sports/db/schema.rb
- edge/samples/sports/public/javascripts/controls.js
- edge/samples/sports/public/javascripts/dragdrop.js
- edge/samples/sports/public/javascripts/effects.js
Added Paths
Diff
Modified: edge/samples/sports/CHANGELOG (872 => 873)
--- edge/samples/sports/CHANGELOG 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/CHANGELOG 2008-06-16 21:40:10 UTC (rev 873)
@@ -1,3 +1,5 @@
+06/16/08 - Updated to Rails 2.1 [Matthew Bass]
+
10/06/07 - Copied fresh styling from latest version of Streamlined [Matthew Bass]
10/01/07 - Moved all controllers under admin namespace (more representative and better for debugging) [Jason Rudolph and Stu Halloway]
Modified: edge/samples/sports/app/views/layouts/streamlined.rhtml (872 => 873)
--- edge/samples/sports/app/views/layouts/streamlined.rhtml 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/app/views/layouts/streamlined.rhtml 2008-06-16 21:40:10 UTC (rev 873)
@@ -14,7 +14,6 @@
<%= stylesheet_link_tag 'streamlined' %>
<%= stylesheet_link_tag 'menu' %>
<%= stylesheet_link_tag 'tabber' %>
- <%= stylesheet_link_tag 'sports' %>
</head>
<body>
<div id="header">
@@ -24,7 +23,7 @@
<div id="left">
<%= render(:partial => "shared/streamlined/side_menu")%>
<% if advanced_filtering %>
- <%= render :partial => STREAMLINED_TEMPLATE_ROOT + '/shared/filter' %>
+ <%= render_streamlined_file '/shared/_filter.rhtml' %>
<% end %>
</div>
<div id="center">
Modified: edge/samples/sports/config/boot.rb (872 => 873)
--- edge/samples/sports/config/boot.rb 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/config/boot.rb 2008-06-16 21:40:10 UTC (rev 873)
@@ -25,7 +25,7 @@
end
def preinitialize
- load(preinitializer_path) if File.exists?(preinitializer_path)
+ load(preinitializer_path) if File.exist?(preinitializer_path)
end
def preinitializer_path
@@ -43,6 +43,7 @@
class VendorBoot < Boot
def load_initializer
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ Rails::Initializer.run(:install_gem_spec_stubs)
end
end
@@ -93,7 +94,7 @@
end
def parse_gem_version(text)
- $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+ $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
end
private
Modified: edge/samples/sports/config/environment.rb (872 => 873)
--- edge/samples/sports/config/environment.rb 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/config/environment.rb 2008-06-16 21:40:10 UTC (rev 873)
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
Modified: edge/samples/sports/db/schema.rb (872 => 873)
--- edge/samples/sports/db/schema.rb 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/db/schema.rb 2008-06-16 21:40:10 UTC (rev 873)
@@ -1,5 +1,5 @@
# This file is auto-generated from the current state of the database. Instead of editing this file,
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
# then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -12,7 +12,7 @@
ActiveRecord::Schema.define(:version => 10) do
create_table "coaches", :force => true do |t|
- t.integer "team_id"
+ t.integer "team_id", :limit => 11
t.string "first_name"
t.string "last_name"
t.string "middle_name"
@@ -25,8 +25,8 @@
end
create_table "fantasy_teams_players", :id => false, :force => true do |t|
- t.integer "fantasy_team_id"
- t.integer "player_id"
+ t.integer "fantasy_team_id", :limit => 11
+ t.integer "player_id", :limit => 11
end
create_table "home_states", :force => true do |t|
@@ -38,23 +38,23 @@
end
create_table "players", :force => true do |t|
- t.integer "team_id"
+ t.integer "team_id", :limit => 11
t.string "name"
end
create_table "sponsors", :force => true do |t|
t.string "name"
t.string "spokesperson_type"
- t.integer "spokesperson_id"
+ t.integer "spokesperson_id", :limit => 11
end
create_table "teams", :force => true do |t|
t.string "name"
t.string "city"
t.string "sport"
- t.integer "ranking"
- t.integer "home_state_id"
- t.decimal "annual_sales", :precision => 8, :scale => 2
+ t.integer "ranking", :limit => 11
+ t.integer "home_state_id", :limit => 11
+ t.decimal "annual_sales", :precision => 8, :scale => 2
end
end
Modified: edge/samples/sports/public/javascripts/controls.js (872 => 873)
--- edge/samples/sports/public/javascripts/controls.js 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/public/javascripts/controls.js 2008-06-16 21:40:10 UTC (rev 873)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
// Contributors:
Modified: edge/samples/sports/public/javascripts/dragdrop.js (872 => 873)
--- edge/samples/sports/public/javascripts/dragdrop.js 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/public/javascripts/dragdrop.js 2008-06-16 21:40:10 UTC (rev 873)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sa...@oriontransfer.co.nz)
//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
Modified: edge/samples/sports/public/javascripts/effects.js (872 => 873)
--- edge/samples/sports/public/javascripts/effects.js 2008-06-16 21:38:56 UTC (rev 872)
+++ edge/samples/sports/public/javascripts/effects.js 2008-06-16 21:40:10 UTC (rev 873)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Contributors:
// Justin Palmer (http://encytemedia.com/)
// Mark Pilgrim (http://diveintomark.org/)
Added: edge/samples/sports/script/dbconsole (0 => 873)
--- edge/samples/sports/script/dbconsole (rev 0)
+++ edge/samples/sports/script/dbconsole 2008-06-16 21:40:10 UTC (rev 873)
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'
Property changes on: edge/samples/sports/script/dbconsole
___________________________________________________________________
Name: svn:executable
+ *
Reply all
Reply to author
Forward
0 new messages