From 50f5ead7a17d16aa4d0d13d06087c6a3433ddaa3 Mon Sep 17 00:00:00 2001 From: Pablo Diego Silva da Silva Date: Fri, 23 Nov 2018 14:55:53 -0200 Subject: [PATCH 1/3] Merge pull request #652 from ejplatform/i626_share_texts [Review] I626 Share conversation and boards text --- src/ej/templates/jinja2/base.jinja2 | 27 +++++++++++-------- .../jinja2/ej_boards/conversation-list.jinja2 | 7 +++++ .../jinja2/ej_conversations/detail.jinja2 | 7 +++++ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2 index f98f886cd..c444bb367 100644 --- a/src/ej/templates/jinja2/base.jinja2 +++ b/src/ej/templates/jinja2/base.jinja2 @@ -92,17 +92,22 @@ - - - - - - - - - - - + + {% block metaOG %} + + + + + + + + + + {% endblock metaOG %} + + {% block metaOG2 %} + + {% endblock metaOG2 %} diff --git a/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 b/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 index d67ee262c..62269d0eb 100644 --- a/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 +++ b/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 @@ -1 +1,8 @@ {% extends 'ej_conversations/list.jinja2' %} + +{% block metaOG2 %} + + + + +{% endblock metaOG2 %} \ No newline at end of file diff --git a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 index b2c4a18ed..7d274427e 100644 --- a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 +++ b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 @@ -1,5 +1,12 @@ {% extends 'base.jinja2' %} +{% block metaOG2 %} + + + + +{% endblock metaOG2 %} + {% block content %}
{# Ballon with title #} From 41bf107db67c7faeac154d9348da97030d0eb0d5 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Fri, 23 Nov 2018 15:20:37 -0200 Subject: [PATCH 2/3] Update 626_share_texts --- src/ej/templates/jinja2/base.jinja2 | 18 ++++++++---------- .../jinja2/ej_boards/conversation-list.jinja2 | 7 ++++--- .../jinja2/ej_conversations/detail.jinja2 | 3 +++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2 index c444bb367..55e3f2c20 100644 --- a/src/ej/templates/jinja2/base.jinja2 +++ b/src/ej/templates/jinja2/base.jinja2 @@ -83,30 +83,28 @@ - - - - - - {% block metaOG %} - + - + + {% endblock metaOG %} {% block metaOG2 %} - + + + + + {% endblock metaOG2 %} diff --git a/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 b/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 index 62269d0eb..c7e359293 100644 --- a/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 +++ b/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 @@ -2,7 +2,8 @@ {% block metaOG2 %} - - - + + + + {% endblock metaOG2 %} \ No newline at end of file diff --git a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 index 7d274427e..e55e8810b 100644 --- a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 +++ b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 @@ -5,6 +5,9 @@ + + + {% endblock metaOG2 %} {% block content %} From 6c21cce1aa4820db516291d81efbf91dc796bbbe Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Fri, 23 Nov 2018 16:13:03 -0200 Subject: [PATCH 3/3] Fix facebook share message --- src/ej_conversations/jinja2/ej_conversations/detail.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 index e55e8810b..e8713cf10 100644 --- a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 +++ b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 @@ -2,7 +2,7 @@ {% block metaOG2 %} - +