diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/assets/application.css | 1 | ||||
| -rw-r--r-- | railties/assets/application.js | 1 | ||||
| -rw-r--r-- | railties/assets/application.rhtml | 15 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 16 |
5 files changed, 32 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index d258852c0a..8672a7a863 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added -a/--with-assets option to rails generator that will include default assets for application layout, javascript, and stylesheet [DHH] + * Added socket cleanup for lighttpd, both before and after [DHH] * Added automatic creation of tmp/ when running script/server [DHH] diff --git a/railties/assets/application.css b/railties/assets/application.css new file mode 100644 index 0000000000..bf0bd539b8 --- /dev/null +++ b/railties/assets/application.css @@ -0,0 +1 @@ +/* Place your application-specific styles here */ diff --git a/railties/assets/application.js b/railties/assets/application.js new file mode 100644 index 0000000000..c963741545 --- /dev/null +++ b/railties/assets/application.js @@ -0,0 +1 @@ +// Place your application-specific JavaScript functions and classes here diff --git a/railties/assets/application.rhtml b/railties/assets/application.rhtml new file mode 100644 index 0000000000..5c796f3bd4 --- /dev/null +++ b/railties/assets/application.rhtml @@ -0,0 +1,15 @@ +<!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>
\ No newline at end of file diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 1dc903a6c8..8e40127dce 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -6,7 +6,7 @@ class AppGenerator < Rails::Generator::Base DATABASES = %w( mysql oracle postgresql sqlite2 sqlite3 ) - default_options :db => "mysql", :shebang => DEFAULT_SHEBANG + default_options :db => "mysql", :shebang => DEFAULT_SHEBANG, :include_assets => false mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.." def initialize(runtime_args, runtime_options = {}) @@ -81,6 +81,13 @@ class AppGenerator < Rails::Generator::Base %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 @@ -97,8 +104,11 @@ class AppGenerator < Rails::Generator::Base "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| } opt.on("-d", "--database=name", String, - "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).", - "Default: mysql") { |options[:db]| } + "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 |