From 32aefd920490ebad7df5feff0640877698f6b6ff Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Sat, 26 Jan 2013 11:48:44 +0000
Subject: [PATCH] simplyfy code, add noscript fallback for twitter

git-svn-id: http://piwigo.org/svn/extensions/SocialButtons@20406 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/pinterest.inc.php         |   1 -
 include/tumblr.inc.php            |  14 --------------
 main.inc.php                      |   6 +++++-
 template/facebook.tpl             |   4 ++--
 template/google.tpl               |   2 +-
 template/images/twitter_large.png | Bin 1505 -> 1720 bytes
 template/images/twitter_small.png | Bin 1163 -> 1311 bytes
 template/pinterest.tpl            |   2 +-
 template/tumblr.tpl               |   6 +++---
 template/twitter.tpl              |   5 +++--
 10 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/include/pinterest.inc.php b/include/pinterest.inc.php
index db5e27e..d0500f6 100644
--- a/include/pinterest.inc.php
+++ b/include/pinterest.inc.php
@@ -13,7 +13,6 @@ function socialbutt_pinterest($basename, $root_url, &$tpl_vars, &$buttons)
   
   // config
   $tpl_vars['PINTEREST'] = $conf['SocialButtons']['pinterest'];
-  $tpl_vars['PINTEREST']['copyright'] = ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)';
   $tpl_vars['PINTEREST']['title'] = $picture['current']['TITLE'];
   
   if ($conf['SocialButtons']['pinterest']['img_size'] == 'Original')
diff --git a/include/tumblr.inc.php b/include/tumblr.inc.php
index bd03379..068b1e9 100644
--- a/include/tumblr.inc.php
+++ b/include/tumblr.inc.php
@@ -5,22 +5,8 @@ function socialbutt_tumblr($basename, $root_url, &$tpl_vars, &$buttons)
 {
   global $conf, $template;
   
-  $tumblr_css = array(
-    'share_1' => 'width:81px; height:20px;',
-    'share_2' => 'width:61px; height:20px;',
-    'share_3' => 'width:129px; height:20px;',
-    'share_4' => 'width:20px; height:20px;',
-    'share_1T' => 'width:81px; height:20px;',
-    'share_2T' => 'width:61px; height:20px;',
-    'share_3T' => 'width:129px; height:20px;',
-    'share_4T' => 'width:20px; height:20px;',
-    );
-  
-  
   // config
   $tpl_vars['TUMBLR'] = $conf['SocialButtons']['tumblr'];
-  $tpl_vars['TUMBLR']['css'] = $tumblr_css[ $conf['SocialButtons']['tumblr']['type'] ];
-  $tpl_vars['TUMBLR']['copyright'] = ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)';
   
   // button on piture page
   if ($basename == 'picture')
diff --git a/main.inc.php b/main.inc.php
index 6b1eb8f..1aed52f 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -117,6 +117,7 @@ function socialbutt_add_button()
   $tpl_vars = array(
     'share_url' => $share_url,
     'position' => $conf['SocialButtons']['position'],
+    'copyright' => ' (from <a href="'.$root_url.'">'.$conf['gallery_title'].'</a>)',
     );
   $buttons = array();
   
@@ -153,7 +154,10 @@ function socialbutt_add_button()
   }
   
   
-  $template->assign('SOCIALBUTT', $tpl_vars);
+  $template->assign(array(
+    'SOCIALBUTT' => $tpl_vars,
+    'SOCIALBUTT_PATH' => SOCIALBUTT_PATH,
+    ));
   
   // parse buttons
   foreach ($buttons as &$button)
diff --git a/template/facebook.tpl b/template/facebook.tpl
index 299a9de..968c5f9 100644
--- a/template/facebook.tpl
+++ b/template/facebook.tpl
@@ -1,10 +1,10 @@
 {strip}
 {footer_script}jQuery('body').prepend('<div id="fb-root"></div>');{/footer_script}
-{combine_script id='facebook_jssdk' load='async' path='https://connect.facebook.net/'|cat:$SOCIALBUTT.FACEBOOK.lang|cat:'/all.js#xfbml=1'}
+{combine_script id='facebook_jssdk' load='footer' path='https://connect.facebook.net/'|cat:$SOCIALBUTT.FACEBOOK.lang|cat:'/all.js#xfbml=1'}
 
 {if $SOCIALBUTT.FACEBOOK.layout=='none'}
 {html_style}{literal}
-.fb-like span { height: 22px !important; overflow: hidden; margin-right:10px; }
+.fb-like span { height: 22px !important; overflow: hidden !important; margin-right:10px; }
 .fb-like iframe { top: -41px; }
 {/literal}{/html_style}
 {assign var=facebook_layout value='box_count'}
diff --git a/template/google.tpl b/template/google.tpl
index 3d9f3f9..4e5b0af 100644
--- a/template/google.tpl
+++ b/template/google.tpl
@@ -2,5 +2,5 @@
 {combine_script id='google_plusone' load='footer' path='https://apis.google.com/js/plusone.js'}
 
 <script type="text/javascript">window.___gcfg = {ldelim}lang: '{$SOCIALBUTT.GOOGLE.lang}'};</script>
-<div class="g-plusone" data-size="{$SOCIALBUTT.GOOGLE.size}" data-annotation="{$SOCIALBUTT.GOOGLE.annotation}" data-href="{$SOCIALBUTT.share_url}"></div>
+<div style="display:inline-block;" class="g-plusone" data-size="{$SOCIALBUTT.GOOGLE.size}" data-annotation="{$SOCIALBUTT.GOOGLE.annotation}" data-href="{$SOCIALBUTT.share_url}"></div>
 {/strip}
\ No newline at end of file
diff --git a/template/images/twitter_large.png b/template/images/twitter_large.png
index 80ac03636127a8995521814297c52320bb70580e..bcb02c97547a68c8f435a02ddadb6d220adb106c 100644
GIT binary patch
delta 1679
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
Z0{~{kYhvPS<In&A002ovPDHLkV1oSG9(n)(

delta 1463
zcmV;o1xWh14dDxr83+OZ002aL&Wn*DCw~QlNkl<Zc-rJxZA?>F7=G`){cdULT2L;v
z9bjQ*@ngxRf&%F@T7ud3XFoR0ra#cQY{{}8a}u3dVvzZF$znAmCL;b=mVKyEFpGlF
z?FUQ5R3=_F<O)j|3beGPy|?$?y|;x@N(-25$>^Rm?K#gqIp;j*{kZQbAxTms5`SS?
zHWUhpq6oPHk|gzdz0GFR>2w6o^Zot(7K_DdwW?IAoDs=!+_PuT#>dAuY}i1c4GDsv
zX&Q17V`F3Jr;4emsj{-NTyoS@n9XK}VH9XqrBaEJnUf+Zib8=3Y~`xLB>p!db2T8B
zx8$%t<S^+M^ZqD*tZU#$b_&~X*njiCtf?@ml}HZzXEqfYSCh#5<AJ*G@7;K7%ccTj
znnL$ApO4po#g5(9r@?#I`nQ->U4Qz|R;{-iITV~6+|yLs*uH4Ny-l5sJN^?QeUn@u
zub}SM@8`DB`$`LweCwkz9~i-E1!cT!&>MZ>pl>4T$S=4)I$d94Nu6rvNq?{Rl<X6&
z2jBS`KDcu6fJ2Ur7#I7eql0a0xa_!ae8=;N+*qK4Jaa%2-~D;4eqg-0>P5Rzhx|0C
zz@P<{1_(kPhYf`i1fjN2@VsKhWSu&Rz()o7myc@_`DiryZ<vX_a`^r8jJs)x^hqWX
zPa0k}X+A2;Lqma;z8=<W{D1DZ9pC(Vrg!*$fRj}v6e6%eQkxCLxh)nfEX2%+uZ~}G
z`*B-?%jG)LEzWlu+8)Py-Dl=I@pb}pkHyUV<F?c18QjUu#^khVm=!54!lj2}Kd_S~
zB?&qMys!q=I(+KF<|pFSNfK2pI3-CmiYPE5EdfX_;;7zT4$yJ8M}O{&vV-_w@Q#<o
zPS4#Afb!kd4ymVk*U66ZqnEo8&F;YqhmKs42V~|Q`%fLk8NuD$-F;$bmc=uRe6zH`
zFOYs7M-ZS?gWd%B1z;|e8`MIPqEKyCNYZi|XIBx5t6aFJp(nU)Z&y3G-ELsm5lLd7
z453C>Rk7ghz9qLR*MH6+w(ds>gPrm*Wab5)7vu$`*vw2cmSy$KF{vZPTeWK&9z^<P
z=G>A}$e+a!g!(m_6_pe5K>}Una(X;yz3s#hxDS3-4L2|1C1Lmu1I{B=w7}j)weZOE
z-Y!qd`)nj}3K@85-TWCocQIhW-J1k7WM7z?55h(Jt}#k4>3>N<5VDIC6Ye@2A7WAE
z>!_0TdWRUNi;mECCv)5DEs-@=7GdIblmal$Bdsm_?eizeh527H^U>kiXjr18$?UF(
zJOxaKLVc5%Ftb}p;E$JSW3kwZ-BtG3qU|mxbhNZEP`Zwm=t`H9X=&*Ir)ztWfRDFT
zyHU+gw;$pyK7aJ^;-Q+FnlJ9~S$WB3FI_PIirqCqHg7KcSfDPAM6XVWeIX*<o|1UN
zPQ7LT)VPeBCijpynIhD6o?&2b^)^9@71>H~^Qf^BHKH;2t)F%_NwtlK>sscjhhwjX
zBC%{ds^1Ik?Vs0mlpXSX_4c|9J0N;{du=vbwhcZAM1Q~i3ocJk0R_Gr$y9|Ou8~f!
zS78!Z_KygaPNxDc9OlGShJ;uo7>VIIYYZ9%h^Ye-R06Z3mf+{u1ydw3GBT1mCO_%<
zgPn=_{QR^+i&X&_@>31tPzq<u)q6}5`ppX7)?y?Wh%CWy;Q*KZ-^F5T2|nBCWhx%e
zo{iT>Lw`4)M!WnlEUM)K00<K$)#SlGD|Mh)E5}8MTiv&i>FMd+R#knmUa3@)B$<p-
zp69W4o0tgZ$W<#EM~>VlDT=~(0F_q9<O(p|pfrV6tHlhd)9G?jBudk0Gz2D)fq?-{
z97MLtW)%Ws5W_7T4p&rE5ZJ+7GCDdM3<lFKge0pPDwWD$FwiuuR;&LOU;whdW|a1-
R2A%)_002ovPDHLkV1o1I(Ln$J

diff --git a/template/images/twitter_small.png b/template/images/twitter_small.png
index 4f341df3d2a3cc49328a16e02a4789dfcbfede00..96df5ff05e31fbabad1d876906360a1601482bca 100644
GIT binary patch
delta 1266
zcmV<O1P%L(37-m(83+ad007(_E^d(_D1X68L_t(|+T532Op{j_fS<M>6etCUaVrH1
zBCur6>5Wc7Vu{IsWV<vj0r#U3oY`)6v+2x!vII4|T$W4|m{H0SZ<l2bm*_@uH{OU@
zl$DM0fj`^G28Ck#_50cRzCtO|sy8OuH#up~dEfK%eCK`NbB@h048q~CF*7rRrhjSV
zk~ka=N=izot*y1$Zr{FbL?RKYtE+K3ojC;>kH?vuoTR9z2;0cWh*4KpM}B@jxhRQ5
zg3-}YBt=n>Bne&Da}v~aUsY9+%u238rb|Z9*|<WfbG0ka#uJ>oHpQ%>;VUU%-%FL2
zttpx8pEyu6^QKGJ_rLLK-8woqRe!8#f93o&u1D>{AM%9r&(J^mFBAVoIlA4)zD-_X
zArm;z$*IuliR!!i>Fw}6UK%;Tf&LnLk2XEpjz%0Vx`TK5Wonj_{taTc@)-Ghp6hBc
ztXm6q2dD{#5^+jhg={Hbvp7Z-ooBA_rcL}E`kclO{^0PpXXvaJA5%+^(0?9hh{z0l
zc8bu3;~7KIz66?HI$!ianTNn%4qiBWjYESs85o;^;x$kpV4X!!R06J2dRu&KEGt;-
ztC5Juh{Z(Fl3t=IX8m{0?B9j|V1Te?7o^AU$M5eUXw}064*Hk%!5*RWr%F#SZG9Pa
zX8$)hZF<s$BWd&KDd>!#XMb-_3m6wX;~}!9g1|pczLJGuej(Uw$xmedYAUVINmf?7
ze+=E?G(=dKbsx>U8z6L<;R#WnkQt|ehK6xut3J$SvB-wq&G;q;=sGq?+le5-peQHW
z7(CX+fMu6W=cA)9z&m0Jp(NPXf$u)hj4}Gfb}y~J#+bE<3q)SN1%H&x)zY$&=(E|S
zS?5$nSsK$YVKpjVf19?ik04JO$nqsZZTmUS5&Evk?D5Hj1bBC21>vEe857;cKHSNL
zwBaVLe%W+l9hC}}6B#P^Vu?qK(dUaDyjLsnrK~fni+GeWWK><{@P@+dM^lQ^{Hnq{
zzK!NK_-JUDCV^F7<A1?JJ)!WF*ySI^PV}(1TqT@LT^#D~qoaCxI89mLPdU3Tt{RI|
z8jl{M<}U4U>(u0noiy}}yS2GUWv|b<+GSI&yGWX9Q`ojskd6;CG+s~34lmvvE!2;n
zrGHRx?%XOCt5ea~V&e1Dr5nu8&vWCOw`gwuluOEkbtyQ*Sbw#ate|Fjd9B2$Ed{)`
zPG1ST=&~1@ORS`m6?AFdv^HgH6Rn|(Tnw$J(xak!Dp?;I6Ykhb(^kc@Q9XM&-P6ig
zZx`+D?R53o={|Rq#)s&1y@IOsV#2|XX@B=T@_nGTt5>fYUaxogXi-!?5pnaw-2@S5
zDY(l-rgbHc6n_D{uN+Qp%*Pgsu8Qpyl2?ekz>cyIC7yZ|<x%J^5b>fCo4ZG1RXx4$
zQa;dEj`09pUZERHCA?=L8fU4Cc(^1%%gf7C>$8b$>T<cbIj{5GR4kc*#C_2x7QO3P
z36G=^jXnhO36nc_?qs<zh-aHmT=d_sUw*b}=7AqyAYZcZbiP?7^LB40AM-a|%vX(B
zo^~-e(QdaRnJ@6UxjBl9i>-!S5);x4Gq>A~&5X5Mw{98J)6>=sC#RlfBK*qA%BZTU
cvi&c>0ML#UoMC&8V*mgE07*qoM6N<$g0@(G7ytkO

delta 1117
zcmV-j1fu(&3X2Jl83+OZ002{exjB&`D1R+UL_t(|+RRp8Oj~6XKezX`xAZS|LHqYo
z2Ca#6ZZFL7rx|34Er~uZGokorW-u3h@kPPKKQUojd^9Gqgi092WUt1Eoe9%YeBp&H
zX5g&?mj<R1rG>KIf8X`HZ7HR6__8cL4>#xgopZkadd~U2?+~&qa~!w1xrr61RevE#
z(qgfAy<TE%Z7q|@G&VNUG+ncFd7fWgT{RdC)W*g}OG}GZt3?RaEL}{`<MAvmE>eOZ
zP!v_mTuc2RNfL#%+UHu5O1f!Yu+qA6k2EjdoKK|%nX%~mUT|Xv3|9C&QM!tvl-B*<
z{rYlCL-@F>guHZX{$5rCq!z@@iGRg^R{qTnoo4!uI{~=pTj3FQ-*&!%iP2u>@leCt
zPk2X%Iu6TjhBOY$Joq`4zTVYrrL}ke+P){5py3E;NRY(1$XktdCmr?q5Knk)_H_av
z{#pC`zhC}lEZhi+EQ<1DX)SK@(-F4$YDJ@J3Uo^ne%=l?d-PB8x$*f+v44fh<R+Nv
zL2m-u00s*ft)tz{F`GW`D~o(i6<IBgEMV=ou?uIqE=HGC>&$Q$mf;yyUyfevD&hsW
zYtM$NfY|@F8@O&$gS)$-0`E$?;|m)=8{sK?rrs6(oBomm(A5D!sDBNAWhwX!g->XC
z2vQ0Sg*7H{)(`BR#0o+y+<y}I{r)9R)f0DE@ShDZE0g_KVxem@s$2`juJli;)`K9^
z8;QQ{2f%2gmnoxL*}I>gb_RdRr3o6eI!rEqg-}JCqMR_|VvCh^D}>`+6xsFao1w1;
zxs<|j(`@L%RTzxSa_1NhvmI!6EysUK0wh1^oZ1atRXq=avgj7nntv(M!<=|n?>=iH
z-#tow!J#xFf!crkk#xDauF9=fWUE>be<~1y595grV0~V@9enI^DzWkdgoe*Mq~-i+
zyfhK%Z7hb$!p<LD6_A&TIryL6#mQ?kBd<=vo)sxPVUW%<G&(4Sor??MRA&g567eNp
zcbn7M*6mvwpNK)IvwxMBkgL7h2kej2_qVsV?|=P9An?hwP#r9?%;x|d(z{q*JVK3}
z)W6bz_88~eU@Bn2r>P2Ew3~+l-`0*Gd;2!q<hDza-QC0{lMw7^RVhgJb2o;A$<h9v
zo}T`QX5i*f`y)VvT%IO?*hf9@+~Uf9hM1e1b2^>HTTGBXo`2=Oe;{UPE0}GdH>&rS
zg8CeA{g{r(Wy`y~>_x9L>ovkomY4U|6iB(PhvGiH%$P67UPv{th?RNaX-uW-a5xHE
z5d>j08W*<Fx2c?Z!bp<QYtB4P*(o`jeFWDhDC_I%2cC&chM}nUe8pi>#y0`Kli8`2
zQJBJ$4nAJ^TS|h2ywuuogLA6UXed0TZ*6UvOeVaj*+C3*#ocH&n+dGp7REz5eyeJC
jZloxi&E|Hy{}W&UaAprwOnhC`00000NkvXXu0mjfnQtxp

diff --git a/template/pinterest.tpl b/template/pinterest.tpl
index 9a77b88..659954c 100644
--- a/template/pinterest.tpl
+++ b/template/pinterest.tpl
@@ -1,6 +1,6 @@
 {strip}
 {combine_script id='pinterest_pinit' path='http://assets.pinterest.com/js/pinit.js'}
 
-<a href="http://pinterest.com/pin/create/button/?url={$SOCIALBUTT.share_url|urlencode}&media={$SOCIALBUTT.PINTEREST.source|urlencode}&description={$SOCIALBUTT.PINTEREST.title|urlencode}{$SOCIALBUTT.PINTEREST.copyright|urlencode}" 
+<a href="http://pinterest.com/pin/create/button/?url={$SOCIALBUTT.share_url|urlencode}&media={$SOCIALBUTT.PINTEREST.source|urlencode}&description={$SOCIALBUTT.PINTEREST.title|cat:$SOCIALBUTT.copyright|urlencode}" 
   class="pin-it-button" count-layout="{$SOCIALBUTT.PINTEREST.layout}"><img border="0" src="http://assets.pinterest.com/images/PinExt.png" title="Pin It"/></a>
 {/strip}
\ No newline at end of file
diff --git a/template/tumblr.tpl b/template/tumblr.tpl
index 998fb70..1d74f0c 100644
--- a/template/tumblr.tpl
+++ b/template/tumblr.tpl
@@ -3,9 +3,9 @@
 
 {if $SOCIALBUTT.TUMBLR.mode=='photo'}
 {capture assign="inline_tags"}{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first},{/if}{$tag.name}{/foreach}{/capture}
-<a href="http://www.tumblr.com/share/photo?source={$SOCIALBUTT.TUMBLR.source|urlencode}&caption={$SOCIALBUTT.TUMBLR.title|urlencode}{$SOCIALBUTT.TUMBLR.copyright|urlencode}&clickthru={$SOCIALBUTT.share_url|urlencode}&tags={$inline_tags|urlencode}"
+<a href="http://www.tumblr.com/share/photo?source={$SOCIALBUTT.TUMBLR.source|urlencode}&caption={$SOCIALBUTT.TUMBLR.title|cat:$SOCIALBUTT.copyright|urlencode}&clickthru={$SOCIALBUTT.share_url|urlencode}&tags={$inline_tags|urlencode}"
 {else}
-<a href="http://www.tumblr.com/share/link?url={$SOCIALBUTT.share_url|urlencode}&name={$SOCIALBUTT.TUMBLR.title|urlencode}&description={$CONTENT_DESCRIPTION|urlencode}{$SOCIALBUTT.TUMBLR.copyright|urlencode}"
+<a href="http://www.tumblr.com/share/link?url={$SOCIALBUTT.share_url|urlencode}&name={$SOCIALBUTT.TUMBLR.title|urlencode}&description={$CONTENT_DESCRIPTION|cat:$SOCIALBUTT.copyright|urlencode}"
 {/if}
-style="display:inline-block;text-indent:-9999px;overflow:hidden;{$SOCIALBUTT.TUMBLR.css}background:url('http://platform.tumblr.com/v1/{$SOCIALBUTT.TUMBLR.type}.png') top left no-repeat transparent;">Tumblr</a>
+><img src="http://platform.tumblr.com/v1/{$SOCIALBUTT.TUMBLR.type}.png" alt="Share on Tumblr"></a>
 {/strip}
\ No newline at end of file
diff --git a/template/twitter.tpl b/template/twitter.tpl
index 438f1f1..1b1f26b 100644
--- a/template/twitter.tpl
+++ b/template/twitter.tpl
@@ -1,7 +1,8 @@
 {strip}
 {combine_script id='twitter_widgets' load='footer' path='http://platform.twitter.com/widgets.js'}
 
-<a href="https://twitter.com/share" class="twitter-share-button" 
+<a href="https://twitter.com/share?url={$SOCIALBUTT.share_url}&text={$PAGE_TITLE|cat:' | '|cat:$GALLERY_TITLE}{if $SOCIALBUTT.TWITTER.via}&via={$SOCIALBUTT.TWITTER.via}{/if}" 
   data-url="{$SOCIALBUTT.share_url}" data-lang="{$SOCIALBUTT.TWITTER.lang}" data-via="{$SOCIALBUTT.TWITTER.via}"
-  data-size="{$SOCIALBUTT.TWITTER.size}" data-count="{$SOCIALBUTT.TWITTER.count}">Tweet</a>
+  data-size="{$SOCIALBUTT.TWITTER.size}" data-count="{$SOCIALBUTT.TWITTER.count}" class="twitter-share-button">
+  <img src="{$ROOT_PATH}{$SOCIALBUTT_PATH}template/images/twitter_{$SOCIALBUTT.TWITTER.size}.png" alt="Share on Twitter"></a>
 {/strip}
\ No newline at end of file