Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit a35753f

Browse files
michpetrovdgutride
michpetrov
authored and
dgutride
committed
fix(forms): Remove hyphens from inclusion variables (#1097)
1 parent e38f1c9 commit a35753f

File tree

4 files changed

+47
-46
lines changed

4 files changed

+47
-46
lines changed

‎tests/pages/_includes/widgets/forms/expand-collapse-section.html‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
<form class="form-horizontal">
22
<div class="form-group">
3-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-blueprintname}}">Blueprint Name</label>
4-
<div class="col-sm-{{include.col-size-field}}">
5-
<input type="text" id="{{include.id-blueprintname}}" class="form-control">
3+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_blueprintname}}">Blueprint Name</label>
4+
<div class="col-sm-{{include.col_size_field}}">
5+
<input type="text" id="{{include.id_blueprintname}}" class="form-control">
66
</div>
77
</div>
88
<div class="form-group">
9-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-catalog}}">Catalog</label>
10-
<div class="col-sm-{{include.col-size-field}}">
11-
<input type="text" id="{{include.id-catalog}}" class="form-control"></div>
9+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_catalog}}">Catalog</label>
10+
<div class="col-sm-{{include.col_size_field}}">
11+
<input type="text" id="{{include.id_catalog}}" class="form-control"></div>
1212
</div>
1313
<div class="form-group">
14-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-number}}">Number</label>
15-
<div class="col-sm-{{include.col-size-field}}">
16-
<input type="text" id="{{include.id-number}}" class="form-control"></div>
14+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_number}}">Number</label>
15+
<div class="col-sm-{{include.col_size_field}}">
16+
<input type="text" id="{{include.id_number}}" class="form-control"></div>
1717
</div>
1818

19-
<fieldset class="fields-section-pf" id="{{include.id-fieldsection}}">
19+
<fieldset class="fields-section-pf" id="{{include.id_fieldsection}}">
2020
<legend class="fields-section-header-pf">
2121
<span class="fa fa-angle-right fa-angle-down field-section-toggle-pf"></span>
22-
<a href="#{{include.id-fieldsection}}" class="field-section-toggle-pf">Advanced Options</a>
22+
<a href="#{{include.id_fieldsection}}" class="field-section-toggle-pf">Advanced Options</a>
2323
</legend>
2424
<div class="form-group">
25-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-entry1}}">Entry Point 1</label>
26-
<div class="col-sm-{{include.col-size-field}}">
27-
<input type="text" id="{{include.id-entry1}}" class="form-control"></div>
25+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_entry1}}">Entry Point 1</label>
26+
<div class="col-sm-{{include.col_size_field}}">
27+
<input type="text" id="{{include.id_entry1}}" class="form-control"></div>
2828
</div>
2929
<div class="form-group">
30-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-entry2}}">Entry Point 2</label>
31-
<div class="col-sm-{{include.col-size-field}}">
32-
<input type="text" id="{{include.id-entry2}}" class="form-control"></div>
30+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_entry2}}">Entry Point 2</label>
31+
<div class="col-sm-{{include.col_size_field}}">
32+
<input type="text" id="{{include.id_entry2}}" class="form-control"></div>
3333
</div>
3434
<div class="form-group">
35-
<label class="col-sm-{{include.col-size-label}} control-label" for="{{include.id-entry3}}">Entry Point 3</label>
36-
<div class="col-sm-{{include.col-size-field}}">
37-
<input type="text" id="{{include.id-entry3}}" class="form-control"></div>
35+
<label class="col-sm-{{include.col_size_label}} control-label" for="{{include.id_entry3}}">Entry Point 3</label>
36+
<div class="col-sm-{{include.col_size_field}}">
37+
<input type="text" id="{{include.id_entry3}}" class="form-control"></div>
3838
</div>
3939
</fieldset>
4040

41-
{% if include.is-modal == false %}
41+
{% if include.is_modal == false %}
4242
<div class="form-group">
43-
<div class="col-sm-offset-{{include.col-size-label}} col-sm-{{include.col-size-field}}">
43+
<div class="col-sm-offset-{{include.col_size_label}} col-sm-{{include.col_size_field}}">
4444
<button type="submit" class="btn btn-primary">Save</button>
4545
<button type="submit" class="btn btn-default">Cancel</button>
4646
</div>
4747
</div>
4848
{% endif %}
49-
{% if include.is-modal == true %}
49+
{% if include.is_modal == true %}
5050
<div class="modal-footer">
5151
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
5252
<button type="button" class="btn btn-primary">Save</button>
@@ -65,7 +65,8 @@
6565
$('.fa.field-section-toggle-pf').removeClass('fa-angle-down');
6666

6767
// click the field section heading to expand the section
68-
$("#{{include.id-fieldsection}} .field-section-toggle-pf").click(function(event){
68+
$("#{{include.id_fieldsection}} .field-section-toggle-pf").click(function(event){
69+
event.preventDefault();
6970
$(this).parents(".fields-section-pf").find(".fa").toggleClass("fa-angle-down");
7071
$(this).parents(".fields-section-pf").find(".form-group").toggleClass("hidden");
7172
if ($(this).parent().attr('aria-expanded') == 'false') {

‎tests/pages/_includes/widgets/forms/input-validation-form.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{% if include.has-error == true %}{% include widgets/communication/alert-danger.html %}{% endif %}
1+
{% if include.has_error == true %}{% include widgets/communication/alert-danger.html %}{% endif %}
22
<form class="form-horizontal">
33
<div class="form-group">
4-
<label class="col-sm-2 control-label" for="{{include.id-default}}">Default</label>
4+
<label class="col-sm-2 control-label" for="{{include.id_default}}">Default</label>
55
<div class="col-sm-10">
6-
<input type="text" id="{{include.id-default}}" class="form-control">
6+
<input type="text" id="{{include.id_default}}" class="form-control">
77
</div>
88
</div>
99
<div class="form-group">
10-
<label class="col-sm-2 control-label" for="{{include.id-disabled}}">Disabled</label>
10+
<label class="col-sm-2 control-label" for="{{include.id_disabled}}">Disabled</label>
1111
<div class="col-sm-10">
12-
<input type="text" id="{{include.id-disabled}}" class="form-control" disabled></div>
12+
<input type="text" id="{{include.id_disabled}}" class="form-control" disabled></div>
1313
</div>
14-
<div class="form-group {% if include.has-error == true %}has-error{% endif %}">
15-
<label class="col-sm-2 control-label" for="{{include.id-error}}">{% if include.has-error == true %}With{% else %}No{% endif %} error</label>
14+
<div class="form-group {% if include.has_error == true %}has-error{% endif %}">
15+
<label class="col-sm-2 control-label" for="{{include.id_error}}">{% if include.has_error == true %}With{% else %}No{% endif %} error</label>
1616
<div class="col-sm-10">
17-
<input type="text" id="{{include.id-error}}" class="form-control">
18-
{% if include.has-error == true %}
17+
<input type="text" id="{{include.id_error}}" class="form-control">
18+
{% if include.has_error == true %}
1919
<span class="help-block">Please correct the error</span>
2020
{% endif %}
2121
</div>

‎tests/pages/_includes/widgets/forms/input-validation-modal.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
<h4 class="modal-title">Modal title</h4>
88
</div>
99
<div class="modal-body">
10-
{% if include.has-error == true %}{% include widgets/communication/alert-danger.html %}{% endif %}
10+
{% if include.has_error == true %}{% include widgets/communication/alert-danger.html %}{% endif %}
1111
<form class="form-horizontal">
1212
<div class="form-group">
13-
<label class="col-sm-2 control-label" for="{{include.id-default}}">Default</label>
13+
<label class="col-sm-2 control-label" for="{{include.id_default}}">Default</label>
1414
<div class="col-sm-10">
15-
<input type="text" id="{{include.id-default}}" class="form-control"></div>
15+
<input type="text" id="{{include.id_default}}" class="form-control"></div>
1616
</div>
1717
<div class="form-group">
18-
<label class="col-sm-2 control-label" for="{{include.id-disabled}}">Disabled</label>
18+
<label class="col-sm-2 control-label" for="{{include.id_disabled}}">Disabled</label>
1919
<div class="col-sm-10">
20-
<input type="text" id="{{include.id-disabled}}" class="form-control" disabled></div>
20+
<input type="text" id="{{include.id_disabled}}" class="form-control" disabled></div>
2121
</div>
22-
<div class="form-group {% if include.has-error == true %}has-error{% endif %}">
23-
<label class="col-sm-2 control-label" for="{{include.id-error}}">{% if include.has-error == true %}With{% else %}No{% endif %} error</label>
22+
<div class="form-group {% if include.has_error == true %}has-error{% endif %}">
23+
<label class="col-sm-2 control-label" for="{{include.id_error}}">{% if include.has_error == true %}With{% else %}No{% endif %} error</label>
2424
<div class="col-sm-10">
25-
<input type="text" id="{{include.id-error}}" class="form-control">
26-
{% if include.has-error == true %}
25+
<input type="text" id="{{include.id_error}}" class="form-control">
26+
{% if include.has_error == true %}
2727
<span class="help-block">Please correct the error</span>
2828
{% endif %}
2929
</div>

‎tests/pages/forms.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ <h3 id="right-aligned_all-fields-optional">All Fields Optional</h3>
182182
</form>
183183

184184
<h3 id="right-aligned_error-feedback">Error Feedback</h3>
185-
{% include widgets/forms/input-validation-form.html id-default="exampleInput" id-disabled="exampleInputDisabled" id-error="exampleInputError" has-error=true %}
185+
{% include widgets/forms/input-validation-form.html id_default="exampleInput" id_disabled="exampleInputDisabled" id_error="exampleInputError" has_error=true %}
186186

187187
<h2 id="top-aligned">Top-aligned labels</h2>
188188

@@ -298,12 +298,12 @@ <h2 id="inside-a-modal">Inside a modal</h2>
298298
}
299299
</style>
300300
<div class="example-pf">
301-
{% include widgets/forms/input-validation-modal.html id-default="modalInput" id-disabled="modalInputDisabled" id-error="modalInputError" has-error=true %}
301+
{% include widgets/forms/input-validation-modal.html id_default="modalInput" id_disabled="modalInputDisabled" id_error="modalInputError" has_error=true %}
302302
</div>
303303

304304
<h2 id="expand-collapse-section">Expand-Collapse Section</h2>
305305
<div class="example-pf">
306-
{% include widgets/forms/expand-collapse-section.html id-blueprintname="AdvOptBlueprintName" id-catalog="AdvOptCatalog" id-number="AdvOptNumber" id-entry1="AdvOptEntry1" id-entry2="AdvOptEntry2" id-entry3="AdvOptEntry3" id-fieldsection="AdvOptSection" is-modal=false col-size-label="2" col-size-field="10" %}
306+
{% include widgets/forms/expand-collapse-section.html id_blueprintname="AdvOptBlueprintName" id_catalog="AdvOptCatalog" id_number="AdvOptNumber" id_entry1="AdvOptEntry1" id_entry2="AdvOptEntry2" id_entry3="AdvOptEntry3" id_fieldsection="AdvOptSection" is_modal=false col_size_label="2" col_size_field="10" %}
307307
</div>
308308

309309
<h2 id="expand-collapse-section-inside-a-modal">Expand-Collapse Section inside a modal</h2>
@@ -320,7 +320,7 @@ <h4 class="modal-title" id="myModalLabel">Edit Blueprint Details</h4>
320320
</div>
321321
<div class="modal-body">
322322
<div class="example-pf">
323-
{% include widgets/forms/expand-collapse-section.html id-blueprintname="AdvOptBlueprintNameMod" id-catalog="AdvOptCatalogMod" id-number="AdvOptNumberMod" id-entry1="AdvOptEntry1Mod" id-entry2="AdvOptEntry2Mod" id-entry3="AdvOptEntry3Mod" id-fieldsection="AdvOptSectionMod" is-modal=true col-size-label="3" col-size-field="9" %}
323+
{% include widgets/forms/expand-collapse-section.html id_blueprintname="AdvOptBlueprintNameMod" id_catalog="AdvOptCatalogMod" id_number="AdvOptNumberMod" id_entry1="AdvOptEntry1Mod" id_entry2="AdvOptEntry2Mod" id_entry3="AdvOptEntry3Mod" id_fieldsection="AdvOptSectionMod" is_modal=true col_size_label="3" col_size_field="9" %}
324324
</div>
325325
</div>
326326
</div>

0 commit comments

Comments
 (0)