aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-11-09 18:19:08 +0100
committerGitHub <noreply@github.com>2016-11-09 18:19:08 +0100
commit644b340178136ef9465fdc3cf40f1de0f5f8c3d3 (patch)
treee8168f9f3ee9e9635316c01fb826914098ba65bb /app
parent1e8c7fa5f946bd63f0650392b76115f5ae8a45de (diff)
parent8a9604aafe8b8c6ddde4e1be78189af5238588fb (diff)
downloadwallabag-644b340178136ef9465fdc3cf40f1de0f5f8c3d3.tar.gz
wallabag-644b340178136ef9465fdc3cf40f1de0f5f8c3d3.tar.zst
wallabag-644b340178136ef9465fdc3cf40f1de0f5f8c3d3.zip
Merge pull request #2566 from wallabag/add-unmarkit
Added unmark.it sharing
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20161109150755.php40
-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/unmark-icon--black.pngbin0 -> 926 bytes
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css5
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css5
16 files changed, 62 insertions, 0 deletions
diff --git a/app/DoctrineMigrations/Version20161109150755.php b/app/DoctrineMigrations/Version20161109150755.php
new file mode 100644
index 00000000..e4d269c4
--- /dev/null
+++ b/app/DoctrineMigrations/Version20161109150755.php
@@ -0,0 +1,40 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface
11{
12 /**
13 * @var ContainerInterface
14 */
15 private $container;
16 public function setContainer(ContainerInterface $container = null)
17 {
18 $this->container = $container;
19 }
20 private function getTable($tableName)
21 {
22 return $this->container->getParameter('database_table_prefix') . $tableName;
23 }
24 /**
25 * @param Schema $schema
26 */
27 public function up(Schema $schema)
28 {
29 $this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('share_unmark', 0, 'entry')");
30 $this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
31 }
32 /**
33 * @param Schema $schema
34 */
35 public function down(Schema $schema)
36 {
37 $this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'share_unmark';");
38 $this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'unmark_url';");
39 }
40}
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 7c323783..8ee0a303 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -15,6 +15,7 @@ share_diaspora: Aktiver deling til Diaspora
15share_mail: Aktiver deling med email 15share_mail: Aktiver deling med email
16share_shaarli: Aktiver deling gennem Shaarli 16share_shaarli: Aktiver deling gennem Shaarli
17share_twitter: Aktiver deling gennem Twitter 17share_twitter: Aktiver deling gennem Twitter
18share_unmark: Aktiver deling gennem Unmark.it
18show_printlink: Vis et link til print-indhold 19show_printlink: Vis et link til print-indhold
19wallabag_support_url: Support-URL for wallabag 20wallabag_support_url: Support-URL for wallabag
20wallabag_url: URL for *sin* wallabag-installation 21wallabag_url: URL for *sin* wallabag-installation
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index 438eb74a..73a9d640 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -15,6 +15,7 @@ share_diaspora: Teilen zu Diaspora aktiveren
15share_mail: Teilen via E-Mail aktiveren 15share_mail: Teilen via E-Mail aktiveren
16share_shaarli: Teilen zu Shaarli aktiveren 16share_shaarli: Teilen zu Shaarli aktiveren
17share_twitter: Teilen zu Twitter aktiveren 17share_twitter: Teilen zu Twitter aktiveren
18share_unmark: Teilen zu Unmark.it aktiveren
18show_printlink: Link anzeigen, um den Inhalt auszudrucken 19show_printlink: Link anzeigen, um den Inhalt auszudrucken
19wallabag_support_url: Support-URL für wallabag 20wallabag_support_url: Support-URL für wallabag
20wallabag_url: URL von *deiner* wallabag-Instanz 21wallabag_url: URL von *deiner* wallabag-Instanz
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index c2f2b3fb..c8c13805 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -15,6 +15,7 @@ share_diaspora: Enable share to Diaspora
15share_mail: Enable share by email 15share_mail: Enable share by email
16share_shaarli: Enable share to Shaarli 16share_shaarli: Enable share to Shaarli
17share_twitter: Enable share to Twitter 17share_twitter: Enable share to Twitter
18share_unmark: Enable share to Unmark.it
18show_printlink: Display a link to print content 19show_printlink: Display a link to print content
19wallabag_support_url: Support URL for wallabag 20wallabag_support_url: Support URL for wallabag
20wallabag_url: URL of *your* wallabag instance 21wallabag_url: URL of *your* wallabag instance
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index 76feea50..0ea98d8f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -15,6 +15,7 @@ share_diaspora: Activar compartir con Diaspora
15share_mail: Activar compartir con email 15share_mail: Activar compartir con email
16share_shaarli: Activar compartir con Shaarli 16share_shaarli: Activar compartir con Shaarli
17share_twitter: Activar compartir con Twitter 17share_twitter: Activar compartir con Twitter
18share_unmark: Activar compartir con Unmark.it
18show_printlink: Mostrar un enlace para imprimir contenido 19show_printlink: Mostrar un enlace para imprimir contenido
19wallabag_support_url: URL de soporte de wallabag 20wallabag_support_url: URL de soporte de wallabag
20wallabag_url: URL de *tu* instancia de wallabag 21wallabag_url: URL de *tu* instancia de wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index 30df0086..c527b971 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -15,6 +15,7 @@ share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
15share_mail: فعال‌سازی هم‌رسانی با ایمیل 15share_mail: فعال‌سازی هم‌رسانی با ایمیل
16share_shaarli: فعال‌سازی هم‌رسانی به Shaarli 16share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
17share_twitter: فعال‌سازی هم‌رسانی به Twitter 17share_twitter: فعال‌سازی هم‌رسانی به Twitter
18share_unmark: فعال‌سازی هم‌رسانی به Unmark.it
18show_printlink: نمایش پیوندی برای چاپ مطلب 19show_printlink: نمایش پیوندی برای چاپ مطلب
19wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag 20wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
20wallabag_url: نشانی صفحهٔ wallabag *شما* 21wallabag_url: نشانی صفحهٔ wallabag *شما*
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index a60341b3..176e7c86 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -15,6 +15,7 @@ share_diaspora: Activer le partage vers Diaspora
15share_mail: Activer le partage par email 15share_mail: Activer le partage par email
16share_shaarli: Activer le partage vers Shaarli 16share_shaarli: Activer le partage vers Shaarli
17share_twitter: Activer le partage vers Twitter 17share_twitter: Activer le partage vers Twitter
18share_unmark: Activer le partage vers Unmark.it
18show_printlink: Afficher un lien pour imprimer 19show_printlink: Afficher un lien pour imprimer
19wallabag_support_url: URL de support de wallabag 20wallabag_support_url: URL de support de wallabag
20wallabag_url: URL de *votre* instance de wallabag 21wallabag_url: URL de *votre* instance de wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 3ad5f7d0..621d4dcd 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -15,6 +15,7 @@ share_diaspora: Abilita la condivisione con Diaspora
15share_mail: Abilita la condivisione per email 15share_mail: Abilita la condivisione per email
16share_shaarli: Abilita la condivisione con Shaarli 16share_shaarli: Abilita la condivisione con Shaarli
17share_twitter: Abilita la condivisione con Twitter 17share_twitter: Abilita la condivisione con Twitter
18share_unmark: Abilita la condivisione con Unmark.it
18show_printlink: Mostra un collegamento per stampare il contenuto 19show_printlink: Mostra un collegamento per stampare il contenuto
19wallabag_support_url: URL di supporto per wallabag 20wallabag_support_url: URL di supporto per wallabag
20wallabag_url: URL della *tua* installazione di wallabag 21wallabag_url: URL della *tua* installazione di wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index fd83b437..04accd45 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -15,6 +15,7 @@ share_diaspora: Activar lo partatge cap a Diaspora
15share_mail: Activar lo partatge per corrièl 15share_mail: Activar lo partatge per corrièl
16share_shaarli: Activar lo partatge cap a Shaarli 16share_shaarli: Activar lo partatge cap a Shaarli
17share_twitter: Activar lo partatge cap a Twitter 17share_twitter: Activar lo partatge cap a Twitter
18share_unmark: Activar lo partatge cap a Unmark.it
18show_printlink: Afichar un ligam per imprimir 19show_printlink: Afichar un ligam per imprimir
19wallabag_support_url: URL d'assisténcia de wallabag 20wallabag_support_url: URL d'assisténcia de wallabag
20wallabag_url: URL de *vòstra* instància de wallabag 21wallabag_url: URL de *vòstra* instància de wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 3a63eebb..2f4f3154 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -15,6 +15,7 @@ share_diaspora: Włącz udostępnianie dla Diaspora
15share_mail: Włącz udostępnianie przez email 15share_mail: Włącz udostępnianie przez email
16share_shaarli: Włącz udostępnianie dla Shaarli 16share_shaarli: Włącz udostępnianie dla Shaarli
17share_twitter: Włącz udostępnianie dla Twitter 17share_twitter: Włącz udostępnianie dla Twitter
18share_unmark: Włącz udostępnianie dla Unmark.it
18show_printlink: Pokaż link do wydrukowania zawartości 19show_printlink: Pokaż link do wydrukowania zawartości
19wallabag_support_url: Adres URL wsparcia dla wallabag 20wallabag_support_url: Adres URL wsparcia dla wallabag
20wallabag_url: Adres *twojej* instacji wallabag 21wallabag_url: Adres *twojej* instacji wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index e8260422..5da940e9 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -14,6 +14,7 @@ share_diaspora: Habilitar compartilhamento para o Diaspora
14share_mail: Habilitar compartilhamento por e-mail 14share_mail: Habilitar compartilhamento por e-mail
15share_shaarli: Habilitar compartilhamento para o Shaarli 15share_shaarli: Habilitar compartilhamento para o Shaarli
16share_twitter: Habilitar compartilhamento para o Twitter 16share_twitter: Habilitar compartilhamento para o Twitter
17share_unmark: Habilitar compartilhamento para o Unmark.it
17show_printlink: Mostrar um link para imprimir o conteúdo 18show_printlink: Mostrar um link para imprimir o conteúdo
18wallabag_support_url: URL de Suporte do wallabag 19wallabag_support_url: URL de Suporte do wallabag
19wallabag_url: URL de *sua* instância do wallabag 20wallabag_url: URL de *sua* instância do wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 4fb42e98..6d2eaffd 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -15,6 +15,7 @@ share_diaspora: Permite share către Diaspora
15share_mail: Permite share prin email 15share_mail: Permite share prin email
16share_shaarli: Permite share către Shaarli 16share_shaarli: Permite share către Shaarli
17share_twitter: Permite share către Twitter 17share_twitter: Permite share către Twitter
18share_unmark: Permite share către Unmark.it
18show_printlink: Afișează un link pentru a printa content-ul 19show_printlink: Afișează un link pentru a printa content-ul
19wallabag_support_url: URL-ul de suport pentru wallabag 20wallabag_support_url: URL-ul de suport pentru wallabag
20wallabag_url: URL-ul instanței tale wallabag 21wallabag_url: URL-ul instanței tale wallabag
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index ebfadf29..9146bfb6 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -15,6 +15,7 @@
15# share_mail: Enable share by email 15# share_mail: Enable share by email
16# share_shaarli: Enable share to Shaarli 16# share_shaarli: Enable share to Shaarli
17# share_twitter: Enable share to Twitter 17# share_twitter: Enable share to Twitter
18# share_unmark: Enable share to Unmark.it
18# show_printlink: Display a link to print content 19# show_printlink: Display a link to print content
19# wallabag_support_url: Support URL for wallabag 20# wallabag_support_url: Support URL for wallabag
20# wallabag_url: URL of *your* wallabag instance 21# wallabag_url: URL of *your* wallabag instance
diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png
new file mode 100644
index 00000000..45f679ee
--- /dev/null
+++ b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.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 44db2070..6cf49de1 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -936,6 +936,11 @@ a.add-to-wallabag-link-after::after {
936 background-image: url("../../_global/img/icons/diaspora-icon--black.png"); 936 background-image: url("../../_global/img/icons/diaspora-icon--black.png");
937} 937}
938 938
939/* Unmark.it */
940.icon-image--unmark {
941 background-image: url("../../_global/img/icons/unmark-icon--black.png");
942}
943
939/* shaarli */ 944/* shaarli */
940.icon-image--shaarli { 945.icon-image--shaarli {
941 background-image: url("../../_global/img/icons/shaarli.png"); 946 background-image: url("../../_global/img/icons/shaarli.png");
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 2cc2e8a0..b165d45e 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -124,6 +124,11 @@
124 background-image: url("../../_global/img/icons/diaspora-icon--black.png"); 124 background-image: url("../../_global/img/icons/diaspora-icon--black.png");
125} 125}
126 126
127/* Unmark.it */
128.icon-image--unmark {
129 background-image: url("../../_global/img/icons/unmark-icon--black.png");
130}
131
127/* Shaarli */ 132/* Shaarli */
128.icon-image--shaarli { 133.icon-image--shaarli {
129 background-image: url("../../_global/img/icons/shaarli.png"); 134 background-image: url("../../_global/img/icons/shaarli.png");