Change share entry behavior

12 files changed, 18 insertions, 1 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 2eb0b7b0..f9b7bfac 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Deling'
             # share_email_label: 'Email'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Download'
             # print: 'Print'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 3d4ae9b3..79d03286 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Teilen'
             share_email_label: 'E-Mail'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Herunterladen'
             print: 'Drucken'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index b7a16446..d921b39f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Share'
             share_email_label: 'Email'
             public_link: 'public link'
+            delete_public_link: 'delete public link'
             download: 'Download'
             print: 'Print'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 0e4c0e6e..c2ec4dbd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Compartir'
             share_email_label: 'Dirección e-mail'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Descargar'
             print: 'Imprimir'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 3b36f6f2..561ed907 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'هم‌رسانی'
             share_email_label: 'نشانی ایمیل'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'بارگیری'
             print: 'چاپ'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index df7c2271..c0671883 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Partager'
             share_email_label: 'Email'
             public_link: 'Lien public'
+            delete_public_link: 'Supprimer lien public'
             download: 'Télécharger'
             print: 'Imprimer'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 3760c2d6..2e3dd08b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -185,6 +185,8 @@ entry:
             add_a_tag: 'Aggiungi un tag'
             share_content: 'Condividi'
             share_email_label: 'E-mail'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Download'
             print: 'Stampa'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index f3bfbd80..7b978a60 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Partatjar'
             share_email_label: 'Corrièl'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Telecargar'
             print: 'Imprimir'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 93d3e91f..da170e4d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Udostępnij'
             share_email_label: 'Adres email'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Pobierz'
             print: 'Drukuj'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 3ba1e078..fa2d6468 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Dă mai departe'
             share_email_label: 'E-mail'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'Descarcă'
             # print: 'Print'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index f6337caa..05c31336 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -188,6 +188,7 @@ entry:
             share_content: 'Paylaş'
             share_email_label: 'E-posta'
             # public_link: 'public link'
+            # delete_public_link: 'delete public link'
             download: 'İndir'
             # print: 'Print'
             problem:
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 585e4dd5..05bb378d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -101,10 +101,15 @@
                 <ul>
                     {% if craue_setting('share_public') %}
                         <li>
-                            <a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
+                            <a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
                                 <span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
                             </a>
                         </li>
+                        <li>
+                            <a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
+                                <span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
+                            </a>
+                        </li>
                     {% endif %}
                     {% if craue_setting('share_twitter') %}
                         <li>