kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3176 from sbwalker/dev

Browse Source 
improve UX for Extend license option
This commit is contained in:
Shaun Walker 2023-08-23 09:39:04 -04:00 committed by GitHub
commit 412405e22c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -134,10 +134,13 @@ else
{ {
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date) if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{ {
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />"; if (string.IsNullOrEmpty(package.PaymentUrl))
if (!string.IsNullOrEmpty(package.PaymentUrl))
{ {
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>"; link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
}
else
{
link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
} }
} }
} }

9
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -101,10 +101,13 @@ else
{ {
if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date) if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
{ {
link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span><br />"; if (string.IsNullOrEmpty(package.PaymentUrl))
if (!string.IsNullOrEmpty(package.PaymentUrl))
{ {
link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>"; link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
}
else
{
link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
} }
} }
} }