From 77c5140bed9271bd34d561fa656ea6f2b12bed1f Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 10 Jun 2017 12:13:30 +0200
Subject: Better export page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
---
 src/Wallabag/CoreBundle/Resources/translations/messages.da.yml    | 3 ++-
 src/Wallabag/CoreBundle/Resources/translations/messages.en.yml    | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml    | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml    | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.it.yml    | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml    | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml    | 2 +-
 .../Resources/views/themes/common/Entry/share.html.twig           | 8 ++++++--
 8 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src')

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:
         #         and: 'One rule AND another'
         #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
         #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
+
 entry:
     page_titles:
         # unread: 'Unread entries'
@@ -244,7 +245,7 @@ entry:
         url_label: 'Url'
         save_label: 'Gem'
     public:
-        # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
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:
         url_label: 'Url'
         save_label: 'Save'
     public:
-        shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Are you sure you want to remove that article?"
         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:
         url_label: 'نشانی'
         save_label: 'ذخیره'
     public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
         # 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:
         url_label: "Adresse"
         save_label: "Enregistrer"
     public:
-        shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
+        shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
     confirm:
         delete: "Voulez-vous vraiment supprimer cet article ?"
         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..73081ca5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -245,7 +245,7 @@ entry:
         url_label: 'Url'
         save_label: 'Salva'
     public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Vuoi veramente rimuovere quell'articolo?"
         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:
         url_label: 'Url'
         save_label: 'Salvează'
     public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
         # 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:
         url_label: 'Url'
         save_label: 'Kaydet'
     public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         # delete: "Are you sure you want to remove that article?"
         # 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..3828c296 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
@@ -24,7 +24,7 @@
 
             article {
                 margin: 0 auto;
-                width: 600px;
+                width: 900px;
             }
         </style>
         <meta property="og:title" content="{{ entry.title|e|raw }}" />
@@ -45,7 +45,11 @@
         <header>
             <h1>{{ entry.title|e|raw }}</h1>
             <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>
-            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div>
+            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div>
+
+            {% if entry.previewPicture is not null %}
+                <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div>
+            {% endif %}
         </header>
         <article>
             {{ entry.content | raw }}
-- 
cgit v1.2.3


From 5642d1a150bcd2601b626aabd5976ad421c8f4b8 Mon Sep 17 00:00:00 2001
From: Sven Fischer <git-dev@linux4tw.de>
Date: Sat, 17 Jun 2017 09:36:08 +0200
Subject: adjust :de: shared_by_wallabag string to include user info

---
 src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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:
         url_label: 'URL'
         save_label: 'Speichern'
     public:
-        shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
+        shared_by_wallabag: "Dieser Artikel wurde von %username% mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
     confirm:
         delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?"
         delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?"
-- 
cgit v1.2.3


From 38dd2def2025acbd001aa0510b838fb5b59fdbde Mon Sep 17 00:00:00 2001
From: Sven Fischer <git-dev@linux4tw.de>
Date: Sat, 17 Jun 2017 09:38:13 +0200
Subject: add :it: shared_by_wallabag string translated by @matteocoder

---
 src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 73081ca5..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:
         url_label: 'Url'
         save_label: 'Salva'
     public:
-        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
         delete: "Vuoi veramente rimuovere quell'articolo?"
         delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
-- 
cgit v1.2.3


From 6b1b148d655eec4411e13a90a0bd050b923e3ef9 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 20 Jun 2017 07:14:37 +0200
Subject: Add share.scss file

Still needs to include it in the twig template
---
 .../views/themes/common/Entry/share.html.twig      | 26 ----------------------
 1 file changed, 26 deletions(-)

(limited to 'src')

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 3828c296..308fda2e 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 @@
 <html>
     <head>
         <title>{{ entry.title|e|raw }}</title>
-        <style>
-            body {
-                margin: 10px;
-                font-family: 'Roboto',Verdana,Geneva,sans-serif;
-                font-size: 16px;
-                color: #000;
-            }
-            header {
-                text-align: center;
-            }
-
-            header h1 {
-                font-size: 1.3em;
-            }
-
-            a,
-            a:hover,
-            a:visited {
-                color: #000;
-            }
-
-            article {
-                margin: 0 auto;
-                width: 900px;
-            }
-        </style>
         <meta property="og:title" content="{{ entry.title|e|raw }}" />
         <meta property="og:type" content="article" />
         <meta property="og:url" content="{{ app.request.uri }}" />
-- 
cgit v1.2.3


From 77255d668828d7ae4cceb186b5215a0d4ddd69f6 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 22 Jun 2017 12:15:24 +0200
Subject: Add css on share public page

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig   | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

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 308fda2e..2e8fe65c 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
@@ -14,6 +14,11 @@
         <meta name="twitter:site" content="@wallabagapp" />
         <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
         <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
+        {% if not app.debug %}
+            <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}">
+        {% endif %}
+
+        <script src="{{ asset('bundles/wallabagcore/public' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
     </head>
     <body>
         <header>
-- 
cgit v1.2.3


From 151f45db0ef6d0a4737eb220b0803b3ccfd0b6f5 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 22 Jun 2017 14:55:49 +0200
Subject: Don't load js for nothing in prod

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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 2e8fe65c..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
@@ -14,11 +14,12 @@
         <meta name="twitter:site" content="@wallabagapp" />
         <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
         <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
-        {% if not app.debug %}
+        {% if app.debug %}
+            <script src="{{ asset('bundles/wallabagcore/public.dev.js') }}"></script>
+        {% else %}
             <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}">
         {% endif %}
 
-        <script src="{{ asset('bundles/wallabagcore/public' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
     </head>
     <body>
         <header>
-- 
cgit v1.2.3