The method of displaying meta tags in the admin panel has been replaced.

johncms · Sep 18, 2021 · c3b64ff · c3b64ff
1 parent 01b730b
commit c3b64ff
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/system/src/View/AdminRenderEngineFactory.php b/system/src/View/AdminRenderEngineFactory.php
@@ -38,6 +38,7 @@ public function __invoke(ContainerInterface $container): Render
                 'user'       => $container->get(User::class),
                 'tools'      => $container->get(Tools::class),
                 'csrf_token' => $container->get(Csrf::class)->getToken(),
+                'metaTags'   => $container->get(MetaTagManager::class),
             ]
         );
 

diff --git a/themes/admin/templates/system/layout/default.phtml b/themes/admin/templates/system/layout/default.phtml
@@ -1,9 +1,11 @@
 <?php
 /**
  * @var string $locale
- * @var Johncms\System\Users\User $user
+ * @var Johncms\Users\User $user
  * @var Johncms\Counters $counters
  * @var Johncms\Ads $ads
+ *
+ * @var Johncms\View\MetaTagManager $metaTags
  */
 
 $counters = $container->get('counters');
@@ -21,32 +23,25 @@ $analytics = $counters->counters();
     <meta content="yes" name="apple-mobile-web-app-capable">
     <meta name="Generator" content="JohnCMS, https://johncms.com">
     <?= $this->section('meta', '') ?>
-    <?php
-    if (! empty($keywords)): ?>
-        <meta name="keywords" content="<?= $this->e($keywords) ?>">
-    <?php
-    endif ?>
-    <?php
-    if (! empty($description)): ?>
-        <meta name="description" content="<?= $this->e($description) ?>">
-    <?php
-    endif ?>
-    <?php
-    if (! empty($canonical)): ?>
-        <link rel="canonical" href="<?= $canonical ?>">
-    <?php
-    endif ?>
+    <?php if (! empty($metaTags->getKeywords())): ?>
+        <meta name="keywords" content="<?= $this->e($metaTags->getKeywords()) ?>">
+    <?php endif ?>
+    <?php if (! empty($metaTags->getDescription())): ?>
+        <meta name="description" content="<?= $this->e($metaTags->getDescription()) ?>">
+    <?php endif ?>
+    <?php if (! empty($metaTags->getCanonical())): ?>
+        <link rel="canonical" href="<?= $metaTags->getCanonical() ?>">
+    <?php endif ?>
     <meta name="theme-color" content="#586776">
-    <?php if($locale === 'ar'): ?>
+    <?php if ($locale === 'ar'): ?>
         <link rel="stylesheet" href="<?= $this->asset('css/app.rtl.css', true) ?>">
     <?php else: ?>
         <link rel="stylesheet" href="<?= $this->asset('css/app.css', true) ?>">
     <?php endif; ?>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,700,700i&display=swap">
     <link rel="shortcut icon" href="<?= $this->asset('images/favicon.ico') ?>">
     <?= $this->section('styles', '') ?>
-    <link rel="alternate" type="application/rss+xml" title="RSS News" href="<?= $config['homeurl'] ?>/rss/">
-    <title><?= (isset($title) ? $this->e($title) : $config['copyright']) ?></title>
+    <title><?= $this->e($metaTags->getTitle()) ?></title>
 </head>
 <body>
 <div class="wrapper min-vh-100 d-flex flex-column justify-content-between" id="app">

diff --git a/themes/admin/templates/system/layout/guest.phtml b/themes/admin/templates/system/layout/guest.phtml
@@ -2,6 +2,8 @@
 /**
  * @var string $locale
  * @var Johncms\Counters $counters
+ *
+ * @var Johncms\View\MetaTagManager $metaTags
  */
 
 ?>
@@ -16,6 +18,15 @@
     <meta content="yes" name="apple-mobile-web-app-capable">
     <meta name="Generator" content="JohnCMS, https://johncms.com">
     <?= $this->section('meta', '') ?>
+    <?php if (! empty($metaTags->getKeywords())): ?>
+        <meta name="keywords" content="<?= $this->e($metaTags->getKeywords()) ?>">
+    <?php endif ?>
+    <?php if (! empty($metaTags->getDescription())): ?>
+        <meta name="description" content="<?= $this->e($metaTags->getDescription()) ?>">
+    <?php endif ?>
+    <?php if (! empty($metaTags->getCanonical())): ?>
+        <link rel="canonical" href="<?= $metaTags->getCanonical() ?>">
+    <?php endif ?>
     <meta name="theme-color" content="#586776">
     <?php if ($locale === 'ar'): ?>
         <link rel="stylesheet" href="<?= $this->asset('css/app.rtl.css', true) ?>">
@@ -25,7 +36,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,700,700i&display=swap">
     <link rel="shortcut icon" href="<?= $this->asset('images/favicon.ico') ?>">
     <?= $this->section('styles', '') ?>
-    <title><?= (isset($title) ? $this->e($title) : $config['copyright']) ?></title>
+    <title><?= $this->e($metaTags->getTitle()) ?></title>
 </head>
 <body>
 <div class="wrapper bg-light">