diff --git a/e107_plugins/social/css/fontello.css b/e107_plugins/social/css/fontello.css index 4d163a3ba..5bc1910ce 100644 --- a/e107_plugins/social/css/fontello.css +++ b/e107_plugins/social/css/fontello.css @@ -1,10 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?47486947'); - src: url('../font/fontello.eot?47486947#iefix') format('embedded-opentype'), - url('../font/fontello.woff?47486947') format('woff'), - url('../font/fontello.ttf?47486947') format('truetype'), - url('../font/fontello.svg?47486947#fontello') format('svg'); + src: url('../font/fontello.eot?25587411'); + src: url('../font/fontello.eot?25587411#iefix') format('embedded-opentype'), + url('../font/fontello.woff2?25587411') format('woff2'), + url('../font/fontello.woff?25587411') format('woff'), + url('../font/fontello.ttf?25587411') format('truetype'), + url('../font/fontello.svg?25587411#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -14,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?47486947#fontello') format('svg'); + src: url('../font/fontello.svg?25587411#fontello') format('svg'); } } */ @@ -35,30 +36,25 @@ /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; /* Animation center compensation - margins should be symmetric */ /* remove if not needed */ - /*margin-left: .2em; */ + margin-left: .2em; /* you can be more comfortable with increased icons size */ /* font-size: 120%; */ + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } -.e-social-mail:before { content: '\e820'; } /* '' */ -.e-social-instagram-filled:before { content: '\e818'; } /* '' */ -.e-social-thumbs-up:before { content: '\e81f'; } /* '' */ -.e-social-export:before { content: '\e824'; } /* '' */ -.e-social-foursquare:before { content: '\e822'; } /* '' */ -.e-social-share:before { content: '\e823'; } /* '' */ -.e-social-spread:before { content: '\e81b'; } /* '' */ -.e-social-delicious:before { content: '\e813'; } /* '' */ -.e-social-flattr:before { content: '\e81c'; } /* '' */ .e-social-gplus:before { content: '\e800'; } /* '' */ .e-social-stumbleupon:before { content: '\e801'; } /* '' */ .e-social-pinterest:before { content: '\e802'; } /* '' */ @@ -66,11 +62,7 @@ .e-social-reddit:before { content: '\e804'; } /* '' */ .e-social-blogger:before { content: '\e805'; } /* '' */ .e-social-dribbble:before { content: '\e806'; } /* '' */ -.e-social-flickr:before { content: '\e81d'; } /* '' */ -.e-social-google:before { content: '\e819'; } /* '' */ -.e-social-mail-alt:before { content: '\e821'; } /* '' */ .e-social-linkedin:before { content: '\e807'; } /* '' */ -.e-social-rss:before { content: '\e81a'; } /* '' */ .e-social-skype:before { content: '\e808'; } /* '' */ .e-social-twitter:before { content: '\e809'; } /* '' */ .e-social-youtube:before { content: '\e80a'; } /* '' */ @@ -82,8 +74,29 @@ .e-social-github-circled:before { content: '\e810'; } /* '' */ .e-social-tumblr:before { content: '\e811'; } /* '' */ .e-social-yelp:before { content: '\e812'; } /* '' */ +.e-social-delicious:before { content: '\e813'; } /* '' */ .e-social-acrobat:before { content: '\e814'; } /* '' */ -.e-social-blogger-rect:before { content: '\e816'; } /* '' */ .e-social-linkedin-rect:before { content: '\e815'; } /* '' */ +.e-social-blogger-rect:before { content: '\e816'; } /* '' */ .e-social-instagram-1:before { content: '\e817'; } /* '' */ -.e-social-instapaper:before { content: '\e81e'; } /* '' */ \ No newline at end of file +.e-social-instagram-filled:before { content: '\e818'; } /* '' */ +.e-social-google:before { content: '\e819'; } /* '' */ +.e-social-rss:before { content: '\e81a'; } /* '' */ +.e-social-spread:before { content: '\e81b'; } /* '' */ +.e-social-flattr:before { content: '\e81c'; } /* '' */ +.e-social-flickr:before { content: '\e81d'; } /* '' */ +.e-social-instapaper:before { content: '\e81e'; } /* '' */ +.e-social-thumbs-up:before { content: '\e81f'; } /* '' */ +.e-social-mail:before { content: '\e820'; } /* '' */ +.e-social-mail-alt:before { content: '\e821'; } /* '' */ +.e-social-foursquare:before { content: '\e822'; } /* '' */ +.e-social-share:before { content: '\e823'; } /* '' */ +.e-social-export:before { content: '\e824'; } /* '' */ +.e-social-pocket:before { content: '\e825'; } /* '' */ +.e-social-wordpress:before { content: '\e826'; } /* '' */ +.e-social-pinboard:before { content: '\e827'; } /* '' */ +.e-social-instagram:before { content: '\e828'; } /* '' */ +.e-social-vk:before { content: '\e829'; } /* '' */ +.e-social-vine:before { content: '\e82a'; } /* '' */ +.e-social-meetup:before { content: '\e82b'; } /* '' */ +.e-social-youtube-play:before { content: '\e82c'; } /* '' */ \ No newline at end of file diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index d63b4dc91..54867ef4c 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -33,13 +33,15 @@ class social_shortcodes extends e_shortcode // 'google-plus' => array('icon' => 'fa-google-plus', 'title'=>"On Google Plus", 'url' => "https://plusone.google.com/_/+1/confirm?hl=en&url=[u]"), 'linkedin' => array('icon' => 'e-social-linkedin', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "LinkedIn"), 'url' => "http://www.linkedin.com/shareArticle?mini=true&url=[u]"), 'pinterest' => array('icon' => 'e-social-pinterest', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "Pinterest"), 'url' => "http://www.pinterest.com/pin/create/button/?url=[u]&description=[t]&media=[m]"), - // 'thumblr' => array('icon' => 'fa-tumblr', 'title'=>"On Tumblr", 'url' => "http://www.tumblr.com/share/link?url=[u]&name=[t]&description=[d]"), 'stumbleupon' => array('icon' => 'e-social-stumbleupon', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "StumbleUpon"), 'url' => "http://www.stumbleupon.com/submit?url=[u]&title=[t]"), 'reddit' => array('icon' => 'e-social-reddit', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "Reddit"), 'url' => "http://reddit.com/submit?url=[u]&title=[t]"), 'digg' => array('icon' => 'e-social-digg', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "Digg"), 'url' => "http://www.digg.com/submit?url=[u]"), - - //http://reddit.com/submit?url=http%3A%2F%2Fwebsite.com&title=Website%20Title // no fa icon available - //http://www.digg.com/submit?url=http%3A%2F%2Fwebsite.com // no fa icon available + + 'tumblr' => array('icon' => 'e-social-tumblr', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "Tumblr"), 'url' => "http://www.tumblr.com/share?v=3&u=[u]&t=[t]&s="), + 'pocket' => array('icon' => 'e-social-pocket', 'title'=> $tp->lanVars(LAN_SOCIAL_004, "Pocket"), 'url' => "https://getpocket.com/save?url=[u]&title=[t]"), + 'wordpress' => array('icon' => 'e-social-wordpress', 'title'=> $tp->lanVars(LAN_SOCIAL_000, "Wordpress"), 'url' => "http://wordpress.com/press-this.php?u=[u]&t=[t]&s=[t]"), + 'pinboard' => array('icon' => 'e-social-pinboard', 'title'=> $tp->lanVars(LAN_SOCIAL_004, "Pinboard"), 'url' => "https://pinboard.in/popup_login/?url=[u]&title=[t]&description=[t]"), + ); return $providers; @@ -176,7 +178,8 @@ class social_shortcodes extends e_shortcode /** * {SOCIALSHARE: url=x&title=y} * @example {SOCIALSHARE: type=basic} - Show only Email, Facebook, Twitter and Google. - * @example {SOCIALSHARE: dropdown=1&type=basic} - Show only Email, Facebook, Twitter and Google in a drop-down button + * @example {SOCIALSHARE: dropdown=1&type=basic} - Show only Email, Facebook, Twitter and Google in a drop-down button + * @example {SOCIALSHARE: providers=twitter,pinterest&tip=false} - override provider preferences and disable tooltips. * @example for plugin developers: send 'var' values for use by the social shortcode. (useful for loops where the value must change regularly) * $socialArray = array('url'=>'your-url-here', 'title'=>'your-title-here'); e107::getScBatch('social')->setVars($socialArray); @@ -208,7 +211,7 @@ class social_shortcodes extends e_shortcode } else { - $parm['providers'] = array_keys($providers); + $parm['providers'] = explode(",",$parm['providers']); } if(empty($parm['dropdown'])) @@ -299,7 +302,7 @@ class social_shortcodes extends e_shortcode // Show only Email, Facebook, Twitter and Google. if(varset($parm['type']) == 'basic') { - $remove = array('linkedi','pinterest', 'stumbleupon', 'digg', 'reddit', 'linkedin'); + $remove = array('linkedi','pinterest', 'stumbleupon', 'digg', 'reddit', 'linkedin', 'tumblr','pocket','wordpress','pinboard'); foreach($remove as $v) { unset($opt[$v]); diff --git a/e107_plugins/social/font/fontello.eot b/e107_plugins/social/font/fontello.eot index 9debeb7e1..e66bd0da8 100644 Binary files a/e107_plugins/social/font/fontello.eot and b/e107_plugins/social/font/fontello.eot differ diff --git a/e107_plugins/social/font/fontello.svg b/e107_plugins/social/font/fontello.svg index 3e796e754..dab15029e 100644 --- a/e107_plugins/social/font/fontello.svg +++ b/e107_plugins/social/font/fontello.svg @@ -1,48 +1,100 @@ -Copyright (C) 2014 by original authors @ fontello.com +Copyright (C) 2016 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e107_plugins/social/font/fontello.ttf b/e107_plugins/social/font/fontello.ttf index 50469bd67..a405fece8 100644 Binary files a/e107_plugins/social/font/fontello.ttf and b/e107_plugins/social/font/fontello.ttf differ diff --git a/e107_plugins/social/font/fontello.woff b/e107_plugins/social/font/fontello.woff index b4857f1bf..a7d1befd3 100644 Binary files a/e107_plugins/social/font/fontello.woff and b/e107_plugins/social/font/fontello.woff differ diff --git a/e107_plugins/social/languages/English/English_front.php b/e107_plugins/social/languages/English/English_front.php index bfe5ee15c..188988266 100644 --- a/e107_plugins/social/languages/English/English_front.php +++ b/e107_plugins/social/languages/English/English_front.php @@ -11,6 +11,8 @@ define("LAN_SOCIAL_000", "Share On [x]"); define("LAN_SOCIAL_001", "Like on [x]"); define("LAN_SOCIAL_002", "Email to someone"); define("LAN_SOCIAL_003", "+1 on Google"); +define("LAN_SOCIAL_004", "Add to [x]"); + //LAN_SOCIAL_100 to LAN_SOCIAL_199 // Facebook specific define("LAN_SOCIAL_100", "Unable to display feed. Facebook App ID has not been defined in preferences.");