TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults [DHH] (backed out of -a/--with-assets, not worth it)

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3770 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-03-04 23:53:41 +00:00
parent 55854c4195
commit 045f5fd02e
7 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@ -1,6 +1,6 @@
*SVN*
* Added -a/--with-assets option to rails generator that will include default assets for application layout, javascript, and stylesheet (this an experiment and may go away at any time!) [DHH]
* Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults [DHH]
* Added socket cleanup for lighttpd, both before and after [DHH]

2
railties/Rakefile
View File

@ -39,7 +39,7 @@ TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test )
LOG_FILES = %w( server.log development.log test.log production.log )
HTML_FILES = %w( 404.html 500.html index.html robots.txt favicon.ico images/rails.png
javascripts/prototype.js
javascripts/prototype.js javascripts/application.js
javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
BIN_FILES = %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner runner server plugin )

1
railties/assets/application.css
View File

@ -1 +0,0 @@
/* Place your application-specific styles here */

1
railties/assets/application.js
View File

@ -1 +0,0 @@
// Place your application-specific JavaScript functions and classes here

15
railties/assets/application.rhtml
View File

@ -1,15 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title><%=h @title || "Rails Application" %></title>
<%= javascript_include_tag :defaults %>
<%= stylesheet_link_tag "application" %>
</head>
<body>
<%= yield %>
</body>
</html>

2
railties/html/javascripts/application.js Normal file
View File

@ -0,0 +1,2 @@
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults

21
railties/lib/rails_generator/generators/applications/app/app_generator.rb
View File

@ -6,7 +6,7 @@ class AppGenerator < Rails::Generator::Base
DATABASES = %w( mysql oracle postgresql sqlite2 sqlite3 )
default_options :db => "mysql", :shebang => DEFAULT_SHEBANG, :include_assets => false
default_options :db => "mysql", :shebang => DEFAULT_SHEBANG
mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
def initialize(runtime_args, runtime_options = {})
@ -69,10 +69,11 @@ def manifest
m.file "html/images/rails.png", "public/images/rails.png"
# Javascripts
m.file "html/javascripts/prototype.js", "public/javascripts/prototype.js"
m.file "html/javascripts/effects.js", "public/javascripts/effects.js"
m.file "html/javascripts/dragdrop.js", "public/javascripts/dragdrop.js"
m.file "html/javascripts/controls.js", "public/javascripts/controls.js"
m.file "html/javascripts/prototype.js", "public/javascripts/prototype.js"
m.file "html/javascripts/effects.js", "public/javascripts/effects.js"
m.file "html/javascripts/dragdrop.js", "public/javascripts/dragdrop.js"
m.file "html/javascripts/controls.js", "public/javascripts/controls.js"
m.file "html/javascripts/application.js", "public/javascripts/application.js"
# Docs
m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
@ -81,13 +82,6 @@ def manifest
%w(server production development test).each { |file|
m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
}
# Default assets
if options[:include_assets]
m.file "assets/application.css", "public/stylesheets/application.css"
m.file "assets/application.js", "public/javascripts/application.css"
m.file "assets/application.rhtml", "app/views/layouts/application.rhtml"
end
end
end
@ -106,9 +100,6 @@ def add_options!(opt)
opt.on("-d", "--database=name", String,
"Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).",
"Default: mysql") { |options[:db]| }
opt.on("-a", "--with-assets",
"Include default assets for layout, javascript, and stylesheet.") { |options[:include_assets]| }
end
def mysql_socket_location