cambios para que haya 2 logos
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
|
||||||
<link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" />
|
<link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" />
|
||||||
<link href="_content/Blazor.Bootstrap/Blazor.Bootstrap.bundle.scp.css" rel="stylesheet" />
|
<link href="_content/Blazor.Bootstrap/Blazor.Bootstrap.bundle.scp.css" rel="stylesheet" />
|
||||||
<link href="Content/Site.css?v=0.62" rel="stylesheet" />
|
<link href="Content/Site.css?v=0.70" rel="stylesheet" />
|
||||||
<link href="Content/all.min.css" rel="stylesheet" />
|
<link href="Content/all.min.css" rel="stylesheet" />
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||||
<script src="Scripts/jquery.min.js"></script>
|
<script src="Scripts/jquery.min.js"></script>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet" />
|
||||||
<link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" />
|
<link href="_content/Blazor.Bootstrap/blazor.bootstrap.css" rel="stylesheet" />
|
||||||
<link href="_content/Blazor.Bootstrap/Blazor.Bootstrap.bundle.scp.css" rel="stylesheet" />
|
<link href="_content/Blazor.Bootstrap/Blazor.Bootstrap.bundle.scp.css" rel="stylesheet" />
|
||||||
<link href="Content/Site.css?v=0.64" rel="stylesheet" />
|
<link href="Content/Site.css?v=0.70" rel="stylesheet" />
|
||||||
<link href="Content/all.min.css" rel="stylesheet" />
|
<link href="Content/all.min.css" rel="stylesheet" />
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||||
<script src="Scripts/jquery.min.js"></script>
|
<script src="Scripts/jquery.min.js"></script>
|
||||||
@@ -40,14 +40,15 @@
|
|||||||
<div class="pa-header-row1">
|
<div class="pa-header-row1">
|
||||||
<nav class="navbar navbar-expand-lg navbar-light fixed-top bg-light navCACOA">
|
<nav class="navbar navbar-expand-lg navbar-light fixed-top bg-light navCACOA">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div>
|
<div class="movilcoacyle" style="min-width:255px">
|
||||||
<button class="navbar-toggler" type="button" onclick="cambiar()">
|
<button class="navbar-toggler" type="button" onclick="cambiar()">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="@urlWeb">
|
<a href="https://cacoa.es/">
|
||||||
@* <img src="Content/Imagenes/logo_CACOA_alta.jpg" style="height: 40px" class="logoCacoa" /> *@
|
<img src="Content/Imagenes/logo_CACOA_alta.jpg" style="height: 40px" class="logoCacoa" />
|
||||||
<img src="data:image;base64, @System.Convert.ToBase64String(logoColegioArray)" style="height: 40px" class="logoCacoa" />
|
</a>
|
||||||
|
<a href="@urlWeb">
|
||||||
|
<img src="data:image;base64, @System.Convert.ToBase64String(logoColegioArray)" style="max-height: 40px;" class="logoCacoa" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="topMenu">
|
<div class="collapse navbar-collapse" id="topMenu">
|
||||||
@@ -88,7 +89,7 @@
|
|||||||
<div class="ml-auto">
|
<div class="ml-auto">
|
||||||
<ul class="navbar-nav mr-auto ulMenu">
|
<ul class="navbar-nav mr-auto ulMenu">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<NavLink class="nav-link headNav" href="/"> <i class="fas fa-user-slash"></i>Cerrar Sesión</NavLink>
|
<NavLink class="nav-link headNav" href="/"> <i class="fas fa-user-slash"></i><span class="miniHide">Cerrar Sesión</span></NavLink>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -165,7 +166,7 @@
|
|||||||
bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
|
bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
|
||||||
|
|
||||||
// Redirigir al home si no hay token y la ruta no es pública
|
// Redirigir al home si no hay token y la ruta no es pública
|
||||||
logoColegioArray = bd.ficheros.Where(x => x.NombreFichero == "LogoColegio2").Select(x => x.Fichero).First();
|
logoColegioArray = bd.ficheros.Where(x => x.NombreFichero == "LogoColegio").Select(x => x.Fichero).First();
|
||||||
|
|
||||||
urlWeb = bd.enumeraciones.First(x => x.Codigo.Contains("CW.URLWEBCOLEGIO")).ValorAlfabetico1;
|
urlWeb = bd.enumeraciones.First(x => x.Codigo.Contains("CW.URLWEBCOLEGIO")).ValorAlfabetico1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,8 +15,12 @@
|
|||||||
<div class="back">
|
<div class="back">
|
||||||
<div class="div-center arealogin">
|
<div class="div-center arealogin">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
@* <img src="Content/Imagenes/CACOA-6.png" height="49" /> *@
|
<div class="d-flex">
|
||||||
<img src="data:image;base64, @System.Convert.ToBase64String(logoColegioArray)" height="49" />
|
<img src="Content/Imagenes/CACOA-6.png" height="45" class="me-3" />
|
||||||
|
<div class="ms-auto">
|
||||||
|
<img src="data:image;base64, @System.Convert.ToBase64String(logoColegioArray)" height="45" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h4 class="mt-2">Acceso a la Herramienta</h4>
|
<h4 class="mt-2">Acceso a la Herramienta</h4>
|
||||||
<hr />
|
<hr />
|
||||||
@@ -48,6 +52,14 @@
|
|||||||
<p class="form-text text-muted" style="color:red !important">@mensajeError</p>
|
<p class="form-text text-muted" style="color:red !important">@mensajeError</p>
|
||||||
</div>
|
</div>
|
||||||
<button type="submit" class="btnBlue"> Acceder </button>
|
<button type="submit" class="btnBlue"> Acceder </button>
|
||||||
|
<hr />
|
||||||
|
<div class="d-flex">
|
||||||
|
|
||||||
|
<div class="ms-auto">
|
||||||
|
<p style="font-size:10px;margin-bottom:0px" class="text-muted">Desarrollado por:</p>
|
||||||
|
<img src="Content/Imagenes/LogoTcsColor.png" height="20" class="me-3" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</EditForm>
|
</EditForm>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
40
HerramientaCASA/HeaderPdf.razor
Normal file
40
HerramientaCASA/HeaderPdf.razor
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
@page "/CabeceraPdf"
|
||||||
|
@using bdHerramientaCACOA.dbcontext
|
||||||
|
cabecera()
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset='utf-8' />
|
||||||
|
<title></title>
|
||||||
|
</head>
|
||||||
|
<body style='margin:0px !important;'>
|
||||||
|
<div style='height:55px; width:100%; font-size:12px; color:#078b98; font-weight:bold; background-color: #D7ECEF; display:flex;'>
|
||||||
|
<table style='width:100%; border:0; border-collapse:collapse;'>
|
||||||
|
<tr>
|
||||||
|
<td style='text-align: left; width: 50%; padding-left: 10px; padding-top:8px;'>
|
||||||
|
<img style='height: 40px; border-radius: 10px !important;' src='data:image/jpeg;base64,@($"{logoBase64f}")' alt='Image'>
|
||||||
|
</td>
|
||||||
|
<td style='text-align: right; width: 50%; padding: 10px;'>
|
||||||
|
Costes Asociados a los Servicios de Arquitectura - CASA
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>";
|
||||||
|
|
||||||
|
|
||||||
|
@code {
|
||||||
|
string logoBase64f = "";
|
||||||
|
void cabecera()
|
||||||
|
{
|
||||||
|
var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: true);
|
||||||
|
|
||||||
|
var logoByte = bd.ficheros
|
||||||
|
.First(x => x.NombreFichero == "LogoColegio2")
|
||||||
|
.Fichero;
|
||||||
|
|
||||||
|
var logoBase64 = Convert.ToBase64String(logoByte);
|
||||||
|
logoBase64f = logoBase64;
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
HerramientaCASA/wwwroot/Content/Imagenes/LogoTcsColor.png
Normal file
BIN
HerramientaCASA/wwwroot/Content/Imagenes/LogoTcsColor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
@@ -14,7 +14,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.logoCacoa {
|
.logoCacoa {
|
||||||
border-radius: 10px !important;
|
/*border-radius: 10px !important;*/
|
||||||
}
|
}
|
||||||
.navCACOA {
|
.navCACOA {
|
||||||
background-color: rgb(215 236 239) !important;
|
background-color: rgb(215 236 239) !important;
|
||||||
@@ -500,23 +500,30 @@ li.nav-item.active {
|
|||||||
.impriManual {
|
.impriManual {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
.arealogin {
|
||||||
|
max-width: 500px;
|
||||||
|
max-height: 500px;
|
||||||
|
}
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
.arealogin {
|
.arealogin {
|
||||||
margin-left: 20px !important;
|
margin-left: 20px !important;
|
||||||
margin-right: 20px !important;
|
margin-right: 20px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.guardarNombre {
|
.guardarNombre {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.impriManual {
|
.impriManual {
|
||||||
height: 36px;
|
height: 36px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tituloSim {
|
.tituloSim {
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.top-menu {
|
.top-menu {
|
||||||
top: 6px;
|
top: 6px;
|
||||||
right: 52px;
|
right: 52px;
|
||||||
@@ -538,6 +545,22 @@ li.nav-item.active {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 545px) {
|
||||||
|
/* .movilcoacyle {
|
||||||
|
width: calc(100% - 25px);
|
||||||
|
}*/
|
||||||
|
.miniHide {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.arealogin {
|
||||||
|
margin-left: 0px !important;
|
||||||
|
margin-right: 0px !important;
|
||||||
|
padding-left: 5px !important;
|
||||||
|
padding-right: 5px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*DevExpress stilos*/
|
/*DevExpress stilos*/
|
||||||
.btn-secondary {
|
.btn-secondary {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
@@ -750,6 +773,7 @@ div.content {
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btnBorrarGuardar {
|
.btnBorrarGuardar {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 1.23em;
|
font-size: 1.23em;
|
||||||
@@ -807,6 +831,7 @@ div.content {
|
|||||||
.checkTabla div {
|
.checkTabla div {
|
||||||
min-height: 12px;
|
min-height: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.checkGordo {
|
.checkGordo {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
width: 13px;
|
width: 13px;
|
||||||
@@ -892,6 +917,7 @@ div.content {
|
|||||||
.pagePrincipal {
|
.pagePrincipal {
|
||||||
margin: 30px;
|
margin: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.espacioTablas {
|
.espacioTablas {
|
||||||
margin: 20px;
|
margin: 20px;
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
HerramientaCASA/wwwroot/chrome-win/D3DCompiler_47.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/D3DCompiler_47.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/chrome.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/chrome.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/chrome.exe
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/chrome.exe
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/chrome_elf.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/chrome_elf.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/dxcompiler.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/dxcompiler.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/dxil.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/dxil.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/libEGL.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/libEGL.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/libGLESv2.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/libGLESv2.dll
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/v8_context_snapshot.bin
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/v8_context_snapshot.bin
Normal file
Binary file not shown.
BIN
HerramientaCASA/wwwroot/chrome-win/vk_swiftshader.dll
Normal file
BIN
HerramientaCASA/wwwroot/chrome-win/vk_swiftshader.dll
Normal file
Binary file not shown.
Reference in New Issue
Block a user