Skip to content

Commit

Permalink
Take advantage of asset pipeline for some core assets [THEME] [DEPLOY]
Browse files Browse the repository at this point in the history
Removed some core assets (jquery, jquery-ui, formtastic) that are
automatically provided by gems; before the asset pipeline, assets had to be
copied across to the project directory by hand or via *:install rake tasks.

Removed some assets that didn't appear to be used by anything such as
reset-fonts-grids.css, jquery.dimensions.min.js.

[THEME] The 'reset' stylesheet was moved to core, it is unlikely you would
need or want to update this manually.  'common' and 'formtastic' core
stylesheets have been merged into the 'application' stylesheet.

  Change the following lines in themes/*/views/layouts/application.html.erb:
    <%= theme_stylesheet_link_tag 'reset', :media => :all %>
    <%= stylesheet_link_tag 'common', 'formtastic', :media => :all %>
  to look like:
    <%= stylesheet_link_tag 'application', :media => :all %>

Conflicts:
	app/assets/javascripts/jquery-ui.js
	app/assets/javascripts/jquery-ui.min.js
	app/assets/javascripts/jquery.js
	app/assets/javascripts/jquery.min.js
	app/assets/javascripts/jquery_ujs.js
  • Loading branch information
dhedlund committed Jun 24, 2013
1 parent d854a40 commit 2f20d30
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 22,511 deletions.
5 changes: 5 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ To run Calagator in `production` mode, which runs more quickly, but doesn't relo
* Initialize your database, run `bundle exec rake RAILS_ENV=production db:migrate`
* Run `bundle exec rake clear` to clear your cache after updating your application's code.
* Setup a production web server using [Phusion Passenger](http://www.modrails.com/), [Thin](http://code.macournoyer.com/thin/), [Unicorn](http://unicorn.bogomips.org/), [Rainbows](http://rainbows.rubyforge.org/), etc. These will be able to serve more users more quickly than using the built-in server (e.g. `rails server`).
* Run the following commands to compile core and theme-based assets into the public/ directory:
```bash
bundle exec rake assets:precompile
bundle exec rake themes:create_cache
```

The Calagator.org site runs on [Ubuntu Linux](http://ubuntu.com/), [Phusion REE (Ruby Enterprise Edition)](http://rubyenterpriseedition.com/) and [Phusion Passenger](http://www.modrails.com/).

Expand Down
5 changes: 3 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults
//= require jquery
//= require jquery_ujs

$(document).ready(function(){
// Shows hidden section when a link is clicked, and hides the link.
//
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/forms.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= require jquery-ui
//= require date-functions
//= require jquery.timePicker
Loading

0 comments on commit 2f20d30

Please sign in to comment.