Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 70d7cc9

Browse files
author
Ramón Tomás
committed
Migrate WebMVC app to bootstrap 4
1 parent 96cabfe commit 70d7cc9

File tree

19 files changed

+137
-132
lines changed

19 files changed

+137
-132
lines changed

‎src/Web/WebMVC/Views/Campaigns/Details.cshtml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<div class="container">
1616
<div class="card esh-campaigns-items">
1717
<img class="card-img-top" src="@Model.PictureUri" alt="Card image cap">
18-
<div class="card-block">
18+
<div class="card-body">
1919
<h4 class="card-title">@Model.Name</h4>
20-
<p class="card-text">@Model.Description</p>
21-
<p class="card-text">
22-
<small class="text-muted">
23-
From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy")
24-
</small>
25-
</p>
20+
<p class="card-text">@Model.Description</p>
21+
</div>
22+
<div class="card-footer">
23+
<small class="text-muted">
24+
From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy")
25+
</small>
2626
</div>
2727
</div>
2828
</div>

‎src/Web/WebMVC/Views/Campaigns/Index.cshtml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,28 @@
2727
<div class="esh-campaigns-items" style="font-weight: 300;">
2828
UPDATE USER LOCATION
2929
</div>
30+
<br />
31+
<form class="form-inline" asp-action="CreateNewUserLocation" method="post">
32+
<label class="sr-only" for="longitudeInput">Name</label>
3033

31-
<form class="form-inline" asp-action="CreateNewUserLocation" method="post">
32-
<label class="sr-only" for="longitudeInput">Name</label>
33-
34-
<div class="input-group mb-2 mr-sm-2 mb-sm-0">
35-
<div class="input-group-addon">Lat</div>
36-
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude">
37-
</div>
34+
<div class="input-group mb-3">
35+
<div class="input-group-prepend">
36+
<span class="input-group-text" id="inputGroup-sizing-default">Lat</span>
37+
</div>
38+
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude">
39+
</div>
3840

39-
<div class="input-group mb-2 mr-sm-2 mb-sm-0">
40-
<div class="input-group-addon">Lon</div>
41-
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude">
42-
</div>
43-
44-
<div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2">
45-
<input type="submit" value="Update" class="btn esh-campaigns-form-button" />
46-
</div>
47-
</form>
41+
<div class="input-group mb-3">
42+
<div class="input-group-prepend">
43+
<span class="input-group-text" id="inputGroup-sizing-default">Lon</span>
44+
</div>
45+
<input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude">
46+
</div>
47+
48+
<div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2">
49+
<input type="submit" value="Update" class="btn esh-campaigns-form-button" />
50+
</div>
51+
</form>
4852
</div>
4953
</div>
5054
<br />

‎src/Web/WebMVC/Views/Campaigns/_campaign.cshtml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
@model CampaignItem
22

3-
<form asp-controller="Campaigns" asp-action="Details" asp-route-id="@Model.Id">
4-
<div class="card-block">
3+
<form asp-controller="Campaigns" asp-action="Details" asp-route-id="@Model.Id">
4+
<div class="card">
5+
<img class="card-img-top esh-campaigns-thumbnail" src="@Model.PictureUri" alt="@Model.Name">
6+
<div class="card-body">
57
<h4 class="card-title esh-campaigns-name">@Model.Name</h4>
6-
<img class="card-img-top esh-campaigns-thumbnail" src="@Model.PictureUri" alt="@Model.Name">
78
@if (ViewBag.IsCampaignDetailFunctionActive == true)
89
{
910
<input type="button" value="More Details" class="btn esh-campaigns-button" onClick="window.open('@Model.DetailsUri')">
1011
}
1112
else
1213
{
1314
<input class="esh-campaigns-button" type="submit" value="More details">
14-
}
15+
}
1516
</div>
16-
<div class="card-footer">
17+
<div class="card-footer esh-campaigns-card-footer-text">
1718
<small class="text-muted">
1819
From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy")
1920
</small>
2021
</div>
21-
</form>
22+
</div>
23+
</form>

‎src/Web/WebMVC/Views/Order/Create.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
@await Html.PartialAsync("_OrderItems")
8888

8989
<section class="esh-orders_new-section">
90-
<div class="form-group">
90+
<div class="form-group row">
9191
<div class="col-md-9">
9292
</div>
9393
<div class="col-md-2">

‎src/Web/WebMVC/Views/Order/Detail.cshtml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
<div class="container">
1414
<section class="esh-orders_detail-section">
1515
<article class="esh-orders_detail-titles row">
16-
<section class="esh-orders_detail-title col-xs-3">Order number</section>
17-
<section class="esh-orders_detail-title col-xs-3">Date</section>
18-
<section class="esh-orders_detail-title col-xs-3">Total</section>
19-
<section class="esh-orders_detail-title col-xs-3">Status</section>
16+
<section class="esh-orders_detail-title col-3">Order number</section>
17+
<section class="esh-orders_detail-title col-3">Date</section>
18+
<section class="esh-orders_detail-title col-3">Total</section>
19+
<section class="esh-orders_detail-title col-3">Status</section>
2020
</article>
2121

2222
<article class="esh-orders_detail-items row">
23-
<section class="esh-orders_detail-item col-xs-3">@Model.OrderNumber</section>
24-
<section class="esh-orders_detail-item col-xs-3">@Model.Date</section>
25-
<section class="esh-orders_detail-item col-xs-3">$@Model.Total</section>
26-
<section class="esh-orders_detail-title col-xs-3">@Model.Status</section>
23+
<section class="esh-orders_detail-item col-3">@Model.OrderNumber</section>
24+
<section class="esh-orders_detail-item col-3">@Model.Date</section>
25+
<section class="esh-orders_detail-item col-3">$@Model.Total</section>
26+
<section class="esh-orders_detail-title col-3">@Model.Status</section>
2727
</article>
2828
</section>
2929

3030
<section class="esh-orders_detail-section">
3131
<article class="esh-orders_detail-titles row">
32-
<section class="esh-orders_detail-title col-xs-12">Description</section>
32+
<section class="esh-orders_detail-title col-12">Description</section>
3333
</article>
3434

3535
<article class="esh-orders_detail-items row">
36-
<section class="esh-orders_detail-item col-xs-12">@Model.Description</section>
36+
<section class="esh-orders_detail-item col-12">@Model.Description</section>
3737
</article>
3838
</section>
3939

4040
<section class="esh-orders_detail-section">
4141
<article class="esh-orders_detail-titles row">
42-
<section class="esh-orders_detail-title col-xs-12">Shiping address</section>
42+
<section class="esh-orders_detail-title col-12">Shiping address</section>
4343
</article>
4444

4545
<article class="esh-orders_detail-items row">
46-
<section class="esh-orders_detail-item col-xs-12">@Model.Street</section>
46+
<section class="esh-orders_detail-item col-12">@Model.Street</section>
4747
</article>
4848

4949
<article class="esh-orders_detail-items row">
50-
<section class="esh-orders_detail-item col-xs-12">@Model.City</section>
50+
<section class="esh-orders_detail-item col-12">@Model.City</section>
5151
</article>
5252

5353
<article class="esh-orders_detail-items row">
54-
<section class="esh-orders_detail-item col-xs-12">@Model.Country</section>
54+
<section class="esh-orders_detail-item col-12">@Model.Country</section>
5555
</article>
5656
</section>
5757

5858
<section class="esh-orders_detail-section">
5959
<article class="esh-orders_detail-titles row">
60-
<section class="esh-orders_detail-title col-xs-12">ORDER DETAILS</section>
60+
<section class="esh-orders_detail-title col-12">ORDER DETAILS</section>
6161
</article>
6262

6363
@for (int i = 0; i < Model.OrderItems.Count; i++)
@@ -67,23 +67,23 @@
6767
<section class="esh-orders_detail-item col-md-4 hidden-md-down">
6868
<img class="esh-orders_detail-image" src="@item.PictureUrl">
6969
</section>
70-
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-4">@item.ProductName</section>
71-
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ @item.UnitPrice.ToString("N2")</section>
72-
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">@item.Units</section>
73-
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
70+
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-4">@item.ProductName</section>
71+
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-1">$ @item.UnitPrice.ToString("N2")</section>
72+
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-1">@item.Units</section>
73+
<section class="esh-orders_detail-item esh-orders_detail-item--middle col-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
7474
</article>
7575
}
7676
</section>
7777

7878
<section class="esh-orders_detail-section esh-orders_detail-section--right">
7979
<article class="esh-orders_detail-titles esh-basket-titles--clean row">
80-
<section class="esh-orders_detail-title col-xs-9"></section>
81-
<section class="esh-orders_detail-title col-xs-2">TOTAL</section>
80+
<section class="esh-orders_detail-title col-9"></section>
81+
<section class="esh-orders_detail-title col-2">TOTAL</section>
8282
</article>
8383

8484
<article class="esh-orders_detail-items row">
85-
<section class="esh-orders_detail-item col-xs-9"></section>
86-
<section class="esh-orders_detail-item esh-orders_detail-item--mark col-xs-2">$ @Model.Total</section>
85+
<section class="esh-orders_detail-item col-9"></section>
86+
<section class="esh-orders_detail-item esh-orders_detail-item--mark col-2">$ @Model.Total</section>
8787
</article>
8888
</section>
8989
</div>

‎src/Web/WebMVC/Views/Order/Index.cshtml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ new Header() { Controller = "OrderManagement", Text = "Orders Management" } })
1414

1515
<div class="container">
1616
<article class="esh-orders-titles row">
17-
<section class="esh-orders-title col-xs-2">Order number</section>
18-
<section class="esh-orders-title col-xs-4">Date</section>
19-
<section class="esh-orders-title col-xs-2">Total</section>
20-
<section class="esh-orders-title col-xs-2">Status</section>
21-
<section class="esh-orders-title col-xs-2"></section>
17+
<section class="esh-orders-title col-2">Order number</section>
18+
<section class="esh-orders-title col-4">Date</section>
19+
<section class="esh-orders-title col-2">Total</section>
20+
<section class="esh-orders-title col-2">Status</section>
21+
<section class="esh-orders-title col-2"></section>
2222
</article>
2323
@if (Model != null && Model.Any())
2424
{
2525
foreach (var item in Model)
2626
{
2727
<article class="esh-orders-items row">
28-
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
29-
<section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section>
30-
<section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
31-
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section>
32-
<section class="esh-orders-item col-xs-1">
28+
<section class="esh-orders-item col-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
29+
<section class="esh-orders-item col-4">@Html.DisplayFor(modelItem => item.Date)</section>
30+
<section class="esh-orders-item col-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
31+
<section class="esh-orders-item col-2">@Html.DisplayFor(modelItem => item.Status)</section>
32+
<section class="esh-orders-item col-1">
3333
<a class="esh-orders-link" asp-controller="Order" asp-action="Detail" asp-route-orderId="@item.OrderNumber">Detail</a>
3434
</section>
35-
<section class="esh-orders-item col-xs-1">
35+
<section class="esh-orders-item col-1">
3636
@if (item.Status.ToLower() == "submitted")
3737
{
3838
<a class="esh-orders-link" asp-controller="Order" asp-action="cancel" asp-route-orderId="@item.OrderNumber">Cancel</a>

‎src/Web/WebMVC/Views/Order/_OrderItems.cshtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<section class="esh-orders_new-section">
55
<article class="esh-orders_new-titles row">
6-
<section class="esh-orders_new-title col-xs-12">Order details</section>
6+
<section class="esh-orders_new-title col-12">Order details</section>
77
</article>
88

99
@for (int i = 0; i < Model.OrderItems.Count; i++)
@@ -15,32 +15,32 @@
1515
<img class="esh-orders_new-image" src="@item.PictureUrl">
1616
<input type="hidden" value="@item.PictureUrl" name=@("orderitems[" + i + "].PictureUrl") />
1717
</section>
18-
<section class="esh-orders_new-item esh-orders_new-item--middle col-xs-4">
18+
<section class="esh-orders_new-item esh-orders_new-item--middle col-4">
1919
@item.ProductName
2020
<input type="hidden" value="@item.ProductName" name=@("orderitems[" + i + "].ProductName") />
2121
</section>
22-
<section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">
22+
<section class="esh-orders_new-item esh-orders_new-item--middle col-1">
2323
$ @item.UnitPrice.ToString("N2")
2424
<input type="hidden" value="@item.UnitPrice" name=@("orderitems[" + i + "].UnitPrice") />
2525
</section>
26-
<section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">
26+
<section class="esh-orders_new-item esh-orders_new-item--middle col-1">
2727
@item.Units
2828
<input type="hidden" value="@item.Units" name=@("orderitems[" + i + "].Units") />
2929
</section>
30-
<section class="esh-orders_new-item esh-orders_new-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
30+
<section class="esh-orders_new-item esh-orders_new-item--middle col-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
3131
</article>
3232
}
3333
</section>
3434

3535
<section class="esh-orders_new-section esh-orders_new-section--right">
3636
<article class="esh-orders_new-titles row">
37-
<section class="esh-orders_new-title col-xs-9"></section>
38-
<section class="esh-orders_new-title col-xs-2">Total</section>
37+
<section class="esh-orders_new-title col-9"></section>
38+
<section class="esh-orders_new-title col-2">Total</section>
3939
</article>
4040

4141
<article class="esh-orders_new-items row">
42-
<section class="esh-orders_new-item col-xs-9"></section>
43-
<section class="esh-orders_new-item esh-orders_new-item--mark col-xs-2">
42+
<section class="esh-orders_new-item col-9"></section>
43+
<section class="esh-orders_new-item esh-orders_new-item--mark col-2">
4444
$ @Model.Total.ToString("N2")
4545
<input type="hidden" value="@Model.Total" name="Total"/>
4646
</section>

‎src/Web/WebMVC/Views/OrderManagement/Index.cshtml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212

1313
<div class="container">
1414
<article class="esh-orders-titles row">
15-
<section class="esh-orders-title col-xs-2">Order number</section>
16-
<section class="esh-orders-title col-xs-4">Date</section>
17-
<section class="esh-orders-title col-xs-2">Total</section>
18-
<section class="esh-orders-title col-xs-2">Status</section>
19-
<section class="esh-orders-title col-xs-2"></section>
15+
<section class="esh-orders-title col-2">Order number</section>
16+
<section class="esh-orders-title col-4">Date</section>
17+
<section class="esh-orders-title col-2">Total</section>
18+
<section class="esh-orders-title col-2">Status</section>
19+
<section class="esh-orders-title col-2"></section>
2020
</article>
2121

2222
@foreach (var item in Model)
2323
{
2424
<article class="esh-orders-items row">
25-
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
26-
<section class="esh-orders-item col-xs-4">@Html.DisplayFor(modelItem => item.Date)</section>
27-
<section class="esh-orders-item col-xs-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
28-
<section class="esh-orders-item col-xs-2">@Html.DisplayFor(modelItem => item.Status)</section>
29-
<section class="esh-orders-item col-xs-2">
25+
<section class="esh-orders-item col-2">@Html.DisplayFor(modelItem => item.OrderNumber)</section>
26+
<section class="esh-orders-item col-4">@Html.DisplayFor(modelItem => item.Date)</section>
27+
<section class="esh-orders-item col-2">$ @Html.DisplayFor(modelItem => item.Total)</section>
28+
<section class="esh-orders-item col-2">@Html.DisplayFor(modelItem => item.Status)</section>
29+
<section class="esh-orders-item col-2">
3030
<form asp-action="OrderProcess" id="[email protected]" method="post">
3131
<input type="hidden" name="orderId" value="@item.OrderNumber" />
3232
<select name="actionCode" asp-items="@item.ActionCodeSelectList"

0 commit comments

Comments
 (0)