Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[30746] branches/6.x
|
From: <xa...@us...> - 2010-11-17 14:52:16
|
Revision: 30746
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30746&view=rev
Author: xavidp
Date: 2010-11-17 14:52:08 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
[NEW]ShareThis widget allowed in articles, in a similar way to what it was implemented in blogs. Right now it's still dependent on the setting in blogs for the icon to appear (help needed to make the button appear when blogs sharethis is off)
Modified Paths:
--------------
branches/6.x/lib/prefs/article.php
branches/6.x/lib/prefs/feature.php
branches/6.x/lib/setup/prefs.php
branches/6.x/templates/article_trailer.tpl
branches/6.x/templates/header.tpl
branches/6.x/templates/tiki-admin_include_blogs.tpl
branches/6.x/templates/tiki-admin_include_cms.tpl
Modified: branches/6.x/lib/prefs/article.php
===================================================================
--- branches/6.x/lib/prefs/article.php 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/lib/prefs/article.php 2010-11-17 14:52:08 UTC (rev 30746)
@@ -68,5 +68,11 @@
'description' => tra('Allow additional custom fields for article types'),
'type' => 'flag',
),
+ 'article_sharethis_publisher' => array(
+ 'name' => tra('Your ShareThis publisher identifier (optional)'),
+ 'type' => 'text',
+ 'size' => '40',
+ ),
+
);
}
Modified: branches/6.x/lib/prefs/feature.php
===================================================================
--- branches/6.x/lib/prefs/feature.php 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/lib/prefs/feature.php 2010-11-17 14:52:08 UTC (rev 30746)
@@ -861,6 +861,11 @@
'name' => tra('Specify notification emails when creating articles'),
'type' => 'flag',
),
+ 'feature_cms_sharethis' => array(
+ 'name' => tra('ShareThis buttons'),
+ 'type' => 'flag',
+ 'hint' => tra('Insert a ShareThis button from www.sharethis.com.'),
+ ),
'feature_categorypath' => array(
'name' => tra('Category Path'),
'description' => tra('Show category tree, above wiki pages'),
Modified: branches/6.x/lib/setup/prefs.php
===================================================================
--- branches/6.x/lib/setup/prefs.php 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/lib/setup/prefs.php 2010-11-17 14:52:08 UTC (rev 30746)
@@ -671,6 +671,7 @@
'feature_cms_rankings' => 'n',
'feature_cms_print' => 'y',
'feature_cms_emails' => 'n',
+ 'feature_cms_sharethis' => 'n',
'art_sort_mode' => 'publishDate_desc',
'art_list_title' => 'y',
'art_list_title_len' => '50',
@@ -705,6 +706,7 @@
'article_image_size_x' => '0',
'article_image_size_y' => '0',
'article_custom_attributes' => 'y',
+ 'article_sharethis_publisher' => '',
'feature_cms_templates' => 'n',
'cms_bot_bar' => 'y',
'cms_left_column' => 'y',
@@ -712,6 +714,7 @@
'cms_top_bar' => 'n',
'art_home_title' => '',
+
// trackers
'feature_trackers' => 'n',
't_use_db' => 'y',
Modified: branches/6.x/templates/article_trailer.tpl
===================================================================
--- branches/6.x/templates/article_trailer.tpl 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/templates/article_trailer.tpl 2010-11-17 14:52:08 UTC (rev 30746)
@@ -17,6 +17,22 @@
{if $prefs.feature_share eq 'y' && $tiki_p_share eq 'y'}
<a title="{tr}Share page{/tr}" href="tiki-share.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{icon _id='share_link' alt="{tr}Share this page{/tr}"}</a>
{/if}
+ {if $prefs.feature_cms_sharethis eq "y"}
+ {capture name=shared_title}{tr}Share This{/tr}{/capture}
+ {capture name=shared_link_title}{tr}ShareThis via AIM, social bookmarking and networking sites, etc.{/tr}{/capture}
+ {wiki}{literal}<script language="javascript" type="text/javascript">
+ //Create your sharelet with desired properties and set button element to false
+ var object{/literal}{$articleId}{literal} = SHARETHIS.addEntry({
+ title:'{/literal}{$smarty.capture.shared_title|replace:'\'':'\\\''}{literal}'
+ },
+ {button:false});
+ //Output your customized button
+ document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>');
+ //Tie customized button to ShareThis button functionality.
+ var element{/literal}{$articleId}{literal} = document.getElementById("share{/literal}{$articleId}{literal}");
+ object{/literal}{$articleId}{literal}.attachButton(element{/literal}{$articleId}{literal});
+ </script>{/literal}{/wiki}
+ {/if}
{if $prefs.feature_tell_a_friend eq 'y' && $tiki_p_tell_a_friend eq 'y'}
<a title="{tr}Send a link{/tr}" href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{icon _id='email_link' alt="{tr}Send a link{/tr}"}</a>
{/if}
Modified: branches/6.x/templates/header.tpl
===================================================================
--- branches/6.x/templates/header.tpl 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/templates/header.tpl 2010-11-17 14:52:08 UTC (rev 30746)
@@ -124,10 +124,14 @@
<link rel="alternate" type="application/rss+xml" title='{$prefs.feed_calendar_title|escape|default:"{tr}RSS Calendars{/tr}"}' href="tiki-calendars_rss.php?ver={$prefs.feed_default_version|escape:'url'}" />
{/if}
-{if $prefs.feature_blogs eq 'y' and $prefs.feature_blog_sharethis eq "y"}
- {if $prefs.blog_sharethis_publisher neq ""}
+{if ($prefs.feature_blogs eq 'y' and $prefs.feature_blog_sharethis eq "y") or ($prefs.feature_cms eq 'y' and $prefs.feature_cms_sharethis eq "y")}
+ {if $prefs.blog_sharethis_publisher neq "" and $prefs.article_sharethis_publisher neq ""}
<script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&type=website&buttonText=&onmouseover=false&send_services=aim"></script>
- {else}
+ {elseif $prefs.blog_sharethis_publisher neq "" and $prefs.article_sharethis_publisher eq ""}
+ <script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.blog_sharethis_publisher}&type=website&buttonText=&onmouseover=false&send_services=aim"></script>
+ {elseif $prefs.blog_sharethis_publisher eq "" and $prefs.article_sharethis_publisher neq ""}
+ <script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#publisher={$prefs.article_sharethis_publisher}&type=website&buttonText=&onmouseover=false&send_services=aim"></script>
+ {elseif $prefs.blog_sharethis_publisher eq "" and $prefs.article_sharethis_publisher eq ""}
<script type="text/javascript" src="http://w.sharethis.com/button/sharethis.js#type=website&buttonText=&onmouseover=false&send_services=aim"></script>
{/if}
{/if}
Modified: branches/6.x/templates/tiki-admin_include_blogs.tpl
===================================================================
--- branches/6.x/templates/tiki-admin_include_blogs.tpl 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/templates/tiki-admin_include_blogs.tpl 2010-11-17 14:52:08 UTC (rev 30746)
@@ -35,7 +35,7 @@
<fieldset>
<legend>
- {tr}Sharing on social networks{/tr}{help url="Blog#Sharing_Social_Networks"}
+ {tr}Sharing on social networks{/tr}{help url="Social+Networks#Using+ShareThis"}
</legend>
{preference name=feature_blog_sharethis}
<div class="adminoptionboxchild" id="feature_blog_sharethis_childcontainer">
Modified: branches/6.x/templates/tiki-admin_include_cms.tpl
===================================================================
--- branches/6.x/templates/tiki-admin_include_cms.tpl 2010-11-17 14:45:17 UTC (rev 30745)
+++ branches/6.x/templates/tiki-admin_include_cms.tpl 2010-11-17 14:52:08 UTC (rev 30746)
@@ -65,6 +65,16 @@
</fieldset>
<fieldset>
+ <legend>
+ {tr}Sharing on social networks{/tr}{help url="Social+Networks#Using+ShareThis"}
+ </legend>
+ {preference name=feature_cms_sharethis}
+ <div class="adminoptionboxchild" id="feature_cms_sharethis_childcontainer">
+ {preference name=article_sharethis_publisher}
+ </div>
+ </fieldset>
+
+ <fieldset>
<legend>{tr}Import CSV file{/tr}</legend>
<div class="adminoptionbox">
<div class="adminoptionlabel">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC"](http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC"){kind=link}