Skip to content

Commit 0c1341d

Browse files
author
mariannk
committed
Merge branch 'issue-1826-new-popup-windows-markup' into develop
2 parents 0a43198 + bc88f93 commit 0c1341d

19 files changed

+217
-211
lines changed

‎src/Plugins/Nop.Plugin.Pickup.PickupInStore/Views/_CreateOrUpdate.cshtml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
<div class="panel-group">
17-
<div class="panel panel-default">
17+
<div class="panel panel-default panel-popup">
1818

1919
<script type="text/javascript">
2020
$(document).ready(function() {
@@ -42,91 +42,91 @@
4242

4343
<div class="panel-body">
4444
<div class="form-group">
45-
<div class="col-md-3">
45+
<div class="col-sm-3">
4646
@Html.NopLabelFor(model => model.Name)
4747
</div>
48-
<div class="col-md-9">
48+
<div class="col-sm-9">
4949
@Html.NopEditorFor(model => model.Name)
5050
@Html.ValidationMessageFor(model => model.Name)
5151
</div>
5252
</div>
5353
<div class="form-group">
54-
<div class="col-md-3">
54+
<div class="col-sm-3">
5555
@Html.NopLabelFor(model => model.Description)
5656
</div>
57-
<div class="col-md-9">
57+
<div class="col-sm-9">
5858
@Html.NopTextAreaFor(model => model.Description)
5959
@Html.ValidationMessageFor(model => model.Description)
6060
</div>
6161
</div>
6262
<div class="form-group">
63-
<div class="col-md-3">
63+
<div class="col-sm-3">
6464
@Html.NopLabelFor(model => model.Address.CountryId)
6565
</div>
66-
<div class="col-md-9">
66+
<div class="col-sm-9">
6767
@Html.NopDropDownListFor(model => model.Address.CountryId, Model.Address.AvailableCountries)
6868
@Html.ValidationMessageFor(model => model.Address.CountryId)
6969
</div>
7070
</div>
7171
<div class="form-group">
72-
<div class="col-md-3">
72+
<div class="col-sm-3">
7373
@Html.NopLabelFor(model => model.Address.StateProvinceId)
7474
</div>
75-
<div class="col-md-9">
75+
<div class="col-sm-9">
7676
@Html.NopDropDownListFor(model => model.Address.StateProvinceId, Model.Address.AvailableStates)
7777
@Html.ValidationMessageFor(model => model.Address.StateProvinceId)
7878
</div>
7979
</div>
8080
<div class="form-group">
81-
<div class="col-md-3">
81+
<div class="col-sm-3">
8282
@Html.NopLabelFor(model => model.Address.City)
8383
</div>
84-
<div class="col-md-9">
84+
<div class="col-sm-9">
8585
@Html.NopEditorFor(model => model.Address.City)
8686
@Html.ValidationMessageFor(model => model.Address.City)
8787
</div>
8888
</div>
8989
<div class="form-group">
90-
<div class="col-md-3">
90+
<div class="col-sm-3">
9191
@Html.NopLabelFor(model => model.Address.Address1)
9292
</div>
93-
<div class="col-md-9">
93+
<div class="col-sm-9">
9494
@Html.NopEditorFor(model => model.Address.Address1)
9595
@Html.ValidationMessageFor(model => model.Address.Address1)
9696
</div>
9797
</div>
9898
<div class="form-group">
99-
<div class="col-md-3">
99+
<div class="col-sm-3">
100100
@Html.NopLabelFor(model => model.Address.ZipPostalCode)
101101
</div>
102-
<div class="col-md-9">
102+
<div class="col-sm-9">
103103
@Html.NopEditorFor(model => model.Address.ZipPostalCode)
104104
@Html.ValidationMessageFor(model => model.Address.ZipPostalCode)
105105
</div>
106106
</div>
107107
<div class="form-group">
108-
<div class="col-md-3">
108+
<div class="col-sm-3">
109109
@Html.NopLabelFor(model => model.OpeningHours)
110110
</div>
111-
<div class="col-md-9">
111+
<div class="col-sm-9">
112112
@Html.NopEditorFor(model => model.OpeningHours)
113113
@Html.ValidationMessageFor(model => model.OpeningHours)
114114
</div>
115115
</div>
116116
<div class="form-group">
117-
<div class="col-md-3">
117+
<div class="col-sm-3">
118118
@Html.NopLabelFor(model => model.PickupFee)
119119
</div>
120-
<div class="col-md-9">
120+
<div class="col-sm-9">
121121
@Html.NopEditorFor(model => model.PickupFee)
122122
@Html.ValidationMessageFor(model => model.PickupFee)
123123
</div>
124124
</div>
125125
<div class="form-group" @(Model.AvailableStores.SelectionIsNotPossible() ? Html.Raw("style=\"display:none\"") : null)>
126-
<div class="col-md-3">
126+
<div class="col-sm-3">
127127
@Html.NopLabelFor(model => model.StoreId)
128128
</div>
129-
<div class="col-md-9">
129+
<div class="col-sm-9">
130130
@Html.NopDropDownListFor(model => model.StoreId, Model.AvailableStores)
131131
@Html.ValidationMessageFor(model => model.StoreId)
132132
</div>

‎src/Plugins/Nop.Plugin.Shipping.FixedOrByWeight/Views/_CreateOrUpdateRateByWeight.cshtml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,112 +38,112 @@
3838
</script>
3939

4040
<div class="panel-group">
41-
<div class="panel panel-default">
41+
<div class="panel panel-default panel-popup">
4242
<div class="panel-body">
4343
<div class="form-group" @(Model.AvailableStores.SelectionIsNotPossible() ? Html.Raw("style=\"display:none\"") : null)>
44-
<div class="col-md-3">
44+
<div class="col-sm-3">
4545
@Html.NopLabelFor(model => model.StoreId)
4646
</div>
47-
<div class="col-md-9">
47+
<div class="col-sm-9">
4848
@Html.NopDropDownListFor(model => model.StoreId, Model.AvailableStores)
4949
@Html.ValidationMessageFor(model => model.StoreId)
5050
</div>
5151
</div>
5252
<div class="form-group">
53-
<div class="col-md-3">
53+
<div class="col-sm-3">
5454
@Html.NopLabelFor(model => model.WarehouseId)
5555
</div>
56-
<div class="col-md-9">
56+
<div class="col-sm-9">
5757
@Html.NopDropDownListFor(model => model.WarehouseId, Model.AvailableWarehouses)
5858
@Html.ValidationMessageFor(model => model.WarehouseId)
5959
</div>
6060
</div>
6161
<div class="form-group">
62-
<div class="col-md-3">
62+
<div class="col-sm-3">
6363
@Html.NopLabelFor(model => model.CountryId)
6464
</div>
65-
<div class="col-md-9">
65+
<div class="col-sm-9">
6666
@Html.NopDropDownListFor(model => model.CountryId, Model.AvailableCountries)
6767
@Html.ValidationMessageFor(model => model.CountryId)
6868
</div>
6969
</div>
7070
<div class="form-group">
71-
<div class="col-md-3">
71+
<div class="col-sm-3">
7272
@Html.NopLabelFor(model => model.StateProvinceId)
7373
</div>
74-
<div class="col-md-9">
74+
<div class="col-sm-9">
7575
@Html.NopDropDownListFor(model => model.StateProvinceId, Model.AvailableStates)
7676
@Html.ValidationMessageFor(model => model.StateProvinceId)
7777
</div>
7878
</div>
7979
<div class="form-group">
80-
<div class="col-md-3">
80+
<div class="col-sm-3">
8181
@Html.NopLabelFor(model => model.Zip)
8282
</div>
83-
<div class="col-md-9">
83+
<div class="col-sm-9">
8484
@Html.NopEditorFor(model => model.Zip)
8585
@Html.ValidationMessageFor(model => model.Zip)
8686
</div>
8787
</div>
8888
<div class="form-group">
89-
<div class="col-md-3">
89+
<div class="col-sm-3">
9090
@Html.NopLabelFor(model => model.ShippingMethodId)
9191
</div>
92-
<div class="col-md-9">
92+
<div class="col-sm-9">
9393
@Html.NopDropDownListFor(model => model.ShippingMethodId, Model.AvailableShippingMethods)
9494
@Html.ValidationMessageFor(model => model.ShippingMethodId)
9595
</div>
9696
</div>
9797
<div class="form-group">
98-
<div class="col-md-3">
98+
<div class="col-sm-3">
9999
@Html.NopLabelFor(model => model.From)
100100
</div>
101-
<div class="col-md-9">
101+
<div class="col-sm-9">
102102
@Html.NopEditorFor(model => model.From, Model.BaseWeightIn)
103103
@Html.ValidationMessageFor(model => model.From)
104104
</div>
105105
</div>
106106
<div class="form-group">
107-
<div class="col-md-3">
107+
<div class="col-sm-3">
108108
@Html.NopLabelFor(model => model.To)
109109
</div>
110-
<div class="col-md-9">
110+
<div class="col-sm-9">
111111
@Html.NopEditorFor(model => model.To, Model.BaseWeightIn)
112112
@Html.ValidationMessageFor(model => model.To)
113113
</div>
114114
</div>
115115
<div class="form-group">
116-
<div class="col-md-3">
116+
<div class="col-sm-3">
117117
@Html.NopLabelFor(model => model.AdditionalFixedCost)
118118
</div>
119-
<div class="col-md-9">
119+
<div class="col-sm-9">
120120
@Html.NopEditorFor(model => model.AdditionalFixedCost, Model.PrimaryStoreCurrencyCode)
121121
@Html.ValidationMessageFor(model => model.AdditionalFixedCost)
122122
</div>
123123
</div>
124124
<div class="form-group">
125-
<div class="col-md-3">
125+
<div class="col-sm-3">
126126
@Html.NopLabelFor(model => model.LowerWeightLimit)
127127
</div>
128-
<div class="col-md-9">
128+
<div class="col-sm-9">
129129
@Html.NopEditorFor(model => model.LowerWeightLimit)
130130
@Html.ValidationMessageFor(model => model.LowerWeightLimit)
131131
</div>
132132
</div>
133133
<div class="form-group">
134-
<div class="col-md-3">
134+
<div class="col-sm-3">
135135
@Html.NopLabelFor(model => model.RatePerWeightUnit)
136136
</div>
137-
<div class="col-md-9">
137+
<div class="col-sm-9">
138138
@Html.NopEditorFor(model => model.RatePerWeightUnit, Model.PrimaryStoreCurrencyCode)
139139
@Html.ValidationMessageFor(model => model.RatePerWeightUnit)
140140
</div>
141141
</div>
142142
<div class="form-group">
143-
<div class="col-md-3">
143+
<div class="col-sm-3">
144144
@Html.NopLabelFor(model => model.PercentageRateOfSubtotal)
145145
</div>
146-
<div class="col-md-9">
146+
<div class="col-sm-9">
147147
@Html.NopEditorFor(model => model.PercentageRateOfSubtotal)
148148
@Html.ValidationMessageFor(model => model.PercentageRateOfSubtotal)
149149
</div>

‎src/Presentation/Nop.Web/Administration/Content/styles.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,12 +1256,12 @@ span.grid-report-item.red {
12561256
.form-horizontal .label-wrapper .ico-help {
12571257
display: none;
12581258
}
1259-
.form-horizontal .panel-popup .ico-help {
1260-
display: block;
1261-
}
12621259
.form-horizontal .panel-popup .form-group input[type=checkbox] {
12631260
margin-top: 10px;
12641261
}
1262+
.form-horizontal .panel-popup .ico-help {
1263+
display: block;
1264+
}
12651265
.form-control {
12661266
margin-bottom: 3px;
12671267
}
@@ -1291,9 +1291,6 @@ span.grid-report-item.red {
12911291
.form-horizontal .panel-popup .form-group input[type=checkbox] {
12921292
margin-top: 10px;
12931293
}
1294-
.form-horizontal span.required {
1295-
float: none;
1296-
}
12971294
.form-group input[type=checkbox] {
12981295
margin-top: 2px;
12991296
}
@@ -1319,6 +1316,12 @@ span.grid-report-item.red {
13191316

13201317
/* FORM ELEMENTS */
13211318
.form-horizontal .panel-popup .label-wrapper {
1322-
float: left;
1319+
float: none;
1320+
}
1321+
.form-horizontal .panel-popup .ico-help {
1322+
display: none;
1323+
}
1324+
.form-horizontal span.required {
1325+
float: none;
13231326
}
13241327
}

‎src/Presentation/Nop.Web/Administration/Content/styles.rtl.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,12 +1266,12 @@ span.grid-report-item.red {
12661266
.form-horizontal .label-wrapper .ico-help {
12671267
display: none;
12681268
}
1269-
.form-horizontal .panel-popup .ico-help {
1270-
display: block;
1271-
}
12721269
.form-horizontal .panel-popup .form-group input[type=checkbox] {
12731270
margin-top: 10px;
12741271
}
1272+
.form-horizontal .panel-popup .ico-help {
1273+
display: block;
1274+
}
12751275
.form-control {
12761276
margin-bottom: 3px;
12771277
}
@@ -1301,9 +1301,6 @@ span.grid-report-item.red {
13011301
.form-horizontal .panel-popup .form-group input[type=checkbox] {
13021302
margin-top: 10px;
13031303
}
1304-
.form-horizontal span.required {
1305-
float: none;
1306-
}
13071304
.form-group input[type=checkbox] {
13081305
margin-top: 2px;
13091306
}
@@ -1329,7 +1326,13 @@ span.grid-report-item.red {
13291326

13301327
/* FORM ELEMENTS */
13311328
.form-horizontal .panel-popup .label-wrapper {
1332-
float: right;
1329+
float: none;
1330+
}
1331+
.form-horizontal .panel-popup .ico-help {
1332+
display: none;
1333+
}
1334+
.form-horizontal span.required {
1335+
float: none;
13331336
}
13341337
}
13351338

‎src/Presentation/Nop.Web/Administration/Views/AddressAttribute/_CreateOrUpdateValue.cshtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
@Html.HiddenFor(model => model.AddressAttributeId)
1616
<div class="form-horizontal">
1717
<div class="panel-group">
18-
<div class="panel panel-default">
18+
<div class="panel panel-default panel-popup">
1919
<div class="panel-body">
2020
@(Html.LocalizedEditor<AddressAttributeValueModel, AddressAttributeValueLocalizedModel>("addressattributevalue-localized",
2121
@<div>
2222
<div class="form-group">
23-
<div class="col-md-3">
23+
<div class="col-sm-3">
2424
@Html.NopLabelFor(model => model.Locales[item].Name)
2525
</div>
26-
<div class="col-md-9">
26+
<div class="col-sm-9">
2727
@Html.NopEditorFor(model => model.Locales[item].Name)
2828
@Html.ValidationMessageFor(model => model.Locales[item].Name)
2929
</div>
@@ -33,10 +33,10 @@
3333
,
3434
@<div>
3535
<div class="form-group">
36-
<div class="col-md-3">
36+
<div class="col-sm-3">
3737
@Html.NopLabelFor(model => model.Name)
3838
</div>
39-
<div class="col-md-9">
39+
<div class="col-sm-9">
4040
@Html.NopEditorFor(model => model.Name)
4141
@Html.ValidationMessageFor(model => model.Name)
4242
</div>
@@ -45,19 +45,19 @@
4545
))
4646

4747
<div class="form-group">
48-
<div class="col-md-3">
48+
<div class="col-sm-3">
4949
@Html.NopLabelFor(model => model.IsPreSelected)
5050
</div>
51-
<div class="col-md-9">
51+
<div class="col-sm-9">
5252
@Html.NopEditorFor(model => model.IsPreSelected)
5353
@Html.ValidationMessageFor(model => model.IsPreSelected)
5454
</div>
5555
</div>
5656
<div class="form-group">
57-
<div class="col-md-3">
57+
<div class="col-sm-3">
5858
@Html.NopLabelFor(model => model.DisplayOrder)
5959
</div>
60-
<div class="col-md-9">
60+
<div class="col-sm-9">
6161
@Html.NopEditorFor(model => model.DisplayOrder)
6262
@Html.ValidationMessageFor(model => model.DisplayOrder)
6363
</div>

0 commit comments

Comments
 (0)