Skip to content

Commit 0614cac

Browse files
eric-schneideraimurphy
eric-schneider
and
aimurphy
authored
DOC-5456: Update references to deprecated DataStax properties (#201)
* Remove Discord, X, and LinkedIn from footer * Update footer links * Update favicon * Update home link in left nav * Update head metadata * Another stab at updating head meta * Update footer General Inquiries * Update footer link description * Update src/partials/footer.hbs Co-authored-by: April I. Murphy <36110273+aimurphy@users.noreply.github.com> * Update copyright and remove “an IBM Company” * Sneak in a couple highlight languages * Use pipe to separate preference center link --------- Co-authored-by: April I. Murphy <36110273+aimurphy@users.noreply.github.com>
1 parent 1c1bc69 commit 0614cac

File tree

4 files changed

+101
-133
lines changed

4 files changed

+101
-133
lines changed

‎src/js/vendor/highlight.bundle.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
var hljs = require('highlight.js/lib/highlight')
55
var hljsCurl = require('highlightjs-curl')
66
var sql = require('highlight.js/lib/languages/sql')
7+
var ini = require('highlight.js/lib/languages/ini')
78

89
hljs.registerLanguage('asciidoc', require('highlight.js/lib/languages/asciidoc'))
910
hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash'))
@@ -18,6 +19,7 @@
1819
hljs.registerLanguage('go', require('highlight.js/lib/languages/go'))
1920
hljs.registerLanguage('groovy', require('highlight.js/lib/languages/groovy'))
2021
hljs.registerLanguage('haskell', require('highlight.js/lib/languages/haskell'))
22+
hljs.registerLanguage('ini', ini)
2123
hljs.registerLanguage('java', require('highlight.js/lib/languages/java'))
2224
hljs.registerLanguage('javascript', require('highlight.js/lib/languages/javascript'))
2325
hljs.registerLanguage('json', require('highlight.js/lib/languages/json'))
@@ -40,6 +42,7 @@
4042
// Use SQL highlighter for CQL
4143
hljs.registerLanguage('cql', sql)
4244
hljs.registerLanguage('swift', require('highlight.js/lib/languages/swift'))
45+
hljs.registerLanguage('toml', ini)
4346
hljs.registerLanguage('typescript', require('highlight.js/lib/languages/typescript'))
4447
hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'))
4548
hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml'))

‎src/partials/footer.hbs‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<footer class="footer [&_a]:text-link flex flex-col gap-6 border-t mt-auto pt-6 text-sm md:flex-row row-start-2 xl:peer-[.toc]:col-span-2">
22
<div class="flex flex-col gap-6">
33
<a
4-
href="https://www.datastax.com"
4+
href="https://www.ibm.com/products/datastax"
55
target="_blank"
6-
title="Go to the DataStax Website"
7-
data-track="Footer datastax.com Link Clicked"
6+
title="Go to the DataStax home page"
7+
data-track="Footer Home Page Link Clicked"
88
class="w-min !text-primary"
99
>
1010
{{> logo}}
1111
</a>
1212
<p class="!m-0">
13-
<span>©</span>
13+
<span>© Copyright IBM Corporation</span>
1414
<span id="copyrightdate">{{year}}</span>
15-
<span>DataStax, an IBM Company |
15+
<span> |
1616
<a
17-
href="https://www.datastax.com/legal/datastax-website-privacy-policy"
17+
href="https://www.ibm.com/privacy"
1818
target="_blank"
1919
data-track="Footer Privacy Policy Link Clicked"
2020
>Privacy policy</a>
2121
|
2222
<a
23-
href="https://www.datastax.com/legal/datastax-website-terms-use"
23+
href="https://www.ibm.com/legal/terms"
2424
target="_blank"
2525
data-track="Footer Terms of Use Link Clicked"
2626
>Terms of use</a>
2727
{{#with site.keys.ibmSegment}}
2828
<span id="preferenceCenterContainer">
29-
·&nbsp;
29+
|&nbsp;
3030
<a
3131
id="preferenceCenterLink"
3232
href="#"
@@ -48,34 +48,13 @@
4848
</div>
4949
<div class="flex flex-col gap-6 md:ml-auto md:items-end">
5050
<div class="flex items-center gap-4">
51-
<a
52-
href="https://discord.gg/datastax"
53-
target="_blank"
54-
title="Go to DataStax Developers Discord"
55-
data-track="Footer Discord Link Clicked"
56-
class="h-6 w-6 bg-[url('../img/social-discord.svg')] bg-no-repeat dark:invert"
57-
></a>
5851
<a
5952
href="https://github.com/datastax"
6053
target="_blank"
6154
title="Go to DataStax GitHub"
6255
data-track="Footer Github Link Clicked"
6356
class="h-6 w-6 bg-[url('../img/social-github.svg')] bg-no-repeat dark:invert"
6457
></a>
65-
<a
66-
href="https://www.linkedin.com/showcase/datastaxdevs/"
67-
target="_blank"
68-
title="Go to DataStax Developers LinkedIn"
69-
data-track="LinkedIn Link Clicked"
70-
class="h-6 w-6 bg-[url('../img/social-linkedin.svg')] bg-no-repeat dark:invert"
71-
></a>
72-
<a
73-
href="https://twitter.com/datastaxdevs"
74-
target="_blank"
75-
title="Go to DataStax Developers X (Twitter)"
76-
data-track="Footer Twitter Link Clicked"
77-
class="h-6 w-6 bg-[url('../img/social-x.svg')] bg-no-repeat dark:invert"
78-
></a>
7958
<a
8059
href="https://www.youtube.com/@DataStaxDevs"
8160
target="_blank"
@@ -86,13 +65,9 @@
8665
</div>
8766
<p class="!m-0 md:text-right">General Inquiries:
8867
<a
89-
href="tel:+1-650-389-6000"
90-
data-track="Footer Telephone Link Clicked"
91-
>+1 (650) 389-6000</a>,
92-
<a
93-
href="mailto:info@datastax.com"
94-
data-track="Footer Email Link Clicked"
95-
>info@datastax.com</a>
68+
href="https://www.ibm.com/contact/global"
69+
data-track="Footer Contact Link Clicked"
70+
>Contact IBM</a>
9671
</p>
9772
</div>
9873
</footer>

‎src/partials/head-meta.hbs‎

Lines changed: 86 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,100 @@
1-
{{!-- Add additional meta tags here --}}
1+
{{!-- Favicon / social --}}
2+
<link rel="icon" href="https://www.ibm.com/favicon.ico">
23

3-
{{!-- apple touch icon --}}
4-
{{!-- <link rel="apple-touch-icon" sizes="180x180" href="https://www.datastax.com/en/astra/_/img/apple-touch-icon-180x180.png"> --}}
5-
<link rel="icon" href="https://www.datastax.com/favicon.ico">
6-
<meta property="article:published_time" content="{{page.localdate}}">
7-
<meta property="article:modified_time" content="{{page.docdate}}">
8-
<meta property="article:author" content="DataStax">
9-
{{!-- og --}}
10-
<meta property="og:site_name" content="DataStax Documentation">
11-
<meta property="og:type" content="article">
12-
<meta property="og:url" content="{{page.canonicalUrl}}">
13-
<meta property="og:title" content="{{> head-title}}">
14-
<meta property="og:description" content="{{page.description}}">
15-
<meta property="og:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
16-
<meta property="og:image:type" content="image/png">
17-
<meta property="og:image:width" content="1200">
18-
<meta property="og:image:height" content="628">
19-
<meta property="og:image:alt" content="DataStax Documentation">
20-
{{!-- twitter --}}
21-
<meta name="twitter:card" content="summary_large_image">
22-
<meta name="twitter:site" content="@datastax">
23-
<meta name="twitter:creator" content="@datastax">
24-
<meta name="twitter:url" content="{{page.canonicalUrl}}">
25-
<meta name="twitter:title" content="{{> head-title}}">
26-
<meta name="twitter:description" content="{{page.description}}">
27-
<meta name="twitter:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
28-
<script type="application/ld+json">
29-
[
30-
{{!-- {{commented expressions}} --}}
31-
{{#if (eq "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
4+
{{!-- Article meta --}}
5+
<meta property="article:published_time" content="{{page.localdate}}">
6+
<meta property="article:modified_time" content="{{page.docdate}}">
7+
<meta property="article:author" content="DataStax">
8+
9+
{{!-- Open Graph --}}
10+
{{#if (eq "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
11+
<meta property="og:type" content="website">
12+
{{else}}
13+
<meta property="og:type" content="article">
14+
{{/if}}
15+
<meta property="og:site_name" content="DataStax Documentation">
16+
<meta property="og:url" content="{{page.canonicalUrl}}">
17+
<meta property="og:title" content="{{> head-title}}">
18+
<meta property="og:description" content="{{page.description}}">
19+
<meta property="og:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
20+
<meta property="og:image:type" content="image/png">
21+
<meta property="og:image:width" content="1200">
22+
<meta property="og:image:height" content="628">
23+
<meta property="og:image:alt" content="DataStax Documentation">
24+
25+
{{!-- Twitter / X --}}
26+
<meta name="twitter:card" content="summary_large_image">
27+
<meta name="twitter:url" content="{{page.canonicalUrl}}">
28+
<meta name="twitter:title" content="{{> head-title}}">
29+
<meta name="twitter:description" content="{{page.description}}">
30+
<meta name="twitter:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
31+
32+
<script type="application/ld+json">
3233
{
33-
"@context": "https://schema.org",
34-
"@type": "WebSite",
35-
"@id": "https://docs.datastax.com",
36-
"name": "DataStax Documentation",
37-
"url": "{{page.canonicalUrl}}",
38-
"image": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
34+
"@context": "https://schema.org",
35+
"@graph": [
36+
{
37+
"@type": "Organization",
38+
"@id": "https://docs.datastax.com#organization",
39+
"name": "DataStax",
40+
"url": "https://docs.datastax.com",
41+
"logo": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
3942
"sameAs": [
40-
"https://github.com/datastaxdevs/",
41-
"https://twitter.com/datastaxdevs",
42-
"https://datastax.medium.com/"
43-
],
44-
"potentialAction": {
45-
"@type": "SearchAction",
46-
"target": "https://www.datastax.com/search?dataset=docs&query={search_term}",
47-
"query-input": "required name=search_term"
43+
"https://www.ibm.com/products/datastax",
44+
"https://github.com/datastax/",
45+
"https://github.com/datastaxdevs/",
46+
"https://www.youtube.com/@DataStax",
47+
"https://www.youtube.com/@DataStaxDevs",
48+
"https://en.wikipedia.org/wiki/DataStax"
49+
],
50+
"parentOrganization": {
51+
"@type": "Organization",
52+
"@id": "https://www.ibm.com#organization",
53+
"name": "IBM",
54+
"url": "https://www.ibm.com"
55+
}
4856
},
49-
"Publisher":{
50-
"@type": "Corporation",
51-
"@id": "https://datastax.com#organization",
52-
"name": "DataStax",
53-
"url": "https://datastax.com"
57+
{
58+
"@type": "WebSite",
59+
"@id": "https://docs.datastax.com#website",
60+
"name": "DataStax Documentation",
61+
"url": "https://docs.datastax.com",
62+
"publisher": { "@id": "https://docs.datastax.com#organization" }
5463
},
55-
"Author":{
56-
"@type": "Corporation",
57-
"@id": "https://datastax.com#organization",
58-
"name": "DataStax"
59-
}
60-
},
61-
{{else}}
62-
{
63-
"@context": "https://schema.org",
64+
{{#if (eq "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
65+
{
6466
"@type": "WebPage",
6567
"@id": "{{page.canonicalUrl}}",
66-
"name":"{{page.title}}",
67-
"inLanguage":"en-US",
68-
"reviewedBy":{
69-
"@type": "Corporation",
70-
"@id": "https://datastax.com#organization",
71-
"name": "DataStax"
72-
},
73-
"author":{
74-
"@type": "Corporation",
75-
"@id": "https://datastax.com#organization",
76-
"name": "DataStax"
77-
},
78-
"isPartOf": {
79-
"@type": "WebSite",
80-
"@id": "https://docs.datastax.com",
81-
"name": "DataStax Documentation"
82-
},
83-
"mainEntity":
68+
"name": "{{page.title}}",
69+
"inLanguage": "en-US",
70+
"isPartOf": { "@id": "https://docs.datastax.com#website" },
71+
"publisher": { "@id": "https://docs.datastax.com#organization" },
72+
"primaryImageOfPage": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png"
73+
}
74+
{{else}}
8475
{
85-
"@type":"TechArticle",
76+
"@type": "WebPage",
77+
"@id": "{{page.canonicalUrl}}",
78+
"name": "{{page.title}}",
79+
"inLanguage": "en-US",
80+
"isPartOf": { "@id": "https://docs.datastax.com#website" },
81+
"reviewedBy": { "@id": "https://docs.datastax.com#organization" },
82+
"author": { "@id": "https://docs.datastax.com#organization" },
83+
"mainEntity": {
84+
"@type": "TechArticle",
8685
"@id": "{{page.canonicalUrl}}#main_content",
87-
"mainEntityOfPage": "true",
88-
"datePublished":"{{page.localdate}}",
89-
"dateModified":"{{page.docdate}}",
86+
"mainEntityOfPage": true,
87+
"datePublished": "{{page.localdate}}",
88+
"dateModified": "{{page.docdate}}",
9089
"headline": "{{page.title}}",
91-
"description":"{{page.description}}",
92-
"keywords":"{{page.keywords}}",
90+
"description": "{{page.description}}",
91+
"keywords": "{{page.keywords}}",
9392
"image": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
94-
"publisher":{
95-
"@type": "Corporation",
96-
"@id": "https://datastax.com#organization",
97-
"name": "DataStax",
98-
"url": "https://datastax.com"
99-
},
100-
"author":{
101-
"@type": "Corporation",
102-
"@id": "https://datastax.com#organization",
103-
"name": "DataStax",
104-
"url": "https://datastax.com"
105-
}
93+
"publisher": { "@id": "https://docs.datastax.com#organization" },
94+
"author": { "@id": "https://docs.datastax.com#organization" }
95+
}
10696
}
107-
}
108-
{{/if}}
97+
{{/if}}
10998
]
99+
}
110100
</script>

‎src/partials/nav-secondary.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<li>
33
<a
44
class="text-body-small text-primary hover:bg-[var(--ds-neutral-plain-hover-bg)] flex rounded p-1 !no-underline transition-colors"
5-
href="https://www.datastax.com/"
5+
href="https://www.ibm.com/products/datastax"
66
target="_self"
77
>
88
<span class="material-icons text-tertiary mr-2">home</span>

0 commit comments

Comments
 (0)