Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Hernández committed Nov 3, 2010
1 parent 1877b27 commit 157d455
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 166 deletions.
37 changes: 25 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,52 @@
Usage
=====
`rails new app_name -J -m http://github.com/aentos/rails3-templates/main.rb`
`rails new app_name -J -m http://github.com/recrea/rails3-templates/main.rb`

Gems
====

General use
-----------
* [will_paginate](http://github.com/mislav/will_paginate)
* [attrtastic](http://github.com/MBO/attrtastic)
* [formtastic](http://github.com/justinfrench/formtastic)
* [haml-rails](http://github.com/indirect/haml-rails)
* [inherited_resources](http://github.com/josevalim/inherited_resources)
* [friendly_id](http://github.com/norman/friendly_id)
* [compass](http://github.com/chriseppstein/compass)
* [inherited_resources]
* [fancy_buttons](http://github.com/imathis/fancy-buttons)
* [simple_form](http://github.com/plataformatec/simple_form)
* [show_for](http://github.com/plataformatec/show_for)
* [will_paginate](http://github.com/mislav/will_paginate)
* [tabs_on_rails](http://github.com/weppos/tabs_on_rails)
* [breadcrumbs_on_rails](http://github.com/weppos/breadcrumbs_on_rails)
* [paperclip](http://github.com/thoughtbot/paperclip)
* [metasearch](http://github.com/ernie/meta_search)

Development
-----------

Testing
-------
* [shoulda]
* [factory_girl]
* [cucumber]
* [capybara]
* [faker](http://faker.rubyforge.org/)
* [shoulda](http://github.com/thoughtbot/shoulda)
* [factory_girl](http://github.com/thoughtbot/factory_girl)
* [cucumber](http://github.com/aslakhellesoy/cucumber)
* [capybara](http://github.com/jnicklas/capybara)
* [faker](http://github.com/stympy/faker)

Production
----------
* [whenever](http://github.com/javan/whenever)
* [backup](http://github.com/meskyanichi/backup)

Optional
--------
* [hoptoad_notifier](http://github.com/thoughtbot/hoptoad_notifier)
* [exceptional_notifier](http://getexceptional.com)

Plugins
=======
* [asset_packager](http://github.com/sbecker/asset_packager)

Other tools
===========
* [960 grid system](http://960.gs/)
* [Hoptoad](http://hoptoadapp.com/)
* [Exceptional](http://getexceptional.com/)
* [Hoptoad](http://hoptoadapp.com/)

30 changes: 19 additions & 11 deletions application_blueprint.html.haml → application.html.haml
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
!!! 5
%html
%html{:lang => I18n.locale}
%head
%title= "[Default title] #{yield(:title)}"
/meta
%meta{ :charset => "utf-8" }/
-#
Always force latest IE rendering engine (even in intranet) & Chrome Frame
Remove this if you use the .htaccess
%meta{ :content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible" }/
%meta{ :name => "robots", :content => "noindex, nofollow" }/
%meta{ :name => "MSSmartTagsPreventParsing", :content => "true" }/
%meta{ 'http-equiv' => "pragma", :content => "no-cache" }/
%meta{ 'http-equiv' => "imagetoolbar", :content => "no" }/
%meta{ 'http-equiv' => "X-UA-Compatible", :content => "IE=edge,chrome=1" }/
%meta{ :content => "", :name => "description" }/
%meta{ :content => "", :name => "author" }/
%meta{ :content => "", :name => "keywords" }/
%meta{ :content => "", :name => "copyright" }/
-# Mobile viewport optimized: j.mp/bplateviewport
%meta{ :content => "width=device-width; initial-scale=1.0", :name => "viewport" }/

-# Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references
-# %link{ :href => "/favicon.ico", :rel => "shortcut icon" }/
-# %link{ :href => "/apple-touch-icon.png", :rel => "apple-touch-icon" }/
/dublincore
%link{:rel => "meta", :type => "application/rdf+xml", :href => "application.rdf"}

/hidden nav
%link{:rel => "shortcut icon", :type => "vnd.microsoft.icon", :href => "/images/favicon.ico"}
%link{:rel => "shortcut icon", :href => "/images/favicon.png"}
%link{:rel => "apple-touch-icon", :href => "/images/ipicon.png"}
%link{:rel => "start", :href => "[Web URL]", :title => "[Default title]"}
%link{:rel => "made", :href => "mailto:[email protected]"}
%link{:rel => "alternate", :type => "application/rss+xml", :href => "[RSS URL]", :title => "RSS"}

%title= "[Default title] #{yield(:title)}"
= raw stylesheet_link_merged('screen', :media => 'screen, projection')
= raw stylesheet_link_merged('print', :media => 'print')
/[if lt IE 8]
= raw stylesheet_link_merged('ie', :media => 'screen, projection')
-# For the less-enabled mobile browsers like Opera Mini
= raw stylesheet_link_merged('handheld', :media => 'handheld')
= csrf_meta_tag
%body{ :class => "#{controller.controller_name}" }
%body
#container
#header HEADER
#sidebar SIDEBAR
Expand Down
40 changes: 0 additions & 40 deletions application_960.html.haml

This file was deleted.

2 changes: 1 addition & 1 deletion capistrano.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

app_name = ask "\r\n\r\nEnter the application name:"
server = ask "\r\n\r\nEnter the servername or IP:"
git_repo = ask "\r\n\r\nEnter the git repo URL, e.g. [email protected]:aentos/app.git :"
git_repo = ask "\r\n\r\nEnter the git repo URL, e.g. [email protected]:recrea/app.git :"

file 'config/deploy.rb', <<-FILE
# Bundler Integration
Expand Down
2 changes: 0 additions & 2 deletions devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
run "bundle install"

generate "devise:install"
generate "devise User"
generate "devise Admin"

git :add => '.'
git :commit => 'm "Devise"'
Loading

0 comments on commit 157d455

Please sign in to comment.