Browse Source

Fix: stick to the .ruby-version will ya?

master
Ilya Konanykhin 8 years ago
parent
commit
9faa92a8e6
  1. 3
      Gemfile.lock
  2. 6
      app/views/bikes/new.html.haml
  3. 4
      app/views/layouts/application.html.haml
  4. 4
      app/views/task_lists/edit.haml
  5. 10
      app/views/time_entries/index.haml
  6. 2
      app/views/time_entries/new.haml

3
Gemfile.lock

@ -272,6 +272,3 @@ DEPENDENCIES
spork (~> 0.9.2) spork (~> 0.9.2)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
will_paginate (~> 3.0.3) will_paginate (~> 3.0.3)
BUNDLED WITH
1.13.6

6
app/views/bikes/new.html.haml

@ -22,7 +22,7 @@
.help-block .help-block
.form-group .form-group
.btn-group{"data-toggle": 'buttons'} .btn-group(data-toggle="buttons")
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_style', 3 = radio_button_tag 'bike_style', 3
RD RD
@ -43,7 +43,7 @@
.help-block .help-block
.form-group .form-group
.btn-group{ "data-toggle": 'buttons'} .btn-group(data-toggle="buttons")
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'bike_condition', 2 = radio_button_tag 'bike_condition', 2
Poor Poor
@ -70,4 +70,4 @@
%input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" } %input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" }
.form-group .form-group
= button_tag 'Add Bike', id: 'add_bike_submit', class: 'btn btn-primary', "data-url": "#{api_create_bike_path}" = button_tag 'Add Bike', id: 'add_bike_submit', class: 'btn btn-primary', data: {url: api_create_bike_path}

4
app/views/layouts/application.html.haml

@ -1,8 +1,8 @@
!!! 5 !!! 5
%html{lang: 'en'} %html{lang: 'en'}
%head %head
%meta{charset: 'utf-8'}/ %meta(charset="utf-8")/
%meta{name: 'viewport', content: 'width=device-width', "initial-scale": '1.0'} %meta(name="viewport" content="width=device-width" initial-scale="1.0")/
%title= content_for?(:title) ? yield(:title) : 'Velocipede' %title= content_for?(:title) ? yield(:title) : 'Velocipede'
= csrf_meta_tags = csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all' = stylesheet_link_tag 'application', media: 'all'

4
app/views/task_lists/edit.haml

@ -13,8 +13,8 @@
- @task_list.tasks.each do |task| - @task_list.tasks.each do |task|
.checkbox .checkbox
%label %label
= check_box_tag nil, nil, task.done, class: 'task_list_task', type: 'checkbox', "data-id": task.id = check_box_tag nil, nil, task.done, class: 'task_list_task', type: 'checkbox', data: {id: task.id}
= task.task = task.task
.form-group .form-group
= button_tag 'Save Changes', id: 'update_tasks_submit', class: 'btn btn-primary disabled', "data-url": "#{api_update_task_path}" = button_tag 'Save Changes', id: 'update_tasks_submit', class: 'btn btn-primary disabled', data: {url: api_update_task_path}

10
app/views/time_entries/index.haml

@ -18,7 +18,7 @@
- @user_time_entries.each do |entry| - @user_time_entries.each do |entry|
-# data: {start_date: ..} gets transformed to data-start-date instead of data-start_date, we don't want this -# data: {start_date: ..} gets transformed to data-start-date instead of data-start_date, we don't want this
%tr{data: {id: entry.id, description: entry.description, duration: entry.duration_in_hours}, %tr{data: {id: entry.id, description: entry.description, duration: entry.duration_in_hours},
"data-start_date": entry.start_date.to_date.to_formatted_s(:rfc822)} "data-start_date" => entry.start_date.to_date.to_formatted_s(:rfc822)}
%td= entry.start_date.to_date.to_formatted_s(:rfc822) %td= entry.start_date.to_date.to_formatted_s(:rfc822)
%td= entry.duration_in_hours %td= entry.duration_in_hours
%td= entry.type %td= entry.type
@ -29,19 +29,19 @@
= link_to 'Add Time Entry', new_time_entry_path, class: 'btn btn-primary' = link_to 'Add Time Entry', new_time_entry_path, class: 'btn btn-primary'
.modal#confirmation{role: 'dialog', "aria-labelledby": 'confirmation_title', "aria-hidden": 'true', tabindex: -1} .modal#confirmation(role="dialog" aria-labelledby="confirmation_title" aria-hidden="true" tabindex="-1")
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%button.close{"data-dismiss": 'modal', "aria-hidden": 'true'} × %button.close(data-dismiss="modal" aria-hidden="true") ×
%h4#confirmation_title Are you sure you want to delete? %h4#confirmation_title Are you sure you want to delete?
.modal-body .modal-body
#work_entry_start_date Start Date #work_entry_start_date Start Date
#work_entry_duration Duration #work_entry_duration Duration
#work_entry_description Description #work_entry_description Description
.modal-footer .modal-footer
%button.btn.btn-default{"data-dismiss": 'modal', "aria-hidden": 'true'} Cancel %button.btn.btn-default(data-dismiss="modal" aria-hidden="true") Cancel
%button.btn.btn-danger#confirmation_delete{"data-url": "api/v1/time_entries/"} Delete %button.btn.btn-danger#confirmation_delete(data-url="api/v1/time_entries/") Delete

2
app/views/time_entries/new.haml

@ -32,7 +32,7 @@
.help-block .help-block
.form-group .form-group
.btn-group{"data-toggle": 'buttons'} .btn-group(data-toggle="buttons")
%label.btn.btn-default %label.btn.btn-default
= radio_button_tag 'action_id', 1, false, autocomplete: 'off' = radio_button_tag 'action_id', 1, false, autocomplete: 'off'
Volunteer Volunteer

Loading…
Cancel
Save