platforms/browser/www/artesano.html

 
         document.write("<a href='mailto:" + json[i]["E-mail"] + "'>" + "<h2 align='center'>" + json[i]["E-mail"] + "</h2>" + "</a>");
 
-
+        console.log("SE CORRE");
 
     });
 

platforms/browser/www/index.html

 
                             //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>`);
 
                                      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>`;
                 <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(`
                             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("#"));
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
+<<<<<<< HEAD
+                        console.log("Redes: "+redes);
+
+                        if(redes.includes("facebook")){
+
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("instagram")){
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("myspace")){
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
+                            redes = redes.substr(redes.indexOf("#")+1,redes.length);
+                            redes = redes.substr(0, redes.length-1);
+                            console.log(redes);
+                            data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("#") || redes.includes("mailto")){
+                            console.log("tiene un disparate");
+                        } else {
+                            console.log("no tiene nada");
+                        }
+
+=======
                         if (redes.trim() != "") {
                           data+='Red Social: ' + redes + '<br>';
                         }
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
 
                         document.getElementById("all").innerHTML = `${data}`;
 
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
     </body>
-</html>
+</html>

www/artesano.html

 
         document.write("<a href='mailto:" + json[i]["E-mail"] + "'>" + "<h2 align='center'>" + json[i]["E-mail"] + "</h2>" + "</a>");
 
-
+        console.log("SE CORRE");
 
     });
 

www/index.html

 
                             //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>`);
 
                                      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>`;
                 <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(`
                             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("#"));
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
+<<<<<<< HEAD
+                        console.log("Redes: "+redes);
+
+                        if(redes.includes("facebook")){
+
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("instagram")){
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("myspace")){
+                            console.log(redes.substring(1,redes.length-2));
+                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
+                            redes = redes.substr(redes.indexOf("#")+1,redes.length);
+                            redes = redes.substr(0, redes.length-1);
+                            console.log(redes);
+                            data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(redes.includes("#") || redes.includes("mailto")){
+                            console.log("tiene un disparate");
+                        } else {
+                            console.log("no tiene nada");
+                        }
+
                         if (redes.trim() != "") {
                           data+='Red Social: ' + redes + '<br>';
                         }
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
     </body>
-</html>
+</html>