Shortcodes by Angie Makes - Version 1.53

Version Description

Download this release

Release Info

Developer cbaldelomar
Plugin Icon wp plugin Shortcodes by Angie Makes
Version 1.53
Comparing to
See all releases

Code changes from version 1.50 to 1.53

README.md CHANGED
@@ -66,6 +66,17 @@ Use the shortcode manager in the TinyMCE text editor
66
 
67
  ## Changelog ##
68
 
 
 
 
 
 
 
 
 
 
 
 
69
  ### Version 1.50
70
 
71
  * Social icons now open a new tab by default
66
 
67
  ## Changelog ##
68
 
69
+ ### Version 1.53
70
+
71
+ * Added Icon+Text option for share buttons
72
+ * Deprecated an attribute in social icons shortcode
73
+
74
+ ### Version 1.52
75
+
76
+ * Added font icons for share buttons
77
+ * Now supporting font icons and images for social media buttons
78
+ * Fixed line-height style bug
79
+
80
  ### Version 1.50
81
 
82
  * Social icons now open a new tab by default
includes/css/style.css CHANGED
@@ -678,12 +678,14 @@
678
  .wc-shortcodes-social-icons-wrapper {
679
  width: 100%;
680
  margin-bottom: 14px;
 
681
  }
682
  .wc-shortcodes-social-icons {
683
  list-style: none;
684
  margin: 0;
685
  padding: 0;
686
  text-align: left;
 
687
  }
688
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-align-center {
689
  text-align: center;
@@ -702,9 +704,21 @@
702
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-medium img {
703
  max-height: 24px;
704
  }
 
 
 
 
 
 
705
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-small img {
706
  max-height: 16px;
707
  }
 
 
 
 
 
 
708
  .wc-shortcodes-social-icons li {
709
  display: inline-block;
710
  margin-right: 6px;
@@ -712,10 +726,101 @@
712
  }
713
  .wc-shortcodes-social-icons li a {
714
  display: block;
 
715
  }
716
  .wc-shortcodes-social-icons li img {
717
  max-height: 48px;
718
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
719
  .wc-shortcodes-social-icons li:last-child {
720
  margin-right: 0;
721
  }
@@ -725,10 +830,14 @@
725
  * [wc_share]
726
  * ----------------------------------------------------------------------------
727
  */
 
 
 
728
  .wc-shortcodes-share-buttons ul {
729
  list-style: none;
730
  margin: 0;
731
  padding: 0;
 
732
  }
733
  .wc-shortcodes-share-buttons li {
734
  display: inline-block;
@@ -736,13 +845,46 @@
736
  }
737
  .wc-shortcodes-share-buttons li a {
738
  display: block;
 
739
  }
740
  .wc-shortcodes-share-buttons li a img {
 
741
  max-height: 36px;
742
  }
743
  .wc-shortcodes-share-buttons ul li:last-child {
744
  margin-right: 0;
745
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
746
 
747
 
748
  /**
@@ -1095,38 +1237,6 @@ pre.pre-wrap {
1095
  .widget_wc_shortcodes_social_icons .wc-shortcodes-social-icons.wc-shortcodes-columns-1 li {
1096
  width: 100%;
1097
  }
1098
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-10 img { max-height: 10px; }
1099
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-12 img { max-height: 12px; }
1100
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-14 img { max-height: 14px; }
1101
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-16 img { max-height: 16px; }
1102
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-18 img { max-height: 18px; }
1103
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-20 img { max-height: 20px; }
1104
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-22 img { max-height: 22px; }
1105
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-24 img { max-height: 24px; }
1106
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-26 img { max-height: 26px; }
1107
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-28 img { max-height: 28px; }
1108
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-30 img { max-height: 30px; }
1109
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-32 img { max-height: 32px; }
1110
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-34 img { max-height: 34px; }
1111
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-36 img { max-height: 36px; }
1112
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-38 img { max-height: 38px; }
1113
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-40 img { max-height: 40px; }
1114
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-42 img { max-height: 42px; }
1115
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-44 img { max-height: 44px; }
1116
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-46 img { max-height: 46px; }
1117
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-48 img { max-height: 48px; }
1118
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-50 img { max-height: 50px; }
1119
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-52 img { max-height: 52px; }
1120
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-54 img { max-height: 54px; }
1121
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-56 img { max-height: 56px; }
1122
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-58 img { max-height: 58px; }
1123
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-60 img { max-height: 60px; }
1124
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-62 img { max-height: 62px; }
1125
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-64 img { max-height: 64px; }
1126
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-66 img { max-height: 66px; }
1127
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-68 img { max-height: 68px; }
1128
- .wc-shortcodes-social-icons.wc-shortcodes-maxheight-70 img { max-height: 70px; }
1129
-
1130
 
1131
  /**
1132
  * jQuery Countdown styles 1.6.3.
678
  .wc-shortcodes-social-icons-wrapper {
679
  width: 100%;
680
  margin-bottom: 14px;
681
+ line-height: 1;
682
  }
683
  .wc-shortcodes-social-icons {
684
  list-style: none;
685
  margin: 0;
686
  padding: 0;
687
  text-align: left;
688
+ line-height: 1;
689
  }
690
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-align-center {
691
  text-align: center;
704
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-medium img {
705
  max-height: 24px;
706
  }
707
+ .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-medium i {
708
+ font-size: 14px;
709
+ width: 24px;
710
+ height: 24px;
711
+ line-height: 24px;
712
+ }
713
  .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-small img {
714
  max-height: 16px;
715
  }
716
+ .wc-shortcodes-social-icons.wc-shortcodes-social-icons-size-small i {
717
+ font-size: 10px;
718
+ width: 16px;
719
+ height: 16px;
720
+ line-height: 16px;
721
+ }
722
  .wc-shortcodes-social-icons li {
723
  display: inline-block;
724
  margin-right: 6px;
726
  }
727
  .wc-shortcodes-social-icons li a {
728
  display: block;
729
+ line-height: 1;
730
  }
731
  .wc-shortcodes-social-icons li img {
732
  max-height: 48px;
733
  }
734
+ .wc-shortcodes-social-icons li i {
735
+ font-size: 24px;
736
+ width: 48px;
737
+ height: 48px;
738
+ line-height: 48px;
739
+ overflow: hidden;
740
+ text-align: center;
741
+ vertical-align: middle;
742
+ background-color: #999999;
743
+ color: #ffffff;
744
+ }
745
+ .wc-shortcodes-social-icons li i.fa-facebook { background-color: #305999; }
746
+ .wc-shortcodes-social-icons li i.fa-google-plus { background-color: #ee7321; }
747
+ .wc-shortcodes-social-icons li i.fa-twitter { background-color: #00a7f1; }
748
+ .wc-shortcodes-social-icons li i.fa-pinterest { background-color: #d64800; }
749
+ .wc-shortcodes-social-icons li i.fa-instagram { background-color: #b2b2b4; }
750
+ .wc-shortcodes-social-icons li i.fa-plus-square { background-color: #00b5fc; }
751
+ .wc-shortcodes-social-icons li i.fa-flickr { background-color: #ff6182; }
752
+ .wc-shortcodes-social-icons li i.fa-rss { background-color: #facf4c; }
753
+ .wc-shortcodes-social-icons li i.fa-envelope { background-color: #ebe180; }
754
+ .wc-shortcodes-social-icons li i.fa-dollar { background-color: #d46000; }
755
+ .wc-shortcodes-social-icons li i.fa-camera { background-color: #333333; }
756
+ .wc-shortcodes-social-icons li i.fa-shopping-cart { background-color: #a5d488; }
757
+ .wc-shortcodes-social-icons li i.fa-youtube { background-color: #c74a00; }
758
+ .wc-shortcodes-social-icons li i.fa-tumblr { background-color: #426b8a; }
759
+
760
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-10 img { max-height: 10px; }
761
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-12 img { max-height: 12px; }
762
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-14 img { max-height: 14px; }
763
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-16 img { max-height: 16px; }
764
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-18 img { max-height: 18px; }
765
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-20 img { max-height: 20px; }
766
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-22 img { max-height: 22px; }
767
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-24 img { max-height: 24px; }
768
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-26 img { max-height: 26px; }
769
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-28 img { max-height: 28px; }
770
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-30 img { max-height: 30px; }
771
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-32 img { max-height: 32px; }
772
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-34 img { max-height: 34px; }
773
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-36 img { max-height: 36px; }
774
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-38 img { max-height: 38px; }
775
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-40 img { max-height: 40px; }
776
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-42 img { max-height: 42px; }
777
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-44 img { max-height: 44px; }
778
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-46 img { max-height: 46px; }
779
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-48 img { max-height: 48px; }
780
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-50 img { max-height: 50px; }
781
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-52 img { max-height: 52px; }
782
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-54 img { max-height: 54px; }
783
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-56 img { max-height: 56px; }
784
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-58 img { max-height: 58px; }
785
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-60 img { max-height: 60px; }
786
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-62 img { max-height: 62px; }
787
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-64 img { max-height: 64px; }
788
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-66 img { max-height: 66px; }
789
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-68 img { max-height: 68px; }
790
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-70 img { max-height: 70px; }
791
+
792
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-10 i { font-size: 6px; line-height: 10px; height: 10px; width: 10px; }
793
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-12 i { font-size: 8px; line-height: 12px; height: 12px; width: 12px; }
794
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-14 i { font-size: 8px; line-height: 14px; height: 14px; width: 14px; }
795
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-16 i { font-size: 10px; line-height: 16px; height: 16px; width: 16px; }
796
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-18 i { font-size: 10px; line-height: 18px; height: 18px; width: 18px; }
797
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-20 i { font-size: 12px; line-height: 20px; height: 20px; width: 20px; }
798
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-22 i { font-size: 12px; line-height: 22px; height: 22px; width: 22px; }
799
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-24 i { font-size: 14px; line-height: 24px; height: 24px; width: 24px; }
800
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-26 i { font-size: 14px; line-height: 26px; height: 26px; width: 26px; }
801
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-28 i { font-size: 16px; line-height: 28px; height: 28px; width: 28px; }
802
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-30 i { font-size: 16px; line-height: 30px; height: 30px; width: 30px; }
803
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-32 i { font-size: 18px; line-height: 32px; height: 32px; width: 32px; }
804
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-34 i { font-size: 18px; line-height: 34px; height: 34px; width: 34px; }
805
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-36 i { font-size: 18px; line-height: 36px; height: 36px; width: 36px; }
806
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-38 i { font-size: 20px; line-height: 38px; height: 38px; width: 38px; }
807
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-40 i { font-size: 20px; line-height: 40px; height: 40px; width: 40px; }
808
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-42 i { font-size: 22px; line-height: 42px; height: 42px; width: 42px; }
809
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-44 i { font-size: 22px; line-height: 44px; height: 44px; width: 44px; }
810
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-46 i { font-size: 24px; line-height: 46px; height: 46px; width: 46px; }
811
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-48 i { font-size: 24px; line-height: 48px; height: 48px; width: 48px; }
812
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-50 i { font-size: 26px; line-height: 50px; height: 50px; width: 50px; }
813
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-52 i { font-size: 26px; line-height: 52px; height: 52px; width: 52px; }
814
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-54 i { font-size: 28px; line-height: 54px; height: 54px; width: 54px; }
815
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-56 i { font-size: 28px; line-height: 56px; height: 56px; width: 56px; }
816
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-58 i { font-size: 30px; line-height: 58px; height: 58px; width: 58px; }
817
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-60 i { font-size: 30px; line-height: 60px; height: 60px; width: 60px; }
818
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-62 i { font-size: 32px; line-height: 62px; height: 62px; width: 62px; }
819
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-64 i { font-size: 32px; line-height: 64px; height: 64px; width: 64px; }
820
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-66 i { font-size: 34px; line-height: 66px; height: 66px; width: 66px; }
821
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-68 i { font-size: 34px; line-height: 68px; height: 68px; width: 68px; }
822
+ .wc-shortcodes-social-icons.wc-shortcodes-maxheight-70 i { font-size: 36px; line-height: 70px; height: 70px; width: 70px; }
823
+
824
  .wc-shortcodes-social-icons li:last-child {
825
  margin-right: 0;
826
  }
830
  * [wc_share]
831
  * ----------------------------------------------------------------------------
832
  */
833
+ .wc-shortcodes-share-buttons {
834
+ line-height: 1;
835
+ }
836
  .wc-shortcodes-share-buttons ul {
837
  list-style: none;
838
  margin: 0;
839
  padding: 0;
840
+ line-height: 1;
841
  }
842
  .wc-shortcodes-share-buttons li {
843
  display: inline-block;
845
  }
846
  .wc-shortcodes-share-buttons li a {
847
  display: block;
848
+ line-height: 1;
849
  }
850
  .wc-shortcodes-share-buttons li a img {
851
+ vertical-align: top;
852
  max-height: 36px;
853
  }
854
  .wc-shortcodes-share-buttons ul li:last-child {
855
  margin-right: 0;
856
  }
857
+ .wc-shortcodes-share-buttons li i {
858
+ font-size: 20px;
859
+ width: 36px;
860
+ height: 36px;
861
+ line-height: 36px;
862
+ overflow: hidden;
863
+ text-align: center;
864
+ vertical-align: top;
865
+ background-color: #999999;
866
+ color: #ffffff;
867
+ }
868
+ .wc-shortcodes-share-buttons-format-icon-text li span {
869
+ margin-left: 0.4em;
870
+ }
871
+ .wc-shortcodes-share-buttons-format-text li a i {
872
+ display: none;
873
+ }
874
+ .wc-shortcodes-share-buttons li i.fa-facebook { background-color: #305999; }
875
+ .wc-shortcodes-share-buttons li i.fa-google-plus { background-color: #ee7321; }
876
+ .wc-shortcodes-share-buttons li i.fa-twitter { background-color: #00a7f1; }
877
+ .wc-shortcodes-share-buttons li i.fa-pinterest { background-color: #d64800; }
878
+ .wc-shortcodes-share-buttons li i.fa-instagram { background-color: #b2b2b4; }
879
+ .wc-shortcodes-share-buttons li i.fa-plus-square { background-color: #00b5fc; }
880
+ .wc-shortcodes-share-buttons li i.fa-flickr { background-color: #ff6182; }
881
+ .wc-shortcodes-share-buttons li i.fa-rss { background-color: #facf4c; }
882
+ .wc-shortcodes-share-buttons li i.fa-envelope { background-color: #ebe180; }
883
+ .wc-shortcodes-share-buttons li i.fa-dollar { background-color: #d46000; }
884
+ .wc-shortcodes-share-buttons li i.fa-camera { background-color: #333333; }
885
+ .wc-shortcodes-share-buttons li i.fa-shopping-cart { background-color: #a5d488; }
886
+ .wc-shortcodes-share-buttons li i.fa-youtube { background-color: #c74a00; }
887
+ .wc-shortcodes-share-buttons li i.fa-tumblr { background-color: #426b8a; }
888
 
889
 
890
  /**
1237
  .widget_wc_shortcodes_social_icons .wc-shortcodes-social-icons.wc-shortcodes-columns-1 li {
1238
  width: 100%;
1239
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1240
 
1241
  /**
1242
  * jQuery Countdown styles 1.6.3.
includes/options.php CHANGED
@@ -19,6 +19,17 @@ function wc_shortcodes_set_options() {
19
  'description' => '',
20
  'type' => 'social_icons',
21
  ),
 
 
 
 
 
 
 
 
 
 
 
22
  ),
23
  ),
24
  array(
@@ -32,9 +43,16 @@ function wc_shortcodes_set_options() {
32
  'description' => '',
33
  'type' => 'input',
34
  ),
 
 
 
 
 
 
 
35
  array(
36
  'id' => 'facebook_icon',
37
- 'title' => 'Icon',
38
  'default' => $wc_shortcodes_theme_support['facebook_social_icon'],
39
  'description' => '',
40
  'type' => 'image',
@@ -52,9 +70,16 @@ function wc_shortcodes_set_options() {
52
  'description' => '',
53
  'type' => 'input',
54
  ),
 
 
 
 
 
 
 
55
  array(
56
  'id' => 'twitter_icon',
57
- 'title' => 'Icon',
58
  'default' => $wc_shortcodes_theme_support['twitter_social_icon'],
59
  'description' => '',
60
  'type' => 'image',
@@ -72,9 +97,16 @@ function wc_shortcodes_set_options() {
72
  'description' => '',
73
  'type' => 'input',
74
  ),
 
 
 
 
 
 
 
75
  array(
76
  'id' => 'pinterest_icon',
77
- 'title' => 'Icon',
78
  'default' => $wc_shortcodes_theme_support['pinterest_social_icon'],
79
  'description' => '',
80
  'type' => 'image',
@@ -92,9 +124,16 @@ function wc_shortcodes_set_options() {
92
  'description' => '',
93
  'type' => 'input',
94
  ),
 
 
 
 
 
 
 
95
  array(
96
  'id' => 'google_icon',
97
- 'title' => 'Icon',
98
  'default' => $wc_shortcodes_theme_support['google_social_icon'],
99
  'description' => '',
100
  'type' => 'image',
@@ -112,9 +151,16 @@ function wc_shortcodes_set_options() {
112
  'description' => '',
113
  'type' => 'input',
114
  ),
 
 
 
 
 
 
 
115
  array(
116
  'id' => 'bloglovin_icon',
117
- 'title' => 'Icon',
118
  'default' => $wc_shortcodes_theme_support['bloglovin_social_icon'],
119
  'description' => '',
120
  'type' => 'image',
@@ -132,9 +178,16 @@ function wc_shortcodes_set_options() {
132
  'description' => '',
133
  'type' => 'input',
134
  ),
 
 
 
 
 
 
 
135
  array(
136
  'id' => 'email_icon',
137
- 'title' => 'Icon',
138
  'default' => $wc_shortcodes_theme_support['email_social_icon'],
139
  'description' => '',
140
  'type' => 'image',
@@ -152,9 +205,16 @@ function wc_shortcodes_set_options() {
152
  'description' => '',
153
  'type' => 'input',
154
  ),
 
 
 
 
 
 
 
155
  array(
156
  'id' => 'flickr_icon',
157
- 'title' => 'Icon',
158
  'default' => $wc_shortcodes_theme_support['flickr_social_icon'],
159
  'description' => '',
160
  'type' => 'image',
@@ -172,9 +232,16 @@ function wc_shortcodes_set_options() {
172
  'description' => '',
173
  'type' => 'input',
174
  ),
 
 
 
 
 
 
 
175
  array(
176
  'id' => 'instagram_icon',
177
- 'title' => 'Icon',
178
  'default' => $wc_shortcodes_theme_support['instagram_social_icon'],
179
  'description' => '',
180
  'type' => 'image',
@@ -192,9 +259,16 @@ function wc_shortcodes_set_options() {
192
  'description' => '',
193
  'type' => 'input',
194
  ),
 
 
 
 
 
 
 
195
  array(
196
  'id' => 'rss_icon',
197
- 'title' => 'Icon',
198
  'default' => $wc_shortcodes_theme_support['rss_social_icon'],
199
  'description' => '',
200
  'type' => 'image',
@@ -212,9 +286,16 @@ function wc_shortcodes_set_options() {
212
  'description' => '',
213
  'type' => 'input',
214
  ),
 
 
 
 
 
 
 
215
  array(
216
  'id' => 'custom1_icon',
217
- 'title' => 'Icon',
218
  'default' => $wc_shortcodes_theme_support['custom1_social_icon'],
219
  'description' => '',
220
  'type' => 'image',
@@ -232,9 +313,16 @@ function wc_shortcodes_set_options() {
232
  'description' => '',
233
  'type' => 'input',
234
  ),
 
 
 
 
 
 
 
235
  array(
236
  'id' => 'custom2_icon',
237
- 'title' => 'Icon',
238
  'default' => $wc_shortcodes_theme_support['custom2_social_icon'],
239
  'description' => '',
240
  'type' => 'image',
@@ -252,9 +340,16 @@ function wc_shortcodes_set_options() {
252
  'description' => '',
253
  'type' => 'input',
254
  ),
 
 
 
 
 
 
 
255
  array(
256
  'id' => 'custom3_icon',
257
- 'title' => 'Icon',
258
  'default' => $wc_shortcodes_theme_support['custom3_social_icon'],
259
  'description' => '',
260
  'type' => 'image',
@@ -272,9 +367,16 @@ function wc_shortcodes_set_options() {
272
  'description' => '',
273
  'type' => 'input',
274
  ),
 
 
 
 
 
 
 
275
  array(
276
  'id' => 'custom4_icon',
277
- 'title' => 'Icon',
278
  'default' => $wc_shortcodes_theme_support['custom4_social_icon'],
279
  'description' => '',
280
  'type' => 'image',
@@ -292,9 +394,16 @@ function wc_shortcodes_set_options() {
292
  'description' => '',
293
  'type' => 'input',
294
  ),
 
 
 
 
 
 
 
295
  array(
296
  'id' => 'custom5_icon',
297
- 'title' => 'Icon',
298
  'default' => $wc_shortcodes_theme_support['custom5_social_icon'],
299
  'description' => '',
300
  'type' => 'image',
@@ -324,8 +433,10 @@ function wc_shortcodes_set_options() {
324
  'description' => '',
325
  'type' => 'dropdown',
326
  'options' => array(
327
- 'text' => 'Text',
328
  'image' => 'Image',
 
 
329
  ),
330
  ),
331
  ),
@@ -341,9 +452,16 @@ function wc_shortcodes_set_options() {
341
  'description' => '',
342
  'type' => 'input',
343
  ),
 
 
 
 
 
 
 
344
  array(
345
  'id' => 'facebook_share_icon',
346
- 'title' => 'Icon',
347
  'default' => $wc_shortcodes_theme_support['facebook_share_button'],
348
  'description' => '',
349
  'type' => 'image',
@@ -361,9 +479,16 @@ function wc_shortcodes_set_options() {
361
  'description' => '',
362
  'type' => 'input',
363
  ),
 
 
 
 
 
 
 
364
  array(
365
  'id' => 'twitter_share_icon',
366
- 'title' => 'Icon',
367
  'default' => $wc_shortcodes_theme_support['twitter_share_button'],
368
  'description' => '',
369
  'type' => 'image',
@@ -381,9 +506,16 @@ function wc_shortcodes_set_options() {
381
  'description' => '',
382
  'type' => 'input',
383
  ),
 
 
 
 
 
 
 
384
  array(
385
  'id' => 'pinterest_share_icon',
386
- 'title' => 'Icon',
387
  'default' => $wc_shortcodes_theme_support['pinterest_share_button'],
388
  'description' => '',
389
  'type' => 'image',
@@ -401,9 +533,16 @@ function wc_shortcodes_set_options() {
401
  'description' => '',
402
  'type' => 'input',
403
  ),
 
 
 
 
 
 
 
404
  array(
405
  'id' => 'google_share_icon',
406
- 'title' => 'Icon',
407
  'default' => $wc_shortcodes_theme_support['google_share_button'],
408
  'description' => '',
409
  'type' => 'image',
@@ -421,9 +560,16 @@ function wc_shortcodes_set_options() {
421
  'description' => '',
422
  'type' => 'input',
423
  ),
 
 
 
 
 
 
 
424
  array(
425
  'id' => 'email_share_icon',
426
- 'title' => 'Icon',
427
  'default' => $wc_shortcodes_theme_support['email_share_button'],
428
  'description' => '',
429
  'type' => 'image',
19
  'description' => '',
20
  'type' => 'social_icons',
21
  ),
22
+ array(
23
+ 'id' => 'social_icons_format',
24
+ 'title' => 'Format',
25
+ 'default' => $wc_shortcodes_theme_support['social_icons_format'],
26
+ 'description' => '',
27
+ 'type' => 'dropdown',
28
+ 'options' => array(
29
+ 'icon' => 'Icon',
30
+ 'image' => 'Image',
31
+ ),
32
+ ),
33
  ),
34
  ),
35
  array(
43
  'description' => '',
44
  'type' => 'input',
45
  ),
46
+ array(
47
+ 'id' => 'facebook_font_icon',
48
+ 'title' => 'Font Icon',
49
+ 'default' => $wc_shortcodes_theme_support['facebook_font_icon'],
50
+ 'description' => '',
51
+ 'type' => 'input',
52
+ ),
53
  array(
54
  'id' => 'facebook_icon',
55
+ 'title' => 'Image Icon',
56
  'default' => $wc_shortcodes_theme_support['facebook_social_icon'],
57
  'description' => '',
58
  'type' => 'image',
70
  'description' => '',
71
  'type' => 'input',
72
  ),
73
+ array(
74
+ 'id' => 'twitter_font_icon',
75
+ 'title' => 'Font Icon',
76
+ 'default' => $wc_shortcodes_theme_support['twitter_font_icon'],
77
+ 'description' => '',
78
+ 'type' => 'input',
79
+ ),
80
  array(
81
  'id' => 'twitter_icon',
82
+ 'title' => 'Image Icon',
83
  'default' => $wc_shortcodes_theme_support['twitter_social_icon'],
84
  'description' => '',
85
  'type' => 'image',
97
  'description' => '',
98
  'type' => 'input',
99
  ),
100
+ array(
101
+ 'id' => 'pinterest_font_icon',
102
+ 'title' => 'Font Icon',
103
+ 'default' => $wc_shortcodes_theme_support['pinterest_font_icon'],
104
+ 'description' => '',
105
+ 'type' => 'input',
106
+ ),
107
  array(
108
  'id' => 'pinterest_icon',
109
+ 'title' => 'Image Icon',
110
  'default' => $wc_shortcodes_theme_support['pinterest_social_icon'],
111
  'description' => '',
112
  'type' => 'image',
124
  'description' => '',
125
  'type' => 'input',
126
  ),
127
+ array(
128
+ 'id' => 'google_font_icon',
129
+ 'title' => 'Font Icon',
130
+ 'default' => $wc_shortcodes_theme_support['google_font_icon'],
131
+ 'description' => '',
132
+ 'type' => 'input',
133
+ ),
134
  array(
135
  'id' => 'google_icon',
136
+ 'title' => 'Image Icon',
137
  'default' => $wc_shortcodes_theme_support['google_social_icon'],
138
  'description' => '',
139
  'type' => 'image',
151
  'description' => '',
152
  'type' => 'input',
153
  ),
154
+ array(
155
+ 'id' => 'bloglovin_font_icon',
156
+ 'title' => 'Font Icon',
157
+ 'default' => $wc_shortcodes_theme_support['bloglovin_font_icon'],
158
+ 'description' => '',
159
+ 'type' => 'input',
160
+ ),
161
  array(
162
  'id' => 'bloglovin_icon',
163
+ 'title' => 'Image Icon',
164
  'default' => $wc_shortcodes_theme_support['bloglovin_social_icon'],
165
  'description' => '',
166
  'type' => 'image',
178
  'description' => '',
179
  'type' => 'input',
180
  ),
181
+ array(
182
+ 'id' => 'email_font_icon',
183
+ 'title' => 'Font Icon',
184
+ 'default' => $wc_shortcodes_theme_support['email_font_icon'],
185
+ 'description' => '',
186
+ 'type' => 'input',
187
+ ),
188
  array(
189
  'id' => 'email_icon',
190
+ 'title' => 'Image Icon',
191
  'default' => $wc_shortcodes_theme_support['email_social_icon'],
192
  'description' => '',
193
  'type' => 'image',
205
  'description' => '',
206
  'type' => 'input',
207
  ),
208
+ array(
209
+ 'id' => 'flickr_font_icon',
210
+ 'title' => 'Font Icon',
211
+ 'default' => $wc_shortcodes_theme_support['flickr_font_icon'],
212
+ 'description' => '',
213
+ 'type' => 'input',
214
+ ),
215
  array(
216
  'id' => 'flickr_icon',
217
+ 'title' => 'Image Icon',
218
  'default' => $wc_shortcodes_theme_support['flickr_social_icon'],
219
  'description' => '',
220
  'type' => 'image',
232
  'description' => '',
233
  'type' => 'input',
234
  ),
235
+ array(
236
+ 'id' => 'instagram_font_icon',
237
+ 'title' => 'Font Icon',
238
+ 'default' => $wc_shortcodes_theme_support['instagram_font_icon'],
239
+ 'description' => '',
240
+ 'type' => 'input',
241
+ ),
242
  array(
243
  'id' => 'instagram_icon',
244
+ 'title' => 'Image Icon',
245
  'default' => $wc_shortcodes_theme_support['instagram_social_icon'],
246
  'description' => '',
247
  'type' => 'image',
259
  'description' => '',
260
  'type' => 'input',
261
  ),
262
+ array(
263
+ 'id' => 'rss_font_icon',
264
+ 'title' => 'Font Icon',
265
+ 'default' => $wc_shortcodes_theme_support['rss_font_icon'],
266
+ 'description' => '',
267
+ 'type' => 'input',
268
+ ),
269
  array(
270
  'id' => 'rss_icon',
271
+ 'title' => 'Image Icon',
272
  'default' => $wc_shortcodes_theme_support['rss_social_icon'],
273
  'description' => '',
274
  'type' => 'image',
286
  'description' => '',
287
  'type' => 'input',
288
  ),
289
+ array(
290
+ 'id' => 'custom1_font_icon',
291
+ 'title' => 'Font Icon',
292
+ 'default' => $wc_shortcodes_theme_support['custom1_font_icon'],
293
+ 'description' => '',
294
+ 'type' => 'input',
295
+ ),
296
  array(
297
  'id' => 'custom1_icon',
298
+ 'title' => 'Image Icon',
299
  'default' => $wc_shortcodes_theme_support['custom1_social_icon'],
300
  'description' => '',
301
  'type' => 'image',
313
  'description' => '',
314
  'type' => 'input',
315
  ),
316
+ array(
317
+ 'id' => 'custom2_font_icon',
318
+ 'title' => 'Font Icon',
319
+ 'default' => $wc_shortcodes_theme_support['custom2_font_icon'],
320
+ 'description' => '',
321
+ 'type' => 'input',
322
+ ),
323
  array(
324
  'id' => 'custom2_icon',
325
+ 'title' => 'Image Icon',
326
  'default' => $wc_shortcodes_theme_support['custom2_social_icon'],
327
  'description' => '',
328
  'type' => 'image',
340
  'description' => '',
341
  'type' => 'input',
342
  ),
343
+ array(
344
+ 'id' => 'custom3_font_icon',
345
+ 'title' => 'Font Icon',
346
+ 'default' => $wc_shortcodes_theme_support['custom3_font_icon'],
347
+ 'description' => '',
348
+ 'type' => 'input',
349
+ ),
350
  array(
351
  'id' => 'custom3_icon',
352
+ 'title' => 'Image Icon',
353
  'default' => $wc_shortcodes_theme_support['custom3_social_icon'],
354
  'description' => '',
355
  'type' => 'image',
367
  'description' => '',
368
  'type' => 'input',
369
  ),
370
+ array(
371
+ 'id' => 'custom4_font_icon',
372
+ 'title' => 'Font Icon',
373
+ 'default' => $wc_shortcodes_theme_support['custom4_font_icon'],
374
+ 'description' => '',
375
+ 'type' => 'input',
376
+ ),
377
  array(
378
  'id' => 'custom4_icon',
379
+ 'title' => 'Image Icon',
380
  'default' => $wc_shortcodes_theme_support['custom4_social_icon'],
381
  'description' => '',
382
  'type' => 'image',
394
  'description' => '',
395
  'type' => 'input',
396
  ),
397
+ array(
398
+ 'id' => 'custom5_font_icon',
399
+ 'title' => 'Font Icon',
400
+ 'default' => $wc_shortcodes_theme_support['custom5_font_icon'],
401
+ 'description' => '',
402
+ 'type' => 'input',
403
+ ),
404
  array(
405
  'id' => 'custom5_icon',
406
+ 'title' => 'Image Icon',
407
  'default' => $wc_shortcodes_theme_support['custom5_social_icon'],
408
  'description' => '',
409
  'type' => 'image',
433
  'description' => '',
434
  'type' => 'dropdown',
435
  'options' => array(
436
+ 'icon' => 'Icon',
437
  'image' => 'Image',
438
+ 'icon-text' => 'Icon + Text',
439
+ 'text' => 'Text',
440
  ),
441
  ),
442
  ),
452
  'description' => '',
453
  'type' => 'input',
454
  ),
455
+ array(
456
+ 'id' => 'facebook_share_font_icon',
457
+ 'title' => 'Font Icon',
458
+ 'default' => $wc_shortcodes_theme_support['facebook_share_font_icon'],
459
+ 'description' => '',
460
+ 'type' => 'input',
461
+ ),
462
  array(
463
  'id' => 'facebook_share_icon',
464
+ 'title' => 'Image Icon',
465
  'default' => $wc_shortcodes_theme_support['facebook_share_button'],
466
  'description' => '',
467
  'type' => 'image',
479
  'description' => '',
480
  'type' => 'input',
481
  ),
482
+ array(
483
+ 'id' => 'twitter_share_font_icon',
484
+ 'title' => 'Font Icon',
485
+ 'default' => $wc_shortcodes_theme_support['twitter_share_font_icon'],
486
+ 'description' => '',
487
+ 'type' => 'input',
488
+ ),
489
  array(
490
  'id' => 'twitter_share_icon',
491
+ 'title' => 'Image Icon',
492
  'default' => $wc_shortcodes_theme_support['twitter_share_button'],
493
  'description' => '',
494
  'type' => 'image',
506
  'description' => '',
507
  'type' => 'input',
508
  ),
509
+ array(
510
+ 'id' => 'pinterest_share_font_icon',
511
+ 'title' => 'Font Icon',
512
+ 'default' => $wc_shortcodes_theme_support['pinterest_share_font_icon'],
513
+ 'description' => '',
514
+ 'type' => 'input',
515
+ ),
516
  array(
517
  'id' => 'pinterest_share_icon',
518
+ 'title' => 'Image Icon',
519
  'default' => $wc_shortcodes_theme_support['pinterest_share_button'],
520
  'description' => '',
521
  'type' => 'image',
533
  'description' => '',
534
  'type' => 'input',
535
  ),
536
+ array(
537
+ 'id' => 'google_share_font_icon',
538
+ 'title' => 'Font Icon',
539
+ 'default' => $wc_shortcodes_theme_support['google_share_font_icon'],
540
+ 'description' => '',
541
+ 'type' => 'input',
542
+ ),
543
  array(
544
  'id' => 'google_share_icon',
545
+ 'title' => 'Image Icon',
546
  'default' => $wc_shortcodes_theme_support['google_share_button'],
547
  'description' => '',
548
  'type' => 'image',
560
  'description' => '',
561
  'type' => 'input',
562
  ),
563
+ array(
564
+ 'id' => 'email_share_font_icon',
565
+ 'title' => 'Font Icon',
566
+ 'default' => $wc_shortcodes_theme_support['email_share_font_icon'],
567
+ 'description' => '',
568
+ 'type' => 'input',
569
+ ),
570
  array(
571
  'id' => 'email_share_icon',
572
+ 'title' => 'Image Icon',
573
  'default' => $wc_shortcodes_theme_support['email_share_button'],
574
  'description' => '',
575
  'type' => 'image',
includes/shortcode-functions.php CHANGED
@@ -317,32 +317,62 @@ if( !function_exists('wc_shortcodes_social_icons') ) {
317
  function wc_shortcodes_social_icons( $atts ){
318
  extract(shortcode_atts(array(
319
  'class' => '',
320
- 'size' => 'large',
321
- 'align' => 'left',
 
322
  ), $atts));
323
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
324
  $class = trim( 'wc-shortcodes-social-icons-wrapper wc-shortcodes-item ' . $class );
325
 
326
  $order = get_option( WC_SHORTCODES_PREFIX . 'social_icons_display' );
 
 
327
 
328
  if ( ! is_array( $order ) || empty( $order ) ) {
329
  return;
330
  }
331
 
 
 
 
 
 
 
 
 
 
332
  $first = true;
333
 
334
  $html = '<div class="' . $class . '">';
335
- $html .= '<ul class="wc-shortcodes-social-icons wc-shortcodes-clearfix wc-shortcodes-social-icons-align-'.$align.' wc-shortcodes-social-icons-size-'.$size.'">';
336
  foreach ( $order as $key => $value ) {
337
  $link_option_name = WC_SHORTCODES_PREFIX . $key . '_link';
338
- $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_icon';
 
 
 
 
339
 
340
- if ( $icon_url = get_option( $icon_option_name ) ) {
341
- $social_link = get_option( $link_option_name );
342
- $social_link = apply_filters( 'wc_shortcodes_social_link', $social_link, $key );
343
 
344
- $first_class = $first ? ' first-icon' : '';
345
- $first = false;
346
 
347
  $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
348
  $html .='<a target="_blank" href="'.$social_link.'">';
@@ -350,6 +380,15 @@ if( !function_exists('wc_shortcodes_social_icons') ) {
350
  $html .= '</a>';
351
  $html .= '</li>';
352
  }
 
 
 
 
 
 
 
 
 
353
  }
354
  $html .= '</ul>';
355
  $html .= '</div>';
@@ -1385,7 +1424,6 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1385
  $share_buttons = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_display' );
1386
  $size = sizeof( $share_buttons );
1387
  $format = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_format', 'image' );
1388
- $show_image = 'image' == $format ? true : false;
1389
 
1390
  if ( empty( $share_buttons ) )
1391
  return '';
@@ -1396,8 +1434,9 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1396
  $classes[] = 'wc-shortcodes-share-buttons';
1397
  $classes[] = 'wc-shortcodes-share-buttons-format-'.$format;
1398
  $classes[] = 'wc-shortcodes-share-buttons-size-'.$size;
1399
- if ( ! empty( $class ) )
1400
  $classes[] = $class;
 
1401
 
1402
  $style_attr = '';
1403
 
@@ -1412,17 +1451,25 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1412
  $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_text';
1413
  $icon_text = get_option( $icon_option_name );
1414
 
 
 
 
1415
  $first_class = $first ? ' first-share-button' : '';
1416
 
1417
  switch ( $key ) {
1418
  case 'pinterest' :
1419
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1420
  $html .='<a href="javascript:void((function()%7Bvar%20e=document.createElement(&apos;script&apos;);e.setAttribute(&apos;type&apos;,&apos;text/javascript&apos;);e.setAttribute(&apos;charset&apos;,&apos;UTF-8&apos;);e.setAttribute(&apos;src&apos;,&apos;http://assets.pinterest.com/js/pinmarklet.js?r=&apos;+Math.random()*99999999);document.body.appendChild(e)%7D)());">';
1421
- if ( $show_image ) {
1422
- $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1423
- }
1424
- else {
1425
- $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
 
 
 
 
 
1426
  }
1427
  $html .= '</a>';
1428
  $html .= '</li>';
@@ -1430,11 +1477,16 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1430
  case 'facebook' :
1431
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1432
  $html .='<a target="_blank" onclick="return !window.open(this.href, \'Facebook\', \'width=640,height=300\')" href="http://www.facebook.com/sharer/sharer.php?u='.urlencode(get_permalink()).'">';
1433
- if ( $show_image ) {
1434
- $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1435
- }
1436
- else {
1437
- $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
 
 
 
 
 
1438
  }
1439
  $html .= '</a>';
1440
  $html .= '</li>';
@@ -1442,11 +1494,16 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1442
  case 'twitter' :
1443
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1444
  $html .='<a target="_blank" onclick="return !window.open(this.href, \'Twitter\', \'width=500,height=430\')" href="https://twitter.com/share?url='.urlencode(get_permalink()).'" class="share-button-twitter" data-lang="en">';
1445
- if ( $show_image ) {
1446
- $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1447
- }
1448
- else {
1449
- $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
 
 
 
 
 
1450
  }
1451
  $html .= '</a>';
1452
  $html .= '</li>';
@@ -1454,11 +1511,16 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1454
  case 'email' :
1455
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1456
  $html .='<a title="Share by Email" target="_self" href="mailto:?subject=&amp;body='.urlencode(get_permalink()).'">';
1457
- if ( $show_image ) {
1458
- $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1459
- }
1460
- else {
1461
- $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
 
 
 
 
 
1462
  }
1463
  $html .= '</a>';
1464
  $html .= '</li>';
@@ -1467,11 +1529,16 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1467
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1468
  $html .='<a href="https://plus.google.com/share?url='.urlencode(get_permalink()).'" onclick="javascript:window.open(this.href,
1469
  \'\', \'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600\');return false;">';
1470
- if ( $show_image ) {
1471
- $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1472
- }
1473
- else {
1474
- $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
 
 
 
 
 
1475
  }
1476
  $html .= '</a>';
1477
  $html .= '</li>';
317
  function wc_shortcodes_social_icons( $atts ){
318
  extract(shortcode_atts(array(
319
  'class' => '',
320
+ 'size' => 'large', // deprecated. using maxheight now
321
+ 'align' => 'left',
322
+ 'maxheight' => '0',
323
  ), $atts));
324
 
325
+ $maxheight = (int) $maxheight;
326
+
327
+ if ( empty( $maxheight ) ) {
328
+ switch ( $size ) {
329
+ case 'small' :
330
+ $maxheight = 16;
331
+ break;
332
+ case 'medium' :
333
+ $maxheight = 24;
334
+ break;
335
+ default :
336
+ $maxheight = 48;
337
+ }
338
+ }
339
+
340
  $class = trim( 'wc-shortcodes-social-icons-wrapper wc-shortcodes-item ' . $class );
341
 
342
  $order = get_option( WC_SHORTCODES_PREFIX . 'social_icons_display' );
343
+ $format = get_option( WC_SHORTCODES_PREFIX . 'social_icons_format', 'image' );
344
+ $show_image = 'image' == $format ? true : false;
345
 
346
  if ( ! is_array( $order ) || empty( $order ) ) {
347
  return;
348
  }
349
 
350
+ // classes
351
+ $classes = array();
352
+
353
+ $classes[] = 'wc-shortcodes-social-icons';
354
+ $classes[] = 'wc-shortcodes-clearfix';
355
+ $classes[] = 'wc-shortcodes-social-icons-align-'.$align;
356
+ $classes[] = 'wc-shortcodes-maxheight-'.$maxheight;
357
+ $classes[] = 'wc-shortcodes-social-icons-format-'.$format;
358
+
359
  $first = true;
360
 
361
  $html = '<div class="' . $class . '">';
362
+ $html .= '<ul class="'.implode( ' ', $classes ).'">';
363
  foreach ( $order as $key => $value ) {
364
  $link_option_name = WC_SHORTCODES_PREFIX . $key . '_link';
365
+ $image_icon_option_name = WC_SHORTCODES_PREFIX . $key . '_icon';
366
+ $font_icon_option_name = WC_SHORTCODES_PREFIX . $key . '_font_icon';
367
+
368
+ $social_link = get_option( $link_option_name );
369
+ $social_link = apply_filters( 'wc_shortcodes_social_link', $social_link, $key );
370
 
371
+ $first_class = $first ? ' first-icon' : '';
372
+ $first = false;
 
373
 
374
+ if ( $show_image ) {
375
+ $icon_url = get_option( $image_icon_option_name );
376
 
377
  $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
378
  $html .='<a target="_blank" href="'.$social_link.'">';
380
  $html .= '</a>';
381
  $html .= '</li>';
382
  }
383
+ else {
384
+ $icon_class = get_option( $font_icon_option_name );
385
+
386
+ $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
387
+ $html .='<a target="_blank" href="'.$social_link.'">';
388
+ $html .= '<i class="fa '.$icon_class.'"></i>';
389
+ $html .= '</a>';
390
+ $html .= '</li>';
391
+ }
392
  }
393
  $html .= '</ul>';
394
  $html .= '</div>';
1424
  $share_buttons = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_display' );
1425
  $size = sizeof( $share_buttons );
1426
  $format = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_format', 'image' );
 
1427
 
1428
  if ( empty( $share_buttons ) )
1429
  return '';
1434
  $classes[] = 'wc-shortcodes-share-buttons';
1435
  $classes[] = 'wc-shortcodes-share-buttons-format-'.$format;
1436
  $classes[] = 'wc-shortcodes-share-buttons-size-'.$size;
1437
+ if ( ! empty( $class ) ) {
1438
  $classes[] = $class;
1439
+ }
1440
 
1441
  $style_attr = '';
1442
 
1451
  $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_text';
1452
  $icon_text = get_option( $icon_option_name );
1453
 
1454
+ $font_icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_font_icon';
1455
+ $icon_class = get_option( $font_icon_option_name );
1456
+
1457
  $first_class = $first ? ' first-share-button' : '';
1458
 
1459
  switch ( $key ) {
1460
  case 'pinterest' :
1461
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1462
  $html .='<a href="javascript:void((function()%7Bvar%20e=document.createElement(&apos;script&apos;);e.setAttribute(&apos;type&apos;,&apos;text/javascript&apos;);e.setAttribute(&apos;charset&apos;,&apos;UTF-8&apos;);e.setAttribute(&apos;src&apos;,&apos;http://assets.pinterest.com/js/pinmarklet.js?r=&apos;+Math.random()*99999999);document.body.appendChild(e)%7D)());">';
1463
+ switch ( $format ) {
1464
+ case 'image' :
1465
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1466
+ break;
1467
+ case 'icon' :
1468
+ $html .= '<i class="fa '.$icon_class.'"></i>';
1469
+ break;
1470
+ default :
1471
+ $html .= '<i class="fa '.$icon_class.'"></i><span class="wc-share-button-'.$key.'">'.$icon_text.'</span>';
1472
+ break;
1473
  }
1474
  $html .= '</a>';
1475
  $html .= '</li>';
1477
  case 'facebook' :
1478
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1479
  $html .='<a target="_blank" onclick="return !window.open(this.href, \'Facebook\', \'width=640,height=300\')" href="http://www.facebook.com/sharer/sharer.php?u='.urlencode(get_permalink()).'">';
1480
+ switch ( $format ) {
1481
+ case 'image' :
1482
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1483
+ break;
1484
+ case 'icon' :
1485
+ $html .= '<i class="fa '.$icon_class.'"></i>';
1486
+ break;
1487
+ default :
1488
+ $html .= '<i class="fa '.$icon_class.'"></i><span class="wc-share-button-'.$key.'">'.$icon_text.'</span>';
1489
+ break;
1490
  }
1491
  $html .= '</a>';
1492
  $html .= '</li>';
1494
  case 'twitter' :
1495
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1496
  $html .='<a target="_blank" onclick="return !window.open(this.href, \'Twitter\', \'width=500,height=430\')" href="https://twitter.com/share?url='.urlencode(get_permalink()).'" class="share-button-twitter" data-lang="en">';
1497
+ switch ( $format ) {
1498
+ case 'image' :
1499
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1500
+ break;
1501
+ case 'icon' :
1502
+ $html .= '<i class="fa '.$icon_class.'"></i>';
1503
+ break;
1504
+ default :
1505
+ $html .= '<i class="fa '.$icon_class.'"></i><span class="wc-share-button-'.$key.'">'.$icon_text.'</span>';
1506
+ break;
1507
  }
1508
  $html .= '</a>';
1509
  $html .= '</li>';
1511
  case 'email' :
1512
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1513
  $html .='<a title="Share by Email" target="_self" href="mailto:?subject=&amp;body='.urlencode(get_permalink()).'">';
1514
+ switch ( $format ) {
1515
+ case 'image' :
1516
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1517
+ break;
1518
+ case 'icon' :
1519
+ $html .= '<i class="fa '.$icon_class.'"></i>';
1520
+ break;
1521
+ default :
1522
+ $html .= '<i class="fa '.$icon_class.'"></i><span class="wc-share-button-'.$key.'">'.$icon_text.'</span>';
1523
+ break;
1524
  }
1525
  $html .= '</a>';
1526
  $html .= '</li>';
1529
  $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1530
  $html .='<a href="https://plus.google.com/share?url='.urlencode(get_permalink()).'" onclick="javascript:window.open(this.href,
1531
  \'\', \'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600\');return false;">';
1532
+ switch ( $format ) {
1533
+ case 'image' :
1534
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1535
+ break;
1536
+ case 'icon' :
1537
+ $html .= '<i class="fa '.$icon_class.'"></i>';
1538
+ break;
1539
+ default :
1540
+ $html .= '<i class="fa '.$icon_class.'"></i><span class="wc-share-button-'.$key.'">'.$icon_text.'</span>';
1541
+ break;
1542
  }
1543
  $html .= '</a>';
1544
  $html .= '</li>';
includes/widgets.php CHANGED
@@ -46,6 +46,8 @@ class WC_Shortcodes_Social_Icons_Widget extends WP_Widget {
46
  }
47
 
48
  $order = get_option( WC_SHORTCODES_PREFIX . 'social_icons_display' );
 
 
49
 
50
  if ( ! is_array( $order ) || empty( $order ) ) {
51
  return;
@@ -63,6 +65,7 @@ class WC_Shortcodes_Social_Icons_Widget extends WP_Widget {
63
  $classes[] = 'wc-shortcodes-clearfix';
64
  $classes[] = 'wc-shortcodes-columns-'.$columns;
65
  $classes[] = 'wc-shortcodes-maxheight-'.$maxheight;
 
66
 
67
  $html = '<ul class="'.implode( ' ', $classes ).'">';
68
  $i = 0;
@@ -76,23 +79,33 @@ class WC_Shortcodes_Social_Icons_Widget extends WP_Widget {
76
  }
77
 
78
  $link_option_name = WC_SHORTCODES_PREFIX . $key . '_link';
79
- $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_icon';
 
80
 
81
- if ( $icon_url = get_option( $icon_option_name ) ) {
82
- $social_link = get_option( $link_option_name );
83
- $social_link = apply_filters( 'wc_shortcodes_social_link', $social_link, $key );
84
 
85
- if ( $first )
86
- $li_class[] = 'first-icon';
87
 
88
- $first = false;
 
89
 
90
- $html .= '<li class="'.implode( ' ', $li_class ).'">';
91
  $html .='<a target="_blank" href="'.$social_link.'">';
92
  $html .= '<img src="'.$icon_url.'">';
93
  $html .= '</a>';
94
  $html .= '</li>';
95
  }
 
 
 
 
 
 
 
 
 
96
  }
97
  $html .= '</ul>';
98
 
46
  }
47
 
48
  $order = get_option( WC_SHORTCODES_PREFIX . 'social_icons_display' );
49
+ $format = get_option( WC_SHORTCODES_PREFIX . 'social_icons_format', 'image' );
50
+ $show_image = 'image' == $format ? true : false;
51
 
52
  if ( ! is_array( $order ) || empty( $order ) ) {
53
  return;
65
  $classes[] = 'wc-shortcodes-clearfix';
66
  $classes[] = 'wc-shortcodes-columns-'.$columns;
67
  $classes[] = 'wc-shortcodes-maxheight-'.$maxheight;
68
+ $classes[] = 'wc-shortcodes-social-icons-format-'.$format;
69
 
70
  $html = '<ul class="'.implode( ' ', $classes ).'">';
71
  $i = 0;
79
  }
80
 
81
  $link_option_name = WC_SHORTCODES_PREFIX . $key . '_link';
82
+ $image_icon_option_name = WC_SHORTCODES_PREFIX . $key . '_icon';
83
+ $font_icon_option_name = WC_SHORTCODES_PREFIX . $key . '_font_icon';
84
 
85
+ $social_link = get_option( $link_option_name );
86
+ $social_link = apply_filters( 'wc_shortcodes_social_link', $social_link, $key );
 
87
 
88
+ $first_class = $first ? ' first-icon' : '';
89
+ $first = false;
90
 
91
+ if ( $show_image ) {
92
+ $icon_url = get_option( $image_icon_option_name );
93
 
94
+ $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
95
  $html .='<a target="_blank" href="'.$social_link.'">';
96
  $html .= '<img src="'.$icon_url.'">';
97
  $html .= '</a>';
98
  $html .= '</li>';
99
  }
100
+ else {
101
+ $icon_class = get_option( $font_icon_option_name );
102
+
103
+ $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
104
+ $html .='<a target="_blank" href="'.$social_link.'">';
105
+ $html .= '<i class="fa '.$icon_class.'"></i>';
106
+ $html .= '</a>';
107
+ $html .= '</li>';
108
+ }
109
  }
110
  $html .= '</ul>';
111
 
readme.txt CHANGED
@@ -88,6 +88,17 @@ Use the shortcode manager in the TinyMCE text editor
88
 
89
  == Changelog ==
90
 
 
 
 
 
 
 
 
 
 
 
 
91
  ### Version 1.50
92
 
93
  * Social icons now open a new tab by default
88
 
89
  == Changelog ==
90
 
91
+ ### Version 1.53
92
+
93
+ * Added Icon+Text option for share buttons
94
+ * Deprecated an attribute in social icons shortcode
95
+
96
+ ### Version 1.52
97
+
98
+ * Added font icons for share buttons
99
+ * Now supporting font icons and images for social media buttons
100
+ * Fixed line-height style bug
101
+
102
  ### Version 1.50
103
 
104
  * Social icons now open a new tab by default
wc-shortcodes.php CHANGED
@@ -5,11 +5,11 @@ Plugin URI: http://webplantmedia.com/starter-themes/wordpresscanvas/features/sho
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
- Version: 1.50
9
  License: GPLv2 or later
10
  */
11
 
12
- define( 'WC_SHORTCODES_VERSION', '1.50' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
@@ -48,31 +48,51 @@ $wc_shortcodes_share_buttons = array(
48
  );
49
  $wc_shortcodes_theme_support = array(
50
  'fullwidth_container' => '#main',
 
 
51
  'facebook_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
 
52
  'twitter_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
 
53
  'pinterest_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
 
54
  'google_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
 
55
  'bloglovin_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/bloglovin.png',
 
56
  'email_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
 
57
  'flickr_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/flickr.png',
 
58
  'instagram_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/instagram.png',
 
59
  'rss_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/rss.png',
 
60
  'custom1_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/picasa.png',
 
61
  'custom2_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/shopping.png',
 
62
  'custom3_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/youtube.png',
 
63
  'custom4_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/etsy.png',
 
64
  'custom5_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/tumblr.png',
65
  'share_buttons_format' => 'image',
 
 
66
  'pinterest_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
 
 
67
  'facebook_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
 
 
68
  'twitter_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
 
 
69
  'google_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
70
- 'email_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
71
- 'pinterest_share_text' => 'Pin it',
72
- 'facebook_share_text' => 'Share',
73
- 'twitter_share_text' => 'Tweet',
74
- 'google_share_text' => 'Google+',
75
  'email_share_text' => 'Email',
 
 
76
  );
77
 
78
  require_once( dirname(__FILE__) . '/includes/options.php' ); // define options array
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
+ Version: 1.53
9
  License: GPLv2 or later
10
  */
11
 
12
+ define( 'WC_SHORTCODES_VERSION', '1.53' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
48
  );
49
  $wc_shortcodes_theme_support = array(
50
  'fullwidth_container' => '#main',
51
+ 'social_icons_format' => 'image',
52
+ 'facebook_font_icon' => 'fa-facebook',
53
  'facebook_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
54
+ 'twitter_font_icon' => 'fa-twitter',
55
  'twitter_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
56
+ 'pinterest_font_icon' => 'fa-pinterest',
57
  'pinterest_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
58
+ 'google_font_icon' => 'fa-google-plus',
59
  'google_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
60
+ 'bloglovin_font_icon' => 'fa-plus-square',
61
  'bloglovin_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/bloglovin.png',
62
+ 'email_font_icon' => 'fa-envelope',
63
  'email_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
64
+ 'flickr_font_icon' => 'fa-flickr',
65
  'flickr_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/flickr.png',
66
+ 'instagram_font_icon' => 'fa-instagram',
67
  'instagram_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/instagram.png',
68
+ 'rss_font_icon' => 'fa-rss',
69
  'rss_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/rss.png',
70
+ 'custom1_font_icon' => 'fa-camera',
71
  'custom1_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/picasa.png',
72
+ 'custom2_font_icon' => 'fa-shopping-cart',
73
  'custom2_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/shopping.png',
74
+ 'custom3_font_icon' => 'fa-youtube',
75
  'custom3_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/youtube.png',
76
+ 'custom4_font_icon' => 'fa-dollar',
77
  'custom4_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/etsy.png',
78
+ 'custom5_font_icon' => 'fa-tumblr',
79
  'custom5_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/tumblr.png',
80
  'share_buttons_format' => 'image',
81
+ 'pinterest_share_text' => 'Pin it',
82
+ 'pinterest_share_font_icon' => 'fa-pinterest',
83
  'pinterest_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
84
+ 'facebook_share_text' => 'Share',
85
+ 'facebook_share_font_icon' => 'fa-facebook',
86
  'facebook_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
87
+ 'twitter_share_text' => 'Tweet',
88
+ 'twitter_share_font_icon' => 'fa-twitter',
89
  'twitter_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
90
+ 'google_share_text' => 'Share',
91
+ 'google_share_font_icon' => 'fa-google-plus',
92
  'google_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
 
 
 
 
 
93
  'email_share_text' => 'Email',
94
+ 'email_share_font_icon' => 'fa-envelope',
95
+ 'email_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
96
  );
97
 
98
  require_once( dirname(__FILE__) . '/includes/options.php' ); // define options array