aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml1
-rw-r--r--app/Resources/static/themes/_global/img/icons/scuttle.pngbin0 -> 1845 bytes
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css9
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css5
-rw-r--r--docs/de/user/articles.rst1
-rw-r--r--docs/en/user/articles.rst1
-rw-r--r--docs/fr/user/articles.rst1
-rw-r--r--docs/it/user/articles.rst1
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php10
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php10
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig8
-rw-r--r--tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json4
24 files changed, 61 insertions, 2 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index c65463db..d1f7e3b5 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
15share_diaspora: Aktiver deling til Diaspora 15share_diaspora: Aktiver deling til Diaspora
16share_mail: Aktiver deling med email 16share_mail: Aktiver deling med email
17share_shaarli: Aktiver deling gennem Shaarli 17share_shaarli: Aktiver deling gennem Shaarli
18share_scuttle: Aktiver deling gennem Scuttle
18share_twitter: Aktiver deling gennem Twitter 19share_twitter: Aktiver deling gennem Twitter
19share_unmark: Aktiver deling gennem Unmark.it 20share_unmark: Aktiver deling gennem Unmark.it
20show_printlink: Vis et link til print-indhold 21show_printlink: Vis et link til print-indhold
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index bc378147..1105675b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
15share_diaspora: Teilen zu Diaspora aktiveren 15share_diaspora: Teilen zu Diaspora aktiveren
16share_mail: Teilen via E-Mail aktiveren 16share_mail: Teilen via E-Mail aktiveren
17share_shaarli: Teilen zu Shaarli aktiveren 17share_shaarli: Teilen zu Shaarli aktiveren
18share_scuttle: Teilen zu Scuttle aktiveren
18share_twitter: Teilen zu Twitter aktiveren 19share_twitter: Teilen zu Twitter aktiveren
19share_unmark: Teilen zu Unmark.it aktiveren 20share_unmark: Teilen zu Unmark.it aktiveren
20show_printlink: Link anzeigen, um den Inhalt auszudrucken 21show_printlink: Link anzeigen, um den Inhalt auszudrucken
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 52cb8e20..802599b3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, if the service is enabled
15share_diaspora: Enable share to Diaspora 15share_diaspora: Enable share to Diaspora
16share_mail: Enable share by email 16share_mail: Enable share by email
17share_shaarli: Enable share to Shaarli 17share_shaarli: Enable share to Shaarli
18share_scuttle: Enable share to Scuttle
18share_twitter: Enable share to Twitter 19share_twitter: Enable share to Twitter
19share_unmark: Enable share to Unmark.it 20share_unmark: Enable share to Unmark.it
20show_printlink: Display a link to print content 21show_printlink: Display a link to print content
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index c338836d..b3ac18ed 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si el servicio está activado
15share_diaspora: Activar compartir con Diaspora 15share_diaspora: Activar compartir con Diaspora
16share_mail: Activar compartir con Email 16share_mail: Activar compartir con Email
17share_shaarli: Activar compartir con Shaarli 17share_shaarli: Activar compartir con Shaarli
18share_scuttle: Activar compartir con Scuttle
18share_twitter: Activar compartir con Twitter 19share_twitter: Activar compartir con Twitter
19share_unmark: Activar compartir con Unmark.it 20share_unmark: Activar compartir con Unmark.it
20show_printlink: Mostrar un enlace para imprimir contenido 21show_printlink: Mostrar un enlace para imprimir contenido
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index 7a341e0b..c73d63e2 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -15,6 +15,7 @@ shaarli_url: نشانی Shaarli، اگر فعال بود
15share_diaspora: فعال‌سازی هم‌رسانی به Diaspora 15share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
16share_mail: فعال‌سازی هم‌رسانی با ایمیل 16share_mail: فعال‌سازی هم‌رسانی با ایمیل
17share_shaarli: فعال‌سازی هم‌رسانی به Shaarli 17share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
18share_scuttle: فعال‌سازی هم‌رسانی به Scuttle
18share_twitter: فعال‌سازی هم‌رسانی به Twitter 19share_twitter: فعال‌سازی هم‌رسانی به Twitter
19share_unmark: فعال‌سازی هم‌رسانی به Unmark.it 20share_unmark: فعال‌سازی هم‌رسانی به Unmark.it
20show_printlink: نمایش پیوندی برای چاپ مطلب 21show_printlink: نمایش پیوندی برای چاپ مطلب
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index f5c886d6..a53174ae 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si le service Shaarli est activé
15share_diaspora: Activer le partage vers Diaspora 15share_diaspora: Activer le partage vers Diaspora
16share_mail: Activer le partage par email 16share_mail: Activer le partage par email
17share_shaarli: Activer le partage vers Shaarli 17share_shaarli: Activer le partage vers Shaarli
18share_scuttle: Activer le partage vers Scuttle
18share_twitter: Activer le partage vers Twitter 19share_twitter: Activer le partage vers Twitter
19share_unmark: Activer le partage vers Unmark.it 20share_unmark: Activer le partage vers Unmark.it
20show_printlink: Afficher un lien pour imprimer 21show_printlink: Afficher un lien pour imprimer
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 88a1b4f6..3d53fc8d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, se il servizio è abilitato
15share_diaspora: Abilita la condivisione con Diaspora 15share_diaspora: Abilita la condivisione con Diaspora
16share_mail: Abilita la condivisione per email 16share_mail: Abilita la condivisione per email
17share_shaarli: Abilita la condivisione con Shaarli 17share_shaarli: Abilita la condivisione con Shaarli
18share_scuttle: Abilita la condivisione con Scuttle
18share_twitter: Abilita la condivisione con Twitter 19share_twitter: Abilita la condivisione con Twitter
19share_unmark: Abilita la condivisione con Unmark.it 20share_unmark: Abilita la condivisione con Unmark.it
20show_printlink: Mostra un collegamento per stampare il contenuto 21show_printlink: Mostra un collegamento per stampare il contenuto
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 04aaf0e8..79f75245 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
15share_diaspora: Activar lo partatge cap a Diaspora 15share_diaspora: Activar lo partatge cap a Diaspora
16share_mail: Activar lo partatge per corrièl 16share_mail: Activar lo partatge per corrièl
17share_shaarli: Activar lo partatge cap a Shaarli 17share_shaarli: Activar lo partatge cap a Shaarli
18share_scuttle: Activar lo partatge cap a Scuttle
18share_twitter: Activar lo partatge cap a Twitter 19share_twitter: Activar lo partatge cap a Twitter
19share_unmark: Activar lo partatge cap a Unmark.it 20share_unmark: Activar lo partatge cap a Unmark.it
20show_printlink: Afichar un ligam per imprimir 21show_printlink: Afichar un ligam per imprimir
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 1203e159..02fe98e3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -15,6 +15,7 @@ shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
15share_diaspora: Włącz udostępnianie dla Diaspora 15share_diaspora: Włącz udostępnianie dla Diaspora
16share_mail: Włącz udostępnianie przez email 16share_mail: Włącz udostępnianie przez email
17share_shaarli: Włącz udostępnianie dla Shaarli 17share_shaarli: Włącz udostępnianie dla Shaarli
18share_scuttle: Włącz udostępnianie dla Scuttle
18share_twitter: Włącz udostępnianie dla Twitter 19share_twitter: Włącz udostępnianie dla Twitter
19share_unmark: Włącz udostępnianie dla Unmark.it 20share_unmark: Włącz udostępnianie dla Unmark.it
20show_printlink: Pokaż link do wydrukowania zawartości 21show_printlink: Pokaż link do wydrukowania zawartości
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index 1edde87a..4a061bce 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -15,6 +15,7 @@ shaarli_url: URL Shaarli, se o serviço está habilitado
15share_diaspora: Habilitar compartilhamento para o Diaspora 15share_diaspora: Habilitar compartilhamento para o Diaspora
16share_mail: Habilitar compartilhamento por e-mail 16share_mail: Habilitar compartilhamento por e-mail
17share_shaarli: Habilitar compartilhamento para o Shaarli 17share_shaarli: Habilitar compartilhamento para o Shaarli
18share_scuttle: Habilitar compartilhamento para o Scuttle
18share_twitter: Habilitar compartilhamento para o Twitter 19share_twitter: Habilitar compartilhamento para o Twitter
19share_unmark: Habilitar compartilhamento para o Unmark.it 20share_unmark: Habilitar compartilhamento para o Unmark.it
20show_printlink: Mostrar um link para imprimir o conteúdo 21show_printlink: Mostrar um link para imprimir o conteúdo
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index f0c935d3..5ee48074 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, dacă serviciul este permis
15share_diaspora: Permite share către Diaspora 15share_diaspora: Permite share către Diaspora
16share_mail: Permite share prin email 16share_mail: Permite share prin email
17share_shaarli: Permite share către Shaarli 17share_shaarli: Permite share către Shaarli
18share_scuttle: Permite share către Scuttle
18share_twitter: Permite share către Twitter 19share_twitter: Permite share către Twitter
19share_unmark: Permite share către Unmark.it 20share_unmark: Permite share către Unmark.it
20show_printlink: Afișează un link pentru a printa content-ul 21show_printlink: Afișează un link pentru a printa content-ul
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index eb40fc5e..d83a4b7b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -15,6 +15,7 @@
15# share_diaspora: Enable share to Diaspora 15# share_diaspora: Enable share to Diaspora
16# share_mail: Enable share by email 16# share_mail: Enable share by email
17# share_shaarli: Enable share to Shaarli 17# share_shaarli: Enable share to Shaarli
18# share_scuttle: Enable share to Scuttle
18# share_twitter: Enable share to Twitter 19# share_twitter: Enable share to Twitter
19# share_unmark: Enable share to Unmark.it 20# share_unmark: Enable share to Unmark.it
20# show_printlink: Display a link to print content 21# show_printlink: Display a link to print content
diff --git a/app/Resources/static/themes/_global/img/icons/scuttle.png b/app/Resources/static/themes/_global/img/icons/scuttle.png
new file mode 100644
index 00000000..413357bd
--- /dev/null
+++ b/app/Resources/static/themes/_global/img/icons/scuttle.png
Binary files differ
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index e16846ea..480ebc48 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -947,6 +947,11 @@ a.add-to-wallabag-link-after::after {
947 background-image: url("../../_global/img/icons/shaarli.png"); 947 background-image: url("../../_global/img/icons/shaarli.png");
948} 948}
949 949
950/* scuttle */
951.icon-image--scuttle {
952 background-image: url("../../_global/img/icons/scuttle.png");
953}
954
950/* ========================================================================== 955/* ==========================================================================
951 Icon selected 956 Icon selected
952 ========================================================================== */ 957 ========================================================================== */
@@ -1063,6 +1068,10 @@ blockquote {
1063 content: "*"; 1068 content: "*";
1064} 1069}
1065 1070
1071.scuttle::before {
1072 content: "*";
1073}
1074
1066.return { 1075.return {
1067 text-decoration: none; 1076 text-decoration: none;
1068 margin-top: 1em; 1077 margin-top: 1em;
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index ee4ad4e0..45428e23 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -160,6 +160,11 @@
160 background-image: url("../../_global/img/icons/shaarli.png"); 160 background-image: url("../../_global/img/icons/shaarli.png");
161} 161}
162 162
163/* Scuttle */
164.icon-image--scuttle {
165 background-image: url("../../_global/img/icons/scuttle.png");
166}
167
163body { 168body {
164 display: flex; 169 display: flex;
165 min-height: 100vh; 170 min-height: 100vh;
diff --git a/docs/de/user/articles.rst b/docs/de/user/articles.rst
index 07cfa06c..e45fa4d3 100644
--- a/docs/de/user/articles.rst
+++ b/docs/de/user/articles.rst
@@ -82,6 +82,7 @@ Nun kannst du den Artikel teilen:
82- über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben) 82- über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben)
83- über einen Tweet 83- über einen Tweet
84- in deine Shaarli 84- in deine Shaarli
85- in deine Scuttle
85- mit einem Beitrag auf Diaspora* 86- mit einem Beitrag auf Diaspora*
86- an Carrot 87- an Carrot
87- mit einer E-Mail 88- mit einer E-Mail
diff --git a/docs/en/user/articles.rst b/docs/en/user/articles.rst
index 16b3b0d2..6e24d4fb 100644
--- a/docs/en/user/articles.rst
+++ b/docs/en/user/articles.rst
@@ -86,6 +86,7 @@ Now, you can share the article:
86- with a public URL (you'll have a light view of the article) 86- with a public URL (you'll have a light view of the article)
87- with a tweet 87- with a tweet
88- into your Shaarli 88- into your Shaarli
89- into your Scuttle
89- with a post in Diaspora* 90- with a post in Diaspora*
90- to Carrot 91- to Carrot
91- with an email 92- with an email
diff --git a/docs/fr/user/articles.rst b/docs/fr/user/articles.rst
index fb5b3837..c9c2b88a 100644
--- a/docs/fr/user/articles.rst
+++ b/docs/fr/user/articles.rst
@@ -92,6 +92,7 @@ Vous pouvez maintenant le partager :
92- avec une URL publique (vous obtiendrez une vue allégée de l'article) 92- avec une URL publique (vous obtiendrez une vue allégée de l'article)
93- avec un tweet 93- avec un tweet
94- dans votre Shaarli 94- dans votre Shaarli
95- dans votre Scuttle
95- avec un message dans Diaspora* 96- avec un message dans Diaspora*
96- sur Carrot 97- sur Carrot
97- avec un email 98- avec un email
diff --git a/docs/it/user/articles.rst b/docs/it/user/articles.rst
index 944b23ef..8220ad32 100644
--- a/docs/it/user/articles.rst
+++ b/docs/it/user/articles.rst
@@ -83,6 +83,7 @@ Ora potete condividere l'articolo:
83- attraverso una URL pubblica (avrete una vista semplificata dell'articolo) 83- attraverso una URL pubblica (avrete una vista semplificata dell'articolo)
84- attraverso un tweet 84- attraverso un tweet
85- nel vostro Shaarli 85- nel vostro Shaarli
86- nel vostro Scuttle
86- attraverso un post su Diaspora* 87- attraverso un post su Diaspora*
87- su Carrot 88- su Carrot
88- attraverso un'email 89- attraverso un'email
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
@@ -333,6 +333,16 @@ class InstallCommand extends ContainerAwareCommand
333 'section' => 'entry', 333 'section' => 'entry',
334 ], 334 ],
335 [ 335 [
336 'name' => 'share_scuttle',
337 'value' => '1',
338 'section' => 'entry',
339 ],
340 [
341 'name' => 'scuttle_url',
342 'value' => 'http://scuttle.org',
343 'section' => 'entry',
344 ],
345 [
336 'name' => 'share_mail', 346 'name' => 'share_mail',
337 'value' => '1', 347 'value' => '1',
338 'section' => 'entry', 348 'section' => 'entry',
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
@@ -51,11 +51,21 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
51 'section' => 'entry', 51 'section' => 'entry',
52 ], 52 ],
53 [ 53 [
54 'name' => 'share_scuttle',
55 'value' => '1',
56 'section' => 'entry',
57 ],
58 [
54 'name' => 'shaarli_url', 59 'name' => 'shaarli_url',
55 'value' => 'http://myshaarli.com', 60 'value' => 'http://myshaarli.com',
56 'section' => 'entry', 61 'section' => 'entry',
57 ], 62 ],
58 [ 63 [
64 'name' => 'scuttle_url',
65 'value' => 'http://scuttle.org',
66 'section' => 'entry',
67 ],
68 [
59 'name' => 'share_mail', 69 'name' => 'share_mail',
60 'value' => '1', 70 'value' => '1',
61 'section' => 'entry', 71 'section' => 'entry',
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 @@
30 {% 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 %} 30 {% 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 %}
31 {% 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 %} 31 {% 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 %}
32 {% 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 %} 32 {% 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 %}
33 {% 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 %}
33 {% 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 %} 34 {% 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 %}
34 {% 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 %} 35 {% 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 %}
35 {% 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 %} 36 {% 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 @@
131 </a> 131 </a>
132 </li> 132 </li>
133 {% endif %} 133 {% endif %}
134 {% if craue_setting('share_scuttle') %}
135 <li>
136 <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">
137 <i class="tool icon-image icon-image--scuttle" title="scuttle"></i>
138 <span>scuttle</span>
139 </a>
140 </li>
141 {% endif %}
134 {% if craue_setting('share_diaspora') %} 142 {% if craue_setting('share_diaspora') %}
135 <li> 143 <li>
136 <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"> 144 <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">
diff --git a/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json
index c4d1cf58..f232bd87 100644
--- a/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json
+++ b/tests/Wallabag/ImportBundle/fixtures/wallabag-v1-read.json
@@ -5,14 +5,14 @@
5 "2": "https://www.wallabag.org/features/", 5 "2": "https://www.wallabag.org/features/",
6 "3": "0", 6 "3": "0",
7 "4": "1", 7 "4": "1",
8 "5": "\n\t\t<p>Here are some features. If one is missing, you can <a href=\"https://github.com/wallabag/wallabag\">open a new issue</a>.</p>\n<ul class=\"list-group\"><li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is free and open source. Forever.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> No time to read? Save a link in your wallabag to read it later</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Read the saved articles in a comfortable view: the content, only the content</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You save all the content: text and pictures</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can easily migrate from others private services.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You like an article? Share it by email, on twitter or in your <a href=\"https://github.com/sebsauvage/Shaarli\">shaarli</a></li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Because we are increasingly mobile, wallabag fits all your devices</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Saving a link is so easy because we provide you many tools: extensions for Chrome and Firefox, iOS, Android and Windows Phone application, a bookmarklet, a simple field in your config webpage. <a title=\"Download wallabag\" href=\"https://www.wallabag.org/downloads/\">You can download third-party applications here</a>.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> RSS feeds allows you to read your saved links in your RSS agregator</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can set tags to your entries.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is multilingual: french, english, spanish, german, italian, russian, persian, czech, polish, ukrainian and slovienian.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You’re not the only one at home to use wallabag? it’s good, wallabag is multi users</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You prefer a dark template? Perfect, many templates are available in the configuration screen</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Many storage allowed: sqlite, mysql and postgresql</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Scroll position is saved: when you return on an article, you come back where you was. So convenient!</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can flattr flattrable articles directly from your wallabag</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You want to retrieve your wallabag datas? hey, remember, wallabag is open source, you can export it</li>\n</ul>", 8 "5": "\n\t\t<p>Here are some features. If one is missing, you can <a href=\"https://github.com/wallabag/wallabag\">open a new issue</a>.</p>\n<ul class=\"list-group\"><li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is free and open source. Forever.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> No time to read? Save a link in your wallabag to read it later</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Read the saved articles in a comfortable view: the content, only the content</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You save all the content: text and pictures</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can easily migrate from others private services.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You like an article? Share it by email, on twitter, <a href=\"http://scuttle.org\">Scuttle</a> or in your <a href=\"https://github.com/sebsauvage/Shaarli\">shaarli</a></li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Because we are increasingly mobile, wallabag fits all your devices</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Saving a link is so easy because we provide you many tools: extensions for Chrome and Firefox, iOS, Android and Windows Phone application, a bookmarklet, a simple field in your config webpage. <a title=\"Download wallabag\" href=\"https://www.wallabag.org/downloads/\">You can download third-party applications here</a>.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> RSS feeds allows you to read your saved links in your RSS agregator</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can set tags to your entries.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is multilingual: french, english, spanish, german, italian, russian, persian, czech, polish, ukrainian and slovienian.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You’re not the only one at home to use wallabag? it’s good, wallabag is multi users</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You prefer a dark template? Perfect, many templates are available in the configuration screen</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Many storage allowed: sqlite, mysql and postgresql</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Scroll position is saved: when you return on an article, you come back where you was. So convenient!</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can flattr flattrable articles directly from your wallabag</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You want to retrieve your wallabag datas? hey, remember, wallabag is open source, you can export it</li>\n</ul>",
9 "6": "1", 9 "6": "1",
10 "id": "3", 10 "id": "3",
11 "title": "Features - wallabag", 11 "title": "Features - wallabag",
12 "url": "https://www.wallabag.org/features/", 12 "url": "https://www.wallabag.org/features/",
13 "is_read": "0", 13 "is_read": "0",
14 "is_fav": "1", 14 "is_fav": "1",
15 "content": "\n\t\t<p>Here are some features. If one is missing, you can <a href=\"https://github.com/wallabag/wallabag\">open a new issue</a>.</p>\n<ul class=\"list-group\"><li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is free and open source. Forever.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> No time to read? Save a link in your wallabag to read it later</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Read the saved articles in a comfortable view: the content, only the content</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You save all the content: text and pictures</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can easily migrate from others private services.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You like an article? Share it by email, on twitter or in your <a href=\"https://github.com/sebsauvage/Shaarli\">shaarli</a></li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Because we are increasingly mobile, wallabag fits all your devices</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Saving a link is so easy because we provide you many tools: extensions for Chrome and Firefox, iOS, Android and Windows Phone application, a bookmarklet, a simple field in your config webpage. <a title=\"Download wallabag\" href=\"https://www.wallabag.org/downloads/\">You can download third-party applications here</a>.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> RSS feeds allows you to read your saved links in your RSS agregator</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can set tags to your entries.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is multilingual: french, english, spanish, german, italian, russian, persian, czech, polish, ukrainian and slovienian.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You’re not the only one at home to use wallabag? it’s good, wallabag is multi users</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You prefer a dark template? Perfect, many templates are available in the configuration screen</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Many storage allowed: sqlite, mysql and postgresql</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Scroll position is saved: when you return on an article, you come back where you was. So convenient!</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can flattr flattrable articles directly from your wallabag</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You want to retrieve your wallabag datas? hey, remember, wallabag is open source, you can export it</li>\n</ul>", 15 "content": "\n\t\t<p>Here are some features. If one is missing, you can <a href=\"https://github.com/wallabag/wallabag\">open a new issue</a>.</p>\n<ul class=\"list-group\"><li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is free and open source. Forever.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> No time to read? Save a link in your wallabag to read it later</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Read the saved articles in a comfortable view: the content, only the content</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You save all the content: text and pictures</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can easily migrate from others private services.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You like an article? Share it by email, on twitter, <a href=\"http://scuttle.org\">Scuttle</a> or in your <a href=\"https://github.com/sebsauvage/Shaarli\">shaarli</a></li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Because we are increasingly mobile, wallabag fits all your devices</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Saving a link is so easy because we provide you many tools: extensions for Chrome and Firefox, iOS, Android and Windows Phone application, a bookmarklet, a simple field in your config webpage. <a title=\"Download wallabag\" href=\"https://www.wallabag.org/downloads/\">You can download third-party applications here</a>.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> RSS feeds allows you to read your saved links in your RSS agregator</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can set tags to your entries.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> wallabag is multilingual: french, english, spanish, german, italian, russian, persian, czech, polish, ukrainian and slovienian.</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You’re not the only one at home to use wallabag? it’s good, wallabag is multi users</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You prefer a dark template? Perfect, many templates are available in the configuration screen</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Many storage allowed: sqlite, mysql and postgresql</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> Scroll position is saved: when you return on an article, you come back where you was. So convenient!</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You can flattr flattrable articles directly from your wallabag</li>\n<li class=\"list-group-item\"><span class=\"glyphicon glyphicon-ok\"></span> You want to retrieve your wallabag datas? hey, remember, wallabag is open source, you can export it</li>\n</ul>",
16 "user_id": "1", 16 "user_id": "1",
17 "tags": "" 17 "tags": ""
18 }, 18 },