Browse Source

More social fixes

Christian Matos 4 years ago
parent
commit
46f93419bc

BIN
platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate View File


+ 22
- 19
platforms/ios/www/index.html View File

654
                         //If it's none of them then it will not display anything
654
                         //If it's none of them then it will not display anything
655
                         //First Social Media
655
                         //First Social Media
656
                         if(red1.includes("facebook")){
656
                         if(red1.includes("facebook")){
657
-                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
657
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
658
                         }
658
                         }
659
                         else if(red1.includes("instagram")){
659
                         else if(red1.includes("instagram")){
660
-                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
660
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
661
                         }
661
                         }
662
                         else if(red1.includes("myspace")){
662
                         else if(red1.includes("myspace")){
663
-                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
663
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
664
                         }
664
                         }
665
 
665
 
666
                         //Second Social Media
666
                         //Second Social Media
667
                         if(red2.includes("facebook")){
667
                         if(red2.includes("facebook")){
668
-                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
668
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
669
                         }
669
                         }
670
                         else if(red2.includes("instagram")){
670
                         else if(red2.includes("instagram")){
671
-                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
671
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
672
                         }
672
                         }
673
                         else if(red2.includes("myspace")){
673
                         else if(red2.includes("myspace")){
674
-                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
674
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
675
                         }
675
                         }
676
                         
676
                         
677
                         //E-commerce 
677
                         //E-commerce 
678
                         if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
678
                         if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
679
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
679
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
680
                             ecom = ecom.substr(0, ecom.length-1);
680
                             ecom = ecom.substr(0, ecom.length-1);
681
-                            console.log(ecom);
682
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
681
+                            
682
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
683
                         }
683
                         }
684
                         
684
                         
685
 
685
 
726
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
726
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
727
                         //but if theres only one then you just write it into the page
727
                         //but if theres only one then you just write it into the page
728
                         if(esp.trim() != ""){
728
                         if(esp.trim() != ""){
729
+
730
+                            if(esp.includes("Figuras y simbolos indigenas")) {
731
+                                esp = esp.replace("Figuras y simbolos indigenas", "Figuras y símbolos indígenas")
732
+                            }
733
+
729
                             if(esp.includes(";", 0)){
734
                             if(esp.includes(";", 0)){
730
                                 esp=esp.replace(/;/g,", ");
735
                                 esp=esp.replace(/;/g,", ");
731
                                 data+='Tipos de artesanías: '+esp+'<br>';
736
                                 data+='Tipos de artesanías: '+esp+'<br>';
768
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
773
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
769
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
774
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
770
                         //If it's none of them then it will not display anything
775
                         //If it's none of them then it will not display anything
771
-                        if(red1.includes("facebook")) {
772
-                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
776
+                        if(red1.includes("facebook")){
777
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
773
                         }
778
                         }
774
                         else if(red1.includes("instagram")){
779
                         else if(red1.includes("instagram")){
775
-                            
776
-                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
780
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
777
                         }
781
                         }
778
                         else if(red1.includes("myspace")){
782
                         else if(red1.includes("myspace")){
779
-                            
780
-                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
783
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
781
                         }
784
                         }
782
 
785
 
783
-
786
+                        //Second Social Media
784
                         if(red2.includes("facebook")){
787
                         if(red2.includes("facebook")){
785
-                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
788
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
786
                         }
789
                         }
787
                         else if(red2.includes("instagram")){
790
                         else if(red2.includes("instagram")){
788
-                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
791
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
789
                         }
792
                         }
790
                         else if(red2.includes("myspace")){
793
                         else if(red2.includes("myspace")){
791
-                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
794
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
792
                         }
795
                         }
793
 
796
 
794
 
797
 
796
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
799
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
797
                             ecom = ecom.substr(0, ecom.length-1);
800
                             ecom = ecom.substr(0, ecom.length-1);
798
 
801
 
799
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
802
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
800
                         }
803
                         }
801
                         
804
                         
802
 
805
 

+ 16
- 13
www/index.html View File

678
                         if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
678
                         if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
679
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
679
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
680
                             ecom = ecom.substr(0, ecom.length-1);
680
                             ecom = ecom.substr(0, ecom.length-1);
681
-                            console.log(ecom);
682
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
681
+                            
682
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
683
                         }
683
                         }
684
                         
684
                         
685
 
685
 
726
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
726
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
727
                         //but if theres only one then you just write it into the page
727
                         //but if theres only one then you just write it into the page
728
                         if(esp.trim() != ""){
728
                         if(esp.trim() != ""){
729
+
730
+                            if(esp.includes("Figuras y simbolos indigenas")) {
731
+                                esp = esp.replace("Figuras y simbolos indigenas", "Figuras y símbolos indígenas")
732
+                            }
733
+
729
                             if(esp.includes(";", 0)){
734
                             if(esp.includes(";", 0)){
730
                                 esp=esp.replace(/;/g,", ");
735
                                 esp=esp.replace(/;/g,", ");
731
                                 data+='Tipos de artesanías: '+esp+'<br>';
736
                                 data+='Tipos de artesanías: '+esp+'<br>';
768
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
773
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
769
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
774
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
770
                         //If it's none of them then it will not display anything
775
                         //If it's none of them then it will not display anything
771
-                        if(red1.includes("facebook")) {
772
-                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
776
+                        if(red1.includes("facebook")){
777
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
773
                         }
778
                         }
774
                         else if(red1.includes("instagram")){
779
                         else if(red1.includes("instagram")){
775
-                            
776
-                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
780
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
777
                         }
781
                         }
778
                         else if(red1.includes("myspace")){
782
                         else if(red1.includes("myspace")){
779
-                            
780
-                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
783
+                            data+='<a style="margin-right:10px;" href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
781
                         }
784
                         }
782
 
785
 
783
-
786
+                        //Second Social Media
784
                         if(red2.includes("facebook")){
787
                         if(red2.includes("facebook")){
785
-                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
788
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;">';
786
                         }
789
                         }
787
                         else if(red2.includes("instagram")){
790
                         else if(red2.includes("instagram")){
788
-                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
791
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;">';
789
                         }
792
                         }
790
                         else if(red2.includes("myspace")){
793
                         else if(red2.includes("myspace")){
791
-                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
794
+                            data+='<a style="margin-right:10px;" href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;">';
792
                         }
795
                         }
793
 
796
 
794
 
797
 
796
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
799
                             ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
797
                             ecom = ecom.substr(0, ecom.length-1);
800
                             ecom = ecom.substr(0, ecom.length-1);
798
 
801
 
799
-                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
802
+                            data+='<a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;">';
800
                         }
803
                         }
801
                         
804
                         
802
 
805