diff --git a/e107_core/templates/comment_template.php b/e107_core/templates/comment_template.php index e22898e53..259692b42 100644 --- a/e107_core/templates/comment_template.php +++ b/e107_core/templates/comment_template.php @@ -97,7 +97,7 @@ $sc_style['MODERATE']['post'] = ''; $COMMENT_TEMPLATE['form'] = " - {SETIMAGE: w=100} + {SETIMAGE: w=60}
{COMMENT_AVATAR} diff --git a/e107_plugins/social/css/fontello.css b/e107_plugins/social/css/fontello.css new file mode 100644 index 000000000..151dafa85 --- /dev/null +++ b/e107_plugins/social/css/fontello.css @@ -0,0 +1,89 @@ +@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'); + font-weight: normal; + font-style: normal; +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fontello'; + src: url('../font/fontello.svg?47486947#fontello') format('svg'); + } +} +*/ + + [class^="e-social-"]:before, [class*=" e-social-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* 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; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* 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'; } /* '' */ +.e-social-digg:before { content: '\e803'; } /* '' */ +.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'; } /* '' */ +.e-social-vimeo:before { content: '\e80b'; } /* '' */ +.e-social-yahoo:before { content: '\e80c'; } /* '' */ +.e-social-email:before { content: '\e80d'; } /* '' */ +.e-social-dropbox:before { content: '\e80e'; } /* '' */ +.e-social-facebook:before { content: '\e80f'; } /* '' */ +.e-social-github-circled:before { content: '\e810'; } /* '' */ +.e-social-tumblr:before { content: '\e811'; } /* '' */ +.e-social-yelp:before { content: '\e812'; } /* '' */ +.e-social-acrobat:before { content: '\e814'; } /* '' */ +.e-social-blogger-rect:before { content: '\e816'; } /* '' */ +.e-social-linkedin-rect:before { content: '\e815'; } /* '' */ +.e-social-instagram-1:before { content: '\e817'; } /* '' */ +.e-social-instapaper:before { content: '\e81e'; } /* '' */ \ No newline at end of file diff --git a/e107_plugins/social/e_header.php b/e107_plugins/social/e_header.php new file mode 100644 index 000000000..69d34d017 --- /dev/null +++ b/e107_plugins/social/e_header.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index 617b34b51..4c48105a7 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -75,25 +75,27 @@ class social_shortcodes extends e_shortcode $title = varset($parm['title'], deftrue('e_PAGETITLE'). " | ". SITENAME ) ; $description = varset($parm['title'], e107::getUrl()->response()->getMetaDescription()); $media = ""; - $label = varset($parm['label'], $tp->toGlyph('icon-share')." ".defset('LAN_SHARE',"Share")); + $label = varset($parm['label'], $tp->toGlyph('e-social-spread')." ".defset('LAN_SHARE',"Share")); $size = varset($parm['size'],'md'); //TODO LANS ie. "Share on [x]" $providers = array( - 'email' => array('icon' => 'fa-envelope-o', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=Check out this link: [u]"), - 'facebook-like' => array('icon' => 'fa-thumbs-o-up', 'title'=>"Like on Facebook", 'url' => "http://www.facebook.com/plugins/like.php?href=[u]"), - 'facebook-share' => array('icon' => 'fa-facebook', 'title'=>"Share on Facebook", 'url' => "http://www.facebook.com/sharer.php?u=[u]&t=[t]"), - 'twitter' => array('icon' => 'fa-twitter', 'title'=>"Share on Twitter", 'url' => "http://twitter.com/share?url=[u]&text=[t]"), - 'google-plus1' => array('icon' => 'fa-google-plus', 'title'=>"+1 on Google", 'url' => "https://apis.google.com/_/+1/fastbutton?usegapi=1&size=large&hl=en&url=[u]"), + 'email' => array('icon' => 'e-social-mail', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=Check out this link: [u]"), + 'facebook-like' => array('icon' => 'e-social-thumbs-up', 'title'=>"Like on Facebook", 'url' => "http://www.facebook.com/plugins/like.php?href=[u]"), + 'facebook-share' => array('icon' => 'e-social-facebook', 'title'=>"Share on Facebook", 'url' => "http://www.facebook.com/sharer.php?u=[u]&t=[t]"), + 'twitter' => array('icon' => 'e-social-twitter', 'title'=>"Share on Twitter", 'url' => "http://twitter.com/share?url=[u]&text=[t]"), + 'google-plus1' => array('icon' => 'e-social-gplus', 'title'=>"+1 on Google", 'url' => "https://apis.google.com/_/+1/fastbutton?usegapi=1&size=large&hl=en&url=[u]"), + + // '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'=>"Share on LinkedIn", 'url' => "http://www.linkedin.com/shareArticle?mini=true&url=[u]"), + 'pinterest' => array('icon' => 'e-social-pinterest', 'title'=>"Share on 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'=>"On StumbleUpon", 'url' => "http://www.stumbleupon.com/submit?url=[u]&title=[t]"), + 'reddit' => array('icon' => 'e-social-reddit', 'title'=>"On Reddit", 'url' => "http://reddit.com/submit?url=[u]&title=[t]"), + 'digg' => array('icon' => 'e-social-digg', 'title'=>"On Digg", 'url' => "http://www.digg.com/submit?url=[u]"), - // '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' => 'fa-linkedin', 'title'=>"Share on LinkedIn", 'url' => "http://www.linkedin.com/shareArticle?mini=true&url=[u]"), - 'pinterest' => array('icon' => 'fa-pinterest', 'title'=>"Share on 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' => 'fa-stumbleupon', 'title'=>"On Tumblr", 'url' => "http://www.stumbleupon.com/submit?url=[u]&title=[t]"), // no fa icon available. - //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 ); @@ -108,7 +110,7 @@ class social_shortcodes extends e_shortcode } else { - $butSize = 'btn-lg'; + $butSize = 'btn-social'; } @@ -131,7 +133,7 @@ class social_shortcodes extends e_shortcode $text = '
'.$label.' -