From aca445916485da11bdf25bf207bb37b5d5c3d4a8 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 7 Feb 2020 15:19:07 +0300 Subject: [PATCH 1/3] ogdata and message include base theme --- .../base-theme/resources/views/partials/metadata.twig | 10 +--------- .../base-theme/resources/views/partials/ogdata.twig | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index 59f8bdb9a..8a58805e0 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -12,15 +12,7 @@ -{% block ogdata %} - - - - - - -{% endblock %} +{% include "visiosoft.theme.base::partials/ogdata" %} {{ setting_value('streams::name', config_get('streams::distribution.name')) }} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig new file mode 100644 index 000000000..381f7f9d9 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig @@ -0,0 +1,9 @@ +{% block ogdata %} + <meta property="og:site_name" + content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/> + <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/> + <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/> + <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/> + <meta property="og:image" content="{{ template.get('og_image') }}"/> + <meta property="og:type" content="website"/> +{% endblock %} \ No newline at end of file From 37b7e2e59f5a5156c9965c81d3e50e82580d92a2 Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Fri, 7 Feb 2020 15:26:53 +0300 Subject: [PATCH 2/3] include meta Tags --- .../base-theme/resources/views/partials/metadata.twig | 8 +------- .../base-theme/resources/views/partials/metatags.twig | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index 8a58805e0..53ba7feef 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -4,13 +4,7 @@ <!-- To the Future! --> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> -<!-- Meta Tags --> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width"/> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/> -<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> -<meta name="description" content="{{ trans(template.meta_description) }}"/> +{% include "visiosoft.theme.base::partials/metatags" %} {% include "visiosoft.theme.base::partials/ogdata" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig new file mode 100644 index 000000000..ec134b40c --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -0,0 +1,8 @@ +<!-- Meta Tags --> +<meta charset="utf-8"> +<meta name="viewport" content="width=device-width"/> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/> +<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> +<meta name="description" content="{{ trans(template.meta_description) }}"/> +<!-- Meta Tags --> \ No newline at end of file From 7b027350f574cf81980299919a2d679ba34a4b3a Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Fri, 7 Feb 2020 15:45:56 +0300 Subject: [PATCH 3/3] change anomaly --- .../base-theme/resources/views/partials/metadata.twig | 8 -------- .../base-theme/resources/views/partials/metatags.twig | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index 53ba7feef..c785a3670 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -6,14 +6,6 @@ {% include "visiosoft.theme.base::partials/metatags" %} -{% include "visiosoft.theme.base::partials/ogdata" %} - -<title> - {{ setting_value('streams::name', config_get('streams::distribution.name')) }} - › - {{ trans(template.meta_title) }} - - {#{{ favicons("theme::img/favicon.png") }}#} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index ec134b40c..3a0518888 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -5,4 +5,12 @@ - \ No newline at end of file + + + + {{ setting_value('streams::name', config_get('streams::distribution.name')) }} + › + {{ trans(template.meta_title) }} + + +{% include "visiosoft.theme.base::partials/ogdata" %}