Saved: 2018-10-10 09:24

Torey Heinz committed Oct 10, 2018

commit 4f83d537e14d120bfcb634b89f213375623d465b

Showing 2 changed files with 42 additions and 7 deletions

app/content_types/project_requests.yml +18 -5

@@	@@ -75,11 +75,6 @@ fields:
	type: string
	required: false

-	- location: # The lowercase, underscored name of the field
-	label: Location # Human readable name of the field
-	type: string
-	required: false
-	localized: false

	- boat_year:
	label: Boat Year
@@	@@ -101,6 +96,24 @@ fields:
	label: Boat Name
	type: string

+	- location: # The lowercase, underscored name of the field
+	label: Current Location # Human readable name of the field
+	type: string
+	required: false
+	localized: false
+
+	- marina_name:
+	label: Marina Name
+	type: string
+
+	- slip_number:
+	label: Slip Number
+	type: string
+
+	- building_number:
+	label: Building Number
+	type: string
+
	- completion_date: # The lowercase, underscored name of the field
	label: Requested Completion Date # Human readable name of the field
	type: string

app/views/snippets/estimate_form.liquid +24 -2

@@	@@ -82,8 +82,30 @@
	</label>
	<label>
	<strong>Project Location:</strong>
-	<p class="help-text thin">When applicable include: Marina, Dock/Slip number, location on property, etc.</p>
-	<textarea name="content[location]" rows="2">{{project_request.location}}</textarea>
+	<fieldset class="row collapse">
+	<div class="column small-6">
+	<label>
+	Marina Name/Storage Unit
+	<input name="content[marina_name]" required type="text" value="{{project_request.marina_name}}">
+	</label>
+	</div>
+	<div class="column small-3">
+	<label>
+	Building#
+	<input name="content[building_number]" required type="text" value="{{project_request.building_number}}">
+	</label>
+	</div>
+	<div class="column small-3">
+	<label>
+	Slip#
+	<input name="content[slip_number]" required type="text" value="{{project_request.slip_number}}">
+	</label>
+	</div>
+	</fieldset>
+	<label>
+	Additional Details
+	<input name="content[location]" type="text" value="{{project_request.location}}">
+	</label>
	</label>

	<!-- <label>