Merge pull request #2999 from FrenchHope/master

Share articles to a scuttle / semantic scuttle instance

app/DoctrineMigrations/Version20170327194233.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Add the share_scuttle internal setting.
+ */
+class Version20170327194233 extends AbstractMigration implements ContainerAwareInterface
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix').$tableName;
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $scuttle = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
+            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle'");
+
+        $this->skipIf(false !== $scuttle, 'It seems that you already played this migration.');
+
+        $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_scuttle', '1', 'entry')");
+        $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle';");
+        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'scuttle_url';");
+    }
+}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml

@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
 share_diaspora: Aktiver deling til Diaspora
 share_mail: Aktiver deling med email
 share_shaarli: Aktiver deling gennem Shaarli
+share_scuttle: Aktiver deling gennem Scuttle
 share_twitter: Aktiver deling gennem Twitter
 share_unmark: Aktiver deling gennem Unmark.it
 show_printlink: Vis et link til print-indhold

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml

@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
 share_diaspora: Teilen zu Diaspora aktiveren
 share_mail: Teilen via E-Mail aktiveren
 share_shaarli: Teilen zu Shaarli aktiveren
+share_scuttle: Teilen zu Scuttle aktiveren
 share_twitter: Teilen zu Twitter aktiveren
 share_unmark: Teilen zu Unmark.it aktiveren
 show_printlink: Link anzeigen, um den Inhalt auszudrucken

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, if the service is enabled
 share_diaspora: Enable share to Diaspora
 share_mail: Enable share by email
 share_shaarli: Enable share to Shaarli
+share_scuttle: Enable share to Scuttle
 share_twitter: Enable share to Twitter
 share_unmark: Enable share to Unmark.it
 show_printlink: Display a link to print content

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml

@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si el servicio está activado
 share_diaspora: Activar compartir con Diaspora
 share_mail: Activar compartir con Email
 share_shaarli: Activar compartir con Shaarli
+share_scuttle: Activar compartir con Scuttle
 share_twitter: Activar compartir con Twitter
 share_unmark: Activar compartir con Unmark.it
 show_printlink: Mostrar un enlace para imprimir contenido

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml

@@ -15,6 +15,7 @@ shaarli_url: نشانی Shaarli، اگر فعال بود
 share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
 share_mail:  فعال‌سازی هم‌رسانی با ایمیل
 share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
+share_scuttle:  فعال‌سازی هم‌رسانی به Scuttle
 share_twitter:  فعال‌سازی هم‌رسانی به Twitter
 share_unmark:  فعال‌سازی هم‌رسانی به Unmark.it
 show_printlink: نمایش پیوندی برای چاپ مطلب

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si le service Shaarli est activé
 share_diaspora: Activer le partage vers Diaspora
 share_mail: Activer le partage par email
 share_shaarli: Activer le partage vers Shaarli
+share_scuttle: Activer le partage vers Scuttle
 share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml

@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, se il servizio è abilitato
 share_diaspora: Abilita la condivisione con Diaspora
 share_mail: Abilita la condivisione per email
 share_shaarli: Abilita la condivisione con Shaarli
+share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter
 share_unmark: Abilita la condivisione con Unmark.it
 show_printlink: Mostra un collegamento per stampare il contenuto

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml

@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
 share_diaspora: Activar lo partatge cap a Diaspora
 share_mail: Activar lo partatge per corrièl
 share_shaarli: Activar lo partatge cap a Shaarli
+share_scuttle: Activar lo partatge cap a Scuttle
 share_twitter: Activar lo partatge cap a Twitter
 share_unmark: Activar lo partatge cap a Unmark.it
 show_printlink: Afichar un ligam per imprimir

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml

@@ -15,6 +15,7 @@ shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
 share_diaspora: Włącz udostępnianie dla Diaspora
 share_mail: Włącz udostępnianie przez email
 share_shaarli: Włącz udostępnianie dla Shaarli
+share_scuttle: Włącz udostępnianie dla Scuttle
 share_twitter: Włącz udostępnianie dla Twitter
 share_unmark: Włącz udostępnianie dla Unmark.it
 show_printlink: Pokaż link do wydrukowania zawartości

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml

@@ -15,6 +15,7 @@ shaarli_url: URL Shaarli, se o serviço está habilitado
 share_diaspora: Habilitar compartilhamento para o Diaspora
 share_mail: Habilitar compartilhamento por e-mail
 share_shaarli: Habilitar compartilhamento para o Shaarli
+share_scuttle: Habilitar compartilhamento para o Scuttle
 share_twitter: Habilitar compartilhamento para o Twitter
 share_unmark: Habilitar compartilhamento para o Unmark.it
 show_printlink: Mostrar um link para imprimir o conteúdo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml

@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, dacă serviciul este permis
 share_diaspora: Permite share către Diaspora
 share_mail: Permite share prin email
 share_shaarli: Permite share către Shaarli
+share_scuttle: Permite share către Scuttle
 share_twitter: Permite share către Twitter
 share_unmark: Permite share către Unmark.it
 show_printlink: Afișează un link pentru a printa content-ul

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml

@@ -15,6 +15,7 @@
 # share_diaspora: Enable share to Diaspora
 # share_mail: Enable share by email
 # share_shaarli: Enable share to Shaarli
+# share_scuttle: Enable share to Scuttle
 # share_twitter: Enable share to Twitter
 # share_unmark: Enable share to Unmark.it
 # show_printlink: Display a link to print content

app/Resources/static/themes/baggy/css/main.css

@@ -947,6 +947,11 @@ a.add-to-wallabag-link-after::after {
   background-image: url("../../_global/img/icons/shaarli.png");
 }
 
+/* scuttle */
+.icon-image--scuttle {
+  background-image: url("../../_global/img/icons/scuttle.png");
+}
+
 /* ==========================================================================
    Icon selected
    ========================================================================== */
@@ -1063,6 +1068,10 @@ blockquote {
   content: "*";
 }
 
+.scuttle::before {
+  content: "*";
+}
+
 .return {
   text-decoration: none;
   margin-top: 1em;

app/Resources/static/themes/material/css/main.css

@@ -160,6 +160,11 @@
   background-image: url("../../_global/img/icons/shaarli.png");
 }
 
+/* Scuttle */
+.icon-image--scuttle {
+  background-image: url("../../_global/img/icons/scuttle.png");
+}
+
 body {
   display: flex;
   min-height: 100vh;

docs/de/user/articles.rst

@@ -82,6 +82,7 @@ Nun kannst du den Artikel teilen:
 - über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben)
 - über einen Tweet
 - in deine Shaarli
+- in deine Scuttle
 - mit einem Beitrag auf Diaspora*
 - an Carrot
 - mit einer E-Mail

docs/en/user/articles.rst

@@ -86,6 +86,7 @@ Now, you can share the article:
 - with a public URL (you'll have a light view of the article)
 - with a tweet
 - into your Shaarli
+- into your Scuttle
 - with a post in Diaspora*
 - to Carrot
 - with an email

docs/fr/user/articles.rst

@@ -92,6 +92,7 @@ Vous pouvez maintenant le partager :
 - avec une URL publique (vous obtiendrez une vue allégée de l'article)
 - avec un tweet
 - dans votre Shaarli
+- dans votre Scuttle
 - avec un message dans Diaspora*
 - sur Carrot
 - avec un email

docs/it/user/articles.rst

@@ -83,6 +83,7 @@ Ora potete condividere l'articolo:
 - attraverso una URL pubblica (avrete una vista semplificata dell'articolo)
 - attraverso un tweet
 - nel vostro Shaarli
+- nel vostro Scuttle
 - attraverso un post su Diaspora*
 - su Carrot
 - attraverso un'email

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',

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',

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 %}

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">