atomaka/allpro
1
0
Fork 0
Code Releases Activity

Add jquery ui, remove turbolinks, add js test driver

Browse source
This commit is contained in:
Andrew Tomaka 2013-08-10 08:10:32 -04:00
parent daf34100ec
commit 10d4075f48
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -6,7 +6,7 @@ gem 'sass-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails' gem 'jquery-rails'
gem 'turbolinks' gem 'jquery-ui-rails'
gem 'jbuilder', '~> 1.2' gem 'jbuilder', '~> 1.2'
gem 'thin' gem 'thin'
@ -18,6 +18,7 @@ group :test, :development do
gem 'rspec-rails' gem 'rspec-rails'
gem 'factory_girl_rails' gem 'factory_girl_rails'
gem 'capybara' gem 'capybara'
gem 'capybara-webkit'
gem 'guard-rspec' gem 'guard-rspec'
gem 'libnotify' gem 'libnotify'
gem 'rb-fsevent' gem 'rb-fsevent'

11
Gemfile.lock
View file

@ -34,6 +34,9 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-webkit (1.0.0)
capybara (~> 2.0, >= 2.0.2)
json
coderay (1.0.9) coderay (1.0.9)
coffee-rails (4.0.0) coffee-rails (4.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
@ -73,6 +76,9 @@ GEM
jquery-rails (3.0.4) jquery-rails (3.0.4)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.4)
jquery-rails
railties (>= 3.1.0)
json (1.8.0) json (1.8.0)
libnotify (0.8.1) libnotify (0.8.1)
ffi (>= 1.0.11) ffi (>= 1.0.11)
@ -165,8 +171,6 @@ GEM
treetop (1.4.14) treetop (1.4.14)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (1.3.0)
coffee-rails
tzinfo (0.3.37) tzinfo (0.3.37)
uglifier (2.1.2) uglifier (2.1.2)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -179,12 +183,14 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
capybara capybara
capybara-webkit
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
database_cleaner (= 1.0.1) database_cleaner (= 1.0.1)
factory_girl_rails factory_girl_rails
guard-rspec guard-rspec
jbuilder (~> 1.2) jbuilder (~> 1.2)
jquery-rails jquery-rails
jquery-ui-rails
libnotify libnotify
rails (= 4.0.0) rails (= 4.0.0)
rb-fsevent rb-fsevent
@ -193,5 +199,4 @@ DEPENDENCIES
sdoc sdoc
sqlite3 sqlite3
thin thin
turbolinks
uglifier (>= 1.3.0) uglifier (>= 1.3.0)

2
app/assets/javascripts/application.js
View file

@ -12,5 +12,5 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require turbolinks
//= require_tree . //= require_tree .
//= require jquery.ui.datepicker

1
app/assets/stylesheets/application.css
View file

@ -10,4 +10,5 @@
* *
*= require_self *= require_self
*= require_tree . *= require_tree .
*= require jquery.ui.datepicker
*/ */

7
app/views/layouts/application.html.erb
View file

@ -7,8 +7,13 @@
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body> <body>
<%= link_to 'Workouts', workouts_path %><br/><br/>
<%= yield %> <% if flash[:notice] %>
<p class="notice"><%= flash[:notice] %></p>
<% end %>
<%= yield %>
</body> </body>
</html> </html>