Merge remote-tracking branch 'origin/master' into i18n-hackathon

This commit is contained in:
Maikel Linke
2016-03-11 16:50:48 +11:00

View File

@@ -1,6 +1,7 @@
.row
.three.columns.alpha
= f.label :name
%span.required *
.nine.columns.omega
= f.text_field :name, { placeholder: "eg. Professor Plum's Biodynamic Truffles", class: "fullwidth" }
@@ -8,6 +9,7 @@
.row
.three.columns.alpha
=f.label :owner_id, 'Owner'
%span.required *
%div{'ofn-with-tip' => "The primary user responsible for this enterprise."}
%a What's this?
.nine.columns.omega
@@ -68,6 +70,7 @@
.row
.three.columns.alpha
= af.label :address1
%span.required *
.nine.columns.omega
= af.text_field :address1, { placeholder: "eg. 123 High Street"}
.row
@@ -80,6 +83,7 @@
= af.label :city, 'Suburb'
\/
= af.label :zipcode, 'Postcode'
%span.required *
.four.columns
= af.text_field :city, { placeholder: "eg. Northcote"}
.five.columns.omega