hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

move head tags to layout, remove added tags on the client if some where added before

Browse source
This commit is contained in:
xavizalote 2016-04-13 08:43:43 +02:00
parent ca751b49aa
commit 021804b354
3 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
packages/nova-base-components/lib/common/HeadTags.jsx
View file

@ -4,39 +4,43 @@ import { DocHead } from 'meteor/kadira:dochead';
class HeadTags extends Component {
render() {
if (!!this.props) {
DocHead.removeDocHeadAddedTags();
}
const url = this.props.url ? this.props.url : Telescope.utils.getSiteUrl();
const title = this.props.title ? this.props.title : Telescope.settings.get("title");
const description = this.props.description ? this.props.description : Telescope.settings.get("tagline");
const image = this.props.image ? this.props.image : Telescope.utils.getSiteUrl() + Telescope.settings.get("logoUrl");
const metas = [
{charset: "utf-8"},
{name: "description", content: description},
{ charset: "utf-8" },
{ name: "description", content: description },
// responsive
{name: "viewport", content:"width=device-width, initial-scale=1"},
{ name: "viewport", content:"width=device-width, initial-scale=1" },
// facebook
{property: "og:type", content: "article"},
{property: "og:url", content: url},
{property: "og:image", content: image},
{property: "og:title", content: title},
{property: "og:description", content: description},
{ property: "og:type", content: "article" },
{ property: "og:url", content: url },
{ property: "og:image", content: image },
{ property: "og:title", content: title },
{ property: "og:description", content: description },
//twitter
{name: "twitter:card", content: "summary"},
{name: "twitter:image:src", content: image},
{name: "twitter:title", content: title},
{name: "twitter:description", content: description}
{ name: "twitter:card", content: "summary" },
{ name: "twitter:image:src", content: image },
{ name: "twitter:title", content: title },
{ name: "twitter:description", content: description }
];
const links = [
{rel: "canonical", href: Telescope.utils.getSiteUrl()},
{rel: "shortcut icon", href: Telescope.settings.get("favicon", "/img/favicon.ico")}
{ rel: "canonical", href: Telescope.utils.getSiteUrl() },
{ rel: "shortcut icon", href: Telescope.settings.get("favicon", "/img/favicon.ico") }
];
return (
<div>
{DocHead.setTitle(title)}
{metas.map(meta => DocHead.addMeta(meta))}
{links.map(link => DocHead.addLink(link))}
{ DocHead.setTitle(title) }
{ metas.map(meta => DocHead.addMeta(meta)) }
{ links.map(link => DocHead.addLink(link)) }
</div>
);
}

4
packages/nova-base-components/lib/common/Layout.jsx
View file

@ -5,11 +5,13 @@ const FlashContainer = Core.FlashContainer;
const Layout = props => {
({Header, Footer, FlashMessages, NewsletterForm} = Telescope.components);
({Header, Footer, FlashMessages, NewsletterForm, HeadTags} = Telescope.components);
return (
<div className="wrapper" id="wrapper">
<HeadTags />
<Header {...props}/>
<div className="main">

3
packages/nova-base-components/lib/posts/list/PostListHeader.jsx
View file

@ -5,11 +5,10 @@ const ListContainer = SmartContainers.ListContainer;
const PostListHeader = () => {
({PostViews, SearchForm, CategoriesList, HeadTags} = Telescope.components)
({PostViews, SearchForm, CategoriesList} = Telescope.components)
return (
<div>
<HeadTags />
<div className="post-list-header">
<div className="post-list-categories">
<ListContainer collection={Categories} limit={0} resultsPropName="categories" component={CategoriesList}/>