Cambios en nombres

platforms/android/app/src/main/assets/www/img/sfpr.svg

@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13.714in" height="8.712in" viewBox="0 0 987.427 627.239">
+  <g>
+    <path d="M275.659,273.4c19.821,0,35.89-14.958,35.89-33.409s-16.069-33.408-35.89-33.408-35.89,14.957-35.89,33.408S255.837,273.4,275.659,273.4Z" fill="#facf2a"/>
+    <path d="M165.04,335.473c-19.176,0-34.722,14.47-34.722,32.32s15.546,32.32,34.722,32.32,34.721-14.47,34.721-32.32S184.216,335.473,165.04,335.473Z" fill="#facf2a"/>
+    <path d="M313.209,350.705c-.556-11.734-5.391-21.775-12.831-30.548-22.758-26.833-108.187-91.651-89.857-111.282.052-.056.012-.15.012-.226-.017-.218-.056-.423-.066-.645-20.8-2.466-41.02,1.883-56.256,14.025-13.063,10.411-18.633,23.862-15.757,40.525,2.078,12.037,8,22.081,15.709,31.367,18.455,22.232,81.184,77.285,81.184,98.668a30.763,30.763,0,0,1-.619,6.027c.069.363.151.716.208,1.087,7.978-.425,15.758-.6,23.489-1.3,13.845-1.252,26.778-5.4,38.068-13.694C307.9,376.322,313.891,365.1,313.209,350.705Z" fill="#facf2a"/>
+    <g>
+      <path d="M489.532,130.939c-18.977,0-34.361,14.319-34.361,31.985s15.384,31.985,34.361,31.985,34.362-14.32,34.362-31.985S508.51,130.939,489.532,130.939Z" fill="#599eba"/>
+      <path d="M445.309,132.3c-18.014.262-36.451,2.836-52.637,11.383-12.973,6.851-22.867,16.461-27.829,30.613-2.58,7.361-2.962,14.96-2.987,22.63-.01,3.182,0,6.364,0,10.208H332.524v22.627h29.353V398.409h83.432V229.377h26.139V207.06H445.309Z" fill="#599eba"/>
+    </g>
+    <g>
+      <path d="M822.747,207.765c-18.977,0-34.361,14.32-34.361,31.986s15.384,31.985,34.361,31.985,34.361-14.32,34.361-31.985S841.724,207.765,822.747,207.765Z" fill="#5a863c"/>
+      <path d="M774.2,249.335c-4.962-14.151-14.856-23.76-27.829-30.612-16.186-8.548-33.7-11.121-51.709-11.382a12.965,12.965,0,0,0-2.251.472c0,24.475-.313,114.646-.313,190.884,20.546,0,59.221.487,85.068.487,0-76.5.031-124.036.021-127.219C777.166,264.3,776.784,256.7,774.2,249.335Z" fill="#5a863c"/>
+    </g>
+    <g>
+      <path d="M577.022,249.335c-4.962-14.151-14.856-23.76-27.829-30.612-16.186-8.548-33.695-11.121-51.709-11.382a12.99,12.99,0,0,0-2.252.472c0,24.475-.312,211.762-.312,288,22.855,0,62.107.486,85.067.486,0-76.5.032-221.152.022-224.335C579.984,264.3,579.6,256.7,577.022,249.335Z" fill="#e65f25"/>
+      <path d="M590.362,207.869V395.193c39.525-1.74,85.366-39.736,84.614-95.207C674.237,245.575,627.354,208.983,590.362,207.869Z" fill="#e65f25"/>
+    </g>
+    <g>
+      <path d="M142.725,446.577l-3.071-.86c-2.512-.7-3.632-2.024-3.632-4.3s1.756-3.763,4.473-3.763a4.448,4.448,0,0,1,4.593,3.876l.062.279H148.8l-.05-.4c-.587-4.646-3.594-7.311-8.251-7.311-4.771,0-8.1,3.009-8.1,7.32a7.663,7.663,0,0,0,5.761,7.791l3.332.937c2.783.774,3.971,2.047,3.971,4.258,0,2.415-1.7,3.8-4.661,3.8-2.791,0-4.779-1.9-5.188-4.968l-.042-.308h-3.649l.028.382c.382,5.134,3.856,8.452,8.851,8.452,5.192,0,8.291-2.75,8.291-7.358C149.085,450.405,146.945,447.771,142.725,446.577Z" fill="#231f20"/>
+      <polygon points="155.723 438.027 161.75 438.027 161.75 457.832 155.723 457.832 155.723 461.387 171.368 461.387 171.368 457.832 165.342 457.832 165.342 438.027 171.368 438.027 171.368 434.473 155.723 434.473 155.723 438.027" fill="#231f20"/>
+      <polygon points="191.52 454.049 180.932 434.473 177.483 434.473 177.483 461.387 181.075 461.387 181.075 441.811 191.663 461.387 195.112 461.387 195.112 434.473 191.52 434.473 191.52 454.049" fill="#231f20"/>
+      <polygon points="202.312 461.387 205.905 461.387 205.905 449.558 215.3 449.558 215.3 446.003 205.905 446.003 205.905 438.027 217.921 438.027 217.921 434.473 202.312 434.473 202.312 461.387" fill="#231f20"/>
+      <polygon points="224.034 438.027 230.061 438.027 230.061 457.832 224.034 457.832 224.034 461.387 239.68 461.387 239.68 457.832 233.654 457.832 233.654 438.027 239.68 438.027 239.68 434.473 224.034 434.473 224.034 438.027" fill="#231f20"/>
+      <polygon points="259.831 454.049 249.244 434.473 245.794 434.473 245.794 461.387 249.387 461.387 249.387 441.811 259.975 461.387 263.424 461.387 263.424 434.473 259.831 434.473 259.831 454.049" fill="#231f20"/>
+      <polygon points="269.95 461.387 285.559 461.387 285.559 457.831 273.543 457.831 273.543 449.558 282.938 449.558 282.938 446.003 273.543 446.003 273.543 438.027 285.559 438.027 285.559 434.473 269.95 434.473 269.95 461.387" fill="#231f20"/>
+      <path d="M302.118,446.577l-3.071-.86c-2.511-.7-3.631-2.025-3.631-4.3s1.755-3.763,4.472-3.763a4.449,4.449,0,0,1,4.594,3.876l.062.279h3.646l-.051-.4c-.586-4.646-3.594-7.311-8.251-7.311-4.771,0-8.1,3.009-8.1,7.32a7.665,7.665,0,0,0,5.76,7.791l3.333.937c2.783.773,3.97,2.046,3.97,4.258,0,2.414-1.7,3.8-4.66,3.8-2.791,0-4.78-1.9-5.188-4.967l-.042-.308h-3.65l.028.382c.382,5.133,3.857,8.451,8.852,8.451,5.191,0,8.291-2.75,8.291-7.357C308.479,450.405,306.338,447.771,302.118,446.577Z" fill="#231f20"/>
+      <path d="M323.82,434.473H315v26.914h3.6V451.206h5.222c5.684,0,8.814-2.972,8.814-8.368S329.5,434.473,323.82,434.473Zm5.146,8.365c0,2.194-.893,4.81-5.146,4.81H318.6v-9.621h5.222C328.073,438.027,328.966,440.644,328.966,442.838Z" fill="#231f20"/>
+      <path d="M354.806,442.015c0-3.647-2.08-7.542-7.917-7.542h-9.264v26.914h3.592V449.521h3.6l6.961,11.866h4.157l-7.052-12.03C352.6,448.658,354.806,445.948,354.806,442.015Zm-3.631,0c0,2.444-1.682,4.024-4.286,4.024h-5.672v-8.012h5.672C349.533,438.027,351.175,439.556,351.175,442.015Z" fill="#231f20"/>
+      <rect x="366.16" y="456.743" width="4.641" height="4.644" fill="#231f20"/>
+      <path d="M391.232,434.1c-5.355,0-8.814,3.622-8.814,9.227v9.208c0,5.606,3.459,9.228,8.814,9.228s8.815-3.622,8.815-9.228v-9.208C400.047,437.72,396.587,434.1,391.232,434.1Zm5.222,9.227v9.208c0,3.5-2,5.67-5.222,5.67a4.943,4.943,0,0,1-4.185-1.994l9.376-13.587C396.444,442.854,396.454,443.09,396.454,443.325Zm-10.444,9.208v-9.208c0-3.5,2-5.67,5.222-5.67a4.9,4.9,0,0,1,4.508,2.514l-9.584,13.888A7.727,7.727,0,0,1,386.01,452.533Z" fill="#231f20"/>
+      <path d="M423.118,442.015c0-3.647-2.08-7.542-7.918-7.542h-9.264v26.913h3.593V449.521h3.6l6.961,11.865h4.157l-7.053-12.029C420.914,448.657,423.118,445.947,423.118,442.015Zm-3.631,0c0,2.444-1.683,4.024-4.287,4.024h-5.671v-8.012H415.2C417.844,438.027,419.487,439.556,419.487,442.015Z" fill="#231f20"/>
+      <path d="M436.492,446.749v3.558h5.578v2.226c0,3.5-2,5.67-5.222,5.67s-5.222-2.173-5.222-5.67v-9.208c0-3.5,2-5.67,5.222-5.67a4.986,4.986,0,0,1,5.187,4.951l.028.326h3.586l-.022-.377c-.307-5.138-3.753-8.457-8.779-8.457-5.355,0-8.815,3.622-8.815,9.227v9.208c0,5.606,3.46,9.228,8.815,9.228s8.816-3.622,8.816-9.228v-5.784Z" fill="#231f20"/>
+    </g>
+  </g>
+</svg>

platforms/android/app/src/main/assets/www/index.html

@@ -41,6 +41,7 @@
         <meta name="format-detection" content="telephone=no">
         <meta name="msapplication-tap-highlight" content="no">
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
+        <meta charset="UTF-8">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
@@ -52,22 +53,26 @@
     </head>
     <body>
 
-
+        <script> 
+        
+        
+        
+        </script>
 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
            <ons-page>
             <ons-toolbar>
-                <div class="center">Artesanias PR</div>
+                <div class="center">ArtesaníasICP</div>
                 <div class="right"><img class="list-item__thumbnail" src="img/ICP.png"></div>
             </ons-toolbar>
             <!--The tabbar is the place where the user can get acces to the different sections of the app-->
             <!--Each tab will hace a page name (which we use to reference and define them later one), then we have a laber, this is what will be used as a name for that page in the tabbar-->
             <ons-tabbar swipeable position="bottom" modifier="autogrow">
-                <ons-tab page="home.html" label="Hogar" active></ons-tab>
-                <ons-tab page="renglones.html" label="Artesanías"></ons-tab>
-                <ons-tab page ="search.html" label="Buscar"> </ons-tab>
-                <!--<ons-tab page="ferias.html" label="Eventos"></ons-tab>-->
-                <ons-tab page="instituto.html" label="Colab"></ons-tab>
+                <ons-tab page="home.html" label="Hogar" icon = "md-home" active></ons-tab>
+                <ons-tab page="renglones.html" label="Artesanías" icon = "fa-paint-brush"></ons-tab>
+                <ons-tab page ="search.html" label="Buscar" icon = "fa-search"> </ons-tab>
+                <ons-tab page ="ferias.html" label="Eventos" icon = "fa-calendar-alt"> </ons-tab>
+                <ons-tab page="colaboradores.html" label="Colab" icon = "fa-users"></ons-tab>
             </ons-tabbar>
         </ons-page>
 
@@ -219,7 +224,7 @@
                 <div class="center" >${Artesano.Nombre}</div>
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -242,7 +247,7 @@
                             if (Artesano["Telefono 1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
                                 cont ++;
                             }
                             if (Artesano.Especificacion.trim().length != 0) {
@@ -254,7 +259,7 @@
                             //'title':'${Artesano.Nombre}','esp': '${info}'
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
                             //And puts this into the 'item' variable
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -362,7 +367,7 @@
 
                                  //if(Esp[num] in artesanos_json.) {}
                                  Artesanos+=`${results[i].Nombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -398,6 +403,11 @@
                                  listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
                              }
 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
+                                 Artesania.name = "Figuras y símbolos indígenas";
+                             } 
+
+                             console.log(Artesania.name);
 
                              return ons.createElement(`
               <ons-list-item expandable tappable>
@@ -537,7 +547,7 @@
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
                     for (i = 0; i < all_artesanos.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);
@@ -699,7 +709,7 @@
 
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
 
-        <!--<template id="ferias.html">
+        <template id="ferias.html">
             <ons-page id="ferias">
                 <!--<ons-card>
 
@@ -708,7 +718,7 @@
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
                 </div>
 
-                </ons-card>--
+                </ons-card>-->
                 <br><br><br>
                 <button onclick="redirect()">Pasar a la pagina de eventos</button>
 
@@ -718,12 +728,12 @@
               }
               </script>
             </ons-page>
-        </template>-->
+        </template>
 
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
 
-        <template id="instituto.html">
-            <ons-page id="instituto">
+        <template id="colaboradores.html">
+            <ons-page id="colaboradores">
                 <ons-card>
 
                     <h1>Colaboradores</h1>
@@ -744,19 +754,19 @@
                         Directorio Artesanal Cultural PR <img src="img/gobierno.png" style="width:35px;height:35px;border:0;">
                         <br><br>
                     </body>
+                    
 
 
-
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
-                    </a>
+                    </a> 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
                     </a>
-
+                    
                     <br><br><br>
                     <button onclick="redirect()">Pasar a la pagina de eventos</button>
 
@@ -765,11 +775,50 @@
                             location.replace("https://facebook.com/icppr")
                         }
                     </script>
-
+                    
                     <br><br>
+                    <style>
+                        .column {
+                            float: left;
+                            width: 50%;
+                        }
+                        .row {
+                            width: 100%;
+                        }
+                    </style>
                     <h2>SINFINESPR</h2>
+                    <div class = "column">
+                        SINFINESPR es un programa de Titín Foundation que responde a nuestro interés y compromiso con el fortalecimiento del tercer sector.
+                        <br><br>
+                        En esta plataforma agrupamos herramientas que permitirán que tu organización adquiera mayor visibilidad, recursos, conexiones, capacidad para una operación más eficiente y efectiva.
+                        <br><br>
+                        Saludos Cordiales,
+                                Aziria
+                    </div>   
+                    <div class = "column"> 
+                        <img src="img/sfpr.svg" style="width:150px;height:100px">
+                    </div>
+                    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
+                    <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
+                    </a>
+                    <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
+                    </a>
+                    <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
+                    </a>
+                    <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
+                    </a>
+                    <br><br>
+                    <h2>Centro de Desarrollo y Consultoria Computacional</h2>
+                    El Centro de Desarrollo y Consultoría Computacional está compuesto por profesores y estudiantes del departamento de Ciencia de Cómputos de la Universidad de Puerto Rico Recinto de Río Piedras. Nuestra meta es aportar al desarrollo computacional de la Universidad y de Puerto Rico al proveer servicios al día, de calidad y con precios accesibles, a la misma vez que se le ofrece experiencias prácticas a los estudiantes del departamento de Ciencia de Cómputos.
                     <br><br>
-                    <h2>Fundación Titín</h2>
+                    Si tiene alguna duda nos puede conactar por:
+                    <br>
+                    Teléfono: 787-764-0000 Ext. 88341, 88349
+                    <br>
+                    o
+                    <br>
+                    Correo electrónico: <a href = "mailto:carlos.corrada2@upr.edu" style ="color:#0000EE;text-decoration: underline;">carlos.corrada2@upr.edu</a>
 
                 </ons-card>
             </ons-page>

platforms/android/app/src/main/assets/www/js/azar.js

@@ -7,7 +7,7 @@ var page = document.getElementById("home");
 
 var aleatorio = Math.floor(Math.random()*52);
 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
-document.getElementById("Content").innerHTML = data[aleatorio].titulo + "<br>" + data[aleatorio].texto; 
+document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto; 
 
 page.addEventListener("show", function(event){
     document.getElementById("image").innerHTML='';
@@ -17,7 +17,7 @@ page.addEventListener("show", function(event){
     //var img = ons.createElement(`<img src="img/${aleatorio}.png">`);
     document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
     //document.getElementById("Title").innerHTML = data[aleatorio].Renglones;
-    document.getElementById("Content").innerHTML = data[aleatorio].titulo + "<br>" + data[aleatorio].texto;
+    document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto;
     //azar.appendChild(img);
     });
 

platforms/android/app/src/main/assets/www/js/renglones.js

@@ -7,6 +7,10 @@ var list = document.getElementById("list");
           var renglonLower = info[i].Renglones.toLowerCase()
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 
+          if (renglonCap == "Metal") {
+                  renglonCap = "Joyería y orfebrería"
+          }
+
 
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

platforms/android/app/src/main/assets/www/js/saveLocal.js

@@ -41,3 +41,5 @@ try {
   } catch {
     console.log("error");
   }
+
+  

platforms/android/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">HelloCordova</string>
+    <string name="app_name">ArtesaníasICP</string>
     <string name="launcher_name">@string/app_name</string>
     <string name="activity_name">@string/launcher_name</string>
 </resources>

platforms/android/app/src/main/res/xml/config.xml

@@ -4,7 +4,7 @@
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
         <param name="onload" value="true" />
     </feature>
-    <name>HelloCordova</name>
+    <name>ArtesaníasICP</name>
     <description>
         A sample Apache Cordova application that responds to the deviceready event.
     </description>

platforms/browser/www/index.html

@@ -41,6 +41,7 @@
         <meta name="format-detection" content="telephone=no">
         <meta name="msapplication-tap-highlight" content="no">
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
+        <meta charset="UTF-8">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
@@ -52,7 +53,11 @@
     </head>
     <body>
 
-
+        <script> 
+        
+        
+        
+        </script>
 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
            <ons-page>
@@ -219,7 +224,7 @@
                 <div class="center" >${Artesano.Nombre}</div>
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -242,19 +247,20 @@
                             if (Artesano["Telefono 1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
                                 cont ++;
                             }
                             if (Artesano.Especificacion.trim().length != 0) {
                                 cont ++;
                             }
-
+                            
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
                             //And puts this into the 'item' variable
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -361,8 +367,9 @@
                              for(var i=0; i<results.length; i++) {
 
                                  //if(Esp[num] in artesanos_json.) {}
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
                                  Artesanos+=`${results[i].Nombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -396,8 +403,14 @@
                                      redes = lot[4];
 
                                  listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
+                                 console.log(listaArt)
                              }
 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
+                                 Artesania.name = "Figuras y símbolos indígenas";
+                             } 
+
+                             console.log(Artesania.name);
 
                              return ons.createElement(`
               <ons-list-item expandable tappable>
@@ -536,8 +549,9 @@
                     //This is basically declaring what we refer to as informacion in the filter() function
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
                     for (i = 0; i < all_artesanos.length;i++){
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);
@@ -572,9 +586,10 @@
                             em = this.data.email,
                             esp = this.data.esp,
                             redes = this.data.redes;
+                    
 
                         //here the email is the string made from the start to where the '#' is.
-                        email = em.slice(0, em.search("#"));
+                        
 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
@@ -597,8 +612,8 @@
 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
                         }
 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
@@ -747,9 +762,9 @@
                     
 
 
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
-                    </a>
+                    </a> 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
@@ -789,7 +804,7 @@
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
                     </div>
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

platforms/browser/www/js/renglones.js

@@ -7,6 +7,10 @@ var list = document.getElementById("list");
           var renglonLower = info[i].Renglones.toLowerCase()
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 
+          if (renglonCap == "Metal") {
+                  renglonCap = "Joyería y orfebrería"
+          }
+
 
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

platforms/browser/www/js/saveLocal.js

@@ -41,3 +41,5 @@ try {
   } catch {
     console.log("error");
   }
+
+  

platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>Cordova.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

platforms/ios/www/css/index.css

@@ -32,7 +32,7 @@ body {
     margin:0px;
     padding:0px;
     /* Padding to avoid the "unsafe" areas behind notches in the screen */
-    padding: env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-right, 0px);
+    padding: env(safe-area-inset-top, 10px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 10px) env(safe-area-inset-right, 0px);
     text-transform:none;
     width:100%;
 }

platforms/ios/www/index.html

@@ -41,6 +41,7 @@
         <meta name="format-detection" content="telephone=no">
         <meta name="msapplication-tap-highlight" content="no">
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
+        <meta charset="UTF-8">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
@@ -52,7 +53,11 @@
     </head>
     <body>
 
-
+        <script> 
+        
+        
+        
+        </script>
 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
            <ons-page>
@@ -726,7 +731,7 @@
             <ons-page id="colaboradores">
                 <ons-card>
 
-                    <h1>Colaboradoress</h1>
+                    <h1>Colaboradores</h1>
                     <h2>Instituto de Cultura Puertorriqueña</h2>
                     <h3>Ven, descubre lo que nuestra riqueza cultural puertorriqueña tiene para tí.<br> Disfrútala, es tu identidad.
                     </h3>
@@ -747,9 +752,9 @@
                     
 
 
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
-                    </a>
+                    </a> 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
@@ -789,7 +794,7 @@
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
                     </div>
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

platforms/ios/www/js/renglones.js

@@ -7,6 +7,10 @@ var list = document.getElementById("list");
           var renglonLower = info[i].Renglones.toLowerCase()
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 
+          if (renglonCap == "Metal") {
+                  renglonCap = "Joyería y orfebrería"
+          }
+
 
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

platforms/ios/www/js/saveLocal.js

@@ -41,3 +41,5 @@ try {
   } catch {
     console.log("error");
   }
+
+  

www/index.html

@@ -41,6 +41,7 @@
         <meta name="format-detection" content="telephone=no">
         <meta name="msapplication-tap-highlight" content="no">
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
+        <meta charset="UTF-8">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
@@ -52,7 +53,11 @@
     </head>
     <body>
 
-
+        <script> 
+        
+        
+        
+        </script>
 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
            <ons-page>
@@ -219,7 +224,7 @@
                 <div class="center" >${Artesano.Nombre}</div>
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -242,19 +247,20 @@
                             if (Artesano["Telefono 1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
                                 cont ++;
                             }
                             if (Artesano.Especificacion.trim().length != 0) {
                                 cont ++;
                             }
-
+                            
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
                             //And puts this into the 'item' variable
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -361,8 +367,9 @@
                              for(var i=0; i<results.length; i++) {
 
                                  //if(Esp[num] in artesanos_json.) {}
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
                                  Artesanos+=`${results[i].Nombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -396,8 +403,14 @@
                                      redes = lot[4];
 
                                  listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
+                                 console.log(listaArt)
                              }
 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
+                                 Artesania.name = "Figuras y símbolos indígenas";
+                             } 
+
+                             console.log(Artesania.name);
 
                              return ons.createElement(`
               <ons-list-item expandable tappable>
@@ -536,8 +549,9 @@
                     //This is basically declaring what we refer to as informacion in the filter() function
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
                     for (i = 0; i < all_artesanos.length;i++){
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);
@@ -572,9 +586,10 @@
                             em = this.data.email,
                             esp = this.data.esp,
                             redes = this.data.redes;
+                    
 
                         //here the email is the string made from the start to where the '#' is.
-                        email = em.slice(0, em.search("#"));
+                        
 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
@@ -597,8 +612,8 @@
 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
                         }
 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
@@ -747,9 +762,9 @@
                     
 
 
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
-                    </a>
+                    </a> 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
@@ -789,7 +804,7 @@
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
                     </div>
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
                     </a>
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

www/js/renglones.js

@@ -7,6 +7,10 @@ var list = document.getElementById("list");
           var renglonLower = info[i].Renglones.toLowerCase()
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 
+          if (renglonCap == "Metal") {
+                  renglonCap = "Joyería y orfebrería"
+          }
+
 
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

www/js/saveLocal.js

@@ -41,3 +41,5 @@ try {
   } catch {
     console.log("error");
   }
+
+