diff --git a/app/assets/javascripts/user_workouts.coffee.erb b/app/assets/javascripts/user_workouts.coffee
similarity index 85%
rename from app/assets/javascripts/user_workouts.coffee.erb
rename to app/assets/javascripts/user_workouts.coffee
index f50e135..b380691 100644
--- a/app/assets/javascripts/user_workouts.coffee.erb
+++ b/app/assets/javascripts/user_workouts.coffee
@@ -15,8 +15,6 @@ $ ->
$('#workout_form').hide()
- # $('#new_user_workout').hide()
-
$(document).on 'click', '.select_workout', ->
@@ -26,15 +24,9 @@ $ ->
console.log w._name()
image_tag_builder = '<' + '%= ' + 'image_tag ' + w._image_url() + ' %>'
-
$('#workout_grid').hide()
$('#workout_form').fadeIn( 500 )
- #$('#new_user_workout').fadeIn( 500 )
- $('#load_image').html( "" ).addClass( "workout_image" )
-
-
+ $('#load_image').html( "" ).addClass( "workout_image" )
$(document).on 'click', '#search_id', ->
-
- # $('#new_user_workout').hide()
$('#workout_form').hide()
diff --git a/app/assets/stylesheets/user_workouts.scss b/app/assets/stylesheets/user_workouts.scss
index 845a111..caa50ad 100644
--- a/app/assets/stylesheets/user_workouts.scss
+++ b/app/assets/stylesheets/user_workouts.scss
@@ -1,7 +1,18 @@
+.center_text { text-align: center}
+
+.txt_color_grey { color: grey }
+
.display_design { margin-bottom: 15px }
.workout_image { float:left;display:block;background-color:grey;padding:4px }
.workout_name { float:left;margin-left:15px }
-.grey-background { background-color: grey }
\ No newline at end of file
+.grey-background { background-color: grey }
+
+.user_workout_input { font-family:'Roboto';font-weight:900;font-size:70px;line-height:75px;width:80%; }
+
+.user_workout_save { font-family:'Roboto';font-weight:900;font-size:45px;line-height:75px; }
+
+input,
+input::-webkit-input-placeholder { font-size:30px;line-height:75px; }
\ No newline at end of file
diff --git a/app/controllers/user_workouts_controller.rb b/app/controllers/user_workouts_controller.rb
index d2bd41f..f1712ba 100644
--- a/app/controllers/user_workouts_controller.rb
+++ b/app/controllers/user_workouts_controller.rb
@@ -26,6 +26,7 @@ def edit
# POST /user_workouts
# POST /user_workouts.json
def create
+ raise user_workout_params.inspect
@user_workout = UserWorkout.new(user_workout_params)
respond_to do |format|
@@ -79,6 +80,8 @@ def user_workout_params
end
def _workout
+ foo = Hash.new
+ foo[1]
Workout
end
end
diff --git a/app/views/user_workouts/_form.html.haml b/app/views/user_workouts/_form.html.haml
index 58a7dfa..2598500 100644
--- a/app/views/user_workouts/_form.html.haml
+++ b/app/views/user_workouts/_form.html.haml
@@ -11,15 +11,21 @@
- @user_workout.errors.full_messages.each do |msg|
%li= msg
- .row
- .col-xs-4
+ .row.form-group
+ .col-xs-3{:style => "text-align:center;"}
%span#load_image
- .col-xs-4
- %b SETS
- %h2 3
- .col-xs-4
- %b REPS
- %h2 12
+ = f.hidden_field :workout_id, value: 1
+ .col-xs-2.center_text
+ -#%h2.user_workout_input 30
+ = f.number_field :weight, class: 'user_workout_input center_text', placeholder: 'wts'
+ .col-xs-2.center_text
+ -#%h2.user_workout_input 3
+ = f.number_field :set, class: 'user_workout_input center_text', placeholder: 'sets'
+ .col-xs-2.center_text
+ -#%h2.user_workout_input 12
+ = f.number_field :rep, class: 'user_workout_input center_text', placeholder: 'reps'
+ .col-xs-3{:style => "text-align:center;bottom:0"}
+ = f.submit 'save', class: 'user_workout_save txt_color_grey'
-#.form-group
-# = f.label :set, class: 'col-sm-2 control-label'