bike
/
bike-database
mirror of https://github.com/fspc/bike-database.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

improve ui for bike display & edit pages

vagrant
loos 11 years ago
parent
0c5435a5af
commit
4f83b879cc
5 changed files with 77 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      app/views/bikes/_fields.html.erb
  2. 36
      app/views/bikes/_form.html.erb
  3. 10
      app/views/bikes/edit.html.erb
  4. 49
      app/views/bikes/index.html.erb
  5. 14
      app/views/bikes/show.html.erb

27
app/views/bikes/_fields.html.erb
View File

@ -2,81 +2,80 @@
<div class="form-group"> <div class="form-group">
<%= f.label "Bike Entry Date:", class: "col-sm-2 control-label" %> <%= f.label "Bike Entry Date:", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :entry_date, class: "form-control datepicker", disabled: disabled %> <%= f.text_field :entry_date, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Brand:", class: "col-sm-2 control-label" %> <%= f.label "Brand:", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :brand, class: "form-control", disabled: disabled %> <%= f.text_field :brand, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Model:", class: "col-sm-2 control-label" %> <%= f.label "Model:", class: "col-sm-2 control-label" %>
<div class="col-sm-10">
<div class="col-sm-6">
<%= f.text_field :model, class: "form-control", disabled: disabled %> <%= f.text_field :model, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Type:", class: "col-sm-2 control-label" %> <%= f.label "Type:", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :bike_type, class: "form-control", disabled: disabled %> <%= f.text_field :bike_type, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Freecyclery?", class: "col-sm-offset-2 control-label" %> <%= f.label "Freecyclery?", class: "col-sm-offset-2 control-label" %>
<%= f.check_box :freecyclery, disabled: disabled %> <%= f.check_box :freecyclery, disabled: disabled %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Sale?", class: "col-sm-offset-2 control-label" %> <%= f.label "Sale?", class: "col-sm-offset-2 control-label" %>
<%= f.check_box :sale, disabled: disabled %> <%= f.check_box :sale, disabled: disabled %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Serial Number", class: "col-sm-2 control-label" %> <%= f.label "Serial Number", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :serial_number, class: "form-control", disabled: disabled %> <%= f.text_field :serial_number, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Notes", class: "col-sm-2 control-label" %> <%= f.label "Notes", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_area :notes, class: "form-control", disabled: disabled %> <%= f.text_area :notes, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Tag Info", class: "col-sm-2 control-label" %> <%= f.label "Tag Info", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_area :tag_info, class: "form-control", disabled: disabled %> <%= f.text_area :tag_info, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Repaired by:", class: "col-sm-2 control-label" %> <%= f.label "Repaired by:", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :repaired_by, class: "form-control", disabled: disabled %> <%= f.text_field :repaired_by, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Completion Date:", class: "col-sm-2 control-label" %> <%= f.label "Completion Date:", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :completion_date, class: "form-control datepicker", disabled: disabled %> <%= f.text_field :completion_date, class: "form-control datepicker", disabled: disabled %>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.label "Price", class: "col-sm-2 control-label" %> <%= f.label "Price", class: "col-sm-2 control-label" %>
<div class="col-sm-6"> <div class="col-sm-10">
<%= f.text_field :price, class: "form-control", disabled: disabled %> <%= f.text_field :price, class: "form-control", disabled: disabled %>
</div> </div>
</div> </div>

36
app/views/bikes/_form.html.erb
View File

@ -1,19 +1,23 @@
<%= form_for @bike, html: {class: 'form-horizontal'} do |f| %> <div class="container">
<% if @bike.errors.any? %> <%= form_for @bike, html: {class: 'form-horizontal'} do |f| %>
<div id="error_explanation"> <% if @bike.errors.any? %>
<h2><%= pluralize(@bike.errors.count, "error") %> prohibited this bike from being saved:</h2> <div id="error_explanation">
<h2><%= pluralize(@bike.errors.count, "error") %> prohibited this bike from being saved:</h2>
<ul> <ul>
<% @bike.errors.full_messages.each do |msg| %> <% @bike.errors.full_messages.each do |msg| %>
<li><%= msg %></li> <li><%= msg %></li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<%= render 'fields', f: f %> <%= render 'fields', f: f %>
<div class="actions col-sm-offset-2"> <div class="row">
<%= f.submit class: "btn btn-default" %> <div class="actions col-sm-offset-2">
</div> <%= f.submit class: "btn btn-default" %>
<% end %> </div>
</div>
<% end %>
</div>

10
app/views/bikes/edit.html.erb
View File

@ -1,6 +1,8 @@
<h1>Editing bike</h1> <div class="container">
<h1>Editing bike</h1>
<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Show', @bike %> | <%= link_to 'Show', @bike %> |
<%= link_to 'Back', bikes_path %> <%= link_to 'Back', bikes_path %>
</div>

49
app/views/bikes/index.html.erb
View File

@ -1,29 +1,30 @@
<h1>Listing bikes</h1> <div class="container">
<table class="table table-striped table-bordered table-hover"> <h1>Listing bikes</h1>
<thead>
<tr>
<th> Brand </th>
<th> Model </th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody> <table class="table table-striped table-bordered table-hover">
<% @bikes.each do |bike| %> <thead>
<tr> <tr>
<td><%= bike.brand %></td> <th> Brand </th>
<td><%= bike.model %></td> <th> Model </th>
<td><%= link_to 'Show', bike %></td> <th></th>
<td><%= link_to 'Edit', edit_bike_path(bike) %></td> <th></th>
<td><%= link_to 'Destroy', bike, method: :delete, data: { confirm: 'Are you sure?' } %></td> <th></th>
</tr> </tr>
<% end %> </thead>
</tbody> <tbody>
</table> <% @bikes.each do |bike| %>
<tr>
<td><%= bike.brand %></td>
<td><%= bike.model %></td>
<td><%= link_to 'Show', bike %></td>
<td><%= link_to 'Edit', edit_bike_path(bike) %></td>
<td><%= link_to 'Destroy', bike, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
<br> <br>
<%= link_to ' + Log Bike', new_bike_path, class: "btn btn-default" %>
<%= link_to ' + Log Bike', new_bike_path %> </div>

14
app/views/bikes/show.html.erb
View File

@ -1,7 +1,9 @@
<p id="notice"><%= notice %></p> <div class="container">
<%= form_for(@bike) do |f| %> <p id="notice"><%= notice %></p>
<%= render 'fields', f: f, disabled: true %> <%= form_for(@bike) do |f| %>
<% end %> <%= render 'fields', f: f, disabled: true %>
<% end %>
<%= link_to 'Edit', edit_bike_path(@bike) %> | <%= link_to 'Edit', edit_bike_path(@bike) %> |
<%= link_to 'Back', bikes_path %> <%= link_to 'Back', bikes_path %>
</div>

Write Preview
Loading…
Cancel
Save