cambios para que haya 2 logos

HerramientaCASA/Components/Layout/LoginLayout.razor

@@ -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="_content/Blazor.Bootstrap/blazor.bootstrap.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 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>

HerramientaCASA/Components/Layout/MainLayout.razor

@@ -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="_content/Blazor.Bootstrap/blazor.bootstrap.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 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>
@@ -40,14 +40,15 @@
 				<div class="pa-header-row1">
 					<nav class="navbar navbar-expand-lg navbar-light fixed-top bg-light navCACOA">
 						<div class="container-fluid">
-							<div>
+							<div class="movilcoacyle" style="min-width:255px">
 								<button class="navbar-toggler" type="button" onclick="cambiar()">
 									<span class="navbar-toggler-icon"></span>
 								</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>
 							</div>
 							<div class="collapse navbar-collapse" id="topMenu">
@@ -88,7 +89,7 @@
 							<div class="ml-auto">
 								<ul class="navbar-nav mr-auto ulMenu">
 									<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>
 								</ul>
 							</div>
@@ -165,7 +166,7 @@
 		bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
 
 		// 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;
 	}

HerramientaCASA/Components/Pages/Login/Login.razor

@@ -15,8 +15,12 @@
         <div class="back">
         <div class="div-center arealogin">
                 <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>
                     <hr />
@@ -48,6 +52,14 @@
                             <p class="form-text text-muted" style="color:red !important">@mensajeError</p>
                         </div>
                         <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>
                 </div>
             </div>

HerramientaCASA/HeaderPdf.razor

@@ -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;
+    }
+}

HerramientaCASA/wwwroot/Content/Site.css

@@ -14,7 +14,7 @@ body {
 }
 
 .logoCacoa {
-    border-radius: 10px !important;
+    /*border-radius: 10px !important;*/
 }
 .navCACOA {
     background-color: rgb(215 236 239) !important;
@@ -500,23 +500,30 @@ li.nav-item.active {
 .impriManual {
 
 }
-
+.arealogin {
-@media (max-width: 767px) {
+    max-width: 500px;
+    max-height: 500px;
+}
+    @media (max-width: 767px) {
         .arealogin {
             margin-left: 20px !important;
             margin-right: 20px !important;
         }
+
         .guardarNombre {
-        display:block;
+            display: block;
         }
+
         .impriManual {
             height: 36px;
-        position:absolute;
+            position: absolute;
-        right:0px;
+            right: 0px;
         }
+
         .tituloSim {
-    margin-top:8px;
+            margin-top: 8px;
         }
+
         .top-menu {
             top: 6px;
             right: 52px;
@@ -526,9 +533,9 @@ li.nav-item.active {
             .top-menu > .navbar-nav > li {
                 float: none !important;
             }
-}
+    }
 
-@media (min-width: 768px) {
+    @media (min-width: 768px) {
         .top-menu {
             margin-right: -15px;
         }
@@ -536,103 +543,119 @@ li.nav-item.active {
         .top-auth-menu {
             margin-left: auto;
         }
+    }
+
+@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;
         background-color: #2a8a94 !important;
         border-color: #057381 !important;
-}
+    }
 
-.dxbs-table {
+    .dxbs-table {
-}
+    }
 
         .dxbs-table th {
             background-color: #67abb2 !important;
             border-color: #057381 !important;
         }
 
-.dxbs-fixed-header-content > a {
+    .dxbs-fixed-header-content > a {
         color: white;
         text-decoration: none !important;
-}
+    }
 
-.dxbs-icon {
+    .dxbs-icon {
         color: #057381;
-}
+    }
 
-a.nav-link:hover {
+    a.nav-link:hover {
         color: #078b98 !important;
         /* font-weight: bold; */
-}
+    }
 
-.derecha {
+    .derecha {
         text-align: end;
         border-right: 1px solid #a2ccd1;
         border-bottom: 1px solid #a2ccd1;
-}
+    }
 
-.ulMenu li.nav-item {
+    .ulMenu li.nav-item {
         /*border-right: 2px solid #afafb0;*/
         margin-left: 5px;
-}
+    }
 
         .ulMenu li.nav-item a {
             font-weight: bold;
         }
 
-.ulMenu li.active a {
+    .ulMenu li.active a {
         color: #018b98 !important;
-}
+    }
 
-.ulMenu li.nav-item:last-child {
+    .ulMenu li.nav-item:last-child {
         border-right: 0px solid #afafb0;
-}
+    }
 
-@media (max-width: 992px) {
+    @media (max-width: 992px) {
         .ulMenu li.nav-item {
             border-right: 0px solid #afafb0;
         }
-}
+    }
 
 
-.dxbs-table tbody tr td a {
+    .dxbs-table tbody tr td a {
         color: #004f58;
         font-weight: bold;
-}
+    }
 
-.page-item.active.page-number a {
+    .page-item.active.page-number a {
         background-color: #2a8a94;
         border: 2px solid black;
-}
+    }
 
-.page-link {
+    .page-link {
         color: black;
-}
+    }
 
-button.btn.btn-link.dxbs-button {
+    button.btn.btn-link.dxbs-button {
         color: darkred;
-}
+    }
 
-.disabled {
+    .disabled {
         pointer-events: none;
         background-color: #e9ecef;
-}
+    }
 
-.back {
+    .back {
         background: #057381;
         width: 100%;
         position: absolute;
         top: 0;
         bottom: 0;
-}
+    }
 
-.div-center {
+    .div-center {
         max-width: 400px;
         max-height: 400px;
-    width:100%;
+        width: 100%;
-    height:100%;
+        height: 100%;
         background-color: #fff;
         position: absolute;
         left: 0;
@@ -644,54 +667,54 @@ button.btn.btn-link.dxbs-button {
         padding: 1em 2em;
         border-bottom: 2px solid #ccc;
         display: table;
-}
+    }
 
-div.content {
+    div.content {
         display: table-cell;
         vertical-align: middle;
-}
+    }
 
-.nav-link.active {
+    .nav-link.active {
         color: #078b98 !important;
-}
+    }
 
-.formatoCampos {
+    .formatoCampos {
         flex-direction: column;
         display: flex;
-}
+    }
 
-.tituloLbl {
+    .tituloLbl {
         padding-bottom: 5px;
         font-weight: bold;
-}
+    }
 
-.inputForm {
+    .inputForm {
         padding: 0px !important;
-    padding-left:10px !important;
+        padding-left: 10px !important;
         /*padding-right:10px;*/
-}
+    }
 
-.form-check-input:checked {
+    .form-check-input:checked {
         background-color: #018b98;
         border-color: #0098a6;
-}
+    }
 
 
-.tablaCACOA {
+    .tablaCACOA {
         /*margin-top: 50px;*/
         margin-top: 10px;
         width: 100%;
         border-collapse: collapse;
         font-size: 12px;
-}
+    }
 
-.tablaCACOA2 tr td {
+    .tablaCACOA2 tr td {
-    padding:10px;
+        padding: 10px;
-}
+    }
 
-.tablaCACOA thead tr th{
+    .tablaCACOA thead tr th {
-    text-align:center;
+        text-align: center;
-}
+    }
 
     .tablaCACOA th {
         text-align: center;
@@ -717,187 +740,190 @@ div.content {
             }
 
     .tablaCACOA td {
-/*        padding: 15px !important;
+        /*        padding: 15px !important;
         padding-inline: 30px !important;*/
         border: solid 1px black;
     }
 
 
-.tdAlineadoDerecha {
+    .tdAlineadoDerecha {
         text-align: end;
-}
+    }
 
-.formatoMoneda {
+    .formatoMoneda {
         text-align: right;
         padding-right: 5px !important;
-}
+    }
 
-.CajaTab {
+    .CajaTab {
         border: 1px solid #dee2e6;
         border-top: 0px;
-}
+    }
 
-.botonesTabla {
+    .botonesTabla {
         width: 80px;
         text-align: center !important;
-}
+    }
 
-.alturaTitulosTabla {
+    .alturaTitulosTabla {
         height: 35px;
-}
+    }
 
-.btnTablasEspaciado {
+    .btnTablasEspaciado {
         display: flex;
         justify-content: space-around;
-}
+    }
-.btnBorrarGuardar {
+
+    .btnBorrarGuardar {
         cursor: pointer;
         font-size: 1.23em;
-}
+    }
 
-/* Cambiar para ver como se ve el info */
+    /* Cambiar para ver como se ve el info */
-.tooltip .tooltip-inner {
+    .tooltip .tooltip-inner {
         background-color: #e0f0ff !important;
         color: #000 !important;
         font-style: italic;
         font-size: 0.9rem;
-}
+    }
 
-.columna3Ancho {
+    .columna3Ancho {
         width: 3%;
-}
+    }
 
-.columna10Ancho {
+    .columna10Ancho {
         width: 10%;
-}
+    }
 
-.columna20Ancho{
+    .columna20Ancho {
-    width:20%;
+        width: 20%;
-}
+    }
 
-.columna30Ancho {
+    .columna30Ancho {
         width: 30%;
-}
+    }
 
-.columna40Ancho {
+    .columna40Ancho {
         width: 40%;
-}
+    }
 
-.columna50Ancho {
+    .columna50Ancho {
         width: 50%;
-}
+    }
 
 
-.separadorMoneda {
+    .separadorMoneda {
         margin-right: 8px;
-    gap:3px;
+        gap: 3px;
-}
+    }
 
-/**Esto es para que el "no hay mas registros" no tenga margenes*/ 
+    /**Esto es para que el "no hay mas registros" no tenga margenes*/
-.my-5 {
+    .my-5 {
-    margin-top:0px !important;
+        margin-top: 0px !important;
-    margin-bottom:0px !important;
+        margin-bottom: 0px !important;
-}
+    }
 
-.form-check {
+    .form-check {
         display: flex;
         align-items: center;
-}
+    }
 
-.checkTabla div {
+    .checkTabla div {
         min-height: 12px;
-}
+    }
-.checkGordo {
+
+    .checkGordo {
         padding: 0;
         width: 13px;
         height: 13px;
         border: 1px solid #057381 !important;
-}
+    }
 
-.TituloVentana {
+    .TituloVentana {
         font-weight: bold;
         background-color: #018b98;
         color: white;
         padding: 10px;
         padding-left: 15px;
-    margin-bottom:0px;
+        margin-bottom: 0px;
-}
+    }
 
-.TotalesTabla{
+    .TotalesTabla {
-    border:0px !important;
+        border: 0px !important;
-}
+    }
 
-.TablaImprimir table {
+    .TablaImprimir table {
         border-collapse: collapse;
         width: 100%;
         font-size: 984pt;
-}
+    }
 
-.TablaImprimir thead tr th {
+    .TablaImprimir thead tr th {
         text-align: center;
         font-style: normal;
         font-size: 9pt;
-}
+    }
 
-.TablaImprimir tbody {
+    .TablaImprimir tbody {
         border-top: 1px solid black;
         border-bottom: 1px solid black;
         font-size: 9pt;
-}
+    }
 
         .TablaImprimir tbody tr {
             border: none;
         }
 
-.TablaImprimir td, th {
+    .TablaImprimir td, th {
         padding: 8px;
         text-align: left;
-}
+    }
 
-.TablaImprimir tfoot {
+    .TablaImprimir tfoot {
         font-size: 9pt;
-}
+    }
 
 
-.TituloTablaImprimir {
+    .TituloTablaImprimir {
         color: #078b98 !important;
         font-size: 11pt;
-    height:25px;
+        height: 25px;
-}
+    }
 
-.NombreSimulacionImprimir{
+    .NombreSimulacionImprimir {
-    font-style:italic;
+        font-style: italic;
-}
+    }
 
-.EncabezadoImprimir{
+    .EncabezadoImprimir {
-    padding-left:20px;
+        padding-left: 20px;
-    padding-right:20px;
+        padding-right: 20px;
-    margin-bottom:100px;
+        margin-bottom: 100px;
-    font-size:11pt;
+        font-size: 11pt;
-}
+    }
 
-.FooterImprimir {
+    .FooterImprimir {
         padding-left: 20px;
         padding-right: 20px;
         margin-top: 100px;
         font-size: 9pt;
-}
+    }
 
 
-.puntoInfo{
+    .puntoInfo {
-    display:flex;
+        display: flex;
-    gap:5px;
+        gap: 5px;
-}
+    }
 
-.pagePrincipal{
+    .pagePrincipal {
-    margin:30px;
+        margin: 30px;
-}
+    }
-.espacioTablas {
+
+    .espacioTablas {
         margin: 20px;
-}
+    }
 
-.centrarChecksImprimir {
+    .centrarChecksImprimir {
         align-items: center;
         justify-content: flex-end;
         display: flex;
-}
+    }