Merge pull request #569 from ChristianGiupponi/3.0

Add canonical and Alternate link
AsgardCms · Aug 20, 2018 · 0562bc8 · 0562bc8
2 parents adbca71 + ea33997
commit 0562bc8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/Modules/Page/Http/Controllers/PublicController.php b/Modules/Page/Http/Controllers/PublicController.php
@@ -46,7 +46,9 @@ public function uri($slug)
 
         $template = $this->getTemplateForPage($page);
 
-        return view($template, compact('page'));
+        $alternate = $this->getAlternateMetaData($page);
+
+        return view($template, compact('page', 'alternate'));
     }
 
     /**
@@ -60,7 +62,9 @@ public function homepage()
 
         $template = $this->getTemplateForPage($page);
 
-        return view($template, compact('page'));
+        $alternate = $this->getAlternateMetaData($page);
+
+        return view($template, compact('page', 'alternate'));
     }
 
     /**
@@ -101,4 +105,23 @@ private function throw404IfNotFound($page)
             $this->app->abort('404');
         }
     }
+
+    /**
+     * Create a key=>value array for alternate links
+     *
+     * @param $page
+     *
+     * @return array
+     */
+    private function getAlternateMetaData($page)
+    {
+        $translations = $page->getTranslationsArray();
+
+        $alternate = [];
+        foreach ($translations as $locale => $data) {
+            $alternate[$locale] = $data['slug'];
+        }
+
+        return $alternate;
+    }
 }
diff --git a/Themes/Flatly/views/layouts/master.blade.php b/Themes/Flatly/views/layouts/master.blade.php
@@ -3,12 +3,14 @@
 <head lang="{{ LaravelLocalization::setLocale() }}">
     <meta charset="UTF-8">
     @section('meta')
-        <meta name="description" content="@setting('core::site-description')" />
+        <meta name="description" content="@setting('core::site-description')"/>
     @show
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>
-        @section('title')@setting('core::site-name')@show
-    </title>
+    <title>@section('title')@setting('core::site-name')@show</title>
+    @foreach($alternate as $alternateLocale=>$alternateSlug)
+        <link rel="alternate" hreflang="{{$alternateLocale}}" href="{{url($alternateLocale.'/'.$alternateSlug)}}">
+    @endforeach
+    <link rel="canonical" href="{{url()->current()}}" />
     <link rel="shortcut icon" href="{{ Theme::url('favicon.ico') }}">
 
     {!! Theme::style('css/main.css') !!}
@@ -30,7 +32,7 @@
 @yield('scripts')
 
 <?php if (Setting::has('core::analytics-script')): ?>
-    {!! Setting::get('core::analytics-script') !!}
+{!! Setting::get('core::analytics-script') !!}
 <?php endif; ?>
 @stack('js-stack')
 </body>