Skip to content

Commit

Permalink
Fixed nopSolutions#1620 "Info" lists have the same markup on "Order r…
Browse files Browse the repository at this point in the history 
…eview", "Order details" and "Shipment details" pages
  • Loading branch information
mariannk committed Aug 1, 2016
1 parent df29c5d commit 50c76a2
Show file tree
Hide file tree
Showing 4 changed files with 327 additions and 287 deletions.
17 changes: 12 additions & 5 deletions src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3619,9 +3619,9 @@ label, label + * {
font-size: 16px;
}

.order-review-data ul,
.order-review-data > div,
.order-details-area > div,
.shipment-details-area ul {
.shipment-details-area > div {
width: 350px;
max-width: 100%;
margin: 0 auto 40px;
Expand All @@ -3647,7 +3647,14 @@ label, label + * {
.shipment-details-area .title:first-child {
margin-top: 0;
}
.order-details-area .side-list-wrap {
.order-review-data .title strong,
.order-details-area .title strong,
.shipment-details-area .title strong{
font-weight: 700;
}
.order-review-data .side-list-wrap,
.order-details-area .side-list-wrap,
.shipment-details-area .side-list-wrap {
margin-top: 20px;
}
.order-completed .details {
Expand Down Expand Up @@ -5665,9 +5672,9 @@ pre {
.shipment-details-area {
overflow: hidden;
}
.order-review-data ul,
.order-review-data > div,
.order-details-area > div,
.shipment-details-area ul {
.shipment-details-area > div {
float: left;
width: 48%;
margin: 0 1% 40px;
Expand Down
17 changes: 12 additions & 5 deletions src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3646,9 +3646,9 @@ label, label + * {
font-size: 16px;
}

.order-review-data ul,
.order-review-data > div,
.order-details-area > div,
.shipment-details-area ul {
.shipment-details-area > div {
width: 350px;
max-width: 100%;
margin: 0 auto 40px;
Expand All @@ -3674,7 +3674,14 @@ label, label + * {
.shipment-details-area .title:first-child {
margin-top: 0;
}
.order-details-area .side-list-wrap {
.order-review-data .title strong,
.order-details-area .title strong,
.shipment-details-area .title strong{
font-weight: 700;
}
.order-review-data .side-list-wrap,
.order-details-area .side-list-wrap,
.shipment-details-area .side-list-wrap {
margin-top: 20px;
}
.order-completed .details {
Expand Down Expand Up @@ -5734,9 +5741,9 @@ pre {
.shipment-details-area {
overflow: hidden;
}
.order-review-data ul,
.order-review-data > div,
.order-details-area > div,
.shipment-details-area ul {
.shipment-details-area > div {
float: right;
width: 48%;
margin: 0 1% 40px;
Expand Down
212 changes: 112 additions & 100 deletions src/Presentation/Nop.Web/Views/Order/ShipmentDetails.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,113 +13,125 @@
<h1>@string.Format(T("Order.Shipments.Information").Text, Model.Id)</h1>
</div>
<div class="page-body">

<div class="shipment-details-area">
<ul class="shipping-details">
<li class="title">
@T("Order.Shipments.Order#")@Model.Order.Id
</li>
<li class="shipping-method">
@T("Order.Shipments.ShippingMethod"): @Model.Order.ShippingMethod
</li>
<li class="shipped-date">
@T("Order.Shipments.ShippedDate"):
@if (Model.ShippedDate.HasValue)
{
@Model.ShippedDate.Value.ToString("D")
}
else
{
@T("Order.Shipments.ShippedDate.NotYet")
}
</li>
<li class="delivery-date">
@T("Order.Shipments.DeliveryDate"):
@if (Model.DeliveryDate.HasValue)
{
@Model.DeliveryDate.Value.ToString("D")
}
else
{
@T("Order.Shipments.DeliveryDate.NotYet")
}
</li>
@if (!String.IsNullOrEmpty(Model.TrackingNumber))
{
<li class="tracking-number">@T("Order.Shipments.TrackingNumber"):
@if (!string.IsNullOrEmpty(Model.TrackingNumberUrl))
<div class="shipping-info-wrap">
<div class="title">
<strong>@T("Order.Shipments.Order#")@Model.Order.Id</strong>
</div>
<div class="info-content">
<ul class="shipping-info">
<li class="shipping-method">
@T("Order.Shipments.ShippingMethod"): @Model.Order.ShippingMethod
</li>
<li class="shipped-date">
@T("Order.Shipments.ShippedDate"):
@if (Model.ShippedDate.HasValue)
{
@Model.ShippedDate.Value.ToString("D")
}
else
{
@T("Order.Shipments.ShippedDate.NotYet")
}
</li>
<li class="delivery-date">
@T("Order.Shipments.DeliveryDate"):
@if (Model.DeliveryDate.HasValue)
{
@Model.DeliveryDate.Value.ToString("D")
}
else
{
@T("Order.Shipments.DeliveryDate.NotYet")
}
</li>
@if (!String.IsNullOrEmpty(Model.TrackingNumber))
{
<a href="@Model.TrackingNumberUrl" target="_blank" class="tracking-url">@Model.TrackingNumber</a>
<li class="tracking-number">
@T("Order.Shipments.TrackingNumber"):
@if (!string.IsNullOrEmpty(Model.TrackingNumberUrl))
{
<a href="@Model.TrackingNumberUrl" target="_blank" class="tracking-url">@Model.TrackingNumber</a>
}
else
{
@Model.TrackingNumber
}
</li>
}
</ul>
</div>
</div>
<div class="shipping-info-wrap">
<div class="title">
<strong>@T("Order.Shipments.ShippingAddress")</strong>
</div>
<div class="info-content">
<ul class="shipping-address">
@if (!Model.Order.PickUpInStore)
{
<li class="name">
@Model.Order.ShippingAddress.FirstName @Model.Order.ShippingAddress.LastName
</li>
<li class="email">
@T("Order.Shipments.Email"): @Model.Order.ShippingAddress.Email
</li>
<li class="phone">
@T("Order.Shipments.Phone"): @Model.Order.ShippingAddress.PhoneNumber
</li>
<li class="fax">
@T("Order.Shipments.Fax"): @Model.Order.ShippingAddress.FaxNumber
</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Company))
{
<li class="company">
@Model.Order.ShippingAddress.Company
</li>
}
<li class="address1">
@Model.Order.ShippingAddress.Address1
</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Address2))
{
<li class="address2">
@Model.Order.ShippingAddress.Address2
</li>
}
<li class="city-state-zip">
@Model.Order.ShippingAddress.City, @Model.Order.ShippingAddress.StateProvinceName
@Model.Order.ShippingAddress.ZipPostalCode
</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.CountryName))
{
<li class="country">
@Model.Order.ShippingAddress.CountryName
</li>
}
}
else
{
@Model.TrackingNumber
<li class="title">
@T("Order.Shipments.PickupAddress")
</li>
<li class="address1">
@Model.Order.PickupAddress.Address1
</li>
<li class="city-state-zip">
@Model.Order.PickupAddress.City,
@Model.Order.PickupAddress.ZipPostalCode
</li>
if (!string.IsNullOrEmpty(Model.Order.PickupAddress.CountryName))
{
<li class="country">
@Model.Order.PickupAddress.CountryName
</li>
}
}
</li>
}
</ul>
<ul class="shipping-address">
@if (!Model.Order.PickUpInStore)
{
<li class="title">
@T("Order.Shipments.ShippingAddress")
</li>
<li class="name">
@Model.Order.ShippingAddress.FirstName @Model.Order.ShippingAddress.LastName
</li>
<li class="email">
@T("Order.Shipments.Email"): @Model.Order.ShippingAddress.Email
</li>
<li class="phone">
@T("Order.Shipments.Phone"): @Model.Order.ShippingAddress.PhoneNumber
</li>
<li class="fax">
@T("Order.Shipments.Fax"): @Model.Order.ShippingAddress.FaxNumber</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Company))
{
<li class="company">
@Model.Order.ShippingAddress.Company
</li>
}
<li class="address1">
@Model.Order.ShippingAddress.Address1</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Address2))
{
<li class="address2">
@Model.Order.ShippingAddress.Address2
</li>
}
<li class="city-state-zip">
@Model.Order.ShippingAddress.City, @Model.Order.ShippingAddress.StateProvinceName
@Model.Order.ShippingAddress.ZipPostalCode</li>
if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.CountryName))
{
<li class="country">
@Model.Order.ShippingAddress.CountryName
</li>
}
}
else
{
<li class="title">
@T("Order.Shipments.PickupAddress")
</li>
<li class="address1">
@Model.Order.PickupAddress.Address1
</li>
<li class="city-state-zip">
@Model.Order.PickupAddress.City,
@Model.Order.PickupAddress.ZipPostalCode
</li>
if (!string.IsNullOrEmpty(Model.Order.PickupAddress.CountryName))
{
<li class="country">
@Model.Order.PickupAddress.CountryName
</li>
}
}
</ul>
</ul>
</div>
</div>
</div>

@if (Model.Items.Count > 0)
{
<div class="section products">
Expand Down
Loading

0 comments on commit 50c76a2

Please sign in to comment.