From fb9f100e8f4f3288b87536faff4b59cacc7b1efb Mon Sep 17 00:00:00 2001
From: FrenchHope <laurent.espitallier@laposte.net>
Date: Sun, 19 Mar 2017 09:40:31 +0100
Subject: Scuttle sharing

---
 src/Wallabag/CoreBundle/Command/InstallCommand.php             | 10 ++++++++++
 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php   | 10 ++++++++++
 .../Resources/views/themes/baggy/Entry/entry.html.twig         |  1 +
 .../Resources/views/themes/material/Entry/entry.html.twig      |  8 ++++++++
 4 files changed, 29 insertions(+)

(limited to 'src')

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index f0738b91..f1179741 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -332,6 +332,16 @@ class InstallCommand extends ContainerAwareCommand
                 'value' => 'http://myshaarli.com',
                 'section' => 'entry',
             ],
+            [
+                'name' => 'share_scuttle',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'scuttle_url',
+                'value' => 'http://scuttle.org',
+                'section' => 'entry',
+            ],            
             [
                 'name' => 'share_mail',
                 'value' => '1',
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index a723656e..52941a64 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -50,11 +50,21 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'value' => '1',
                 'section' => 'entry',
             ],
+            [
+                'name' => 'share_scuttle',
+                'value' => '1',
+                'section' => 'entry',
+            ],            
             [
                 'name' => 'shaarli_url',
                 'value' => 'http://myshaarli.com',
                 'section' => 'entry',
             ],
+            [
+                'name' => 'scuttle_url',
+                'value' => 'http://scuttle.org',
+                'section' => 'entry',
+            ],            
             [
                 'name' => 'share_mail',
                 'value' => '1',
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index a555691d..5d5e6dd8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -30,6 +30,7 @@
                 {% if craue_setting('share_twitter') %}<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="Tweet"><span>Tweet</span></a></li>{% endif %}
                 {% if craue_setting('share_mail') %}<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="Email"><span>Email</span></a></li>{% endif %}
                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                {% if craue_setting('share_scuttle') %}<li><a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&amp;address={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--scuttle" title="scuttle"><span>scuttle</span></a></li>{% endif %}
                 {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('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 icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
                 {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
                 {% if craue_setting('carrot') %}<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="carrot"><span>Carrot</span></a></li>{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index c3508083..8e60e2b4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -131,6 +131,14 @@
                             </a>
                         </li>
                     {% endif %}
+                    {% if craue_setting('share_scuttle') %}
+                        <li>
+                        <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&amp;address={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank">
+                                <i class="tool icon-image icon-image--scuttle" title="scuttle"></i>
+                                <span>scuttle</span>
+                            </a>
+                        </li>
+                    {% endif %}                    
                     {% if craue_setting('share_diaspora') %}
                         <li>
                             <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;notes=&amp;v=1&amp;noui=1&amp;jump=doclose" target="_blank">
-- 
cgit v1.2.3


From b5a5377af12048e05269fc490e588c1b777cde13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 27 Mar 2017 22:13:13 +0200
Subject: Added migration for Scuttle sharing

---
 src/Wallabag/CoreBundle/Command/InstallCommand.php           | 2 +-
 src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index f1179741..3c4d3f25 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -341,7 +341,7 @@ class InstallCommand extends ContainerAwareCommand
                 'name' => 'scuttle_url',
                 'value' => 'http://scuttle.org',
                 'section' => 'entry',
-            ],            
+            ],
             [
                 'name' => 'share_mail',
                 'value' => '1',
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 52941a64..aaeb9ee9 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -54,7 +54,7 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'name' => 'share_scuttle',
                 'value' => '1',
                 'section' => 'entry',
-            ],            
+            ],
             [
                 'name' => 'shaarli_url',
                 'value' => 'http://myshaarli.com',
@@ -64,7 +64,7 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
                 'name' => 'scuttle_url',
                 'value' => 'http://scuttle.org',
                 'section' => 'entry',
-            ],            
+            ],
             [
                 'name' => 'share_mail',
                 'value' => '1',
-- 
cgit v1.2.3