diff --git a/assets/js/content-interactions.js b/assets/js/content-interactions.js index e4e7d3c85..ac2e10425 100644 --- a/assets/js/content-interactions.js +++ b/assets/js/content-interactions.js @@ -15,7 +15,8 @@ var elementWhiteList = [ ".tabs p a", ".code-tabs p a", ".truncate-toggle", - ".children-links a" + ".children-links a", + ".list-links a" ] $('.article a[href^="#"]:not(' + elementWhiteList + ')').click(function (e) { diff --git a/assets/styles/layouts/_layout-article.scss b/assets/styles/layouts/_layout-article.scss index 2d57fdd8e..1cbcceda7 100644 --- a/assets/styles/layouts/_layout-article.scss +++ b/assets/styles/layouts/_layout-article.scss @@ -243,7 +243,7 @@ ///////////////////////// Landing Page Article Links ///////////////////////// - .children-links { + .children-links, .list-links { h2,h3,h4 { margin-top: -.5rem; @@ -642,6 +642,24 @@ } } } + + //////////////////////////////////// Tags //////////////////////////////////// + + .tags { + border-top: 1px solid $article-hr; + padding-top: 1.5rem; + margin-top: 2rem; + + .tag { + background: $body-bg; + margin: .12rem 0; + padding: .35rem .6rem; + font-style: italic; + font-weight: bold; + color: rgba($article-text, .65); + font-size: .8rem; + } + } } diff --git a/config.toml b/config.toml index de5881dc8..de4a12cae 100644 --- a/config.toml +++ b/config.toml @@ -9,6 +9,9 @@ enableGitInfo = true pygmentsCodefences = true pygmentsUseClasses = true +# Preserve case in article tags +preserveTaxonomyNames = true + # Markdown rendering options [blackfriday] hrefTargetBlank = true @@ -18,3 +21,6 @@ hrefTargetBlank = true [[menu.versions]] name = "v1.x" url = "https://docs.influxdata.com" + +[taxonomies] + "v2.0/tag" = "v2.0/tags" diff --git a/content/v2.0/example.md b/content/v2.0/example.md index 25eca418a..23f265796 100644 --- a/content/v2.0/example.md +++ b/content/v2.0/example.md @@ -8,6 +8,7 @@ menu: #enterprise_all: true enterprise_some: true draft: true +"v2.0/tags": [influxdb] --- This is a paragraph. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc rutrum, metus id scelerisque euismod, erat ante suscipit nibh, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. Morbi eu bibendum erat. Sed ullamcorper, dui id lobortis efficitur, mauris odio pharetra neque, vel tempor odio dolor blandit justo. diff --git a/content/v2.0/process-data/_index.md b/content/v2.0/process-data/_index.md index 4a0647a88..b22240afc 100644 --- a/content/v2.0/process-data/_index.md +++ b/content/v2.0/process-data/_index.md @@ -8,6 +8,7 @@ menu: v2_0: name: Process data weight: 5 +v2.0/tags: [tasks] --- InfluxDB's _**task engine**_ is designed for processing and analyzing data. diff --git a/content/v2.0/process-data/common-tasks/_index.md b/content/v2.0/process-data/common-tasks/_index.md index 24bc3d068..644d8d3a2 100644 --- a/content/v2.0/process-data/common-tasks/_index.md +++ b/content/v2.0/process-data/common-tasks/_index.md @@ -4,6 +4,7 @@ seotitle: Common data processing tasks performed with with InfluxDB description: > InfluxDB Tasks process data on specified schedules. This collection of articles walks through common use cases for InfluxDB tasks. +v2.0/tags: [tasks] menu: v2_0: name: Common tasks diff --git a/content/v2.0/process-data/common-tasks/downsample-data.md b/content/v2.0/process-data/common-tasks/downsample-data.md index c0ef87c45..f13d7de55 100644 --- a/content/v2.0/process-data/common-tasks/downsample-data.md +++ b/content/v2.0/process-data/common-tasks/downsample-data.md @@ -9,6 +9,7 @@ menu: name: Downsample data parent: Common tasks weight: 4 +v2.0/tags: [tasks] --- One of the most common use cases for InfluxDB tasks is downsampling data to reduce diff --git a/content/v2.0/process-data/manage-tasks/_index.md b/content/v2.0/process-data/manage-tasks/_index.md index b26aa7bb1..c72a12c24 100644 --- a/content/v2.0/process-data/manage-tasks/_index.md +++ b/content/v2.0/process-data/manage-tasks/_index.md @@ -4,6 +4,7 @@ seotitle: Manage data processing tasks in InfluxDB description: > InfluxDB provides options for managing the creation, reading, updating, and deletion of tasks using both the 'influx' CLI and the InfluxDB UI. +v2.0/tags: [tasks] menu: v2_0: name: Manage tasks diff --git a/content/v2.0/process-data/manage-tasks/create-task.md b/content/v2.0/process-data/manage-tasks/create-task.md index 520de0b42..85bc5a9ba 100644 --- a/content/v2.0/process-data/manage-tasks/create-task.md +++ b/content/v2.0/process-data/manage-tasks/create-task.md @@ -4,6 +4,7 @@ seotitle: Create a task for processing data in InfluxDB description: > How to create a task that processes data in InfluxDB using the InfluxDB user interface or the 'influx' command line interface. +v2.0/tags: [tasks] menu: v2_0: name: Create a task diff --git a/content/v2.0/process-data/manage-tasks/delete-task.md b/content/v2.0/process-data/manage-tasks/delete-task.md index b8d963502..e7a6f5d2d 100644 --- a/content/v2.0/process-data/manage-tasks/delete-task.md +++ b/content/v2.0/process-data/manage-tasks/delete-task.md @@ -4,6 +4,7 @@ seotitle: Delete a task for processing data in InfluxDB description: > How to delete a task in InfluxDB using the InfluxDB user interface or using the 'influx' command line interface. +v2.0/tags: [tasks] menu: v2_0: name: Delete a task diff --git a/content/v2.0/process-data/manage-tasks/update-task.md b/content/v2.0/process-data/manage-tasks/update-task.md index 88ca555a0..89aa91a61 100644 --- a/content/v2.0/process-data/manage-tasks/update-task.md +++ b/content/v2.0/process-data/manage-tasks/update-task.md @@ -4,6 +4,7 @@ seotitle: Update a task for processing data in InfluxDB description: > How to update a task that processes data in InfluxDB using the InfluxDB user interface or the 'influx' command line interface. +v2.0/tags: [tasks] menu: v2_0: name: Update a task diff --git a/content/v2.0/process-data/manage-tasks/view-tasks.md b/content/v2.0/process-data/manage-tasks/view-tasks.md index 2a0a84f69..25f3686ab 100644 --- a/content/v2.0/process-data/manage-tasks/view-tasks.md +++ b/content/v2.0/process-data/manage-tasks/view-tasks.md @@ -4,6 +4,7 @@ seotitle: View created tasks that process data in InfluxDB description: > How to view all created data processing tasks using the InfluxDB user interface or the 'influx' command line interface. +v2.0/tags: [tasks] menu: v2_0: name: View tasks diff --git a/content/v2.0/process-data/task-options.md b/content/v2.0/process-data/task-options.md index 3600767e2..ca55620e7 100644 --- a/content/v2.0/process-data/task-options.md +++ b/content/v2.0/process-data/task-options.md @@ -9,6 +9,7 @@ menu: name: Task options parent: Process data weight: 5 +v2.0/tags: [tasks, flux] --- Task options define specific information about the task and are specified in your diff --git a/content/v2.0/process-data/write-a-task.md b/content/v2.0/process-data/write-a-task.md index 3c0315297..19429fd4f 100644 --- a/content/v2.0/process-data/write-a-task.md +++ b/content/v2.0/process-data/write-a-task.md @@ -4,6 +4,7 @@ seotitle: Write an InfluxDB task that processes data description: > How to write an InfluxDB task that processes data in some way, then performs an action such as storing the modified data in a new bucket or sending an alert. +v2.0/tags: [tasks] menu: v2_0: name: Write a task diff --git a/content/v2.0/tags/_index.md b/content/v2.0/tags/_index.md new file mode 100644 index 000000000..3a3d5c828 --- /dev/null +++ b/content/v2.0/tags/_index.md @@ -0,0 +1,4 @@ +--- +title: Tags and related content +layout: tags-landing +--- diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a903ad606..b3a523001 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,7 +1,28 @@ {{ partial "header.html" . }} -

{{ .Title }}

+
+ {{ partial "sidebar.html" . }} +
+
-{{ .Content }} +
+
+

Related to "{{ .Title }}"

+
+ + {{ range .Pages }} +

{{ .Title }}

+ {{ if .Description }} +

{{ .Description }}

+ {{ end }} + {{ end }} + +
+
+
+ +
© {{ now.Year }} InfluxData, Inc.
+
+
{{ partial "footer.html" . }} diff --git a/layouts/_default/tags-landing.html b/layouts/_default/tags-landing.html new file mode 100644 index 000000000..85aceba43 --- /dev/null +++ b/layouts/_default/tags-landing.html @@ -0,0 +1,27 @@ +{{ partial "header.html" . }} + +
+ {{ partial "sidebar.html" . }} +
+
+ +
+
+

{{ .Title }}

+
    + + {{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) .RelPermalink }} + {{ $tagSet := print $currentVersion "/tags" }} + {{ range $key, $value := index .Site.Taxonomies $tagSet }} +
  • {{ $key }} ({{ len $value }})
    • + {{ end }} + +
+
+
+ +
© {{ now.Year }} InfluxData, Inc.
+
+
+ +{{ partial "footer.html" . }} diff --git a/layouts/partials/article.html b/layouts/partials/article.html index 2c415fe78..aee7f74e5 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -4,6 +4,7 @@ {{ partial "article/latest-version.html" . }} {{ partial "article/enterprise.html" . }} {{ .Content }} + {{ partial "article/tags.html" . }} {{ partial "article/_alpha-feedback.html"}} diff --git a/layouts/partials/article/tags.html b/layouts/partials/article/tags.html new file mode 100644 index 000000000..1ea930b22 --- /dev/null +++ b/layouts/partials/article/tags.html @@ -0,0 +1,12 @@ +{{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) .RelPermalink }} +{{ $tagSet := print $currentVersion "/tags" }} +{{ if isset .Params $tagSet }} +
+ {{ range .Param $tagSet }} + {{ $name := . }} + {{ with $.Site.GetPage (printf "/%s/%s" $tagSet ($name | urlize)) }} + {{ $name }} + {{ end }} + {{ end }} +
+{{ end }}