mirror of
				https://github.com/fspc/BikeShed-1.git
				synced 2025-10-31 08:55:36 -04:00 
			
		
		
		
	BS3: cleanup
This commit is contained in:
		
							parent
							
								
									9bb5190c4d
								
							
						
					
					
						commit
						b503ec6fbd
					
				| @ -61,7 +61,7 @@ | ||||
| 
 | ||||
|       .form-group | ||||
|         .input-group | ||||
|           = number_field_tag nil, nil, id: 'seat_tube_height', placeholder: 'Seat Tube', min: 0, max: 100, class: "form-control" | ||||
|           = number_field_tag nil, nil, id: 'seat_tube_height', placeholder: 'Seat Tube', min: 0, max: 100, class: 'form-control' | ||||
|           .input-group-addon cm | ||||
|         .help-block | ||||
| 
 | ||||
|  | ||||
| @ -30,7 +30,7 @@ | ||||
|   - unless @bike.color.nil? | ||||
|     %dt Color | ||||
|     %dd | ||||
|       .bike-color{style: "background-color: ##{@bike.color}"} #{@bike.color} | ||||
|       .bike-color(style="background-color: ##{@bike.color}")= @bike.color | ||||
| 
 | ||||
|   - if @task_list | ||||
|     - tasks = @task_list.tasks.to_a | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| 
 | ||||
| .row | ||||
|   .col-xs-12.col-sm-6.col-lg-4 | ||||
|     = form_for resource, as: resource_name, url: password_path(resource_name), html: {method: :post } do |f| | ||||
|     = form_for resource, as: resource_name, url: password_path(resource_name), html: {method: :post} do |f| | ||||
|       = devise_error_messages! | ||||
| 
 | ||||
|       %fieldset | ||||
|  | ||||
| @ -25,8 +25,8 @@ | ||||
| 
 | ||||
|           .pull-right | ||||
|             %span.btn-group | ||||
|               = f.button 'CHECK IN', id: 'checkin', name: 'checkin', type: 'button', value: 'CHECK IN', class: 'btn btn-xsя btn-success' | ||||
|               = f.button 'CHECK OUT', id: 'checkout', name: 'checkout', type: 'button', value: 'CHECK OUT', class: 'btn btn-xsя btn-danger' | ||||
|               = f.button 'Check in', id: 'checkin', name: 'checkin', type: 'button', class: 'btn btn-success' | ||||
|               = f.button 'Check out', id: 'checkout', name: 'checkout', type: 'button', class: 'btn btn-danger' | ||||
| 
 | ||||
|           .clearfix | ||||
| 
 | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| !!! 5 | ||||
| %html{lang: 'en'} | ||||
| %html(lang="en") | ||||
|   %head | ||||
|     %meta(charset="utf-8")/ | ||||
|     %meta(name="viewport" content="width=device-width" initial-scale="1.0")/ | ||||
|  | ||||
| @ -28,4 +28,4 @@ | ||||
| .row.fieldset | ||||
|   .col-xs-12.col-sm-3.col-lg-2 | ||||
|     %p | ||||
|       %input{id: 'index_logout', value: 'Logout', type: 'button', class: 'btn btn-danger btn-block', 'data-url' => destroy_user_session_path} | ||||
|       = button_tag 'Logout', id: 'index_logout', class: 'btn btn-danger btn-block', data: {url: destroy_user_session_path} | ||||
| @ -6,7 +6,7 @@ | ||||
|   = link_to bike_path(@task_list.item) do | ||||
|     #{@task_list.item.shop_id}: #{@task_list.item.bike_brand} | ||||
| 
 | ||||
| %h4 #{@task_list.item.model} | ||||
| %h4= @task_list.item.model | ||||
| 
 | ||||
| %fieldset | ||||
|   .form-group | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -53,4 +53,4 @@ | ||||
| 
 | ||||
|       .control-group | ||||
|         .controls | ||||
|           = button_tag 'Add Time Entry', id: 'add_time_entry_submit', class: 'btn btn-primary', data: {url: "#{api_create_time_entry_path}", forward: "#{"."}"} | ||||
|           = button_tag 'Add Time Entry', id: 'add_time_entry_submit', class: 'btn btn-primary', data: {url: api_create_time_entry_path, forward: '.'} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user