From 267f127067e04eb526a32288d40544e356a595d2 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Fri, 4 Oct 2013 20:09:05 +0000 Subject: [PATCH] add light mode: no script loaded tests in migration task add an id to the div on picture page git-svn-id: http://piwigo.org/svn/extensions/SocialButtons@24757 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin.php | 1 + include/install.inc.php | 23 +++++++++------ include/pinterest.inc.php | 2 +- include/twitter.inc.php | 2 +- language/en_UK/plugin.lang.php | 2 ++ language/fr_FR/plugin.lang.php | 2 ++ main.inc.php | 15 ++++++---- maintain.inc.php | 5 +++- template/admin.tpl | 42 ++++++++++++++++++++++++---- template/facebook.tpl | 7 ++++- template/google.tpl | 7 ++++- template/images/facebook_light.png | Bin 605 -> 693 bytes template/images/google_medium.png | Bin 803 -> 886 bytes template/images/google_small.png | Bin 608 -> 699 bytes template/images/google_standard.png | Bin 949 -> 1057 bytes template/images/google_tall.png | Bin 844 -> 940 bytes template/pinterest.tpl | 12 +++++--- template/style.css | 11 ++++++++ template/tumblr.tpl | 11 +++++--- template/twitter.tpl | 13 +++++---- 20 files changed, 117 insertions(+), 38 deletions(-) diff --git a/admin.php b/admin.php index 5df4990..6c2bd93 100644 --- a/admin.php +++ b/admin.php @@ -11,6 +11,7 @@ if (isset($_POST['submit'])) $conf['SocialButtons'] = array( 'position' => $_POST['position'], 'on_index' => get_boolean($_POST['on_index']), + 'light' => isset($_POST['light']), 'twitter' => array( 'enabled' => isset($_POST['twitter']['enabled']), 'size' => $_POST['twitter']['size'], diff --git a/include/install.inc.php b/include/install.inc.php index 49ae4f9..55196ca 100644 --- a/include/install.inc.php +++ b/include/install.inc.php @@ -10,6 +10,7 @@ function socialbutt_install() $default_config = array( 'position' => 'toolbar', 'on_index' => true, + 'light' => false, 'twitter' => array( 'enabled' => true, 'size' => 'small', @@ -41,21 +42,21 @@ function socialbutt_install() if (isset($conf['TumblrShare'])) { $temp = is_string($conf['TumblrShare']) ? unserialize($conf['TumblrShare']) : $conf['TumblrShare']; - $default_config['tumblr']['type'] = $temp['type']; - $default_config['tumblr']['img_size'] = $temp['img_size']; + if (!empty($temp['type'])) $default_config['tumblr']['type'] = $temp['type']; + if (!empty($temp['img_size'])) $default_config['tumblr']['img_size'] = $temp['img_size']; } if (isset($conf['TweetThis'])) { $temp = is_string($conf['TweetThis']) ? unserialize($conf['TweetThis']) : $conf['TweetThis']; - $default_config['twitter']['size'] = $temp['size']; - $default_config['twitter']['count'] = $temp['count'] ? 'bubble' : 'none'; - $default_config['twitter']['via'] = $temp['via']; + if (!empty($temp['type'])) $default_config['twitter']['size'] = $temp['size']; + if (!empty($temp['count'])) $default_config['twitter']['count'] = $temp['count'] ? 'bubble' : 'none'; + if (!empty($temp['via'])) $default_config['twitter']['via'] = $temp['via']; } if (isset($conf['GooglePlusOne'])) { $temp = is_string($conf['GooglePlusOne']) ? unserialize($conf['GooglePlusOne']) : $conf['GooglePlusOne']; - $default_config['google']['size'] = $temp['size']; - $default_config['google']['annotation'] = $temp['annotation']; + if (!empty($temp['size'])) $default_config['google']['size'] = $temp['size']; + if (!empty($temp['annotation'])) $default_config['google']['annotation'] = $temp['annotation']; } $conf['SocialButtons'] = serialize($default_config); @@ -63,7 +64,7 @@ function socialbutt_install() } else { - $new_conf = unserialize($conf['SocialButtons']); + $new_conf = is_string($conf['SocialButtons']) ? unserialize($conf['SocialButtons']) : $conf['SocialButtons']; if (empty($new_conf['pinterest'])) { @@ -73,6 +74,7 @@ function socialbutt_install() 'img_size' => 'Original', ); } + if (!isset($new_conf['on_index'])) { $new_conf['on_index'] = true; @@ -83,6 +85,11 @@ function socialbutt_install() $new_conf['facebook']['layout'] = 'button_count'; } + if (!isset($new_conf['light'])) + { + $new_conf['light'] = false; + } + $conf['SocialButtons'] = serialize($new_conf); conf_update_param('SocialButtons', $conf['SocialButtons']); } diff --git a/include/pinterest.inc.php b/include/pinterest.inc.php index d0b1f9e..b9a40e1 100644 --- a/include/pinterest.inc.php +++ b/include/pinterest.inc.php @@ -3,7 +3,7 @@ defined('SOCIALBUTT_PATH') or die('Hacking attempt!'); function socialbutt_pinterest($basename, $root_url, &$tpl_vars, &$buttons) { - // only on piture page + // only on picture page if ($basename != 'picture') { return; diff --git a/include/twitter.inc.php b/include/twitter.inc.php index af03b12..5f8134f 100644 --- a/include/twitter.inc.php +++ b/include/twitter.inc.php @@ -5,7 +5,7 @@ function socialbutt_twitter($basename, $root_url, &$tpl_vars, &$buttons) { global $conf, $template, $user; - $twitter_langs = array( + $twitter_langs = array( 'fr','en','ar','ja','es','de','it','id','pt','ko','tr','ru','nl','fil','msa','zh-tw', 'zh-cn','hi','no','sv','fi','da','pl','hu','fa','he','ur','th','uk','ca','el','eu','cs' ); diff --git a/language/en_UK/plugin.lang.php b/language/en_UK/plugin.lang.php index c215785..3c19e7b 100644 --- a/language/en_UK/plugin.lang.php +++ b/language/en_UK/plugin.lang.php @@ -12,4 +12,6 @@ $lang['Top bubble'] = 'Top bubble'; $lang['Display buttons'] = 'Display buttons'; $lang['on photo and album'] = 'on photo and album'; $lang['only on photo'] = 'only on photo'; +$lang['Light mode'] = 'Light mode'; +$lang['When light mode is activated no external script is loaded, it speeds up the load of the page and disables user tracking but also disables annotations and in-page popups.'] = 'When light mode is activated no external script is loaded, it speeds up the load of the page and disables user tracking but also disables annotations and in-page popups.'; ?> \ No newline at end of file diff --git a/language/fr_FR/plugin.lang.php b/language/fr_FR/plugin.lang.php index 75514fd..dc911fb 100644 --- a/language/fr_FR/plugin.lang.php +++ b/language/fr_FR/plugin.lang.php @@ -14,4 +14,6 @@ $lang['Top bubble'] = 'Bulle en haut'; $lang['Display buttons'] = 'Afficher les boutons'; $lang['on photo and album'] = 'sur les photos et les albums'; $lang['only on photo'] = 'uniquement sur les photos'; +$lang['Light mode'] = 'Mode léger'; +$lang['When light mode is activated no external script is loaded, it speeds up the load of the page and disables user tracking but also disables annotations and in-page popups.'] = 'Quand le mode léger est activé aucun script externe n\'est chargé, celà accélère le chargement de la page est désactive le tracking des utilisateurs mais désactive aussi les annotations et les popups détaillés.'; ?> \ No newline at end of file diff --git a/main.inc.php b/main.inc.php index 1716e90..f4d3ef7 100644 --- a/main.inc.php +++ b/main.inc.php @@ -118,10 +118,10 @@ function socialbutt_add_button() } - define('SOCIALBUTT_POSITION', $conf['SocialButtons']['position']); $tpl_vars = array( 'share_url' => $share_url, 'position' => $conf['SocialButtons']['position'], + 'light' => $conf['SocialButtons']['light'], 'copyright' => '(from '.$conf['gallery_title'].')', ); $buttons = array(); @@ -176,16 +176,19 @@ function socialbutt_add_button() switch ($conf['SocialButtons']['position']) { case 'index': - foreach ($buttons as $button) { - $template->add_index_button('
  • '.$button.'
    • ', 100); + foreach ($buttons as $button) + { + $template->add_index_button($button, 100); } break; case 'toolbar': - foreach ($buttons as $button) { + foreach ($buttons as $button) + { $template->add_picture_button($button, 100); } break; default; + define('SOCIALBUTT_POSITION', $conf['SocialButtons']['position']); $template->assign('SOCIALBUTT_BUTTONS', $buttons); $template->set_prefilter('picture', 'socialbutt_add_button_prefilter'); } @@ -197,12 +200,12 @@ function socialbutt_add_button_prefilter($content) { case 'top': $search = '
    '; - $add = '
    {foreach from=$SOCIALBUTT_BUTTONS item=BUTTON}{$BUTTON} {/foreach}
    '; + $add = '
    {foreach from=$SOCIALBUTT_BUTTONS item=BUTTON}{$BUTTON} {/foreach}
    '; break; case 'bottom': $search = '{$ELEMENT_CONTENT}'; - $add = '
    {foreach from=$SOCIALBUTT_BUTTONS item=BUTTON}{$BUTTON} {/foreach}
    '; + $add = '
    {foreach from=$SOCIALBUTT_BUTTONS item=BUTTON}{$BUTTON} {/foreach}
    '; break; } diff --git a/maintain.inc.php b/maintain.inc.php index e046803..32a5be1 100644 --- a/maintain.inc.php +++ b/maintain.inc.php @@ -23,7 +23,10 @@ function plugin_activate() function plugin_uninstall() { - pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "SocialButtons" LIMIT 1;'); + global $conf; + + pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "SocialButtons";'); + unset($conf['SocialButtons']); } ?> \ No newline at end of file diff --git a/template/admin.tpl b/template/admin.tpl index 639930a..ce95864 100644 --- a/template/admin.tpl +++ b/template/admin.tpl @@ -2,11 +2,15 @@ {html_style}{literal} .socialbutt.disabled thead img { + -webkit-filter: grayscale(100%); /* Chrome 19+ & Safari 6+ */ filter: url("data:image/svg+xml;utf8,#grayscale"); /* Firefox 10+ */ filter: gray; /* IE6-9 */ - -webkit-filter: grayscale(100%); /* Chrome 19+ & Safari 6+ */ } -{/literal}{/html_style} +{/literal} +{if $light} +.not-light {ldelim} display:none; } +{/if} +{/html_style} {footer_script}{literal} jQuery("input.enable").change(function() { @@ -22,6 +26,23 @@ jQuery("input.enable").change(function() { $parent.removeClass('disabled'); } }); + +jQuery("input#light_mode").on('change', function() { + if ($(this).is(":checked")) { + $('.not-light').hide(); + } + else { + $('.not-light').show(); + } +}); + +jQuery(".showInfo").tipTip({ + delay: 0, + fadeIn: 200, + fadeOut: 200, + maxWidth: '300px', + defaultPosition: 'bottom' +}); {/literal}{/footer_script} @@ -53,6 +74,15 @@ jQuery("input.enable").change(function() { + + + + + + + i + +
    @@ -86,7 +116,7 @@ jQuery("input.enable").change(function() { - + {'Annotation'|@translate} @@ -144,7 +174,7 @@ jQuery("input.enable").change(function() { - + {'Annotation'|@translate} @@ -179,7 +209,7 @@ jQuery("input.enable").change(function() { {html_options name="pinterest[img_size]" values=$img_sizes output=$img_sizes|translate selected=$pinterest.img_size} - + {'Annotation'|@translate} @@ -220,7 +250,7 @@ jQuery("input.enable").change(function() { - + {'Annotation'|@translate} diff --git a/template/facebook.tpl b/template/facebook.tpl index 94abd2f..2a4bf13 100644 --- a/template/facebook.tpl +++ b/template/facebook.tpl @@ -1,7 +1,12 @@ {strip} +{if $SOCIALBUTT.light} + + Share on Facebook +{else} {footer_script}jQuery('body').prepend('
    ');{/footer_script} {combine_script id='facebook_jssdk' load='footer' path='https://connect.facebook.net/'|cat:$SOCIALBUTT.FACEBOOK.lang|cat:'/all.js#xfbml=1'} -
    +{/if} {/strip} \ No newline at end of file diff --git a/template/google.tpl b/template/google.tpl index 2a8afe7..28a79bd 100644 --- a/template/google.tpl +++ b/template/google.tpl @@ -1,6 +1,11 @@ {strip} +{if $SOCIALBUTT.light} + + Share on Google+ +{else} {combine_script id='google_plusone' load='footer' path='https://apis.google.com/js/plusone.js'} -
    +{/if} {/strip} \ No newline at end of file diff --git a/template/images/facebook_light.png b/template/images/facebook_light.png index 5722afd05de9830d95ee66fee483c8206503ab8e..488b6814dc5f4c4a7d54e13c012d713b8e6f82a2 100644 GIT binary patch delta 644 zcmV-~0(<@41hoZ_83+ad003%Oq`8qHCw~H0Nklzsxv@S!H(PM_T1rHcDCMdwgrs4@{l1m#VM%q=v(tjSl3{?z= z847p22WDmg26d*o^-b2dKz+TipU~lRd^!J|R|0000FRY83+OZ008AWGwzWgCw~F|NklrzUe2fpDef;?4mzV$t3k%agx#suZe{Vnh;NoOudi&|ez&Zs8Secnb1v%e; z`oZ+)&%c3n3Is4SG5-Dcf8gDL3`ld0SJslas`Z1yHAS5}Pb^CvEMarw;cFoI=6}Oi zqEtV>P}p|i35{H{e(yC~BUz#>Cd(brf`>?Tv)7)3M-wph07-je`SN62EJ`H}`l~>0 zqMB=fNdyuvZ~%7-oM90)8@p?OVKbkhI1$FZaL9l5$G95bV1^5YEtl_sgaklbNupf? zbV|5~4v?{O#}$fFF3@GO8LFoGntwAqn2`M`Vrr~8)VUYTs|;j_kEv&`K2n-Po?gyw zk*}I+2X?`ShYSz*XD^1y$v@;@iY+{d%2P~?R4AsU zJ$$Pe4j1lt&mbuv|Mc>j3*_dhfB*l%Q!9`JW^aE7O&b$=xB_`e0hCC|zJCl6uBzcf zHpe`{_IUP|LI$7y8r{N{#s08h!x~PEr>;C#lH$XYr?yRt0g|UKJ>P%&&cU+};ZB)e z>qFg$z4z=BcGnCD0J>%<*Wn|~HNY0~0JhKJ0NC&YHvd44^*0}W067Ee6rdaUdDt0& uJ(vg2J_1|F1Lz=Nr~sX!BpD+B5MTi0$lV28y=XuH0000O=2hL|`8($_l>(DN#^V_(AE-6(!EFmeGdE zHs{uMyS?3Y_cxcCrzo}`{Ez#;+&$0l`Tg!WisyNQ$K!eGcDu_$p%79LTCJAP%74o0 zHJMDiD5ule9S8*06%-WcG#X7x2rvu-m&+B>>-9raUteFsYPHIQfS^W72v8ISj^i*m zI0!l#jmjn$QWavNBBp>1S_Dod_*4=iE=_KjAVM#?knsEj`|%Apzb|=^&Mkzoz8Q3( z`M;2mi7ZAN_d{7^L3UjeENxxTZGYHI4(KblVR_4aD2i5)!wVf_t<4xYxK(mLsQ_&- zLRnf)x>F2e%`q^a-XhTb81k}>P^?_Dpv<_?F9bW<5b1w6F_$QDQUOX%lZKdN#&SHg z>nq5i#P=`rX6iXvGi~lYRg2hAKPZ(t2_&TeArKpNkv^EZL1mc8!?Lurd4CCr9X)lf zt=NLxvo|5r>gFXtz5+fT1KaZqs!cnS@+8K+kZIDP5|oHZ_`}%oD)8ZnvUv{e0HxL- z^Ku8$_tb%n#imI;YpEuCfVflVZ9t&_Z7oIo>i}3=5Aqw&gH>t4OVlv`+C!54NW(tl zUAjkr!r?F}=geA5^#D;|*?+lP@IUVqKEc;u9^3#Qiz5H@RYdd5NKDCOHcS2UCd~RD zA;A3H3WyiRV1jP%Vdx_)e$;O#n_&pnJR=jS$hmm;FByqU=PZFJnK(o_m6p|rI6h;% zr3vbq2GFb4&PyN|49>cqeW9JaQ))k1g4l;%B%I#>mVrFo0NRv;xPNC9%=I%+S04pk zQobmslLG#y1l)iP#;SVA^%~{MThr>}KvPwk=nI|k3OLuW`arJKj1^~`1$fJnM R&c^@%002ovPDHLkV1f`Ahphkr delta 755 zcmV^np~1w&^!xX3Dq6tC z#wIT>f8)jtmS4YqF)}j#`}dE5ssI@BKx2W1v-|@C1{wgM9YB*=K-9M{U-xbL`+w%e zk4vZieS8m*W|5E)%&1|JQJ~NcCZHuR%i`E&mBi92lxA$=wRQzc@Y#FG_bp?URs2sJ zcsHTud5Q<7IMfF${DSNTmcV!i8ZDSm`0euPPY1U#n>nzmXcKhfzptOateElh${7$F zBdDQ1U}OeGHN?&z|Ne6u+W_VMK7YJ}%e`+Z6X5K()ycnaUt#3ngcyhE1CRy3Up@s! z16+tvKm@3oiH!}H1;FG1XLH-QNwm*n;^xI=0Voyy|MUCD(cK)*{t$ot{qUBFi-*J5 z=J)^qXkLC-9P$4^=bEZ~P*>QQ3Sye>~3c0g8TSVET{bE=(Za zy##6#hI_FG(JwFn`kh@#{eS1Zn;-frI1@@()O2xK@a4-FG!e0`#X#+t;?N-aec{;O zC-)hCd}HR}XAu$q^XBEZna!NB1uXiOMCMpbqfvtB-?ejs5gE*U0xT>n%>VwrT{Q92 z{w?1ZPvDYLU=op_q^JPp19ot)G zG-w)x90~<5>PauwA1G)+C|;z+i%<^=QhM+p7Cb2SAVow)5Q~^o!4{zhK_a&FX)!fdfvJZf2%fIb)@q<`u6 z`%{5H;2O#0a*Ki>9HBtaMy($On$0FCVbwIvb&^ab)p$HEQqYb*8snNyry)>T1`NYM zzm0W4JAl9*MoC6>=_QCLqW10$tXdV0a1`$Im*LnS{i}qV_h#U|daDg%xoxbH^7;v+ zQy1VHpTywg4Op}z@8~$h14EoitAB4?pJ@9wDkc0}xC8A|sw-tR;z); zhOsRaL1}dfOgbuIo6`|#`&O4nNC_EkMAo9Xlq|!ryEwDpGD)t zYS*SQXY707l}e=xhQN&u@mq;rB#U)sajl^E8{y4)yb@ jh(sc(SS&X7OMn3Y-wD)T)$1~g00000NkvXXu0mjf;Atgjb83+OZ0042un2eDjD1QP;L_t(|+G70ihSy)(r9400vG7S3n?;p?+fB*hv0aAK;dVl`>VIUWXh=^Rgc##F@ zBT7txI11z6U4Rz-C@n%_^X70hpjbAg610e{W= zvVNg}cerpwx_Ej8(0PJB5o}5t|B%4z@;EsA&*zUHW_SL)a^@c@02#!>C-9et|NHmv zjG9L5a>^eMYy*1sKN0}O4V?XL*IE_3!qp(W#_<2|*VVKC0iE&k>F-z1_NMS-N$)D1w9Uw{7s?E^Xp&1)bR@wx?n-MisaSJB@m_a$qm{1OoP|MxG% zsxM!@fT;g41`ErL;ztLspK^A~kmxdVgR8z4!Cw zvp2gp{Cx6&SwQ&H)cRki4*W+2KxWS>mrx75tnNK>;HeRXSRP? zI*CzOoJm2A_yh?gS>)v8zHxA{@d>jy?gh_&LYan${U)Rng9U?00MNz2sJWtkpKVy07*qoM6N<$f^7;J`v3p{ diff --git a/template/images/google_standard.png b/template/images/google_standard.png index c34946994ff596a0f5e4ffff304adf4cee8e0363..1a24ab0c8c1c308f2f4022ebf34eee8d92b9e56e 100644 GIT binary patch delta 1010 zcmVpx^~XA5^@-(tS{LcVE^m>?)%B;Hnh7z&#2 z;5ZJMOa_5K075dETcsve)E_7W7&-3_PjB;Yc=*T>O4EfLN(0krN z3%*8H(+bfR3mmI9!Lf1!n~yj#>VHD1`6p;^USizN1F+Aj1L84s{rV&1r>zX=-mxF{ zFBigaj)kHqBd!?bWMOJOx)1mEec-2k0TOeNc@ge!njm_r7_j&9S)@4&3(S6nKV}$m z0^!DW=-RP-NUSBFiIZnSRn^=B2;-Ed!?|<~yQKH^AbIcB@JOX)L{BxrNPouj?i!R> ze>SQqx$r?`U#$J=A9-oqnIOmv~ zk*hJ{C{x6^5-*i+UZ$IH?f%Xbv3yn%7?g+iV6Cby2try$AP8)3CBbjD02kvbR&9j6 zZZTAF17eDUU+4$Ocdvn;TYnE>^7K4FYkvkk8ey3#%vk`XxP-j7$liv6b?=_lIhAd8 zR35zmp>{E3RU4Fi$vQ^sQdUVLarzLf%hp4fS_7l^9pp>Ru+_|m>+2s7Cy6nTRh_$? zpNIA|zx>Y!(Nkx`y?^frq@+CPgA$3v zpldVkF6m0i>OjSoM%Jg)&>IByZ^<1)<}N}kk^Ili-3;E8VpM8Ll5%k&#q$8E@}0lKhN&h_Uu?YcL+^M2 zofOhh6Q{9uq;>_6&3~jJpE(Tcx?K?KmkhfPMx#;lO+0h)B%Euv!O^f8Ht$5{T6$=U zT{(})@8_ttND~akI3d*3{Vz?NDduZxM#@$Ji8SfHP$&-=LrTYlS@ZDr`1h;)kX2T1G*UqS-4j} gA3mS&*xv#S06MXDylimkod5s;07*qoM6N<$g2vbLF8}}l delta 901 zcmV;01A6?S2(<^083+OZ000>;7$lJ)D1TQ;L_t(|+Pqd>NK;`L-geHZZOo0u8oHc1 zwI4Nq&vXZD%_>KkGd^GN*2*jIEb*@t*U1-+8|0ec$i>K5--xS&UjR7!;+`WHOmHYJaH9 z<#IZm27>`UrIivSS*=zvn8{?)>2y-56y&Cr61Yf`wApNEAP~SXjAdC-nhhiYkDy*ZJTk@pTGdZA*u|w3=0I3x9{hsZt4a5>Dc$_u6yqNa0?{D}i9z%UxJzHo!|m zPeNh| zg_7G$*cJgw@!J0qFNfe=bMcx0i%S*CW+OB}$}w;2 zXyy)@vi)9v;BOkez!)Kw5D*;4xs>2O9>B*(<+~~*x?Ewt%=^Rtpnp;l4XmWad1SzUa)yc*6Sd~g;BPiHaG)>2P5>ykBWzd{4a^n^qkrWx^ zUaeM3;G#7%GvoDo*R2T7EG8-r)8(W@BFHeC%|Isxa=YDbu~^_L00000NkvXXu0mjf)U>oZ diff --git a/template/images/google_tall.png b/template/images/google_tall.png index 40034501f559f1c5564440ab3ffa812a4b84e120..96b04b4993d45d8ee04fa16c6b60dc32d1066665 100644 GIT binary patch delta 893 zcmV-@1A_d_2CN5=83+ad007U*ZkmxHCw~J@Nklm{T}BZ-Pgss}B^ULq;Npn9k%&`=OH$_u7h z?z%4P&dz0LXF7A#Weo$Z33ds`fh9FnP7t$$Xy zT&}N9r}G3eG&Iy63;cytk!^4u@ZXaaY+S=5-ygaZh3&KuP0bv*h zilU&Wrw0Z}l429d*0jKDzH1l^8i1(4gM0N9Qg1huaUZ1q&of>y7i~t`p_5=t=7a>J zVK8W&(F>)puG@&LQ&kjU@Wo^J>VIz{#h!-jD-QsBIz&-S*woYfVl^~scmipAOThCy z6_91?9$42FBN`0g`|T<^PoE<%{HytED=~6(yDoc8Ta1wun;k+V5<@5m0&JUhf@^yV zvFj6}nvM*He~OyIO(4{G2V!UIA zJ70pxmrgLL=GftSGBTN3#8IK+!;D2aIvFuj&T=C1)Ol~NX)S(iE#8LA%lE-r7ycI@ zhG~lVXOCc9Q3z)0Ao2Z6uofGfN6I10BMtoJ`=Rn-+V>sb1;%WF<60wZ`$}h|ubzb? zrV(?&YVcj{2vn89Sg;1F$bUob>42xQ7UJS8!k9egP2IPiP&P(RA3#>kL+Y?rEVNqx zdtU3Q5z0tL#dRnngAl*Mp_((0$42S; zd@U3T%{ss2YCYWdTK;O!KN&49&CShfq4z7IyiiTsoJr!R$Z55OOZ z#x%nk7bF}AqHA?vU|^JBc*Bs1_1)dwcl-MK@-*j@sSze3xw*No^Yio1{SsgR?bFcg T&D?5w00000NkvXXu0mjfd)2C7 delta 797 zcmV+&1LFLw2h0YL83+OZ002O!`OT3bCw~I&NklA|e8bAfm`JdSj3kNZOl_B8?;}0;yhTA@wGbAPjm{QLsgVxP>{T zS~hoHW8VL}-SynIj_^gz30u#bdwA~dxzF$W`~H5vLv&rIX*wQ{a~x+Wc2E@Mc7MBF zE*BP!Mw7{;&*!t*Y(>Z7c^-HqNy1{WSY2HmilU056deo4@tT^Na5#*~vWy^zrfHV{ zAiz-o14tMEr9^>y^-P`$X+LRs`jhz(*|fd<=oy3{3rq$`7+mJM+o;W3tIqZSY4XJr zdhk|>qrCd+1B;^qrWqb6yk;n%>3{q}c}uGx2;ex|&I8n@=2SBA{Z0>5jJrz@roU_U z#BM#`$f{LhcZk3JE{dXk+g>jCTAKKf0^4EOk_M`A3+(V+X*^)$`T8}hmden&qL{GA zn)T@~Xu7K8GB~>Pn3>OCY*i-5ky0|#J#V$rlc*}<*gLbTri@V%{ItLXHoIc)l{ax-lfpQi?pz8tj-ZzU25zRYQ9 zY(jAYs_fW%ndfr1LS^sJqKY}_{4JlkfcP*4_APs$ojf_t_MKPf=d|2{W!XiQRo4c+ z_eQmR!&pWmBO{IR >iizHgT)mEHXcryw*q7`oPR2S-5UHFqR5Pt|5-ogaVbD$^M7{D|$GXqG*1|158B9REt6#ah-bgHebt*@{D bCBOhxxJ$%ZrWYju015yANkvXXu0mjfn)Q(d diff --git a/template/pinterest.tpl b/template/pinterest.tpl index 7db5708..d80f6f5 100644 --- a/template/pinterest.tpl +++ b/template/pinterest.tpl @@ -1,6 +1,10 @@ {strip} -{combine_script id='pinterest_pinit' load='footer' path='https://assets.pinterest.com/js/pinit.js'} - - + {/strip} \ No newline at end of file diff --git a/template/style.css b/template/style.css index 0afe336..70c9a55 100644 --- a/template/style.css +++ b/template/style.css @@ -115,4 +115,15 @@ } .socialbutt.enabled thead label:before { content:"\2611"; +} + + +.showInfo { + position:static; + display:inline-block; + padding:1px 6px; + width:4px; + height:14px; + line-height:14px; + font-size:0.8em; } \ No newline at end of file diff --git a/template/tumblr.tpl b/template/tumblr.tpl index 0a61f8e..d4e3ab1 100644 --- a/template/tumblr.tpl +++ b/template/tumblr.tpl @@ -1,11 +1,14 @@ {strip} -{combine_script id='tumblr_share' load='footer' path='http://platform.tumblr.com/v1/share.js'} - {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} -Share on Tumblr {/strip} \ No newline at end of file diff --git a/template/twitter.tpl b/template/twitter.tpl index 70f2174..3a36e75 100644 --- a/template/twitter.tpl +++ b/template/twitter.tpl @@ -1,8 +1,11 @@ {strip} -{combine_script id='twitter_widgets' load='footer' path='https://platform.twitter.com/widgets.js'} - - + data-size="{$SOCIALBUTT.TWITTER.size}" data-count="{$SOCIALBUTT.TWITTER.count}" class="twitter-share-button" + {combine_script id='twitter_widgets' load='footer' path='https://platform.twitter.com/widgets.js'} +{/if} +>Share on Twitter {/strip} \ No newline at end of file