Add jquery ui, remove turbolinks, add js test driver

2013-08-10 08:10:32 -04:00 · 2013-08-10 08:10:32 -04:00 · 10d4075f48
commit 10d4075f48
parent daf34100ec
5 changed files with 18 additions and 6 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
 //= require_tree .
+//= require jquery.ui.datepicker
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -10,4 +10,5 @@
 *
 *= require_self
 *= require_tree .
+ *= require jquery.ui.datepicker
 */
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -7,8 +7,13 @@
  <%= csrf_meta_tags %>
 </head>
 <body>
+  <%= link_to 'Workouts', workouts_path %><br/><br/>

-<%= yield %>
+  <% if flash[:notice] %>
+    <p class="notice"><%= flash[:notice] %></p>
+  <% end %>
+
+  <%= yield %>

 </body>
 </html>