Merge pull request #653 from ejplatform/1.3.2-release-candidate

Minor release 1.3.2 - Ada Lovelace
ejplatform · Nov 23, 2018 · 7241140 · 7241140
2 parents c9a1ff7 + 6c21cce
commit 7241140
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/src/ej/templates/jinja2/base.jinja2 b/src/ej/templates/jinja2/base.jinja2
@@ -83,26 +83,29 @@
         <meta http-equiv="cache-control" content="{{ cache_control|default('no-cache') }}">
         <meta http-equiv="expires" content="{{ cache_expires|default(120) }}">
 
-        <!-- SEO -->
-        <meta name="description"
-              content="{{ page_description|default(_('EJ - A platform of social participation.')) }}">
-        <meta itemprop="name" content="EJ - Empurrando Juntos!">
-        <meta itemprop="image" content="/static/img/logo/logo.svg">
-
         <!-- Twitter -->
         <meta name="twitter:card" content="summary">
-        <meta name="twitter:title" content="EJ Platform - Consultas de opinião">
-
-        <!-- Open Graph general (Facebook, Pinterest & Google+) -->
-        <meta property="og:title" content="{{ title|default(_('EJ - A platform of social participacion.')) }}">
-        <meta property="og:image" content="/static/img/logo/logo.svg">
-        <meta property="og:image:width" content="1200">
-        <meta property="og:image:height" content="630">
-        <meta property="og:url" content="https://ejplatform.org/">
-        <meta property="og:site_name" content="EJ - Empurrando Juntos!">
-        <meta property="og:locale" content="pt_BR">
-        <meta property="og:type" content="website">
-        <meta property="fb:app_id" content="1757744567588794">
+
+        {% block metaOG %}
+            <!-- Open Graph general (Facebook, Pinterest & Google+) -->
+            <meta itemprop="image" property="og:image" content="/static/img/logo/logo.svg">
+            <meta property="og:image:type" content="image/svg">
+            <meta property="og:image:width" content="1200">
+            <meta property="og:image:height" content="630">
+            <meta itemprop="name" property="og:site_name" content="EJ - Empurrando Juntos!">
+            <meta property="og:url" content="https://ejplatform.org/">
+            <meta property="og:type" content="website">
+            <meta property="og:locale" content="pt_BR">
+
+        {% endblock metaOG %}
+
+        {% block metaOG2 %}
+            <meta name="description" property="og:title" content="{{ title|default(_('EJ - A platform of social participacion.')) }}">
+
+            <!-- Twitter && Telegram -->
+            <meta name="twitter:title" content="EJ Platform - Consultas de opinião">
+
+        {% endblock metaOG2 %}
     </head>
 
     <body class="{{ body_class|default('Page') }} {{ request.path.replace('/','') if request else '' }}">

diff --git a/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2 b/src/ej_boards/jinja2/ej_boards/conversation-list.jinja2
@@ -1 +1,9 @@
 {% extends 'ej_conversations/list.jinja2' %}
+
+{% block metaOG2 %}
+
+    <meta name="description" property="og:title" content="{{current_board.title}}">
+    <meta property="og:description" content="Participe e dê sua opinião com comentários e votos!">  
+    <!-- Twitter && Telegram -->
+    <meta name="twitter:title" content="{{current_board.title}}">
+{% endblock metaOG2 %}
diff --git a/src/ej_conversations/jinja2/ej_conversations/detail.jinja2 b/src/ej_conversations/jinja2/ej_conversations/detail.jinja2
@@ -1,5 +1,15 @@
 {% extends 'base.jinja2' %}
 
+{% block metaOG2 %}
+
+    <meta name="description" property="og:title" content="{{conversation.text}}">
+    <meta property="og:description" content="Participe e dê sua opinião com comentários e votos!">
+
+    <!-- Twitter && Telegram -->
+    <meta name="twitter:title" content="{{conversation.text}}">
+
+{% endblock metaOG2 %}
+
 {% block content %}
     <div class="ConversationDetail">
         {# Ballon with title #}