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

Add company logos to company vides.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-19 22:03:37 +01:00
parent 565e8c1cde
commit 544cbd5e54
3 changed files with 106 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cicm_web/Views/Company/ByLetter.cshtml
View File

@@ -69,7 +69,26 @@
<a asp-controller="Company"
asp-action="View"
asp-route-id="@company.Id">
@company.Name</a>
@if(company.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", company.LastLogo.Guid + ".svg")))
{
<picture>
<source type="image/svg+xml"
srcset="/assets/logos/@(company.LastLogo.Guid).svg">
<source type="image/webp"
srcset="/assets/logos/thumbs/webp/1x/@(company.LastLogo.Guid).webp,
/assets/logos/thumbs/webp/1x/@(company.LastLogo.Guid).webp 2x,
/assets/logos/thumbs/webp/1x/@(company.LastLogo.Guid).webp 3x">
<img srcset="/assets/logos/thumbs/png/1x/@(company.LastLogo.Guid).png,
/assets/logos/thumbs/png/1x/@(company.LastLogo.Guid).png 2x,
/assets/logos/thumbs/png/1x/@(company.LastLogo.Guid).webp 3x"
src="/assets/logos/thumbs/png/1x@(company.LastLogo.Guid).png")
alt=""
height="auto" width="auto" style="max-height: 32px; max-width: 128px "/>
</picture>
}
@company.Name
</a>
<br />
}
</p>

103
cicm_web/Views/Company/View.cshtml
View File

@@ -37,26 +37,91 @@
@if(Model != null)
{
<div class="container">
<p align=center>
@if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.Id + ".gif")))
@if(Model.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.LastLogo.Guid + ".svg")))
{
<img src="@(System.IO.Path.Combine("/assets/logos", Model.Id + ".gif"))"
alt="">
}
@if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.Id + ".jpg")))
{
<img src="@(System.IO.Path.Combine("/assets/logos", Model.Id + ".jpg"))"
alt="">
}
@if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.Id + ".png")))
{
<img src="@(System.IO.Path.Combine("/assets/logos", Model.Id + ".png"))"
alt="">
<picture>
<source type="image/svg+xml"
srcset="/assets/logos/@(Model.LastLogo.Guid).svg">
<source type="image/webp"
srcset="/assets/logos/webp/1x/@(Model.LastLogo.Guid).webp,
/assets/logos/webp/1x/@(Model.LastLogo.Guid).webp 2x,
/assets/logos/webp/1x/@(Model.LastLogo.Guid).webp 3x">
<img srcset="/assets/logos/png/1x/@(Model.LastLogo.Guid).png,
/assets/logos/png/1x/@(Model.LastLogo.Guid).png 2x,
/assets/logos/png/1x/@(Model.LastLogo.Guid).webp 3x"
src="/assets/logos/png/1x@(Model.LastLogo.Guid).png")
alt=""
height="auto"
width="auto"
style="max-height: 256px; max-width: 256px" />
</picture>
}
</p>
<div>
<div class="row">
@{
string carrouselActive = "active";
}
@if(Model.Logos != null && Model.Logos.Length > 1)
{
<div class="col-3">
<div class="carousel slide"
data-ride="carousel"
id="logosCarousel">
<div class="carousel-inner">
@foreach(CompanyLogo logo in Model.Logos)
{
if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", logo.Guid + ".svg")))
{
<div class="carousel-item @carrouselActive">
<picture>
<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/1x/@(logo.Guid).webp 2x,
/assets/logos/webp/1x/@(logo.Guid).webp 3x">
<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).webp 3x"
src="/assets/logos/png/1x@(logo.Guid).png")
alt=""
height="auto"
width="auto"
style="max-height: 256px; max-width: 256px" />
</picture>
</div>
carrouselActive = null;
}
}
</div>
<a class="carousel-control-prev"
data-slide="prev"
href="#logosCarousel"
role="button">
<span aria-hidden="true"
class="carousel-control-prev-icon">
</span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next"
data-slide="next"
href="#logosCarousel"
role="button">
<span aria-hidden="true"
class="carousel-control-next-icon">
</span>
<span class="sr-only">Next</span>
</a>
</div>
</div>
}
<div class="col-md">
<table>
<tr>
<th colspan="2">
@@ -270,8 +335,9 @@
}
</table>
</div>
</div>
<div>
<div class="row">
@if(Model.Computers.Any())
{
<p>
@@ -292,7 +358,7 @@
}
</div>
<div>
<div class="row">
@if(Model.Consoles.Any())
{
<p>
@@ -312,6 +378,7 @@
<p>There are no videogame consoles made by this company found in the database.</p>
}
</div>
</div>
}
else
{

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>3.0.99.148</Version>
<Version>3.0.99.149</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>