diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 00000000..d13735db --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,17 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD +// GO AFTER THE REQUIRES BELOW. +// +//= require jquery.min +//= require bootstrap.min +//= require chosen.jquery.min +//= require jquery.tablesorter.min +//= require_tree . \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 54e08c61..ab704f8a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,7 +1,19 @@ /* - # app/assets/stylesheets/application.css - *= require formtastic-bootstrap -*/ + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the top of the + * compiled file, but it's generally better to create a new file per style scope. + * + *= require_self + *= require_tree . + *= require bootstrap.min + *= require chosen + *= require formtastic-bootstrap + */ body { padding-top: 40px; diff --git a/app/views/artefacts/_form.html.erb b/app/views/artefacts/_form.html.erb index 52a24a95..5cc07507 100644 --- a/app/views/artefacts/_form.html.erb +++ b/app/views/artefacts/_form.html.erb @@ -88,7 +88,6 @@ <% end %> <%= content_for :extra_javascript do %> -<%= javascript_include_tag('chosen.jquery.min.js', 'artefacts') %> <% end %> -<% content_for :extra_headers, stylesheet_link_tag('chosen') %> diff --git a/app/views/artefacts/index.html.erb b/app/views/artefacts/index.html.erb index 6959eaf7..3a459156 100644 --- a/app/views/artefacts/index.html.erb +++ b/app/views/artefacts/index.html.erb @@ -57,7 +57,6 @@ <%= content_for :extra_javascript do %> - <%= javascript_include_tag 'jquery.tablesorter.min.js' %>