-
+<% if @existing_vehicle %>
+
+ <%= l(:text_vin_already_on_file) %>
+ <%= link_to @existing_vehicle.to_s, vehicle_path(@existing_vehicle) %>
+<% end %>
+
+
+
+ <%# Customer autocomplete from redmine_qbo: fills the hidden customer_id %>
+ <%= f.text_field :customer, label: :field_customer, required: true, size: 60,
+ value: @vehicle.customer&.name, class: 'customer-name', autocomplete: 'off',
+ data: { autocomplete_url: '/customers/autocomplete' } %>
+ <%= f.hidden_field :customer_id, id: 'customer_id' %>
+
+
<%= f.text_field :vin, label: :field_vin, required: true, size: 20, maxlength: 17, autofocus: true %>
+
<%= f.number_field :year, label: :label_year, min: 1900, max: Date.today.year + 2, autocomplete: 'off' %>
+
<%= f.text_field :make, label: :label_make, size: 30, autocomplete: 'off' %>
+
<%= f.text_field :model, label: :label_model, size: 30, autocomplete: 'off' %>
+
+ <%= f.text_area :notes, label: :field_notes, rows: 8, class: 'wiki-edit', id: 'vehicle_notes' %>
+ <%= wikitoolbar_for 'vehicle_notes' %>
+
diff --git a/app/views/vehicles/edit.html.erb b/app/views/vehicles/edit.html.erb
index 7803874..70b992a 100644
--- a/app/views/vehicles/edit.html.erb
+++ b/app/views/vehicles/edit.html.erb
@@ -1,3 +1,9 @@
-
<%=t(:label_edit_customer_vehicle)%>
-
-<%= render partial: 'vehicles/form' %>
+
<%= link_to l(:field_vehicles), vehicles_path %> » <%= link_to @vehicle.to_s, vehicle_path(@vehicle) %>
+
+<%= labelled_form_for @vehicle do |f| %>
+ <%= render partial: 'vehicles/form', locals: { f: f } %>
+ <%= submit_tag l(:button_save) %>
+ <%= link_to l(:button_cancel), vehicle_path(@vehicle) %>
+<% end %>
+
+<% html_title(l(:label_edit_customer_vehicle)) -%>
diff --git a/app/views/vehicles/new.html.erb b/app/views/vehicles/new.html.erb
index ea9c7b1..c8eed15 100644
--- a/app/views/vehicles/new.html.erb
+++ b/app/views/vehicles/new.html.erb
@@ -1,3 +1,9 @@
-
<%=t(:label_new_vehicle)%>
-
-<%= render partial: 'vehicles/form' %>
+
<%= link_to l(:field_vehicles), vehicles_path %> » <%= l(:label_new_vehicle) %>
+
+<%= labelled_form_for @vehicle do |f| %>
+ <%= render partial: 'vehicles/form', locals: { f: f } %>
+ <%= submit_tag l(:button_create) %>
+ <%= link_to l(:button_cancel), @vehicle.customer ? customer_path(@vehicle.customer) : vehicles_path %>
+<% end %>
+
+<% html_title(l(:label_new_vehicle)) -%>