From 03b020eb205a052b3a09f94e316c3b6b48607103 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 9 Sep 2017 19:32:42 +0200 Subject: Entry: handle originUrl in edit form, update translations Signed-off-by: Kevin Decherf --- .../CoreBundle/Resources/views/themes/material/Entry/edit.html.twig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig index b9537975..ed225957 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig @@ -27,6 +27,11 @@ {{ form_label(form.url) }} {{ form_widget(form.url) }} + +
+ {{ form_label(form.origin_url) }} + {{ form_widget(form.origin_url) }} +

{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} -- cgit v1.2.3 From f0f162b8d289f33a7bdff1c6f9ff9ecb1657ff67 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 9 Sep 2017 21:00:32 +0200 Subject: Add support of originUrl field in material entry view Signed-off-by: Kevin Decherf --- .../Resources/views/themes/material/Entry/entry.html.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes') 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 4cff7bf2..0d242d2b 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 @@ -249,6 +249,14 @@ comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + {% if entry.originUrl is not empty %} +
  • + launch + + {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} + +
    • + {% endif %}
      {% for tag in entry.tags %} -- cgit v1.2.3 From 3198ea9682e87f10c2b0fd6e75bcde40ad801245 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 9 Sep 2017 21:20:16 +0200 Subject: Handle original_url querystring in Shaarli sharing link This feature needs at least shaarli-plugin-via 0.2 from https://github.com/Kdecherf/shaarli-plugin-via to work. Shaarli will silently ignore this parameter if this plugin is missing. Signed-off-by: Kevin Decherf --- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes') 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 0d242d2b..d585a7dc 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 @@ -125,7 +125,7 @@ {% endif %} {% if craue_setting('share_shaarli') %}
    • - + shaarli
      • -- cgit v1.2.3 From 6de4cd35b5b979c37cf1bca5e5b3dae6a5b0170e Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 5 Nov 2017 15:32:32 +0100 Subject: Add support of originUrl field in baggy entry view --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index f8723189..f7c89abf 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -71,6 +71,14 @@ comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + + {% if entry.originUrl is not empty %} + launch + + {{ entry.originUrl|striptags|removeSchemeAndWww|truncate(32) }} + + {% endif %} +