added diaspora sharing

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 0f88f335231e131dd1c734c4aad30f3fb64403be..3eaee3a3efa774509f8aa7784dbec0a02714905a 100755 (executable)
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -44,6 +44,8 @@
 @define ('SHARE_MAIL', TRUE);
 @define ('SHARE_SHAARLI', FALSE);
 @define ('SHAARLI_URL', 'http://myshaarliurl.com');
+@define ('SHARE_DIASPORA', FALSE);
+@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
 @define ('FLATTR', TRUE);
 @define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
 @define ('NOT_FLATTRABLE', '0');

diff --git a/themes/_global/img/icons/diaspora-icon--black.png b/themes/_global/img/icons/diaspora-icon--black.png
new file mode 100644 (file)
index 0000000..32bca19
Binary files /dev/null and b/themes/_global/img/icons/diaspora-icon--black.png differ

diff --git a/themes/_global/img/icons/diaspora-icon--white.png b/themes/_global/img/icons/diaspora-icon--white.png
new file mode 100644 (file)
index 0000000..fc48d47
Binary files /dev/null and b/themes/_global/img/icons/diaspora-icon--white.png differ

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index c8196885d630e4ca87cabbd6a2bcd7e0416b8a25..37f1a9847a6c0c721f4d393f94eaed8010322592 100755 (executable)
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -15,6 +15,7 @@
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
+                {% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %}
                 {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %}
                 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}