Social Networks added, problem fix.

platforms/browser/www/index.html

@@ -53,10 +53,9 @@
 
       <script type="text/javascript" src="js/saveLocal.js"></script>
 
-      <script> console.log(window.localStorage.getItem("MADERA")); </script>
 
 
-        <ons-navigator swipeable animation="slide" id="myNavigator">
+
            <ons-page>
             <ons-toolbar>
                 <div class="center">Directorio Artesanal</div>
@@ -200,7 +199,6 @@
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
                                                  Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
-                                                 Red Social: ${Artesano["E-mail"]} <br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -231,11 +229,7 @@
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
-<<<<<<< HEAD
                             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["E-mail"]}', redes: '${Artesano["E-Commerce 1"]}', esp: '${Artesano.Especificacion}' } })" tappable>
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -342,7 +336,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}|${results[i]["E-Commerce 1"]}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -372,11 +366,7 @@
                                      mun = lot[0],
                                      tel = lot[1],
                                      email = lot[2],
-<<<<<<< HEAD
                                      esp = lot[3],
-=======
-                                     esp = lot[3]
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                                      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>`;
@@ -485,6 +475,7 @@
         </script>
 
         <template id="search.html">
+          <ons-navigator swipeable animation="slide" id="SNavigator">
             <ons-page id="Buscar">
                 <p style="text-align: center; margin-top: 10px;">
                     <ons-search-input placeholder="Search anything" id = "searchbar"
@@ -501,11 +492,7 @@
                 <script>
                     for (i = 0; i < all_artesanos.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-<<<<<<< HEAD
                         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="myNavigator.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"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         // var artesano = ons.createElement(`
@@ -539,11 +526,7 @@
                             mun = this.data.mun,
                             tel = this.data.tel,
                             em = this.data.email,
-<<<<<<< HEAD
                             esp = this.data.esp,
-=======
-                            esp = this.data.esp
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                             redes = this.data.redes;
 
                         email = em.slice(0, em.search("#"));
@@ -574,7 +557,6 @@
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
-<<<<<<< HEAD
                         console.log("Redes: "+redes);
 
                         if(redes.includes("facebook")){
@@ -602,11 +584,6 @@
                             console.log("no tiene nada");
                         }
 
-=======
-                        if (redes.trim() != "") {
-                          data+='Red Social: ' + redes + '<br>';
-                        }
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
 
                         document.getElementById("all").innerHTML = `${data}`;
 
@@ -618,6 +595,7 @@
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
 
         <template id="renglones.html">
+          <ons-navigator swipeable animation="slide" id="myNavigator">
             <ons-page id="renglones">
 
             <!--div class="search-bar">

www/index.html

@@ -53,10 +53,9 @@
 
       <script type="text/javascript" src="js/saveLocal.js"></script>
 
-      <script> console.log(window.localStorage.getItem("MADERA")); </script>
 
 
-        <ons-navigator swipeable animation="slide" id="myNavigator">
+
            <ons-page>
             <ons-toolbar>
                 <div class="center">Directorio Artesanal</div>
@@ -200,7 +199,6 @@
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
                                                  Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
-                                                 Red Social: ${Artesano["E-mail"]} <br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -231,11 +229,7 @@
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
-<<<<<<< HEAD
                             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["E-mail"]}', redes: '${Artesano["E-Commerce 1"]}', esp: '${Artesano.Especificacion}' } })" tappable>
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -342,7 +336,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}|${results[i]["E-Commerce 1"]}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -372,11 +366,7 @@
                                      mun = lot[0],
                                      tel = lot[1],
                                      email = lot[2],
-<<<<<<< HEAD
                                      esp = lot[3],
-=======
-                                     esp = lot[3]
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                                      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>`;
@@ -485,6 +475,7 @@
         </script>
 
         <template id="search.html">
+          <ons-navigator swipeable animation="slide" id="SNavigator">
             <ons-page id="Buscar">
                 <p style="text-align: center; margin-top: 10px;">
                     <ons-search-input placeholder="Search anything" id = "searchbar"
@@ -501,11 +492,7 @@
                 <script>
                     for (i = 0; i < all_artesanos.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-<<<<<<< HEAD
                         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="myNavigator.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"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         // var artesano = ons.createElement(`
@@ -539,11 +526,7 @@
                             mun = this.data.mun,
                             tel = this.data.tel,
                             em = this.data.email,
-<<<<<<< HEAD
                             esp = this.data.esp,
-=======
-                            esp = this.data.esp
->>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
                             redes = this.data.redes;
 
                         email = em.slice(0, em.search("#"));
@@ -574,7 +557,6 @@
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
-<<<<<<< HEAD
                         console.log("Redes: "+redes);
 
                         if(redes.includes("facebook")){
@@ -602,9 +584,6 @@
                             console.log("no tiene nada");
                         }
 
-                        if (redes.trim() != "") {
-                          data+='Red Social: ' + redes + '<br>';
-                        }
 
                         document.getElementById("all").innerHTML = `${data}`;
 
@@ -616,6 +595,7 @@
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
 
         <template id="renglones.html">
+          <ons-navigator swipeable animation="slide" id="myNavigator">
             <ons-page id="renglones">
 
             <!--div class="search-bar">