aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20170327194233.php54
-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 -> 1071 bytes
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css9
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css5
16 files changed, 80 insertions, 0 deletions
diff --git a/app/DoctrineMigrations/Version20170327194233.php b/app/DoctrineMigrations/Version20170327194233.php
new file mode 100644
index 00000000..e1466b2f
--- /dev/null
+++ b/app/DoctrineMigrations/Version20170327194233.php
@@ -0,0 +1,54 @@
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
10/**
11 * Add the share_scuttle internal setting.
12 */
13class Version20170327194233 extends AbstractMigration implements ContainerAwareInterface
14{
15 /**
16 * @var ContainerInterface
17 */
18 private $container;
19
20 public function setContainer(ContainerInterface $container = null)
21 {
22 $this->container = $container;
23 }
24
25 private function getTable($tableName)
26 {
27 return $this->container->getParameter('database_table_prefix').$tableName;
28 }
29
30 /**
31 * @param Schema $schema
32 */
33 public function up(Schema $schema)
34 {
35 $scuttle = $this->container
36 ->get('doctrine.orm.default_entity_manager')
37 ->getConnection()
38 ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle'");
39
40 $this->skipIf(false !== $scuttle, 'It seems that you already played this migration.');
41
42 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_scuttle', '1', 'entry')");
43 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
44 }
45
46 /**
47 * @param Schema $schema
48 */
49 public function down(Schema $schema)
50 {
51 $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle';");
52 $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'scuttle_url';");
53 }
54}
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..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
163body { 168body {
164 display: flex; 169 display: flex;
165 min-height: 100vh; 170 min-height: 100vh;