Skip to content

Commit 0b17217

Browse files
philwarehamphilwareham
committed
Forms consistency
1 parent 6940fbc commit 0b17217

File tree

4 files changed

+46
-48
lines changed

4 files changed

+46
-48
lines changed

‎templates/forms/comment/comment_form.txp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
<p><txp:text item="enter_comment_here" /></p>
21
<txp:if_comments_error>
32
<txp:comments_error class="error" wraptag="ol" break="li" />
43
</txp:if_comments_error>
54
<div class="layout-container">
65
<p class="layout-2col">
7-
<label for="name"><txp:text item="comment_name" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
8-
<txp:comment_name_input class="large" size="32" />
6+
<label for="name"><txp:text item="comment_name" /></label><br>
7+
<txp:comment_name_input class="large" size="32" placeholder='<txp:text item="required" />' />
98
</p>
109
<p class="layout-2col">
11-
<label for="email"><txp:text item="comment_email" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
12-
<txp:comment_email_input class="large" size="32" />
10+
<label for="email"><txp:text item="comment_email" /></label><br>
11+
<txp:comment_email_input class="large" size="32" placeholder='<txp:text item="required" />' />
1312
</p>
1413
</div>
1514
<p>
16-
<label for="message"><txp:text item="comment_message" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
17-
<txp:comment_message_input cols="64" rows="4" />
15+
<label for="message"><txp:text item="comment_message" /></label><br>
16+
<txp:comment_message_input cols="64" rows="4" placeholder='<txp:text item="required" />' />
1817
</p>
19-
<p class="field layout-1col">
18+
<p>
2019
<txp:comment_preview />
2120
<txp:comment_submit class="button-primary" />
2221
</p>

‎templates/pages/contact.txp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
<txp:if_plugin name="com_connect" version="4.6">
3333
<txp:com_connect class="" label="" to='<txp:variable name="--contact-email" />' body_form="email">
3434
<div class="layout-container">
35-
<div class="layout-2col">
36-
<txp:com_connect_text class="" name="name" size="32" label='<txp:text item="name" />' />
37-
</div>
38-
<div class="layout-2col">
39-
<txp:com_connect_email class="" name="email" size="32" label='<txp:text item="email" />' />
40-
</div>
41-
<div class="layout-2col">
35+
<p class="layout-2col">
36+
<txp:com_connect_text class="" name="name" size="32" label='<txp:text item="name" />' placeholder='<txp:text item="required" />' />
37+
</p>
38+
<p class="layout-2col">
39+
<txp:com_connect_email class="" name="email" size="32" label='<txp:text item="email" />' placeholder='<txp:text item="required" />' />
40+
</p>
41+
<p class="layout-2col">
4242
<txp:com_connect_text class="" name="organization" size="32" label='<txp:text item="organization" />' required="0" />
43-
</div>
44-
<div class="layout-2col">
43+
</p>
44+
<p class="layout-2col">
4545
<txp:com_connect_text class="" type="tel" name="tel" size="32" label='<txp:text item="tel" />' required="0" />
46-
</div>
47-
<div class="layout-1col">
48-
<txp:com_connect_textarea class="" name="message" cols="64" rows="8" label='<txp:text item="message" />' />
49-
</div>
50-
<div class="layout-1col">
51-
<input type="submit" value="<txp:text item="send" />" />
52-
</div>
46+
</p>
5347
</div>
48+
<p>
49+
<txp:com_connect_textarea class="" name="message" cols="64" rows="8" label='<txp:text item="message" />' placeholder='<txp:text item="required" />' />
50+
</p>
51+
<p>
52+
<input class="button-primary" type="submit" value="<txp:text item="send" />" />
53+
</p>
5454
</txp:com_connect>
5555
TODO
5656
<txp:else />

‎themes/hive-framework-0.0.3/forms/comment/comment_form.txp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
<p><txp:text item="enter_comment_here" /></p>
21
<txp:if_comments_error>
32
<txp:comments_error class="error" wraptag="ol" break="li" />
43
</txp:if_comments_error>
54
<div class="layout-container">
65
<p class="layout-2col">
7-
<label for="name"><txp:text item="comment_name" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
8-
<txp:comment_name_input class="large" size="32" />
6+
<label for="name"><txp:text item="comment_name" /></label><br>
7+
<txp:comment_name_input class="large" size="32" placeholder='<txp:text item="required" />' />
98
</p>
109
<p class="layout-2col">
11-
<label for="email"><txp:text item="comment_email" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
12-
<txp:comment_email_input class="large" size="32" />
10+
<label for="email"><txp:text item="comment_email" /></label><br>
11+
<txp:comment_email_input class="large" size="32" placeholder='<txp:text item="required" />' />
1312
</p>
1413
</div>
1514
<p>
16-
<label for="message"><txp:text item="comment_message" /> <abbr class="required" title="<txp:text item="required" />" aria-label="<txp:text item="required" />">*</abbr></label><br>
17-
<txp:comment_message_input cols="64" rows="4" />
15+
<label for="message"><txp:text item="comment_message" /></label><br>
16+
<txp:comment_message_input cols="64" rows="4" placeholder='<txp:text item="required" />' />
1817
</p>
19-
<p class="field layout-1col">
18+
<p>
2019
<txp:comment_preview />
2120
<txp:comment_submit class="button-primary" />
2221
</p>

‎themes/hive-framework-0.0.3/pages/contact.txp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
<txp:if_plugin name="com_connect" version="4.6">
3333
<txp:com_connect class="" label="" to='<txp:variable name="--contact-email" />' body_form="email">
3434
<div class="layout-container">
35-
<div class="layout-2col">
36-
<txp:com_connect_text class="" name="name" size="32" label='<txp:text item="name" />' />
37-
</div>
38-
<div class="layout-2col">
39-
<txp:com_connect_email class="" name="email" size="32" label='<txp:text item="email" />' />
40-
</div>
41-
<div class="layout-2col">
35+
<p class="layout-2col">
36+
<txp:com_connect_text class="" name="name" size="32" label='<txp:text item="name" />' placeholder='<txp:text item="required" />' />
37+
</p>
38+
<p class="layout-2col">
39+
<txp:com_connect_email class="" name="email" size="32" label='<txp:text item="email" />' placeholder='<txp:text item="required" />' />
40+
</p>
41+
<p class="layout-2col">
4242
<txp:com_connect_text class="" name="organization" size="32" label='<txp:text item="organization" />' required="0" />
43-
</div>
44-
<div class="layout-2col">
43+
</p>
44+
<p class="layout-2col">
4545
<txp:com_connect_text class="" type="tel" name="tel" size="32" label='<txp:text item="tel" />' required="0" />
46-
</div>
47-
<div class="layout-1col">
48-
<txp:com_connect_textarea class="" name="message" cols="64" rows="8" label='<txp:text item="message" />' />
49-
</div>
50-
<div class="layout-1col">
51-
<input type="submit" value="<txp:text item="send" />" />
52-
</div>
46+
</p>
5347
</div>
48+
<p>
49+
<txp:com_connect_textarea class="" name="message" cols="64" rows="8" label='<txp:text item="message" />' placeholder='<txp:text item="required" />' />
50+
</p>
51+
<p>
52+
<input class="button-primary" type="submit" value="<txp:text item="send" />" />
53+
</p>
5454
</txp:com_connect>
5555
TODO
5656
<txp:else />

0 commit comments

Comments
 (0)