Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Auction Info RTL - fixed problem with "Left Time" display - #48

DanielŻuławskia335e834ab2f
diff --git a/src/Web/Grand.Web/Views/Product/_AuctionInfo.cshtml b/src/Web/Grand.Web/Views/Product/_AuctionInfo.cshtml
index 3b0de01b9..e6bd48597 100644
--- a/src/Web/Grand.Web/Views/Product/_AuctionInfo.cshtml
+++ b/src/Web/Grand.Web/Views/Product/_AuctionInfo.cshtml
@@ -8,10 +8,10 @@
{
<countdown :end-time="@Model.EndTime.Value.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/Views/Shared/_AuctionInfoQV.cshtml b/src/Web/Grand.Web/Views/Shared/_AuctionInfoQV.cshtml
index 01e3c8511..0cd692729 100644
--- a/src/Web/Grand.Web/Views/Shared/_AuctionInfoQV.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_AuctionInfoQV.cshtml
@@ -6,10 +6,10 @@
<template v-if="new Date(PopupQuickViewVueModal.EndTime).getTime() > new Date().getTime()">
<countdown :end-time="new Date(PopupQuickViewVueModal.EndTime).getTime()">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductListView.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductListView.cshtml
index be33395ef..72eb04f6b 100644
--- a/src/Web/Grand.Web/Views/Shared/_CatalogProductListView.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_CatalogProductListView.cshtml
@@ -85,10 +85,10 @@
{
<countdown :end-time="@Model.EndTime.Value.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml
index 1b3f0a91f..08097bc13 100644
--- a/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_CatalogProductListViewVue.cshtml
@@ -33,16 +33,16 @@
<b-link :href="Model.Url">{{Model.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</b-link>
</div>
</template>
- <template v-if="Model.ProductType == 25">
+ <template v-if="Model.ProductType == 40">
<template v-if="Model.EndTime !== null">
<div class="countdown-box alert alert-info w-100 mb-1">
<template v-if="new Date(Model.EndTime).getTime() > new Date().getTime()">
<countdown :end-time="new Date(Model.EndTime).getTime()">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductView.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductView.cshtml
index 80d88548d..aea56e373 100644
--- a/src/Web/Grand.Web/Views/Shared/_CatalogProductView.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_CatalogProductView.cshtml
@@ -84,10 +84,10 @@
{
<countdown :end-time="@Model.EndTime.Value.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml b/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml
index 1b27b4918..4fc7faf64 100644
--- a/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_CatalogProductViewVue.cshtml
@@ -32,16 +32,16 @@
<b-link :href="Model.Url">{{Model.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</b-link>
</div>
</template>
- <template v-if="Model.ProductType == 25">
+ <template v-if="Model.ProductType == 40">
<template v-if="Model.EndTime !== null">
<div class="countdown-box alert alert-info w-100 mb-1">
<template v-if="new Date(Model.EndTime).getTime() > new Date().getTime()">
<countdown :end-time="new Date(Model.EndTime).getTime()">
<template v-slot:process="{ timeObj }">
- <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>
- <span>{{ `${timeObj.d}` }} : </span>
- <span>{{ `${timeObj.h}` }} : </span>
- <span>{{ `${timeObj.m}` }} : </span>
+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>
+ <span>{{ `${timeObj.d}` }}</span>
+ <span>{{ `${timeObj.h}` }}</span>
+ <span>{{ `${timeObj.m}` }}</span>
<span>{{ `${timeObj.s}` }}</span>
</template>
<template v-slot:finish>
diff --git a/src/Web/Grand.Web/wwwroot/theme/css/common/common.css b/src/Web/Grand.Web/wwwroot/theme/css/common/common.css
index 8954e7a97..8fcc5f3cf 100644
--- a/src/Web/Grand.Web/wwwroot/theme/css/common/common.css
+++ b/src/Web/Grand.Web/wwwroot/theme/css/common/common.css
@@ -1002,6 +1002,15 @@ input:checked ~ .color-container .color::before {
right: 0;
margin: 0 2px 0 0;
}
+.countdown-box > span {
+ display: inline-flex;
+ align-items: center;
+}
+.countdown-box > span span:not(:last-child)::after {
+ content: ":";
+ position: relative;
+ margin: 0 3px;
+}
/* product box list */
diff --git a/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css b/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css
index 672814ba4..fe1f43c04 100644
--- a/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css
+++ b/src/Web/Grand.Web/wwwroot/theme/css/common/common.rtl.css
@@ -1086,6 +1086,19 @@ input:checked ~ .color-container .color::before {
right: 0;
margin: 0 2px 0 0;
}
+.countdown-box > span {
+ display: inline-flex;
+ align-items: center;
+ flex-direction: row-reverse;
+}
+.countdown-box > span .col-form-label {
+ order: 5;
+}
+.countdown-box > span span:not(.col-form-label)::before {
+ content: ":";
+ position: relative;
+ margin: 0 3px;
+}
/* product box list */