From b71bd8499f906ae94bdcab914a12adf596bf99a5 Mon Sep 17 00:00:00 2001 From: Joseph Nix Date: Sat, 15 Dec 2018 00:20:19 -0600 Subject: [PATCH 1/5] [lektor-website-197] Removing single option for children models of the plugins page. --- content/plugins/lektor-asciidoc/contents.lr | 2 ++ content/plugins/lektor-asciidoctor/contents.lr | 2 ++ content/plugins/lektor-atom/contents.lr | 2 ++ content/plugins/lektor-bibtex-support/contents.lr | 2 ++ content/plugins/lektor-creative-commons/contents.lr | 2 ++ content/plugins/lektor-disqus-comments/contents.lr | 2 ++ content/plugins/lektor-github-repos/contents.lr | 2 ++ content/plugins/lektor-google-analytics/contents.lr | 2 ++ content/plugins/lektor-gulp/contents.lr | 2 ++ content/plugins/lektor-htmlmin/contents.lr | 2 ++ content/plugins/lektor-i18n/contents.lr | 2 ++ content/plugins/lektor-jinja-content/contents.lr | 2 ++ content/plugins/lektor-make/contents.lr | 2 ++ content/plugins/lektor-markdown-admonition/contents.lr | 2 ++ content/plugins/lektor-markdown-excerpt/contents.lr | 2 ++ content/plugins/lektor-markdown-header-anchors/contents.lr | 2 ++ content/plugins/lektor-markdown-highlighter/contents.lr | 2 ++ content/plugins/lektor-minify/contents.lr | 2 ++ content/plugins/lektor-natural-language/contents.lr | 2 ++ content/plugins/lektor-netlify/contents.lr | 2 ++ content/plugins/lektor-nofollow/contents.lr | 2 ++ content/plugins/lektor-npm-support/contents.lr | 2 ++ content/plugins/lektor-pythonmarkdown/contents.lr | 2 ++ content/plugins/lektor-read-full-post/contents.lr | 2 ++ content/plugins/lektor-root-relative-path/contents.lr | 2 ++ content/plugins/lektor-rst/contents.lr | 2 ++ content/plugins/lektor-s3/contents.lr | 2 ++ content/plugins/lektor-shortcodes/contents.lr | 2 ++ content/plugins/lektor-slugify/contents.lr | 2 ++ content/plugins/lektor-strip-html-tags/contents.lr | 2 ++ content/plugins/lektor-surge/contents.lr | 2 ++ content/plugins/lektor-tags/contents.lr | 2 ++ content/plugins/lektor-thumbnail-generator/contents.lr | 2 ++ content/plugins/lektor-webdav/contents.lr | 2 ++ content/plugins/lektor-webpack-support/contents.lr | 2 ++ content/plugins/lektor-yandex-metrica/contents.lr | 2 ++ models/plugins.ini | 5 +++-- packages/project-data/setup.py | 2 +- 38 files changed, 76 insertions(+), 3 deletions(-) diff --git a/content/plugins/lektor-asciidoc/contents.lr b/content/plugins/lektor-asciidoc/contents.lr index 11a5e1f6..09771294 100644 --- a/content/plugins/lektor-asciidoc/contents.lr +++ b/content/plugins/lektor-asciidoc/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-asciidoc --- categories: content diff --git a/content/plugins/lektor-asciidoctor/contents.lr b/content/plugins/lektor-asciidoctor/contents.lr index 1247fbb4..f8c52b95 100644 --- a/content/plugins/lektor-asciidoctor/contents.lr +++ b/content/plugins/lektor-asciidoctor/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-asciidoctor --- tags: diff --git a/content/plugins/lektor-atom/contents.lr b/content/plugins/lektor-atom/contents.lr index 75421e2c..53af43dd 100644 --- a/content/plugins/lektor-atom/contents.lr +++ b/content/plugins/lektor-atom/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-atom --- categories: templates diff --git a/content/plugins/lektor-bibtex-support/contents.lr b/content/plugins/lektor-bibtex-support/contents.lr index da33bfc1..d99e8683 100644 --- a/content/plugins/lektor-bibtex-support/contents.lr +++ b/content/plugins/lektor-bibtex-support/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-bibtex-support --- categories: content diff --git a/content/plugins/lektor-creative-commons/contents.lr b/content/plugins/lektor-creative-commons/contents.lr index dfc9b008..02a73593 100644 --- a/content/plugins/lektor-creative-commons/contents.lr +++ b/content/plugins/lektor-creative-commons/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-creative-commons --- categories: templates diff --git a/content/plugins/lektor-disqus-comments/contents.lr b/content/plugins/lektor-disqus-comments/contents.lr index 47920acc..5c1fa3ca 100644 --- a/content/plugins/lektor-disqus-comments/contents.lr +++ b/content/plugins/lektor-disqus-comments/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-disqus-comments --- categories: templates diff --git a/content/plugins/lektor-github-repos/contents.lr b/content/plugins/lektor-github-repos/contents.lr index 04dca9db..8baa5fe5 100644 --- a/content/plugins/lektor-github-repos/contents.lr +++ b/content/plugins/lektor-github-repos/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-github-repos --- categories: templates diff --git a/content/plugins/lektor-google-analytics/contents.lr b/content/plugins/lektor-google-analytics/contents.lr index bffeafbe..a933f081 100644 --- a/content/plugins/lektor-google-analytics/contents.lr +++ b/content/plugins/lektor-google-analytics/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-google-analytics --- tags: diff --git a/content/plugins/lektor-gulp/contents.lr b/content/plugins/lektor-gulp/contents.lr index ade28fef..46380fe4 100644 --- a/content/plugins/lektor-gulp/contents.lr +++ b/content/plugins/lektor-gulp/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-gulp --- categories: build diff --git a/content/plugins/lektor-htmlmin/contents.lr b/content/plugins/lektor-htmlmin/contents.lr index 2c75f119..ed0297f2 100644 --- a/content/plugins/lektor-htmlmin/contents.lr +++ b/content/plugins/lektor-htmlmin/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-htmlmin --- categories: build diff --git a/content/plugins/lektor-i18n/contents.lr b/content/plugins/lektor-i18n/contents.lr index 2a7e15d9..8741df88 100644 --- a/content/plugins/lektor-i18n/contents.lr +++ b/content/plugins/lektor-i18n/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-i18n --- categories: build diff --git a/content/plugins/lektor-jinja-content/contents.lr b/content/plugins/lektor-jinja-content/contents.lr index d79e2fce..aefe1c1c 100644 --- a/content/plugins/lektor-jinja-content/contents.lr +++ b/content/plugins/lektor-jinja-content/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-jinja-content --- categories: content diff --git a/content/plugins/lektor-make/contents.lr b/content/plugins/lektor-make/contents.lr index faf46fe2..ce867a26 100644 --- a/content/plugins/lektor-make/contents.lr +++ b/content/plugins/lektor-make/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-make --- categories: build diff --git a/content/plugins/lektor-markdown-admonition/contents.lr b/content/plugins/lektor-markdown-admonition/contents.lr index 759a1868..bcca2e05 100644 --- a/content/plugins/lektor-markdown-admonition/contents.lr +++ b/content/plugins/lektor-markdown-admonition/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-markdown-admonition --- categories: content diff --git a/content/plugins/lektor-markdown-excerpt/contents.lr b/content/plugins/lektor-markdown-excerpt/contents.lr index 70c5996b..886b49d5 100644 --- a/content/plugins/lektor-markdown-excerpt/contents.lr +++ b/content/plugins/lektor-markdown-excerpt/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-markdown-excerpt --- categories: templates diff --git a/content/plugins/lektor-markdown-header-anchors/contents.lr b/content/plugins/lektor-markdown-header-anchors/contents.lr index 9082d21c..c774c163 100644 --- a/content/plugins/lektor-markdown-header-anchors/contents.lr +++ b/content/plugins/lektor-markdown-header-anchors/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-markdown-header-anchors --- categories: content diff --git a/content/plugins/lektor-markdown-highlighter/contents.lr b/content/plugins/lektor-markdown-highlighter/contents.lr index add0f701..e38c1ef8 100644 --- a/content/plugins/lektor-markdown-highlighter/contents.lr +++ b/content/plugins/lektor-markdown-highlighter/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-markdown-highlighter --- categories: content diff --git a/content/plugins/lektor-minify/contents.lr b/content/plugins/lektor-minify/contents.lr index 046c13e9..49cd22f1 100644 --- a/content/plugins/lektor-minify/contents.lr +++ b/content/plugins/lektor-minify/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-minify --- tags: diff --git a/content/plugins/lektor-natural-language/contents.lr b/content/plugins/lektor-natural-language/contents.lr index 95d1ba97..c1d58d5b 100644 --- a/content/plugins/lektor-natural-language/contents.lr +++ b/content/plugins/lektor-natural-language/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-natural-language --- categories: templates diff --git a/content/plugins/lektor-netlify/contents.lr b/content/plugins/lektor-netlify/contents.lr index 24c1dc2e..47776e60 100644 --- a/content/plugins/lektor-netlify/contents.lr +++ b/content/plugins/lektor-netlify/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-netlify --- categories: deploy diff --git a/content/plugins/lektor-nofollow/contents.lr b/content/plugins/lektor-nofollow/contents.lr index 584e92f2..8b8dbc9c 100644 --- a/content/plugins/lektor-nofollow/contents.lr +++ b/content/plugins/lektor-nofollow/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-nofollow --- categories: content diff --git a/content/plugins/lektor-npm-support/contents.lr b/content/plugins/lektor-npm-support/contents.lr index a3eb054a..49744348 100644 --- a/content/plugins/lektor-npm-support/contents.lr +++ b/content/plugins/lektor-npm-support/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-npm-support --- categories: build diff --git a/content/plugins/lektor-pythonmarkdown/contents.lr b/content/plugins/lektor-pythonmarkdown/contents.lr index 9deba25e..ab0d72dd 100644 --- a/content/plugins/lektor-pythonmarkdown/contents.lr +++ b/content/plugins/lektor-pythonmarkdown/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-pythonmarkdown --- allow_comments: yes diff --git a/content/plugins/lektor-read-full-post/contents.lr b/content/plugins/lektor-read-full-post/contents.lr index 613a9071..6889c778 100644 --- a/content/plugins/lektor-read-full-post/contents.lr +++ b/content/plugins/lektor-read-full-post/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-read-full-post --- categories: content diff --git a/content/plugins/lektor-root-relative-path/contents.lr b/content/plugins/lektor-root-relative-path/contents.lr index 9025b4d2..cfea3c9a 100644 --- a/content/plugins/lektor-root-relative-path/contents.lr +++ b/content/plugins/lektor-root-relative-path/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-root-relative-path --- categories: templates diff --git a/content/plugins/lektor-rst/contents.lr b/content/plugins/lektor-rst/contents.lr index 37c6516b..a6964efd 100644 --- a/content/plugins/lektor-rst/contents.lr +++ b/content/plugins/lektor-rst/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-rst --- categories: content diff --git a/content/plugins/lektor-s3/contents.lr b/content/plugins/lektor-s3/contents.lr index 8fc52326..ca93c425 100644 --- a/content/plugins/lektor-s3/contents.lr +++ b/content/plugins/lektor-s3/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-s3 --- categories: deploy diff --git a/content/plugins/lektor-shortcodes/contents.lr b/content/plugins/lektor-shortcodes/contents.lr index 09b56f8c..57448a6d 100644 --- a/content/plugins/lektor-shortcodes/contents.lr +++ b/content/plugins/lektor-shortcodes/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-shortcodes --- categories: templates diff --git a/content/plugins/lektor-slugify/contents.lr b/content/plugins/lektor-slugify/contents.lr index 5bdf89ae..a86d2113 100644 --- a/content/plugins/lektor-slugify/contents.lr +++ b/content/plugins/lektor-slugify/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-slugify --- categories: templates diff --git a/content/plugins/lektor-strip-html-tags/contents.lr b/content/plugins/lektor-strip-html-tags/contents.lr index f90574d8..50841366 100644 --- a/content/plugins/lektor-strip-html-tags/contents.lr +++ b/content/plugins/lektor-strip-html-tags/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-strip-html-tags --- categories: templates diff --git a/content/plugins/lektor-surge/contents.lr b/content/plugins/lektor-surge/contents.lr index bd958353..4b314ca7 100644 --- a/content/plugins/lektor-surge/contents.lr +++ b/content/plugins/lektor-surge/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-surge --- categories: deploy diff --git a/content/plugins/lektor-tags/contents.lr b/content/plugins/lektor-tags/contents.lr index 4c727443..45c6873c 100644 --- a/content/plugins/lektor-tags/contents.lr +++ b/content/plugins/lektor-tags/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-tags --- categories: content diff --git a/content/plugins/lektor-thumbnail-generator/contents.lr b/content/plugins/lektor-thumbnail-generator/contents.lr index 61ba38e6..43ea5982 100644 --- a/content/plugins/lektor-thumbnail-generator/contents.lr +++ b/content/plugins/lektor-thumbnail-generator/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-thumbnail-generator --- categories: templates diff --git a/content/plugins/lektor-webdav/contents.lr b/content/plugins/lektor-webdav/contents.lr index ba6791f9..401af384 100644 --- a/content/plugins/lektor-webdav/contents.lr +++ b/content/plugins/lektor-webdav/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-webdav --- categories: templates diff --git a/content/plugins/lektor-webpack-support/contents.lr b/content/plugins/lektor-webpack-support/contents.lr index 4cc1f57e..02587834 100644 --- a/content/plugins/lektor-webpack-support/contents.lr +++ b/content/plugins/lektor-webpack-support/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-webpack-support --- categories: build diff --git a/content/plugins/lektor-yandex-metrica/contents.lr b/content/plugins/lektor-yandex-metrica/contents.lr index 0de5a9df..5f35c1d8 100644 --- a/content/plugins/lektor-yandex-metrica/contents.lr +++ b/content/plugins/lektor-yandex-metrica/contents.lr @@ -1,3 +1,5 @@ +_model: plugin +--- name: lektor-yandex-metrica --- categories: templates diff --git a/models/plugins.ini b/models/plugins.ini index e991a425..7e913380 100644 --- a/models/plugins.ini +++ b/models/plugins.ini @@ -3,5 +3,6 @@ name = Plugins inherits = page label = {{ this.title }} -[children] -model = plugin +# Re-enable after being able to specify 2 models choices instead of only one +# [children] +# model = plugin diff --git a/packages/project-data/setup.py b/packages/project-data/setup.py index 92488a03..5495b7d9 100644 --- a/packages/project-data/setup.py +++ b/packages/project-data/setup.py @@ -9,7 +9,7 @@ setup( py_modules=['lektor_project_data'], install_requires=[ 'requests', - 'readme_renderer==20.0', + 'readme_renderer[md]==24.0', ], entry_points={ 'lektor.plugins': [ From 244e2e385c2c34085e9210dadc56eeb923d6e04b Mon Sep 17 00:00:00 2001 From: Joseph Nix Date: Sat, 15 Dec 2018 01:01:20 -0600 Subject: [PATCH 2/5] [lektor-website-197] Adding plugins/tags page. --- content/plugins/tags/contents.lr | 5 +++++ templates/plugin-tag.html | 2 ++ templates/plugin-tags.html | 24 ++++++++++++++++++++++++ templates/plugin.html | 1 + 4 files changed, 32 insertions(+) create mode 100644 content/plugins/tags/contents.lr create mode 100644 templates/plugin-tags.html diff --git a/content/plugins/tags/contents.lr b/content/plugins/tags/contents.lr new file mode 100644 index 00000000..8180d8e6 --- /dev/null +++ b/content/plugins/tags/contents.lr @@ -0,0 +1,5 @@ +_model: page +--- +title: tags +--- +_template: plugin-tags.html diff --git a/templates/plugin-tag.html b/templates/plugin-tag.html index 48792e95..9402e23b 100644 --- a/templates/plugin-tag.html +++ b/templates/plugin-tag.html @@ -28,4 +28,6 @@
{{ render_plugin_list(this.items) }}
+ +

View a list of all Lektor plugin tags here.

{% endblock %} diff --git a/templates/plugin-tags.html b/templates/plugin-tags.html new file mode 100644 index 00000000..3d0d23a0 --- /dev/null +++ b/templates/plugin-tags.html @@ -0,0 +1,24 @@ +{% extends "plugin.html" %} + +{% block body %} +

Plugin Tags

+ +

+ This is a list of all tags that Lektor plugins have. + Click on individual tags to see which plugins use that tag. +

+
+ + {% set tags = this.parent.children.distinct("tags")|rejectattr("tags") %} + {% for column in tags|sort|slice(3) %} +
+
    + {% for tag in column %} +
  • {{ tag }}
    • + {% endfor %} +
+
+ {% endfor %} + +
+{% endblock %} diff --git a/templates/plugin.html b/templates/plugin.html index a9825986..904a0dcc 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -68,6 +68,7 @@ {% else %}

Plugin has no tags.

{% endif %} +

View all tags.

From 489f34e9884b0d09a50efba1656c4033c97441e0 Mon Sep 17 00:00:00 2001 From: Joseph Nix Date: Sat, 15 Dec 2018 01:34:16 -0600 Subject: [PATCH 3/5] [lektor-website-197] Trimming tags and fixing inconsistencies. --- content/plugins/lektor-asciidoc/contents.lr | 2 +- content/plugins/lektor-asciidoctor/contents.lr | 2 +- content/plugins/lektor-bibtex-support/contents.lr | 2 +- content/plugins/lektor-creative-commons/contents.lr | 8 ++------ content/plugins/lektor-google-analytics/contents.lr | 2 +- content/plugins/lektor-gulp/contents.lr | 6 +++--- content/plugins/lektor-htmlmin/contents.lr | 3 +-- content/plugins/lektor-i18n/contents.lr | 7 +------ content/plugins/lektor-jinja-content/contents.lr | 4 ++-- content/plugins/lektor-make/contents.lr | 1 - content/plugins/lektor-markdown-admonition/contents.lr | 2 +- content/plugins/lektor-markdown-excerpt/contents.lr | 4 ++-- .../plugins/lektor-markdown-header-anchors/contents.lr | 2 +- .../plugins/lektor-markdown-highlighter/contents.lr | 2 +- content/plugins/lektor-minify/contents.lr | 10 +++++----- content/plugins/lektor-natural-language/contents.lr | 4 ++-- content/plugins/lektor-nofollow/contents.lr | 4 ++-- content/plugins/lektor-npm-support/contents.lr | 6 ++++-- content/plugins/lektor-pythonmarkdown/contents.lr | 2 +- content/plugins/lektor-read-full-post/contents.lr | 4 ++-- content/plugins/lektor-root-relative-path/contents.lr | 2 +- content/plugins/lektor-rst/contents.lr | 1 - content/plugins/lektor-s3/contents.lr | 2 +- content/plugins/lektor-shortcodes/contents.lr | 4 ++-- content/plugins/lektor-slugify/contents.lr | 2 +- content/plugins/lektor-strip-html-tags/contents.lr | 4 ++-- content/plugins/lektor-webdav/contents.lr | 6 +++--- content/plugins/lektor-webpack-support/contents.lr | 6 +++--- content/plugins/lektor-yandex-metrica/contents.lr | 2 +- 29 files changed, 48 insertions(+), 58 deletions(-) diff --git a/content/plugins/lektor-asciidoc/contents.lr b/content/plugins/lektor-asciidoc/contents.lr index 09771294..4e5ba283 100644 --- a/content/plugins/lektor-asciidoc/contents.lr +++ b/content/plugins/lektor-asciidoc/contents.lr @@ -6,6 +6,6 @@ categories: content --- tags: -asciidoc +AsciiDoc field type setup-env diff --git a/content/plugins/lektor-asciidoctor/contents.lr b/content/plugins/lektor-asciidoctor/contents.lr index f8c52b95..9e0ad6f1 100644 --- a/content/plugins/lektor-asciidoctor/contents.lr +++ b/content/plugins/lektor-asciidoctor/contents.lr @@ -4,7 +4,7 @@ name: lektor-asciidoctor --- tags: -asciidoc +AsciiDoc field type setup-env --- diff --git a/content/plugins/lektor-bibtex-support/contents.lr b/content/plugins/lektor-bibtex-support/contents.lr index d99e8683..bf042a84 100644 --- a/content/plugins/lektor-bibtex-support/contents.lr +++ b/content/plugins/lektor-bibtex-support/contents.lr @@ -7,5 +7,5 @@ categories: content tags: setup-env -jinja globals +Jinja globals LaTeX \ No newline at end of file diff --git a/content/plugins/lektor-creative-commons/contents.lr b/content/plugins/lektor-creative-commons/contents.lr index 02a73593..a4927282 100644 --- a/content/plugins/lektor-creative-commons/contents.lr +++ b/content/plugins/lektor-creative-commons/contents.lr @@ -8,10 +8,6 @@ tags: Creative Commons Licensing -jinja globals -multi-language -multilingual -setup-env -translate -translation +Jinja globals +i18n setup-env diff --git a/content/plugins/lektor-google-analytics/contents.lr b/content/plugins/lektor-google-analytics/contents.lr index a933f081..e9a72e38 100644 --- a/content/plugins/lektor-google-analytics/contents.lr +++ b/content/plugins/lektor-google-analytics/contents.lr @@ -6,7 +6,7 @@ tags: analytics Google Analytics -jinja globals +Jinja globals setup-env --- categories: templates diff --git a/content/plugins/lektor-gulp/contents.lr b/content/plugins/lektor-gulp/contents.lr index 46380fe4..9b3fee02 100644 --- a/content/plugins/lektor-gulp/contents.lr +++ b/content/plugins/lektor-gulp/contents.lr @@ -5,9 +5,9 @@ name: lektor-gulp categories: build --- tags: -html -css -javascript +HTML +CSS +JavaScript gulp before-build-all server-stop diff --git a/content/plugins/lektor-htmlmin/contents.lr b/content/plugins/lektor-htmlmin/contents.lr index ed0297f2..71bc722e 100644 --- a/content/plugins/lektor-htmlmin/contents.lr +++ b/content/plugins/lektor-htmlmin/contents.lr @@ -6,8 +6,7 @@ categories: build --- tags: -html +HTML minify htmlmin after-build-all - diff --git a/content/plugins/lektor-i18n/contents.lr b/content/plugins/lektor-i18n/contents.lr index 8741df88..814f6754 100644 --- a/content/plugins/lektor-i18n/contents.lr +++ b/content/plugins/lektor-i18n/contents.lr @@ -8,15 +8,10 @@ summary: Use GetText .PO files to translate your site content. --- tags: -multilingual -multi-language -language GetText -translate -translation alternatives i18n -babel +Babel setup-env before-build after-build diff --git a/content/plugins/lektor-jinja-content/contents.lr b/content/plugins/lektor-jinja-content/contents.lr index aefe1c1c..08dce637 100644 --- a/content/plugins/lektor-jinja-content/contents.lr +++ b/content/plugins/lektor-jinja-content/contents.lr @@ -7,8 +7,8 @@ categories: content tags: process-template-context -jinja +Jinja templates content context -markdown +Markdown diff --git a/content/plugins/lektor-make/contents.lr b/content/plugins/lektor-make/contents.lr index ce867a26..8e5ed594 100644 --- a/content/plugins/lektor-make/contents.lr +++ b/content/plugins/lektor-make/contents.lr @@ -8,6 +8,5 @@ tags: before-build-all make -makefile --- summary: Run make lektor for custom build systems. diff --git a/content/plugins/lektor-markdown-admonition/contents.lr b/content/plugins/lektor-markdown-admonition/contents.lr index bcca2e05..98f5ba83 100644 --- a/content/plugins/lektor-markdown-admonition/contents.lr +++ b/content/plugins/lektor-markdown-admonition/contents.lr @@ -9,6 +9,6 @@ official: yes tags: official -markdown +Markdown admonition markdown-config diff --git a/content/plugins/lektor-markdown-excerpt/contents.lr b/content/plugins/lektor-markdown-excerpt/contents.lr index 886b49d5..c2124ed1 100644 --- a/content/plugins/lektor-markdown-excerpt/contents.lr +++ b/content/plugins/lektor-markdown-excerpt/contents.lr @@ -6,6 +6,6 @@ categories: templates --- tags: -markdown -jinja filters +Markdown +Jinja filters setup-env diff --git a/content/plugins/lektor-markdown-header-anchors/contents.lr b/content/plugins/lektor-markdown-header-anchors/contents.lr index c774c163..0fc52f7f 100644 --- a/content/plugins/lektor-markdown-header-anchors/contents.lr +++ b/content/plugins/lektor-markdown-header-anchors/contents.lr @@ -9,7 +9,7 @@ official: yes tags: official -markdown +Markdown headers anchors table of contents diff --git a/content/plugins/lektor-markdown-highlighter/contents.lr b/content/plugins/lektor-markdown-highlighter/contents.lr index e38c1ef8..afcca90d 100644 --- a/content/plugins/lektor-markdown-highlighter/contents.lr +++ b/content/plugins/lektor-markdown-highlighter/contents.lr @@ -9,7 +9,7 @@ official: yes tags: official -markdown +Markdown syntax highlighting Pygments markdown-config diff --git a/content/plugins/lektor-minify/contents.lr b/content/plugins/lektor-minify/contents.lr index 49cd22f1..927d09fa 100644 --- a/content/plugins/lektor-minify/contents.lr +++ b/content/plugins/lektor-minify/contents.lr @@ -5,12 +5,12 @@ name: lektor-minify tags: django_htmlmin -rcssmin -rjsmin +rCSSmin +rJSmin minify -html -css -js +HTML +CSS +JavaScript setup-env after-build --- diff --git a/content/plugins/lektor-natural-language/contents.lr b/content/plugins/lektor-natural-language/contents.lr index c1d58d5b..5999a3c1 100644 --- a/content/plugins/lektor-natural-language/contents.lr +++ b/content/plugins/lektor-natural-language/contents.lr @@ -6,7 +6,7 @@ categories: templates --- tags: -jinja filters -nltk +Jinja filters +NLTK natural language setup-env diff --git a/content/plugins/lektor-nofollow/contents.lr b/content/plugins/lektor-nofollow/contents.lr index 8b8dbc9c..7b5ce500 100644 --- a/content/plugins/lektor-nofollow/contents.lr +++ b/content/plugins/lektor-nofollow/contents.lr @@ -7,7 +7,7 @@ categories: content tags: nofollow links -markdown +Markdown markdown-config --- -summary: Easily create nofollow links in markdown +summary: Easily create nofollow links in Markdown. diff --git a/content/plugins/lektor-npm-support/contents.lr b/content/plugins/lektor-npm-support/contents.lr index 49744348..055e74c4 100644 --- a/content/plugins/lektor-npm-support/contents.lr +++ b/content/plugins/lektor-npm-support/contents.lr @@ -7,11 +7,13 @@ categories: build tags: webpack -browserify +Browserify Parcel Babel Sass -yarn +Node +npm +Yarn server-spawn server-stop before-build-all diff --git a/content/plugins/lektor-pythonmarkdown/contents.lr b/content/plugins/lektor-pythonmarkdown/contents.lr index ab0d72dd..2998ffa3 100644 --- a/content/plugins/lektor-pythonmarkdown/contents.lr +++ b/content/plugins/lektor-pythonmarkdown/contents.lr @@ -10,6 +10,6 @@ official: no --- tags: -markdown +Markdown setup-env field type diff --git a/content/plugins/lektor-read-full-post/contents.lr b/content/plugins/lektor-read-full-post/contents.lr index 6889c778..34f1ab4f 100644 --- a/content/plugins/lektor-read-full-post/contents.lr +++ b/content/plugins/lektor-read-full-post/contents.lr @@ -7,8 +7,8 @@ categories: content tags: setup-env -jinja globals +Jinja globals blog -markdown +Markdown --- summary: Allows blog listing posts to be shortened with a link to the full post. diff --git a/content/plugins/lektor-root-relative-path/contents.lr b/content/plugins/lektor-root-relative-path/contents.lr index cfea3c9a..e4530c75 100644 --- a/content/plugins/lektor-root-relative-path/contents.lr +++ b/content/plugins/lektor-root-relative-path/contents.lr @@ -7,5 +7,5 @@ categories: templates tags: navigation -jinja filters +Jinja filters setup-env diff --git a/content/plugins/lektor-rst/contents.lr b/content/plugins/lektor-rst/contents.lr index a6964efd..a646888a 100644 --- a/content/plugins/lektor-rst/contents.lr +++ b/content/plugins/lektor-rst/contents.lr @@ -6,7 +6,6 @@ categories: content --- tags: -rst reStructuredText field type setup-env diff --git a/content/plugins/lektor-s3/contents.lr b/content/plugins/lektor-s3/contents.lr index ca93c425..535ea59b 100644 --- a/content/plugins/lektor-s3/contents.lr +++ b/content/plugins/lektor-s3/contents.lr @@ -8,7 +8,7 @@ tags: AWS S3 -Cloudfront +CloudFront publisher setup-env --- diff --git a/content/plugins/lektor-shortcodes/contents.lr b/content/plugins/lektor-shortcodes/contents.lr index 57448a6d..818bf55b 100644 --- a/content/plugins/lektor-shortcodes/contents.lr +++ b/content/plugins/lektor-shortcodes/contents.lr @@ -7,9 +7,9 @@ categories: templates tags: shortcodes -markdown +Markdown markdown-config -jinja filters +Jinja filters setup-env --- summary: Allows you to use shortcodes (something like tags) in your model fields. diff --git a/content/plugins/lektor-slugify/contents.lr b/content/plugins/lektor-slugify/contents.lr index a86d2113..7486a65a 100644 --- a/content/plugins/lektor-slugify/contents.lr +++ b/content/plugins/lektor-slugify/contents.lr @@ -7,6 +7,6 @@ categories: templates tags: slugify -jinja filters +Jinja filters python-slugify setup-env diff --git a/content/plugins/lektor-strip-html-tags/contents.lr b/content/plugins/lektor-strip-html-tags/contents.lr index 50841366..552b9583 100644 --- a/content/plugins/lektor-strip-html-tags/contents.lr +++ b/content/plugins/lektor-strip-html-tags/contents.lr @@ -6,6 +6,6 @@ categories: templates --- tags: -jinja filters -html +Jinja filters +HTML setup-env diff --git a/content/plugins/lektor-webdav/contents.lr b/content/plugins/lektor-webdav/contents.lr index 401af384..d7e86039 100644 --- a/content/plugins/lektor-webdav/contents.lr +++ b/content/plugins/lektor-webdav/contents.lr @@ -7,8 +7,8 @@ categories: templates tags: WebDAV +content remote content -jinja globals -jinja filters +Jinja globals +Jinja filters setup-env - diff --git a/content/plugins/lektor-webpack-support/contents.lr b/content/plugins/lektor-webpack-support/contents.lr index 02587834..fc1e399d 100644 --- a/content/plugins/lektor-webpack-support/contents.lr +++ b/content/plugins/lektor-webpack-support/contents.lr @@ -11,9 +11,9 @@ tags: official webpack npm -yarn -node -scss +Yarn +Node +sCSS server-spawn server-stop before-build-all diff --git a/content/plugins/lektor-yandex-metrica/contents.lr b/content/plugins/lektor-yandex-metrica/contents.lr index 5f35c1d8..a7dc556c 100644 --- a/content/plugins/lektor-yandex-metrica/contents.lr +++ b/content/plugins/lektor-yandex-metrica/contents.lr @@ -9,4 +9,4 @@ tags: analytics Yandex Metrica setup-env -jinja globals +Jinja globals From f010714d358f72d5f4e2514ee8b885f7f058db95 Mon Sep 17 00:00:00 2001 From: Joseph Nix Date: Sat, 15 Dec 2018 12:14:42 -0600 Subject: [PATCH 4/5] [lektor-website-197] Fixing url pathing of plugin tags with upper case letters. --- Website.lektorproject | 3 ++- configs/tags.ini | 1 + templates/plugin-tags.html | 4 ++-- templates/plugin.html | 2 +- templates/plugins.html | 7 +++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Website.lektorproject b/Website.lektorproject index f6f43cb0..13079808 100644 --- a/Website.lektorproject +++ b/Website.lektorproject @@ -16,4 +16,5 @@ lektor-markdown-header-anchors = 0.1 lektor-markdown-highlighter = 0.1 lektor-markdown-admonition = 0.1 lektor-atom = 0.2 -lektor-tags = 0.1 +lektor-tags = 0.3 +lektor-slugify = 0.4 diff --git a/configs/tags.ini b/configs/tags.ini index a6260ff6..2c090ee4 100644 --- a/configs/tags.ini +++ b/configs/tags.ini @@ -1,2 +1,3 @@ parent = /plugins template = plugin-tag.html +url_path = {{ this.parent.url_path }}tag/{{ tag|slug(lowercase=False) }} diff --git a/templates/plugin-tags.html b/templates/plugin-tags.html index 3d0d23a0..96d0a328 100644 --- a/templates/plugin-tags.html +++ b/templates/plugin-tags.html @@ -9,12 +9,12 @@

- {% set tags = this.parent.children.distinct("tags")|rejectattr("tags") %} + {% set tags = this.parent.children.distinct("tags") %} {% for column in tags|sort|slice(3) %}
diff --git a/templates/plugin.html b/templates/plugin.html index 904a0dcc..7b4b00b9 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -63,7 +63,7 @@ {% if this.tags %} {% for t in this.tags|sort %} {{ "and " if loop.last }} - {{ t }}{{ ", " if not loop.last }} + {{ t }}{{ ", " if not loop.last }} {% endfor %} {% else %}

Plugin has no tags.

diff --git a/templates/plugins.html b/templates/plugins.html index 83c489f4..53f9ce3f 100644 --- a/templates/plugins.html +++ b/templates/plugins.html @@ -21,4 +21,11 @@ {{ render_plugin_list(category.children) }}
{% endfor %} + +

Tags

+

+ Plugins are also tagged with keywords and topics. + Their tags are listed on their page and are navigable. + You can view a list of all of the tags here. +

{% endblock %} From 1213731fc62ee767e32c3a62b9e80bb66116bb75 Mon Sep 17 00:00:00 2001 From: Joseph Nix Date: Sat, 15 Dec 2018 12:33:16 -0600 Subject: [PATCH 5/5] [lektor-website-197] Addin class ref to links to tags page. --- templates/plugin-tag.html | 2 +- templates/plugin.html | 2 +- templates/plugins.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/plugin-tag.html b/templates/plugin-tag.html index 9402e23b..e9076037 100644 --- a/templates/plugin-tag.html +++ b/templates/plugin-tag.html @@ -29,5 +29,5 @@ {{ render_plugin_list(this.items) }}
-

View a list of all Lektor plugin tags here.

+

View a list of all Lektor plugin tags here.

{% endblock %} diff --git a/templates/plugin.html b/templates/plugin.html index 7b4b00b9..73f13774 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -68,7 +68,7 @@ {% else %}

Plugin has no tags.

{% endif %} -

View all tags.

+

View all tags.

diff --git a/templates/plugins.html b/templates/plugins.html index 53f9ce3f..c8dbab36 100644 --- a/templates/plugins.html +++ b/templates/plugins.html @@ -26,6 +26,6 @@

Plugins are also tagged with keywords and topics. Their tags are listed on their page and are navigable. - You can view a list of all of the tags here. + You can view a list of all of the tags here.

{% endblock %}