From 91549d25bc291012bb56cddc99bfc4f984754812 Mon Sep 17 00:00:00 2001
From: Joaquin Elias Baranda Ayala <joaquinbaranda1999@gmail.com>
Date: Thu, 18 Nov 2021 17:29:23 -0300
Subject: [PATCH] Insercion de Icono en el Browser

---
 curriculumsearch/src/main/resources/static/main.js            | 34 +++++++++++++++++-----------------
 curriculumsearch/src/main/webapp/img/LogoRoshka.ico           | Bin 0 -> 18593 bytes
 curriculumsearch/src/main/webapp/img/LogoRoshka.jpg           | Bin 18593 -> 0 bytes
 curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp    |  2 +-
 curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp    |  3 ++-
 curriculumsearch/src/main/webapp/jsp/exitoRegistro.jsp        |  1 +
 curriculumsearch/src/main/webapp/jsp/forgot_password_form.jsp |  1 +
 curriculumsearch/src/main/webapp/jsp/index.jsp                |  1 +
 curriculumsearch/src/main/webapp/jsp/layouts/base.jsp         |  1 +
 curriculumsearch/src/main/webapp/jsp/login.jsp                |  1 +
 curriculumsearch/src/main/webapp/jsp/postulante-form.jsp      | 55 +++++++++++++++++++++++++++++--------------------------
 11 files changed, 54 insertions(+), 45 deletions(-)
 create mode 100644 curriculumsearch/src/main/webapp/img/LogoRoshka.ico
 delete mode 100644 curriculumsearch/src/main/webapp/img/LogoRoshka.jpg

diff --git a/curriculumsearch/src/main/resources/static/main.js b/curriculumsearch/src/main/resources/static/main.js
index 9c476ee..c192a61 100644
--- a/curriculumsearch/src/main/resources/static/main.js
+++ b/curriculumsearch/src/main/resources/static/main.js
@@ -261,13 +261,13 @@ function agregarFieldExpierncia(event){
         content += `
         <div class="col border border-3" id="exp-${index}">
                     <center><h4>Experiencia <i class="bi bi-trash-fill" onclick="eliminarExperiencia(${index})"></i></h4></center>
-                    <label><b>Institucion:</b> ${exp.institucion}</label><br>  
-                    <label><b>Fecha Inicio:</b> ${exp.fechaDesde}</label><br>
-                    <label><b>Fecha Fin:</b> ${exp.fechaHasta}</label><br>
-                    <label><b>Referencia:</b> ${exp.nombreReferencia}</label><br>
-                    <label><b>Telefono de la referencia:</b> ${exp.telefonoReferencia}</label><br>
-                    <label><b>Cargo:</b> ${exp.cargo}</label><br>
-                    <label><b>Motivo de salida:</b> ${exp.motivoSalida}</label><br>
+                    <label><b>Institucion:</b>&nbsp  ${exp.institucion}</label><br>  
+                    <label><b>Fecha Inicio: </b>&nbsp ${exp.fechaDesde}</label><br>
+                    <label><b>Fecha Fin: </b>&nbsp ${exp.fechaHasta}</label><br>
+                    <label><b>Referencia: </b>&nbsp ${exp.nombreReferencia}</label><br>
+                    <label><b>Telefono de la referencia: </b>&nbsp ${exp.telefonoReferencia}</label><br>
+                    <label><b>Cargo: </b>&nbsp ${exp.cargo}</label><br>
+                    <label><b>Motivo de salida: </b>&nbsp ${exp.motivoSalida}</label><br>
                     
             
         </div>
@@ -368,12 +368,12 @@ function agregarFieldEstudio(){
         content += `
         <div class="col border border-3" id="est-${index}">
         <center><h4>Estudio <i class="bi bi-trash-fill" onclick="eliminarEstudio(${index})"></i></h4></center>
-            <label><b>Institucion:</b> ${est.institucion.nombre}</label><br>
-            <label><b>Tipo de estudio:</b> ${est.tipoDeEstudio}</label><br>  
-            <label><b>Carrera:</b> ${est.temaDeEstudio}</label><br>     
-            <label><b>Fecha Inicio:</b> ${est.fechaDesde}</label><br>
-            <label><b>Fecha Fin:</b> ${est.fechaHasta}</label><br>
-            <label><b>Estado:</b> ${est.estado}</label><br>
+            <label><b>Institucion: </b>&nbsp ${est.institucion.nombre}</label><br>
+            <label><b>Tipo de estudio: </b>&nbsp ${est.tipoDeEstudio}</label><br>  
+            <label><b>Carrera: </b>&nbsp ${est.temaDeEstudio}</label><br>     
+            <label><b>Fecha Inicio: </b>&nbsp ${est.fechaDesde}</label><br>
+            <label><b>Fecha Fin: </b>&nbsp ${est.fechaHasta}</label><br>
+            <label><b>Estado: </b>&nbsp ${est.estado}</label><br>
             
         </div>
         
@@ -452,7 +452,7 @@ function agregarFieldCargo(){
         if(car==null) continue;
         content1 += `
         <div class="col-auto" id="car-${index}" style="text-transform: uppercase;">
-            ${document.querySelector('[name=cargo-id] > option[value="'+car.id+'"]').innerHTML}<i class="bi bi-trash-fill" onclick="eliminarCargoPostulante(event)"></i>     
+            ${document.querySelector('[name=cargo-id] >  option[value="'+car.id+'"]').innerHTML} &nbsp;<i class="bi bi-trash-fill" onclick="eliminarCargoPostulante(event)"></i>     
             
         </div>
 
@@ -528,9 +528,9 @@ function agregarFieldReferencia(event){
         <div class="col border border-3" id="ref-${index}">
         <center><h4>Referencia Personal <i class="bi bi-trash-fill" onclick="eliminarReferencia(${index})"></i></h4></center> 
             
-            <label><b>Nombre:</b> ${exp.nombre}</label><br>
-            <label><b>Telefono:</b> ${exp.telefono}</label><br>
-            <label><b>Relacion:</b> ${exp.relacion}</label><br>
+            <label><b>Nombre: </b>&nbsp ${exp.nombre}</label><br>
+            <label><b>Telefono: </b>&nbsp ${exp.telefono}</label><br>
+            <label><b>Relacion: </b>&nbsp ${exp.relacion}</label><br>
             
         </div>
         
diff --git a/curriculumsearch/src/main/webapp/img/LogoRoshka.ico b/curriculumsearch/src/main/webapp/img/LogoRoshka.ico
new file mode 100644
index 0000000..ecd4d8c
Binary files /dev/null and b/curriculumsearch/src/main/webapp/img/LogoRoshka.ico differ
diff --git a/curriculumsearch/src/main/webapp/img/LogoRoshka.jpg b/curriculumsearch/src/main/webapp/img/LogoRoshka.jpg
deleted file mode 100644
index ecd4d8c..0000000
Binary files a/curriculumsearch/src/main/webapp/img/LogoRoshka.jpg and /dev/null differ
diff --git a/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp b/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
index fa866ef..8fbd0ff 100644
--- a/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
@@ -40,6 +40,6 @@
         </div>
     </layout:put>
     <layout:put block="scripts" type="APPEND">
-
+       
     </layout:put>
 </layout:extends>
diff --git a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
index 8f031a5..e08924f 100644
--- a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
@@ -4,6 +4,7 @@
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
+
 <layout:extends name="layouts/base.jsp">
     <layout:put block="contents" type="REPLACE">
         <h2 style="text-align: center;">
@@ -376,7 +377,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
     <script src="../valEdad.js"></script>
-
+    
   </layout:put>
 
             
diff --git a/curriculumsearch/src/main/webapp/jsp/exitoRegistro.jsp b/curriculumsearch/src/main/webapp/jsp/exitoRegistro.jsp
index f462dbf..22d442c 100644
--- a/curriculumsearch/src/main/webapp/jsp/exitoRegistro.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/exitoRegistro.jsp
@@ -4,6 +4,7 @@
 <html>
 <head>
     <link href="https://fonts.googleapis.com/css?family=Nunito+Sans:400,400i,700,900&display=swap" rel="stylesheet">
+    <link rel="icon" href="../img/LogoRoshka.ico">
 </head>
 <style>
     body {
diff --git a/curriculumsearch/src/main/webapp/jsp/forgot_password_form.jsp b/curriculumsearch/src/main/webapp/jsp/forgot_password_form.jsp
index 37c267f..af4e6c7 100644
--- a/curriculumsearch/src/main/webapp/jsp/forgot_password_form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/forgot_password_form.jsp
@@ -8,6 +8,7 @@
     <title>Forgot Password</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
     <link href="https://getbootstrap.com/docs/4.0/examples/signin/signin.css" rel="stylesheet" crossorigin="anonymous">
+    <link rel="icon" href="../img/LogoRoshka.ico">
 
 </head>
 <body>
diff --git a/curriculumsearch/src/main/webapp/jsp/index.jsp b/curriculumsearch/src/main/webapp/jsp/index.jsp
index a44f6bc..553ce4a 100644
--- a/curriculumsearch/src/main/webapp/jsp/index.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/index.jsp
@@ -5,6 +5,7 @@
 <layout:extends name="layouts/base.jsp">
     <layout:put block="cssDeclaracion" type="REPLACE">
         <link href="../css/indexStyle.css" rel="stylesheet" type="text/css"/>
+        <link rel="icon" href="../img/LogoRoshka.ico">
     </layout:put>
     
 </layout:extends>
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp b/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
index d90023f..9585a8d 100644
--- a/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
@@ -9,6 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <link rel="icon" href="../img/LogoRoshka.ico">
     <layout:block name="cssDeclaracion">
       <link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/>
     </layout:block>
diff --git a/curriculumsearch/src/main/webapp/jsp/login.jsp b/curriculumsearch/src/main/webapp/jsp/login.jsp
index 0f3f1ca..a54c3ef 100644
--- a/curriculumsearch/src/main/webapp/jsp/login.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/login.jsp
@@ -9,6 +9,7 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
     <link href="https://getbootstrap.com/docs/4.0/examples/signin/signin.css" rel="stylesheet" crossorigin="anonymous">
     <link href="../css/style.css" rel="stylesheet" type="text/css"/>
+    <link rel="icon" href="../img/LogoRoshka.ico">
 </head>
 <body>
 <jsp:include page="alerts.jsp"/>
diff --git a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
index e1c9f8e..1b8a9c1 100644
--- a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
@@ -13,6 +13,7 @@
     <title>Curriculum</title>
     <link href="../css/formPostulanteStyle.css" rel="stylesheet" type="text/css"/>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
+    <link rel="icon" href="../img/LogoRoshka.ico">
   </head>
 
   <body class="container">
@@ -167,25 +168,6 @@
                                     </div>
                                   </div>
                                   
-                                  
-                                  
-
-                                  <!-- Button Agregar Experiencia -->
-                                  <div class="inputs mb-3 col-md-12">
-
-                                    <div class="row w-100 p-3 gy-2 border mx-auto">
-                                      <div class="col-12">
-                                        <h3>Experiencias <i class="bi bi-plus-circle-fill" data-bs-toggle="modal" data-bs-target="#experienciaForm"></i></h3>	
-                                      </div>
-                                      <div class="col-12">
-                                        <div class="mt-3 gap-2 row row-cols-4" id="experiencias">
-                                          
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  
-                                    
                                   <!-- Button Agregar Estudio -->
                                   <div class="inputs mb-3 col-md-12">
 
@@ -201,8 +183,7 @@
                                     </div>
                                   </div>
                                   
-                            
-                               
+
                                   <!-- Button Agregar Tecnologia -->
                                   <div class="inputs mb-3 col-md-12">
 
@@ -226,6 +207,28 @@
                                     
                                     </div>
                                   </div>
+
+                                  <!-- Button Agregar Experiencia -->
+                                  <div class="inputs mb-3 col-md-12">
+
+                                    <div class="row w-100 p-3 gy-2 border mx-auto">
+                                      <div class="col-12">
+                                        <h3>Experiencias <i class="bi bi-plus-circle-fill" data-bs-toggle="modal" data-bs-target="#experienciaForm"></i></h3>	
+                                      </div>
+                                      <div class="col-12">
+                                        <div class="mt-3 gap-2 row row-cols-4" id="experiencias">
+                                          
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                  
+                                    
+                                  
+                                  
+                            
+                               
+                                  
                                   
                                   
                                   
@@ -263,7 +266,7 @@
         <div class="modal-content">
           <div class="modal-header">
             <h5 class="modal-title" id="exampleModalLabel" >CargosDisponibles</h5>
-            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" style="color:#21130d;">
               <span aria-hidden="true">&times;</span>
             </button>
           </div>
@@ -295,7 +298,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <h5 class="modal-title" id="exampleModalLabel">Experiencia</h5>
-              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" style="color:#21130d;">
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>
@@ -370,7 +373,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <h5 class="modal-title" id="exampleModalLabel" >tecnologia</h5>
-              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" style="color:#21130d;">
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>
@@ -408,7 +411,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <h5 class="modal-title" id="exampleModalLabel">Estudios</h5>
-              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" style="color:#21130d;">
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>
@@ -477,7 +480,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <h5 class="modal-title" id="exampleModalLabel">Referencias Personales</h5>
-              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+              <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close" style="color:#21130d;">
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>
--
libgit2 0.26.0