From a3a928efafc160fc8b6ade2aa0ad619911902759 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 09:14:05 -0800 Subject: [PATCH 1/9] Fix some broken internal links --- content/docs/api/db/expression/contents.lr | 2 +- content/docs/api/environment/render-template/contents.lr | 2 +- content/docs/api/templates/globals/get-random-id/contents.lr | 2 +- content/plugin-categories/templates/contents.lr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/docs/api/db/expression/contents.lr b/content/docs/api/db/expression/contents.lr index afc787ec..182438d3 100644 --- a/content/docs/api/db/expression/contents.lr +++ b/content/docs/api/db/expression/contents.lr @@ -17,7 +17,7 @@ of it can create more expressive expressions. `F.name` literally just means that a field by that name exists and is set to a value. The query syntax is mostly the same in Python as well as in the Jinja 2 -templates, the main difference are [and :ref](../and/) and [or :ref](../or/). +templates, the main difference are [and :ref](and/) and [or :ref](or/). ## Example diff --git a/content/docs/api/environment/render-template/contents.lr b/content/docs/api/environment/render-template/contents.lr index 4b0e4688..7ddae1c2 100644 --- a/content/docs/api/environment/render-template/contents.lr +++ b/content/docs/api/environment/render-template/contents.lr @@ -14,7 +14,7 @@ method. Here are the parameters and what they mean: * `name`: this is the name of the template that should be rendered. It's the local filename relative to the `templates` folder and uses slashes for paths. -* `pad`: when a [Pad :ref](../../pad/) is available, it should be provided +* `pad`: when a [Pad :ref](../../db/pad/) is available, it should be provided so that the `site` variable can be populated. If a context is available then the pad will also be pulled from the context if needed. * `this`: the value of the `this` variable in templates. This should always diff --git a/content/docs/api/templates/globals/get-random-id/contents.lr b/content/docs/api/templates/globals/get-random-id/contents.lr index ad647268..0e88e6b3 100644 --- a/content/docs/api/templates/globals/get-random-id/contents.lr +++ b/content/docs/api/templates/globals/get-random-id/contents.lr @@ -10,7 +10,7 @@ body: In some situations it can be very useful to generate a unique ID in templates. This is particularly useful when creating templates for the [Flow -:ref](../../../../flow/) system and you need unique IDs for the DOM. +:ref](../../../../content/flow/) system and you need unique IDs for the DOM. ## Example diff --git a/content/plugin-categories/templates/contents.lr b/content/plugin-categories/templates/contents.lr index 34c765c7..7c609da3 100644 --- a/content/plugin-categories/templates/contents.lr +++ b/content/plugin-categories/templates/contents.lr @@ -1,7 +1,7 @@ body: #### text-block #### -text: These plugins primarily deal with Lektor's [Templates :ref](/docs/templates/). They may add or modify [context :ref](docs/templates/#template-context), [api :ref](/docs/api/templates/), [filters :ref](/docs/api/templates/filters/), [globals :ref](/docs/api/templates/globals/), [modify images :ref](/docs/templates/imageops/), [change navigation :ref](/docs/templates/navigation/), or many other functionalities available to templates. +text: These plugins primarily deal with Lektor's [Templates :ref](/docs/templates/). They may add or modify [context :ref](/docs/templates/#template-context), [api :ref](/docs/api/templates/), [filters :ref](/docs/api/templates/filters/), [globals :ref](/docs/api/templates/globals/), [modify images :ref](/docs/templates/imageops/), [change navigation :ref](/docs/templates/navigation/), or many other functionalities available to templates. ---- class: default --- From 98bb69c0918d822cde971094b5f85ba1d39adc34 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 09:14:34 -0800 Subject: [PATCH 2/9] Fix some internal links with bad anchors --- content/docs/api/db/obj/url-to/contents.lr | 2 +- content/docs/content/urls/contents.lr | 2 +- content/docs/guides/sitemap/contents.lr | 2 +- content/docs/templates/videoops/contents.lr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/docs/api/db/obj/url-to/contents.lr b/content/docs/api/db/obj/url-to/contents.lr index 6e9bbc45..79618294 100644 --- a/content/docs/api/db/obj/url-to/contents.lr +++ b/content/docs/api/db/obj/url-to/contents.lr @@ -20,7 +20,7 @@ relative to the current page and `external` can be used to also add the domain part to the URL (if configured). The default behavior is to use the configured URL style (which is `relative`) unless absolute or external were explicitly provided. For more information read about this in the -[Project Configuration :ref](../../../../project/file/#[project]). +[Project Configuration :ref](../../../../project/file/#project). ## Example diff --git a/content/docs/content/urls/contents.lr b/content/docs/content/urls/contents.lr index 83385304..6e9d481c 100644 --- a/content/docs/content/urls/contents.lr +++ b/content/docs/content/urls/contents.lr @@ -103,7 +103,7 @@ to be configured. You can pick the default for URL generation in the project configuration. For more information read about the [Project Configuration -:ref](../../project/file/#[project]). +:ref](../../project/file/#project). The default of `relative`, a relative URL style, means that you can deploy a website to a sub folder without any configuration, however most likely custom diff --git a/content/docs/guides/sitemap/contents.lr b/content/docs/guides/sitemap/contents.lr index 91433041..40083b3c 100644 --- a/content/docs/guides/sitemap/contents.lr +++ b/content/docs/guides/sitemap/contents.lr @@ -51,7 +51,7 @@ from the last build. Note that because sitemaps need to have external URLs (with scheme and everything) you will need to configure the `url` of the site before the template starts working. For more information see [Project File -:ref](../../project/file/#[project]) +:ref](../../project/file/#project) ## Human Readable Sitemap diff --git a/content/docs/templates/videoops/contents.lr b/content/docs/templates/videoops/contents.lr index 31f58a72..e02d25fc 100644 --- a/content/docs/templates/videoops/contents.lr +++ b/content/docs/templates/videoops/contents.lr @@ -14,7 +14,7 @@ Just like [images](../imageops/), videos are separate files that are embedded in {% endfor %} ``` -Just like images you can also access them using `site.get('/myfolder').attachments.videos` or `site.get('/myfolder').attachments.get('examplevideo.mp4')`. Note that not all formats are detected as videos (see [attachments](../../content/attachments/)). If your format is not in the list you may still be able to get it detected as a video by adding it to your [Lektor project file](../../project/file/#[attachment_types]). +Just like images you can also access them using `site.get('/myfolder').attachments.videos` or `site.get('/myfolder').attachments.get('examplevideo.mp4')`. Note that not all formats are detected as videos (see [attachments](../../content/attachments/)). If your format is not in the list you may still be able to get it detected as a video by adding it to your [Lektor project file](../../project/file/#attachment-types). ## Accessing metadata From c7cbf1c5874b81b49303dda483ce4c3d60a25f5e Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 09:15:38 -0800 Subject: [PATCH 3/9] Fix template_var link on /docs/api/templates/globals/get-random-id/ --- templates/doc-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/doc-page.html b/templates/doc-page.html index f14743bf..f432428a 100644 --- a/templates/doc-page.html +++ b/templates/doc-page.html @@ -43,7 +43,7 @@ {% endif %} {% if this.template_var %}
  • Template variable: {{ this.template_var }}
    • {% endif %} {% if this.version_added %} From 57770a90ff3add29f95bd0e5946e124aa379c1c2 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 09:35:43 -0800 Subject: [PATCH 4/9] Add trailing slashes to links that should have them --- content/blog/plugin-play/contents.lr | 2 +- content/docs/api/utils/process-image/contents.lr | 2 +- content/docs/plugins/howto/contents.lr | 2 +- content/docs/plugins/publishing/contents.lr | 2 +- content/docs/quickstart/contents.lr | 2 +- content/docs/themes/installing/contents.lr | 2 +- content/docs/themes/packages/contents.lr | 2 +- content/plugins/contents.lr | 2 +- databags/menu.ini | 14 +++++++------- templates/blog-archive/index.html | 2 +- templates/layout.html | 4 ++-- templates/plugin-tag.html | 6 +++--- templates/plugin.html | 2 +- templates/plugins.html | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/content/blog/plugin-play/contents.lr b/content/blog/plugin-play/contents.lr index 815bf8ec..e223d9de 100644 --- a/content/blog/plugin-play/contents.lr +++ b/content/blog/plugin-play/contents.lr @@ -37,6 +37,6 @@ Plugins are tagged with specific key words or phrases that describe what they ar I think this is especially useful for plugin development when the tag is an event that the plugin hooks. This allows you to quickly find the source code of plugins that depend on the same Lektor plugin events, so that you can see many quick examples to help you write your own plugin. For instance, you can find all of the plugins that hook the `before-build-all` event by looking at it's tag page [here](/plugins/tag/before-build-all/). Tag pages for events also have links back to the plugin documentation pages, including the page for that specific event. -Now go check out some [plugins](/plugins)! +Now go check out some [plugins](/plugins/)! ---- class: default diff --git a/content/docs/api/utils/process-image/contents.lr b/content/docs/api/utils/process-image/contents.lr index 5e3a1b6d..32ea09b5 100644 --- a/content/docs/api/utils/process-image/contents.lr +++ b/content/docs/api/utils/process-image/contents.lr @@ -18,7 +18,7 @@ width and/or height, and the operation mode. In the default mode, if width or height are `None`, they are calculated from the source image's dimensions so that the image is scaled proportionally. -Used internally for the implementation of [thumbnail :ref](../../db/record/thumbnail), and exposed as an API for image-processing plugins. +Used internally for the implementation of [thumbnail :ref](../../db/record/thumbnail/), and exposed as an API for image-processing plugins. ## Example diff --git a/content/docs/plugins/howto/contents.lr b/content/docs/plugins/howto/contents.lr index 988e6158..10be3a80 100644 --- a/content/docs/plugins/howto/contents.lr +++ b/content/docs/plugins/howto/contents.lr @@ -117,7 +117,7 @@ function we also track the plugin's filename to rebuild if the plugin changes. Let's say you want to add an "asciidoc" [field type :ref](../../api/db/types/) so you can write with [AsciiDoc](http://www.methods.co.nz/asciidoc) markup. -First [install AsciiDoc](http://www.methods.co.nz/asciidoc/INSTALL.html) so its command-line program is available. Then update `blog-post.ini` from the [blog guide :ref](../../guides/blog) like so: +First [install AsciiDoc](http://www.methods.co.nz/asciidoc/INSTALL.html) so its command-line program is available. Then update `blog-post.ini` from the [blog guide :ref](../../guides/blog/) like so: ```ini [fields.body] diff --git a/content/docs/plugins/publishing/contents.lr b/content/docs/plugins/publishing/contents.lr index 46d4feca..c5703faf 100644 --- a/content/docs/plugins/publishing/contents.lr +++ b/content/docs/plugins/publishing/contents.lr @@ -86,7 +86,7 @@ credentials for `pypi`. Next time it will have remembered them. ### Guide -We'd love to see your new plugin listed on [our plugins page :ref](/plugins). To do that, submit a pull request to [this repository :ext](https://github.com/lektor/lektor-website) that adds your plugin as a sub-page of /plugins. To have your plugin page look it's best and be found more easily here and on [PyPI :ext](https://pypi.org/), please [fill out your setup.py :ext](https://packaging.python.org/tutorials/distributing-packages/) completely (as in [the above snippet :ref](/docs/plugins/publishing/#enhance-your-setup.py)), including +We'd love to see your new plugin listed on [our plugins page :ref](/plugins/). To do that, submit a pull request to [this repository :ext](https://github.com/lektor/lektor-website) that adds your plugin as a sub-page of /plugins. To have your plugin page look it's best and be found more easily here and on [PyPI :ext](https://pypi.org/), please [fill out your setup.py :ext](https://packaging.python.org/tutorials/distributing-packages/) completely (as in [the above snippet :ref](/docs/plugins/publishing/#enhance-your-setup.py)), including * `author` and `author_email` * `classifiers`, (optional) such as diff --git a/content/docs/quickstart/contents.lr b/content/docs/quickstart/contents.lr index 7f8573ae..fa22c1dc 100644 --- a/content/docs/quickstart/contents.lr +++ b/content/docs/quickstart/contents.lr @@ -12,7 +12,7 @@ the command line client which is the recommended way to do development until the website is ready for end user management. If you do not have the `lektor` [command line executable :ref](../cli/) -available yet just consult the [Installation :ref](../installation) section of +available yet just consult the [Installation :ref](../installation/) section of the documentation. ## Creating a New Project diff --git a/content/docs/themes/installing/contents.lr b/content/docs/themes/installing/contents.lr index 9200f92d..99cd1b74 100644 --- a/content/docs/themes/installing/contents.lr +++ b/content/docs/themes/installing/contents.lr @@ -38,7 +38,7 @@ a particular theme. !!!! Not implemented yet. You could add the `themes` variable to the `.lektorproject` file and Lektor will -search in the [community themes](/themes) and automatically install it. +search in the [community themes](/themes/) and automatically install it. ```ini [project] diff --git a/content/docs/themes/packages/contents.lr b/content/docs/themes/packages/contents.lr index 02f61b7a..da7788b6 100644 --- a/content/docs/themes/packages/contents.lr +++ b/content/docs/themes/packages/contents.lr @@ -8,7 +8,7 @@ body: !!!! Not implemented yet. -Themes could depend on [plugins](../../plugins), and they will be loaded along +Themes could depend on [plugins](../../plugins/), and they will be loaded along the theme. 1. You could use the `[packages]` section of the `theme.ini` to install diff --git a/content/plugins/contents.lr b/content/plugins/contents.lr index 1dd1f3e9..873047e3 100644 --- a/content/plugins/contents.lr +++ b/content/plugins/contents.lr @@ -9,7 +9,7 @@ text: Lektor is a young project but it has a growing list of both official and community supported plugins. Official plugins are maintained by Lektor and kept in good shape together with the rest of the project. Community plugins are moderated and updated regularly, but they might not keep pace with development on Lektor. They are maintained by the community. Install them with `lektor plugins add NAME`. -If you want to make or publish your own plugin, or see our [docs :ref](/docs/plugins). +If you want to make or publish your own plugin, or see our [docs :ref](/docs/plugins/). (*) Asterisks denote official plugins. ---- diff --git a/databags/menu.ini b/databags/menu.ini index 19b6ab34..aeb52978 100644 --- a/databags/menu.ini +++ b/databags/menu.ini @@ -1,27 +1,27 @@ [download] -path = /downloads +path = /downloads/ label = Download [docs] -path = /docs +path = /docs/ label = Documentation [poweredby] -path = /showcase +path = /showcase/ label = Showcase [plugins] -path = /plugins +path = /plugins/ label = Plugins # [themes] -# path = /themes +# path = /themes/ # label = Themes [community] -path = /community +path = /community/ label = Community [blog] -path = /blog +path = /blog/ label = Blog diff --git a/templates/blog-archive/index.html b/templates/blog-archive/index.html index 08de6a98..a270694b 100644 --- a/templates/blog-archive/index.html +++ b/templates/blog-archive/index.html @@ -3,7 +3,7 @@ {% block blog_body %}

    The Transcript Archive

    - « back to the blog + « back to the blog

    There have been posts in the following years:

      diff --git a/templates/layout.html b/templates/layout.html index 519337dc..32f16ca8 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -68,8 +68,8 @@ {%- endif %}
      - License & Copyright • - Contact • + License & Copyright • + Contact • Made with in Carinthia
      diff --git a/templates/plugin-tag.html b/templates/plugin-tag.html index 8c8825d4..97445d49 100644 --- a/templates/plugin-tag.html +++ b/templates/plugin-tag.html @@ -12,11 +12,11 @@ Take a look at their source code to see how they work!

      - Intro to Plugins + Intro to Plugins || Plugin Commands || - Plugin API + Plugin API || This Event

      @@ -30,6 +30,6 @@

      View a list of all Lektor plugin tags - here. + here.

      {% endblock %} diff --git a/templates/plugin.html b/templates/plugin.html index 6220cee9..00cf82f6 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -69,7 +69,7 @@

      Plugin has no tags.

      {% endif %}

      - View all tags. + View all tags.

      diff --git a/templates/plugins.html b/templates/plugins.html index 19fc1521..54a41984 100644 --- a/templates/plugins.html +++ b/templates/plugins.html @@ -27,6 +27,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. + here.

      {% endblock %} From 4679259408b799b797c4682fb70270eaf56c6ff5 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 12:25:29 -0800 Subject: [PATCH 5/9] Fix some stale external links --- .../blog/lektor-at-rails-girls-summer-of-code/contents.lr | 6 ++++-- content/docs/api/environment/jinja-env/contents.lr | 2 +- content/docs/api/publisher/publish/contents.lr | 2 +- content/docs/api/templates/filters/contents.lr | 2 +- content/docs/deployment/glpages/contents.lr | 6 +++--- content/docs/plugins/dev/contents.lr | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/content/blog/lektor-at-rails-girls-summer-of-code/contents.lr b/content/blog/lektor-at-rails-girls-summer-of-code/contents.lr index d645f9f8..ffdee394 100644 --- a/content/blog/lektor-at-rails-girls-summer-of-code/contents.lr +++ b/content/blog/lektor-at-rails-girls-summer-of-code/contents.lr @@ -32,9 +32,9 @@ website: > stipend, from July-September, to work on Open Source projects of their > choice. -Lektor was accepted as a particpating project. For more information about +Lektor was accepted as a participating project. For more information about the project there refer to the [project overview on -RGSOC](https://teams.railsgirlssummerofcode.org/projects/115-lektor-cms). +RGSOC :ext](https://railsgirlssummerofcode.org/blog/page/36/). We want to make it as easy as possible to work on Lektor during the event which is why we will be very flexible with regards to which area interested @@ -44,3 +44,5 @@ If you are interested in working on Lektor you can reach out to us via Twitter at [@getlektor](https://twitter.com/getlektor) or Gitter. +---- +class: default diff --git a/content/docs/api/environment/jinja-env/contents.lr b/content/docs/api/environment/jinja-env/contents.lr index 69bb64d3..2c0ce9c9 100644 --- a/content/docs/api/environment/jinja-env/contents.lr +++ b/content/docs/api/environment/jinja-env/contents.lr @@ -7,7 +7,7 @@ summary: The configured Jinja 2 Environment. body: This object is a configured Jinja2 environment. For more information you can -refer to the [Jinja 2 Documentation :ref](http://jinja.pocoo.org/docs/dev/api/#jinja2.Environment). +refer to the [Jinja 2 Documentation :ext](https://jinja.palletsprojects.com/en/3.0.x/api/#jinja2.Environment). This is where plugins can inject additional data like custom filters, tests or global functions. diff --git a/content/docs/api/publisher/publish/contents.lr b/content/docs/api/publisher/publish/contents.lr index 4de62a3d..2bd8479d 100644 --- a/content/docs/api/publisher/publish/contents.lr +++ b/content/docs/api/publisher/publish/contents.lr @@ -20,7 +20,7 @@ The parameters to the function are as follows: * `target_url`: a URL object with the parsed URL. This object comes from the Werkzeug library and gives access to the individual parts of a URL by the - exposed attributes ([Read about the URL object :ext](http://werkzeug.pocoo.org/docs/0.11/urls/)). + exposed attributes ([Read about the URL object :ext](https://werkzeug.palletsprojects.com/en/2.0.x/urls/)). * `credentials`: an optional dictionary with command line supplied credentials. Note that these credentials might be completely absent and the keys which are provided might change with future versions of Lektor. diff --git a/content/docs/api/templates/filters/contents.lr b/content/docs/api/templates/filters/contents.lr index 0dab42ee..c85f292a 100644 --- a/content/docs/api/templates/filters/contents.lr +++ b/content/docs/api/templates/filters/contents.lr @@ -5,4 +5,4 @@ summary: Filters specific to Lektor that templates have access to. body: These is the list of custom filters added by Lektor in addition to the -[built in filters :ext](http://jinja.pocoo.org/docs/dev/templates/#builtin-filters). +[built in filters :ext](https://jinja.palletsprojects.com/en/3.0.x/templates/#list-of-builtin-filters). diff --git a/content/docs/deployment/glpages/contents.lr b/content/docs/deployment/glpages/contents.lr index 6105aa2b..12d82e44 100644 --- a/content/docs/deployment/glpages/contents.lr +++ b/content/docs/deployment/glpages/contents.lr @@ -5,7 +5,7 @@ summary: Deploys to GitLab Pages. body: [GitLab](https://gitlab.com/) supports Lektor on their [GitLab -Pages](http://doc.gitlab.com/ee/pages/) infrastructure. Effectively +Pages](https://docs.gitlab.com/ee/user/project/pages/) infrastructure. Effectively GitLab can build your website out of any repository on GitLab and hosts it up on either a subdomain or a custom domain (including SSL). @@ -90,7 +90,7 @@ pages: If you want to use a [CNAME :ext](https://en.wikipedia.org/wiki/CNAME) with GitLab pages you can configure it in the GitLab settings: -* [Configure CNAME](http://doc.gitlab.com/ee/pages/#add-a-custom-domain-to-your-pages-website) +* [Configure CNAME](https://docs.gitlab.com/ee/user/project/pages/custom_domains_ssl_tls_certification/#set-up-pages-with-a-custom-domain) ## SSL/TLS Support @@ -98,7 +98,7 @@ If you have an SSL certificate and a custom domain, you can upload your private key and certificate to GitLab and SSL will become available on your custom domain as well. -* [Configure SSL/TLS](http://doc.gitlab.com/ee/pages/#secure-your-custom-domain-website-with-tls) +* [Configure SSL/TLS](https://docs.gitlab.com/ee/user/project/pages/custom_domains_ssl_tls_certification/#adding-an-ssltls-certificate-to-pages) ## 404 Pages diff --git a/content/docs/plugins/dev/contents.lr b/content/docs/plugins/dev/contents.lr index 43a2ab06..9b9729b9 100644 --- a/content/docs/plugins/dev/contents.lr +++ b/content/docs/plugins/dev/contents.lr @@ -81,7 +81,7 @@ So going line by line, these are what the things mean: is your plugin name with underscores instead of dashes as separators. If you need more than one module you should use a package instead. This is not covered here, but you can find this in the [setuptools documentation - :ext](https://pythonhosted.org/setuptools/). + :ext](https://setuptools.pypa.io/en/latest/). * `entry_points`: this is meta data that is needed to associate our package with Lektor. Lektor will load all plugins in the `lektor.plugins` list. It can be a list of definitions in the form `plugin-name = import_path`. From d357e5e19b1331d81c5ef324b9476b1daae5fad2 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 13:40:47 -0800 Subject: [PATCH 6/9] Avoid emitting links to non-existent plugin tag pages. --- templates/doc-page.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/doc-page.html b/templates/doc-page.html index f432428a..c151d8d4 100644 --- a/templates/doc-page.html +++ b/templates/doc-page.html @@ -53,10 +53,13 @@ {{ this.body }} {% if this.parent._slug == 'events' %} -
      -

      - Plugins That Use This Event -

      + {% if this._slug in site.query('/plugins').distinct('tags') %} +
      +

      + A list of some plugins that make use of this event is available + here. +

      + {% endif %} {% endif %} {% if this.version_history %} From 103761dd6f647c8cbc3116c1a5928e5e4f5f9f6c Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 13:49:48 -0800 Subject: [PATCH 7/9] Fix broken link to non-existing theme showcase --- content/docs/themes/installing/contents.lr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/docs/themes/installing/contents.lr b/content/docs/themes/installing/contents.lr index 99cd1b74..8c2b6545 100644 --- a/content/docs/themes/installing/contents.lr +++ b/content/docs/themes/installing/contents.lr @@ -38,7 +38,10 @@ a particular theme. !!!! Not implemented yet. You could add the `themes` variable to the `.lektorproject` file and Lektor will -search in the [community themes](/themes/) and automatically install it. +search in the + +[community themes :ext](https://github.com/lektor/lektor-themes) +and automatically install it. ```ini [project] From 65d03ec753b46dfe8637199b2ee3f108a7b0e53b Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 14:07:51 -0800 Subject: [PATCH 8/9] Add minimal docs for Asset class (to fix broken link to same) --- content/docs/api/db/asset/children/contents.lr | 11 +++++++++++ content/docs/api/db/asset/contents.lr | 14 ++++++++++++++ content/docs/api/db/asset/get-child/contents.lr | 13 +++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 content/docs/api/db/asset/children/contents.lr create mode 100644 content/docs/api/db/asset/contents.lr create mode 100644 content/docs/api/db/asset/get-child/contents.lr diff --git a/content/docs/api/db/asset/children/contents.lr b/content/docs/api/db/asset/children/contents.lr new file mode 100644 index 00000000..f958e346 --- /dev/null +++ b/content/docs/api/db/asset/children/contents.lr @@ -0,0 +1,11 @@ +title: children +--- +summary: Returns a query to the children of a page. +--- +type: property +--- +body: + +[Assets :ref](../) that correspond to directories can have children +below them. The `children` attribute provides a convenient way to access +those. It returns an iterable of child assets. diff --git a/content/docs/api/db/asset/contents.lr b/content/docs/api/db/asset/contents.lr new file mode 100644 index 00000000..789f9317 --- /dev/null +++ b/content/docs/api/db/asset/contents.lr @@ -0,0 +1,14 @@ +title: Asset +--- +summary: Static assets, copied verbatim to the output. +--- +module: lektor.assets +--- +type: class +--- +body: + +Assets are [Source Objects :ref](../obj/) that correspond to static files that +are copied verbatim from the `/assets` folder to the output directory. + +Usually, there is no need to manipulate Asset objects directly. diff --git a/content/docs/api/db/asset/get-child/contents.lr b/content/docs/api/db/asset/get-child/contents.lr new file mode 100644 index 00000000..6bb1e31d --- /dev/null +++ b/content/docs/api/db/asset/get-child/contents.lr @@ -0,0 +1,13 @@ +title: get_child +--- +body: + +Lookup a child of the asset. Returns `None` if no child exists with the specified name. + +Naturally, this method always returns `None` unless the asset is a directory. +--- +signature: name, from_url=False +--- +summary: Get child asset +--- +type: method From bab7d5e497a82cbbbf57e196b86f2306a75c0065 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Sun, 27 Feb 2022 14:38:54 -0800 Subject: [PATCH 9/9] Test for broken internal links in CI --- .github/workflows/deploy.yml | 29 +++++++++++++++++++++++------ .htmltest.yml | 8 ++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 .htmltest.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 217e86ca..7cf9210a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,12 +12,19 @@ on: schedule: - cron: '23 2 * * *' +env: + DEPLOY: >- + ${{ + github.event_name != 'pull_request' + && + github.ref == 'refs/heads/master' + }} + OUTPUT: _html + jobs: - deploy-lektor-website: - name: Deploy lektor website + build: + name: Build lektor website runs-on: ubuntu-latest - env: - DEPLOY: ${{ github.event_name != 'pull_request' }} steps: - uses: actions/checkout@v2 @@ -28,10 +35,20 @@ jobs: python -m pip install --upgrade pip setuptools python -m pip install lektor - - run: lektor build + - name: Build lektor website + run: lektor build -O '${{ env.OUTPUT }}' - - run: lektor deploy ghpages-https + - name: Check for broken internal links + uses: wjdp/htmltest-action@master + with: + path: ${{ env.OUTPUT }} + config: .htmltest.yml + skip_external: true + log_level: 1 + + - name: Deploy lektor website if: env.DEPLOY == 'true' + run: lektor deploy -O '${{ env.OUTPUT }}' ghpages-https env: LEKTOR_DEPLOY_USERNAME: lektor LEKTOR_DEPLOY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} diff --git a/.htmltest.yml b/.htmltest.yml new file mode 100644 index 00000000..f7afd545 --- /dev/null +++ b/.htmltest.yml @@ -0,0 +1,8 @@ +IgnoreAltMissing: true +IgnoreURLs: + - "^http://localhost:" + +# htmltest does not like quotes around URL in meta refresh +CheckMetaRefresh: false +# our redirect page doesn't have a doctype +CheckDoctype: false