diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2017-03-28 15:19:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-28 15:19:42 +0200 |
commit | f76bcf670543a5b55fff9693cd0303b16b333805 (patch) | |
tree | 99254e5ab9407ee8ad23182f0e26803fb0e956a6 /app/Resources | |
parent | 7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (diff) | |
parent | b5a5377af12048e05269fc490e588c1b777cde13 (diff) | |
download | wallabag-f76bcf670543a5b55fff9693cd0303b16b333805.tar.gz wallabag-f76bcf670543a5b55fff9693cd0303b16b333805.tar.zst wallabag-f76bcf670543a5b55fff9693cd0303b16b333805.zip |
Merge pull request #2999 from FrenchHope/master
Share articles to a scuttle / semantic scuttle instance
Diffstat (limited to 'app/Resources')
15 files changed, 26 insertions, 0 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 | |||
15 | share_diaspora: Aktiver deling til Diaspora | 15 | share_diaspora: Aktiver deling til Diaspora |
16 | share_mail: Aktiver deling med email | 16 | share_mail: Aktiver deling med email |
17 | share_shaarli: Aktiver deling gennem Shaarli | 17 | share_shaarli: Aktiver deling gennem Shaarli |
18 | share_scuttle: Aktiver deling gennem Scuttle | ||
18 | share_twitter: Aktiver deling gennem Twitter | 19 | share_twitter: Aktiver deling gennem Twitter |
19 | share_unmark: Aktiver deling gennem Unmark.it | 20 | share_unmark: Aktiver deling gennem Unmark.it |
20 | show_printlink: Vis et link til print-indhold | 21 | show_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 | |||
15 | share_diaspora: Teilen zu Diaspora aktiveren | 15 | share_diaspora: Teilen zu Diaspora aktiveren |
16 | share_mail: Teilen via E-Mail aktiveren | 16 | share_mail: Teilen via E-Mail aktiveren |
17 | share_shaarli: Teilen zu Shaarli aktiveren | 17 | share_shaarli: Teilen zu Shaarli aktiveren |
18 | share_scuttle: Teilen zu Scuttle aktiveren | ||
18 | share_twitter: Teilen zu Twitter aktiveren | 19 | share_twitter: Teilen zu Twitter aktiveren |
19 | share_unmark: Teilen zu Unmark.it aktiveren | 20 | share_unmark: Teilen zu Unmark.it aktiveren |
20 | show_printlink: Link anzeigen, um den Inhalt auszudrucken | 21 | show_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 | |||
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/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 | |||
15 | share_diaspora: Activar compartir con Diaspora | 15 | share_diaspora: Activar compartir con Diaspora |
16 | share_mail: Activar compartir con Email | 16 | share_mail: Activar compartir con Email |
17 | share_shaarli: Activar compartir con Shaarli | 17 | share_shaarli: Activar compartir con Shaarli |
18 | share_scuttle: Activar compartir con Scuttle | ||
18 | share_twitter: Activar compartir con Twitter | 19 | share_twitter: Activar compartir con Twitter |
19 | share_unmark: Activar compartir con Unmark.it | 20 | share_unmark: Activar compartir con Unmark.it |
20 | show_printlink: Mostrar un enlace para imprimir contenido | 21 | show_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، اگر فعال بود | |||
15 | share_diaspora: فعالسازی همرسانی به Diaspora | 15 | share_diaspora: فعالسازی همرسانی به Diaspora |
16 | share_mail: فعالسازی همرسانی با ایمیل | 16 | share_mail: فعالسازی همرسانی با ایمیل |
17 | share_shaarli: فعالسازی همرسانی به Shaarli | 17 | share_shaarli: فعالسازی همرسانی به Shaarli |
18 | share_scuttle: فعالسازی همرسانی به Scuttle | ||
18 | share_twitter: فعالسازی همرسانی به Twitter | 19 | share_twitter: فعالسازی همرسانی به Twitter |
19 | share_unmark: فعالسازی همرسانی به Unmark.it | 20 | share_unmark: فعالسازی همرسانی به Unmark.it |
20 | show_printlink: نمایش پیوندی برای چاپ مطلب | 21 | show_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é | |||
15 | share_diaspora: Activer le partage vers Diaspora | 15 | share_diaspora: Activer le partage vers Diaspora |
16 | share_mail: Activer le partage par email | 16 | share_mail: Activer le partage par email |
17 | share_shaarli: Activer le partage vers Shaarli | 17 | share_shaarli: Activer le partage vers Shaarli |
18 | share_scuttle: Activer le partage vers Scuttle | ||
18 | share_twitter: Activer le partage vers Twitter | 19 | share_twitter: Activer le partage vers Twitter |
19 | share_unmark: Activer le partage vers Unmark.it | 20 | share_unmark: Activer le partage vers Unmark.it |
20 | show_printlink: Afficher un lien pour imprimer | 21 | show_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 | |||
15 | share_diaspora: Abilita la condivisione con Diaspora | 15 | share_diaspora: Abilita la condivisione con Diaspora |
16 | share_mail: Abilita la condivisione per email | 16 | share_mail: Abilita la condivisione per email |
17 | share_shaarli: Abilita la condivisione con Shaarli | 17 | share_shaarli: Abilita la condivisione con Shaarli |
18 | share_scuttle: Abilita la condivisione con Scuttle | ||
18 | share_twitter: Abilita la condivisione con Twitter | 19 | share_twitter: Abilita la condivisione con Twitter |
19 | share_unmark: Abilita la condivisione con Unmark.it | 20 | share_unmark: Abilita la condivisione con Unmark.it |
20 | show_printlink: Mostra un collegamento per stampare il contenuto | 21 | show_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 | |||
15 | share_diaspora: Activar lo partatge cap a Diaspora | 15 | share_diaspora: Activar lo partatge cap a Diaspora |
16 | share_mail: Activar lo partatge per corrièl | 16 | share_mail: Activar lo partatge per corrièl |
17 | share_shaarli: Activar lo partatge cap a Shaarli | 17 | share_shaarli: Activar lo partatge cap a Shaarli |
18 | share_scuttle: Activar lo partatge cap a Scuttle | ||
18 | share_twitter: Activar lo partatge cap a Twitter | 19 | share_twitter: Activar lo partatge cap a Twitter |
19 | share_unmark: Activar lo partatge cap a Unmark.it | 20 | share_unmark: Activar lo partatge cap a Unmark.it |
20 | show_printlink: Afichar un ligam per imprimir | 21 | show_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 | |||
15 | share_diaspora: Włącz udostępnianie dla Diaspora | 15 | share_diaspora: Włącz udostępnianie dla Diaspora |
16 | share_mail: Włącz udostępnianie przez email | 16 | share_mail: Włącz udostępnianie przez email |
17 | share_shaarli: Włącz udostępnianie dla Shaarli | 17 | share_shaarli: Włącz udostępnianie dla Shaarli |
18 | share_scuttle: Włącz udostępnianie dla Scuttle | ||
18 | share_twitter: Włącz udostępnianie dla Twitter | 19 | share_twitter: Włącz udostępnianie dla Twitter |
19 | share_unmark: Włącz udostępnianie dla Unmark.it | 20 | share_unmark: Włącz udostępnianie dla Unmark.it |
20 | show_printlink: Pokaż link do wydrukowania zawartości | 21 | show_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 | |||
15 | share_diaspora: Habilitar compartilhamento para o Diaspora | 15 | share_diaspora: Habilitar compartilhamento para o Diaspora |
16 | share_mail: Habilitar compartilhamento por e-mail | 16 | share_mail: Habilitar compartilhamento por e-mail |
17 | share_shaarli: Habilitar compartilhamento para o Shaarli | 17 | share_shaarli: Habilitar compartilhamento para o Shaarli |
18 | share_scuttle: Habilitar compartilhamento para o Scuttle | ||
18 | share_twitter: Habilitar compartilhamento para o Twitter | 19 | share_twitter: Habilitar compartilhamento para o Twitter |
19 | share_unmark: Habilitar compartilhamento para o Unmark.it | 20 | share_unmark: Habilitar compartilhamento para o Unmark.it |
20 | show_printlink: Mostrar um link para imprimir o conteúdo | 21 | show_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 | |||
15 | share_diaspora: Permite share către Diaspora | 15 | share_diaspora: Permite share către Diaspora |
16 | share_mail: Permite share prin email | 16 | share_mail: Permite share prin email |
17 | share_shaarli: Permite share către Shaarli | 17 | share_shaarli: Permite share către Shaarli |
18 | share_scuttle: Permite share către Scuttle | ||
18 | share_twitter: Permite share către Twitter | 19 | share_twitter: Permite share către Twitter |
19 | share_unmark: Permite share către Unmark.it | 20 | share_unmark: Permite share către Unmark.it |
20 | show_printlink: Afișează un link pentru a printa content-ul | 21 | show_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..3b8eb264 --- /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 | |||
163 | body { | 168 | body { |
164 | display: flex; | 169 | display: flex; |
165 | min-height: 100vh; | 170 | min-height: 100vh; |