claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix showing country logo when country id is less than 100. Fixes #20

Browse Source
This commit is contained in:
Natalia Portillo
2020-08-04 23:11:09 +01:00
parent f3f367b6b9
commit 6f728047c3
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marechai/Marechai.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Version>4.0.0.1756</Version> <Version>4.0.0.1758</Version>
<Company>Canary Islands Computer Museum</Company> <Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright> <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product> <Product>Canary Islands Computer Museum Website</Product>

4
Marechai/Pages/Admin/Details/Company.razor
View File

@@ -354,7 +354,7 @@
<source type="image/svg+xml" srcset="/assets/logos/@(logo.Guid).svg"> <source type="image/svg+xml" srcset="/assets/logos/@(logo.Guid).svg">
<source type="image/webp" srcset="/assets/logos/webp/1x/@(logo.Guid).webp, /assets/logos/webp/2x/@(logo.Guid).webp 2x, /assets/logos/webp/3x/@(logo.Guid).webp 3x"> <source type="image/webp" srcset="/assets/logos/webp/1x/@(logo.Guid).webp, /assets/logos/webp/2x/@(logo.Guid).webp 2x, /assets/logos/webp/3x/@(logo.Guid).webp 3x">
<img srcset="/assets/logos/png/1x/@(logo.Guid).png, /assets/logos/png/2x/@(logo.Guid).png 2x, /assets/logos/png/3x/@(logo.Guid).png 3x" <img srcset="/assets/logos/png/1x/@(logo.Guid).png, /assets/logos/png/2x/@(logo.Guid).png 2x, /assets/logos/png/3x/@(logo.Guid).png 3x"
src="/assets/logos/png/1x@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" /> src="/assets/logos/png/1x/@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
</picture> </picture>
} }
else else
@@ -423,7 +423,7 @@
<picture> <picture>
<source type="image/svg+xml" srcset="/assets/logos/@(_currentLogo.Guid).svg"> <source type="image/svg+xml" srcset="/assets/logos/@(_currentLogo.Guid).svg">
<source type="image/webp" srcset="/assets/logos/webp/1x/@(_currentLogo.Guid).webp, /assets/logos/webp/2x/@(_currentLogo.Guid).webp 2x, /assets/logos/webp/3x/@(_currentLogo.Guid).webp 3x"> <source type="image/webp" srcset="/assets/logos/webp/1x/@(_currentLogo.Guid).webp, /assets/logos/webp/2x/@(_currentLogo.Guid).webp 2x, /assets/logos/webp/3x/@(_currentLogo.Guid).webp 3x">
<img srcset="/assets/logos/png/1x/@(_currentLogo.Guid).png, /assets/logos/png/2x/@(_currentLogo.Guid).png 2x, /assets/logos/png/3x/@(_currentLogo.Guid).png 3x" src="/assets/logos/png/1x@(_currentLogo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" /> <img srcset="/assets/logos/png/1x/@(_currentLogo.Guid).png, /assets/logos/png/2x/@(_currentLogo.Guid).png 2x, /assets/logos/png/3x/@(_currentLogo.Guid).png 3x" src="/assets/logos/png/1x/@(_currentLogo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
</picture> </picture>
</div> </div>
<Field> <Field>

18
Marechai/Pages/Companies/Index.razor
View File

@@ -43,16 +43,16 @@
{ {
<p align="center"> <p align="center">
<b>@string.Format(L["Companies founded in {0}."], L[_countryName])</b> <b>@string.Format(L["Companies founded in {0}."], L[_countryName])</b>
@if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", CountryId + ".svg"))) @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", $"{CountryId:D3}.svg")))
{ {
<picture> <picture>
<source type="image/svg+xml" srcset="/assets/flags/countries/@(CountryId).svg"> <source type="image/svg+xml" srcset="/assets/flags/countries/@($"{CountryId:D3}").svg">
<source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(CountryId).webp, <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp,
/assets/flags/countries/webp/1x/@(CountryId).webp 2x, /assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp 2x,
/assets/flags/countries/webp/1x/@(CountryId).webp 3x"> /assets/flags/countries/webp/1x/@($"{CountryId:D3}").webp 3x">
<img srcset="/assets/flags/countries/png/1x/@(CountryId).png, <img srcset="/assets/flags/countries/png/1x/@($"{CountryId:D3}").png,
/assets/flags/countries/png/1x/@(CountryId).png 2x, /assets/flags/countries/png/1x/@($"{CountryId:D3}").png 2x,
/assets/flags/countries/png/1x/@(CountryId).webp 3x" src="/assets/flags/countries/png/1x@(CountryId).png" alt="" height="32" /> /assets/flags/countries/png/1x/@($"{CountryId:D3}").webp 3x" src="/assets/flags/countries/png/1x/@($"{CountryId:D3}").png" alt="" height="32" />
</picture> </picture>
} }
</p> </p>
@@ -85,7 +85,7 @@
/assets/logos/thumbs/webp/3x/@(company.LastLogo).webp 3x"> /assets/logos/thumbs/webp/3x/@(company.LastLogo).webp 3x">
<img srcset="/assets/logos/thumbs/png/1x/@(company.LastLogo).png, <img srcset="/assets/logos/thumbs/png/1x/@(company.LastLogo).png,
/assets/logos/thumbs/png/2x/@(company.LastLogo).png 2x, /assets/logos/thumbs/png/2x/@(company.LastLogo).png 2x,
/assets/logos/thumbs/png/3x/@(company.LastLogo).png 3x" src="/assets/logos/thumbs/png/1x@(company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 32px; max-width: 128px" /> /assets/logos/thumbs/png/3x/@(company.LastLogo).png 3x" src="/assets/logos/thumbs/png/1x/@(company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 32px; max-width: 128px" />
</picture> </picture>
} }
</a> </a>

20
Marechai/Pages/Companies/View.razor
View File

@@ -60,7 +60,7 @@
/assets/logos/webp/3x/@(_company.LastLogo).webp 3x"> /assets/logos/webp/3x/@(_company.LastLogo).webp 3x">
<img srcset="/assets/logos/png/1x/@(_company.LastLogo).png, <img srcset="/assets/logos/png/1x/@(_company.LastLogo).png,
/assets/logos/png/2x/@(_company.LastLogo).png 2x, /assets/logos/png/2x/@(_company.LastLogo).png 2x,
/assets/logos/png/3x/@(_company.LastLogo).png 3x" src="/assets/logos/png/1x@(_company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" /> /assets/logos/png/3x/@(_company.LastLogo).png 3x" src="/assets/logos/png/1x/@(_company.LastLogo).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
</picture> </picture>
} }
</p> </p>
@@ -85,7 +85,7 @@
/assets/logos/webp/1x/@(logo.Guid).webp 3x"> /assets/logos/webp/1x/@(logo.Guid).webp 3x">
<img class="d-block w-100" srcset="/assets/logos/png/1x/@(logo.Guid).png, <img class="d-block w-100" srcset="/assets/logos/png/1x/@(logo.Guid).png,
/assets/logos/png/1x/@(logo.Guid).png 2x, /assets/logos/png/1x/@(logo.Guid).png 2x,
/assets/logos/png/1x/@(logo.Guid).webp 3x" src="/assets/logos/png/1x@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" /> /assets/logos/png/1x/@(logo.Guid).webp 3x" src="/assets/logos/png/1x/@(logo.Guid).png" alt="" height="auto" width="auto" style="max-height: 256px; max-width: 256px" />
</picture> </picture>
</div> </div>
@@ -136,16 +136,16 @@
@if (_company.Country != null) @if (_company.Country != null)
{ {
<a href="/companies/country/@_company.CountryId"> <a href="/companies/country/@_company.CountryId">
@if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", _company.CountryId + ".svg"))) @if (File.Exists(Path.Combine(Host.WebRootPath, "assets/flags/countries", $"{_company.CountryId:D3}.svg")))
{ {
<picture> <picture>
<source type="image/svg+xml" srcset="/assets/flags/countries/@(_company.CountryId).svg"> <source type="image/svg+xml" srcset="/assets/flags/countries/@($"{_company.CountryId:D3}").svg">
<source type="image/webp" srcset="/assets/flags/countries/webp/1x/@(_company.CountryId).webp, <source type="image/webp" srcset="/assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp,
/assets/flags/countries/webp/1x/@(_company.CountryId).webp 2x, /assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp 2x,
/assets/flags/countries/webp/1x/@(_company.CountryId).webp 3x"> /assets/flags/countries/webp/1x/@($"{_company.CountryId:D3}").webp 3x">
<img srcset="/assets/flags/countries/png/1x/@(_company.CountryId).png, <img srcset="/assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png,
/assets/flags/countries/png/1x/@(_company.CountryId).png 2x, /assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png 2x,
/assets/flags/countries/png/1x/@(_company.CountryId).webp 3x" src="/assets/flags/countries/png/1x@(_company.CountryId).png" alt="" height="32" /> /assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").webp 3x" src="/assets/flags/countries/png/1x/@($"{_company.CountryId:D3}").png" alt="" height="32" />
</picture> </picture>
} }
@L[_company.Country] @L[_company.Country]