Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
0562bc8d
Unverified
Commit
0562bc8d
authored
Aug 20, 2018
by
Nicolas Widart
Committed by
GitHub
Aug 20, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #569 from ChristianGiupponi/3.0
Add canonical and Alternate link
parents
adbca712
ea339979
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
7 deletions
+32
-7
PublicController.php
Modules/Page/Http/Controllers/PublicController.php
+25
-2
master.blade.php
Themes/Flatly/views/layouts/master.blade.php
+7
-5
No files found.
Modules/Page/Http/Controllers/PublicController.php
View file @
0562bc8d
...
...
@@ -46,7 +46,9 @@ class PublicController extends BasePublicController
$template
=
$this
->
getTemplateForPage
(
$page
);
return
view
(
$template
,
compact
(
'page'
));
$alternate
=
$this
->
getAlternateMetaData
(
$page
);
return
view
(
$template
,
compact
(
'page'
,
'alternate'
));
}
/**
...
...
@@ -60,7 +62,9 @@ class PublicController extends BasePublicController
$template
=
$this
->
getTemplateForPage
(
$page
);
return
view
(
$template
,
compact
(
'page'
));
$alternate
=
$this
->
getAlternateMetaData
(
$page
);
return
view
(
$template
,
compact
(
'page'
,
'alternate'
));
}
/**
...
...
@@ -101,4 +105,23 @@ class PublicController extends BasePublicController
$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
;
}
}
Themes/Flatly/views/layouts/master.blade.php
View file @
0562bc8d
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment