aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-06-22 15:34:46 +0200
committerGitHub <noreply@github.com>2017-06-22 15:34:46 +0200
commit29714661b1df78871ceaf0e079f11041a8641d4b (patch)
treea3132b8f83fc8fdc95e860b1d11e854743d589b4 /src
parent9416053bfcefa1cce94ea23eee93f0fabf1af2f8 (diff)
parent151f45db0ef6d0a4737eb220b0803b3ccfd0b6f5 (diff)
downloadwallabag-29714661b1df78871ceaf0e079f11041a8641d4b.tar.gz
wallabag-29714661b1df78871ceaf0e079f11041a8641d4b.tar.zst
wallabag-29714661b1df78871ceaf0e079f11041a8641d4b.zip
Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig38
9 files changed, 20 insertions, 35 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 6574e587..5229ac73 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -159,6 +159,7 @@ config:
159 # and: 'One rule AND another' 159 # and: 'One rule AND another'
160 # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' 160 # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
161 # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' 161 # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
162
162entry: 163entry:
163 page_titles: 164 page_titles:
164 # unread: 'Unread entries' 165 # unread: 'Unread entries'
@@ -244,7 +245,7 @@ entry:
244 url_label: 'Url' 245 url_label: 'Url'
245 save_label: 'Gem' 246 save_label: 'Gem'
246 public: 247 public:
247 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
248 confirm: 249 confirm:
249 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
250 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index d78fff35..996f173a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'URL' 245 url_label: 'URL'
246 save_label: 'Speichern' 246 save_label: 'Speichern'
247 public: 247 public:
248 shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" 248 shared_by_wallabag: "Dieser Artikel wurde von %username% mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
249 confirm: 249 confirm:
250 delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?" 250 delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?"
251 delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?" 251 delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 49e9eab3..aa1cd1a9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Save' 246 save_label: 'Save'
247 public: 247 public:
248 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Are you sure you want to remove that article?" 250 delete: "Are you sure you want to remove that article?"
251 delete_tag: "Are you sure you want to remove that tag from that article?" 251 delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 15460ef7..57e6c029 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'نشانی' 245 url_label: 'نشانی'
246 save_label: 'ذخیره' 246 save_label: 'ذخیره'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
251 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 0d9fda5f..6eac4c36 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: "Adresse" 245 url_label: "Adresse"
246 save_label: "Enregistrer" 246 save_label: "Enregistrer"
247 public: 247 public:
248 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" 248 shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Voulez-vous vraiment supprimer cet article ?" 250 delete: "Voulez-vous vraiment supprimer cet article ?"
251 delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?" 251 delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 669a1aa3..4e26f38c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Salva' 246 save_label: 'Salva'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 delete: "Vuoi veramente rimuovere quell'articolo?" 250 delete: "Vuoi veramente rimuovere quell'articolo?"
251 delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?" 251 delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c663b23e..f16504ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -245,7 +245,7 @@ entry:
245 url_label: 'Url' 245 url_label: 'Url'
246 save_label: 'Salvează' 246 save_label: 'Salvează'
247 public: 247 public:
248 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 248 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
249 confirm: 249 confirm:
250 # delete: "Are you sure you want to remove that article?" 250 # delete: "Are you sure you want to remove that article?"
251 # delete_tag: "Are you sure you want to remove that tag from that article?" 251 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index e0e752e0..90a140cd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -243,7 +243,7 @@ entry:
243 url_label: 'Url' 243 url_label: 'Url'
244 save_label: 'Kaydet' 244 save_label: 'Kaydet'
245 public: 245 public:
246 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 246 # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
247 confirm: 247 confirm:
248 # delete: "Are you sure you want to remove that article?" 248 # delete: "Are you sure you want to remove that article?"
249 # delete_tag: "Are you sure you want to remove that tag from that article?" 249 # delete_tag: "Are you sure you want to remove that tag from that article?"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 623cf1c4..a67807f9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -1,32 +1,6 @@
1<html> 1<html>
2 <head> 2 <head>
3 <title>{{ entry.title|e|raw }}</title> 3 <title>{{ entry.title|e|raw }}</title>
4 <style>
5 body {
6 margin: 10px;
7 font-family: 'Roboto',Verdana,Geneva,sans-serif;
8 font-size: 16px;
9 color: #000;
10 }
11 header {
12 text-align: center;
13 }
14
15 header h1 {
16 font-size: 1.3em;
17 }
18
19 a,
20 a:hover,
21 a:visited {
22 color: #000;
23 }
24
25 article {
26 margin: 0 auto;
27 width: 600px;
28 }
29 </style>
30 <meta property="og:title" content="{{ entry.title|e|raw }}" /> 4 <meta property="og:title" content="{{ entry.title|e|raw }}" />
31 <meta property="og:type" content="article" /> 5 <meta property="og:type" content="article" />
32 <meta property="og:url" content="{{ app.request.uri }}" /> 6 <meta property="og:url" content="{{ app.request.uri }}" />
@@ -40,12 +14,22 @@
40 <meta name="twitter:site" content="@wallabagapp" /> 14 <meta name="twitter:site" content="@wallabagapp" />
41 <meta name="twitter:title" content="{{ entry.title|e|raw }}" /> 15 <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
42 <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" /> 16 <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
17 {% if app.debug %}
18 <script src="{{ asset('bundles/wallabagcore/public.dev.js') }}"></script>
19 {% else %}
20 <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}">
21 {% endif %}
22
43 </head> 23 </head>
44 <body> 24 <body>
45 <header> 25 <header>
46 <h1>{{ entry.title|e|raw }}</h1> 26 <h1>{{ entry.title|e|raw }}</h1>
47 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> 27 <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
48 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div> 28 <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div>
29
30 {% if entry.previewPicture is not null %}
31 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div>
32 {% endif %}
49 </header> 33 </header>
50 <article> 34 <article>
51 {{ entry.content | raw }} 35 {{ entry.content | raw }}