|
|
@@ -231,7 +231,11 @@
|
|
231
|
231
|
|
|
232
|
232
|
//info a pasar
|
|
233
|
233
|
//'title':'${Artesano.Nombre}','esp': '${info}'
|
|
|
234
|
+<<<<<<< HEAD
|
|
|
235
|
+ 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>
|
|
|
236
|
+=======
|
|
234
|
237
|
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>
|
|
|
238
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
235
|
239
|
<div class="title">${Artesano.Nombre}</div>
|
|
236
|
240
|
</ons-list-item>`);
|
|
237
|
241
|
|
|
|
@@ -368,7 +372,11 @@
|
|
368
|
372
|
mun = lot[0],
|
|
369
|
373
|
tel = lot[1],
|
|
370
|
374
|
email = lot[2],
|
|
|
375
|
+<<<<<<< HEAD
|
|
|
376
|
+ esp = lot[3],
|
|
|
377
|
+=======
|
|
371
|
378
|
esp = lot[3]
|
|
|
379
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
372
|
380
|
redes = lot[4];
|
|
373
|
381
|
|
|
374
|
382
|
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>`;
|
|
|
@@ -493,7 +501,11 @@
|
|
493
|
501
|
<script>
|
|
494
|
502
|
for (i = 0; i < all_artesanos.length;i++){
|
|
495
|
503
|
var artesano = ons.createElement(`<ons-list-item class = "artists"
|
|
|
504
|
+<<<<<<< HEAD
|
|
|
505
|
+ 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>
|
|
|
506
|
+=======
|
|
496
|
507
|
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>
|
|
|
508
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
497
|
509
|
<div>${all_artesanos[i].Nombre}</div>
|
|
498
|
510
|
</ons-list-item>`);
|
|
499
|
511
|
// var artesano = ons.createElement(`
|
|
|
@@ -527,7 +539,11 @@
|
|
527
|
539
|
mun = this.data.mun,
|
|
528
|
540
|
tel = this.data.tel,
|
|
529
|
541
|
em = this.data.email,
|
|
|
542
|
+<<<<<<< HEAD
|
|
|
543
|
+ esp = this.data.esp,
|
|
|
544
|
+=======
|
|
530
|
545
|
esp = this.data.esp
|
|
|
546
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
531
|
547
|
redes = this.data.redes;
|
|
532
|
548
|
|
|
533
|
549
|
email = em.slice(0, em.search("#"));
|
|
|
@@ -558,9 +574,39 @@
|
|
558
|
574
|
data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
|
|
559
|
575
|
}
|
|
560
|
576
|
|
|
|
577
|
+<<<<<<< HEAD
|
|
|
578
|
+ console.log("Redes: "+redes);
|
|
|
579
|
+
|
|
|
580
|
+ if(redes.includes("facebook")){
|
|
|
581
|
+
|
|
|
582
|
+ console.log(redes.substring(1,redes.length-2));
|
|
|
583
|
+ 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>';
|
|
|
584
|
+ }
|
|
|
585
|
+ else if(redes.includes("instagram")){
|
|
|
586
|
+ console.log(redes.substring(1,redes.length-2));
|
|
|
587
|
+ 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>';
|
|
|
588
|
+ }
|
|
|
589
|
+ else if(redes.includes("myspace")){
|
|
|
590
|
+ console.log(redes.substring(1,redes.length-2));
|
|
|
591
|
+ 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>';
|
|
|
592
|
+ }
|
|
|
593
|
+ else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
|
|
|
594
|
+ redes = redes.substr(redes.indexOf("#")+1,redes.length);
|
|
|
595
|
+ redes = redes.substr(0, redes.length-1);
|
|
|
596
|
+ console.log(redes);
|
|
|
597
|
+ data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
|
|
|
598
|
+ }
|
|
|
599
|
+ else if(redes.includes("#") || redes.includes("mailto")){
|
|
|
600
|
+ console.log("tiene un disparate");
|
|
|
601
|
+ } else {
|
|
|
602
|
+ console.log("no tiene nada");
|
|
|
603
|
+ }
|
|
|
604
|
+
|
|
|
605
|
+=======
|
|
561
|
606
|
if (redes.trim() != "") {
|
|
562
|
607
|
data+='Red Social: ' + redes + '<br>';
|
|
563
|
608
|
}
|
|
|
609
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
564
|
610
|
|
|
565
|
611
|
document.getElementById("all").innerHTML = `${data}`;
|
|
566
|
612
|
|
|
|
@@ -686,4 +732,4 @@
|
|
686
|
732
|
<script type="text/javascript" src="cordova.js"></script>
|
|
687
|
733
|
<script type="text/javascript" src="js/index.js"></script>
|
|
688
|
734
|
</body>
|
|
689
|
|
-</html>
|
|
|
735
|
+</html>
|
lyxaira.glass
