fix workout view.

2 files changed, 11 insertions, 11 deletions

diff --git a/app/assets/javascripts/templates/workout_view.ractive b/app/assets/javascripts/templates/workout_view.ractive
index 6437b91..a48c7b6 100644
--- a/app/assets/javascripts/templates/workout_view.ractive
+++ b/app/assets/javascripts/templates/workout_view.ractive
@@ -1,28 +1,28 @@
 {{#if clock}}
-  <div class="alert callout {{alertStatus}}">
+  <div class="callout {{alertStatus}}">
     <p> {{message}} </p>
     <p> Rest Clock: {{clock}} </p>
   </div>
 {{/if}}
 
-<ul class="accordion" data-accordion>
+<ul class="accordion" data-accordion data-multi-expand="true" data-allow-all-closed="true">
   {{#each workout.exercises}}
-  <li class="accordion-navigation">
-    <a href="#panel-{{id}}">{{name}}</a>
-    <div id="panel-{{id}}" class="content">
+  <li class="accordion-item" data-accordion-item>
+    <a href="#" class="accordion-title">{{name}}</a>
+    <div class="accordion-content" data-tab-content>
       {{#each sets}}
       <div class="row">
-        <div class="columns small-3">
-          <button id='{{id}}' on-click="updateProgress" class="button round {{status}}">
+        <div class="columns">
+          <button id='{{id}}' on-click="updateProgress" class="button {{status}}">
             {{actual_repetitions}}
           </button>
         </div>
-        <div class="columns small-5">
+        <div class="columns">
           <p class="text-center">
             {{target_repetitions}} x {{target_weight}} lbs
           </p>
         </div>
-        <div class="columns small-4">
+        <div class="columns">
           <p class="text-center">
             {{weight_per_side}}
           </p>
diff --git a/app/assets/javascripts/views/workout_view.js.coffee b/app/assets/javascripts/views/workout_view.js.coffee
index 950ad51..4cccf39 100644
--- a/app/assets/javascripts/views/workout_view.js.coffee
+++ b/app/assets/javascripts/views/workout_view.js.coffee
@@ -30,14 +30,14 @@ class Stronglifters.WorkoutView extends Ractive
 
     if model.successful()
       message = "If it was easy break for 1:30, otherwise rest for 3:00."
-      @displayMessage(message, 'radius')
+      @displayMessage(message, 'success')
     else
       @displayMessage("Take a 5:00 break.", 'alert')
     @clock.start()
 
   refreshStatus: (model, keypath) ->
     if !model.started()
-      @set("#{keypath}.status", "secondary")
+      @set("#{keypath}.status", "secondary hollow")
       return
 
     if model.successful()