bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Konanykhin 2016-12-25 01:00:35 +06:00
parent 1880f91c15
commit 9faa92a8e6
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

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

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

@ -22,7 +22,7 @@
.help-block
.form-group
.btn-group{"data-toggle": 'buttons'}
.btn-group(data-toggle="buttons")
%label.btn.btn-default
= radio_button_tag 'bike_style', 3
RD
@ -43,7 +43,7 @@
.help-block
.form-group
.btn-group{ "data-toggle": 'buttons'}
.btn-group(data-toggle="buttons")
%label.btn.btn-default
= radio_button_tag 'bike_condition', 2
Poor
@ -70,4 +70,4 @@
%input{id: "bike_description", placeholder: "Short description", type: "text", class: "input-lg" }
.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
View File

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

4
app/views/task_lists/edit.haml
View File

@ -13,8 +13,8 @@
- @task_list.tasks.each do |task|
.checkbox
%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
.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
View File

@ -18,7 +18,7 @@
- @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
%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.duration_in_hours
%td= entry.type
@ -29,19 +29,19 @@
= 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-content
.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?
.modal-body
#work_entry_start_date Start Date
#work_entry_duration Duration
#work_entry_description Description
.modal-footer
%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-default(data-dismiss="modal" aria-hidden="true") Cancel
%button.btn.btn-danger#confirmation_delete(data-url="api/v1/time_entries/") Delete

2
app/views/time_entries/new.haml
View File

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