@@ -26,29 +26,38 @@ $suffix = $block->showSuffix();
26
26
?>
27
27
<?php if (($ prefix || $ middle || $ suffix ) && !$ block ->getNoWrap ()): ?>
28
28
<div class="field required fullname <?= $ block ->escapeHtmlAttr ($ block ->getContainerClassName ()) ?> ">
29
- <label for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('firstname ' )) ?> " class="label"><span><?= $ block ->escapeHtml (__ ('Name ' )) ?> </span></label>
29
+ <label for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('firstname ' )) ?> " class="label">
30
+ <span><?= $ block ->escapeHtml (__ ('Name ' )) ?> </span>
31
+ </label>
30
32
<div class="control">
31
33
<fieldset class="fieldset fieldset-fullname">
32
34
<div class="fields">
33
35
<?php endif ; ?>
34
36
35
37
<?php if ($ prefix ): ?>
36
38
<div class="field field-name-prefix<?= $ block ->isPrefixRequired () ? ' required ' : '' ?> ">
37
- <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('prefix ' )) ?> "><span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('prefix ' )) ?> </span></label>
39
+ <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('prefix ' )) ?> ">
40
+ <span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('prefix ' )) ?> </span>
41
+ </label>
38
42
<div class="control">
39
43
<?php if ($ block ->getPrefixOptions () === false ): ?>
40
44
<input type="text" id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('prefix ' )) ?> "
41
45
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('prefix ' )) ?> "
42
46
value="<?= $ block ->escapeHtmlAttr ($ block ->getObject ()->getPrefix ()) ?> "
43
47
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('prefix ' )) ?> "
44
- class="input-text <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('prefix ' )) ?> " <?= $ block ->isPrefixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
48
+ class="input-text
49
+ <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('prefix ' )) ?> "
50
+ <?= $ block ->isPrefixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
45
51
<?php else : ?>
46
52
<select id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('prefix ' )) ?> "
47
53
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('prefix ' )) ?> "
48
54
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('prefix ' )) ?> "
49
- class="<?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('prefix ' )) ?> " <?= $ block ->isPrefixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
55
+ class="<?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('prefix ' )) ?> "
56
+ <?= $ block ->isPrefixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
50
57
<?php foreach ($ block ->getPrefixOptions () as $ _option ): ?>
51
- <option value="<?= $ block ->escapeHtmlAttr (__ ($ _option )) ?> "<?php if ($ block ->getObject ()->getPrefix () == $ _option ): ?> selected="selected"<?php endif ; ?> >
58
+ <option value="<?= $ block ->escapeHtmlAttr (__ ($ _option )) ?> "
59
+ <?php if ($ block ->getObject ()->getPrefix () == $ _option ): ?>
60
+ selected="selected"<?php endif ; ?> >
52
61
<?= $ block ->escapeHtml (__ ($ _option )) ?>
53
62
</option>
54
63
<?php endforeach ; ?>
@@ -58,55 +67,76 @@ $suffix = $block->showSuffix();
58
67
</div>
59
68
<?php endif ; ?>
60
69
<div class="field field-name-firstname required">
61
- <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('firstname ' )) ?> "><span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('firstname ' )) ?> </span></label>
70
+ <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('firstname ' )) ?> ">
71
+ <span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('firstname ' )) ?> </span>
72
+ </label>
62
73
<div class="control">
63
74
<input type="text" id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('firstname ' )) ?> "
64
75
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('firstname ' )) ?> "
65
76
value="<?= $ block ->escapeHtmlAttr ($ block ->getObject ()->getFirstname ()) ?> "
66
77
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('firstname ' )) ?> "
67
- class="input-text <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('firstname ' )) ?> " <?= ($ block ->getAttributeValidationClass ('firstname ' ) == 'required-entry ' ) ? ' data-validate="{required:true}" ' : '' ?> >
78
+ class="input-text
79
+ <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('firstname ' )) ?> "
80
+ <?= ($ block ->getAttributeValidationClass ('firstname ' ) == 'required-entry ' ) ? '
81
+ data-validate="{required:true}" ' : '' ?> >
68
82
</div>
69
83
</div>
70
84
<?php if ($ middle ): ?>
71
85
<?php $ isMiddlenameRequired = $ block ->isMiddlenameRequired (); ?>
72
86
<div class="field field-name-middlename<?= $ isMiddlenameRequired ? ' required ' : '' ?> ">
73
- <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('middlename ' )) ?> "><span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('middlename ' )) ?> </span></label>
87
+ <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('middlename ' )) ?> ">
88
+ <span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('middlename ' )) ?> </span>
89
+ </label>
74
90
<div class="control">
75
91
<input type="text" id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('middlename ' )) ?> "
76
92
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('middlename ' )) ?> "
77
93
value="<?= $ block ->escapeHtmlAttr ($ block ->getObject ()->getMiddlename ()) ?> "
78
94
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('middlename ' )) ?> "
79
- class="input-text <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('middlename ' )) ?> " <?= $ isMiddlenameRequired ? ' data-validate="{required:true}" ' : '' ?> >
95
+ class="input-text
96
+ <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('middlename ' )) ?> "
97
+ <?= $ isMiddlenameRequired ? ' data-validate="{required:true}" ' : '' ?> >
80
98
</div>
81
99
</div>
82
100
<?php endif ; ?>
83
101
<div class="field field-name-lastname required">
84
- <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('lastname ' )) ?> "><span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('lastname ' )) ?> </span></label>
102
+ <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('lastname ' )) ?> ">
103
+ <span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('lastname ' )) ?> </span>
104
+ </label>
85
105
<div class="control">
86
106
<input type="text" id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('lastname ' )) ?> "
87
107
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('lastname ' )) ?> "
88
108
value="<?= $ block ->escapeHtmlAttr ($ block ->getObject ()->getLastname ()) ?> "
89
109
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('lastname ' )) ?> "
90
- class="input-text <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('lastname ' )) ?> " <?= ($ block ->getAttributeValidationClass ('lastname ' ) == 'required-entry ' ) ? ' data-validate="{required:true}" ' : '' ?> >
110
+ class="input-text
111
+ <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('lastname ' )) ?> "
112
+ <?= ($ block ->getAttributeValidationClass ('lastname ' ) == 'required-entry ' ) ? '
113
+ data-validate="{required:true}" ' : '' ?> >
91
114
</div>
92
115
</div>
93
116
<?php if ($ suffix ): ?>
94
117
<div class="field field-name-suffix<?= $ block ->isSuffixRequired () ? ' required ' : '' ?> ">
95
- <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('suffix ' )) ?> "><span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('suffix ' )) ?> </span></label>
118
+ <label class="label" for="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('suffix ' )) ?> ">
119
+ <span><?= $ block ->escapeHtml ($ block ->getStoreLabel ('suffix ' )) ?> </span>
120
+ </label>
96
121
<div class="control">
97
122
<?php if ($ block ->getSuffixOptions () === false ): ?>
98
123
<input type="text" id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('suffix ' )) ?> "
99
124
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('suffix ' )) ?> "
100
125
value="<?= $ block ->escapeHtmlAttr ($ block ->getObject ()->getSuffix ()) ?> "
101
126
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('suffix ' )) ?> "
102
- class="input-text <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('suffix ' )) ?> " <?= $ block ->isSuffixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
127
+ class="input-text
128
+ <?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('suffix ' )) ?> "
129
+ <?= $ block ->isSuffixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
103
130
<?php else : ?>
104
131
<select id="<?= $ block ->escapeHtmlAttr ($ block ->getFieldId ('suffix ' )) ?> "
105
132
name="<?= $ block ->escapeHtmlAttr ($ block ->getFieldName ('suffix ' )) ?> "
106
133
title="<?= $ block ->escapeHtmlAttr ($ block ->getStoreLabel ('suffix ' )) ?> "
107
- class="<?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('suffix ' )) ?> " <?= $ block ->isSuffixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
134
+ class="<?= $ block ->escapeHtmlAttr ($ block ->getAttributeValidationClass ('suffix ' )) ?> "
135
+ <?= $ block ->isSuffixRequired () ? ' data-validate="{required:true}" ' : '' ?> >
108
136
<?php foreach ($ block ->getSuffixOptions () as $ _option ): ?>
109
- <option value="<?= $ block ->escapeHtmlAttr (__ ($ _option )) ?> "<?php if ($ block ->getObject ()->getSuffix () == $ _option ): ?> selected="selected"<?php endif ; ?> >
137
+ <option value="<?= $ block ->escapeHtmlAttr (__ ($ _option )) ?> "
138
+ <?php if ($ block ->getObject ()->getSuffix () == $ _option ): ?>
139
+ selected="selected"<?php endif ; ?> >
110
140
<?= $ block ->escapeHtml (__ ($ _option )) ?>
111
141
</option>
112
142
<?php endforeach ; ?>
0 commit comments