diff --git a/assets/static/favicon.png b/assets/static/favicon.png new file mode 100644 index 00000000..4386aa28 Binary files /dev/null and b/assets/static/favicon.png differ diff --git a/content/contents.lr b/content/contents.lr index df0652e0..99fcca91 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -20,7 +20,7 @@ contents: complex and beautiful websites out of flat files — for people who do not want to make a compromise between a CMS and a static blog engine.

- Getting your ideas implemented is as easy as making breakfast eggs. + Getting your ideas implemented is as easy as frying an egg.

+
  • Star +
  • Join the chat at https://gitter.im/lektor/lektor +
    • #### text-block #### @@ -95,7 +98,7 @@ image: edit-post.png description: The project files are neatly laid out in the filesystem and allow tracking -via cloud storage or version control. +via cloud storage like Dropbox or version control. ----- image: filesystem.png ##### slide ##### diff --git a/content/docs/api/db/expression/and/contents.lr b/content/docs/api/db/expression/and/contents.lr index 7c7a8144..083d37aa 100644 --- a/content/docs/api/db/expression/and/contents.lr +++ b/content/docs/api/db/expression/and/contents.lr @@ -20,7 +20,7 @@ differs between Python and templates. In templates you have to use the ``` diff --git a/content/docs/api/db/expression/contains/contents.lr b/content/docs/api/db/expression/contains/contents.lr index 32ea681d..17641451 100644 --- a/content/docs/api/db/expression/contains/contents.lr +++ b/content/docs/api/db/expression/contains/contents.lr @@ -19,7 +19,7 @@ contained in another string or a item can be contained within a list.

    Projects Tagged 'amazing'

    ``` diff --git a/content/docs/api/db/expression/endswith-cs/contents.lr b/content/docs/api/db/expression/endswith-cs/contents.lr index e60b62bc..c8275949 100644 --- a/content/docs/api/db/expression/endswith-cs/contents.lr +++ b/content/docs/api/db/expression/endswith-cs/contents.lr @@ -18,7 +18,7 @@ see [endswith :ref](../endswith/). ```html+jinja ``` diff --git a/content/docs/api/db/expression/endswith/contents.lr b/content/docs/api/db/expression/endswith/contents.lr index b022220c..c0f6916c 100644 --- a/content/docs/api/db/expression/endswith/contents.lr +++ b/content/docs/api/db/expression/endswith/contents.lr @@ -18,7 +18,7 @@ see [endswith_cs :ref](../endswith-cs/). ```html+jinja ``` diff --git a/content/docs/api/db/expression/eq/contents.lr b/content/docs/api/db/expression/eq/contents.lr index ec8e68bb..68ac3c4e 100644 --- a/content/docs/api/db/expression/eq/contents.lr +++ b/content/docs/api/db/expression/eq/contents.lr @@ -15,7 +15,7 @@ Typically it compares if a value matches a specific value exactly:

    Our Houses

    ``` diff --git a/content/docs/api/db/expression/ge/contents.lr b/content/docs/api/db/expression/ge/contents.lr index 2acb0052..ff2c3233 100644 --- a/content/docs/api/db/expression/ge/contents.lr +++ b/content/docs/api/db/expression/ge/contents.lr @@ -16,7 +16,7 @@ or equal to it. This behavior works best with [integers

    3 or more Stars

    ``` diff --git a/content/docs/api/db/expression/gt/contents.lr b/content/docs/api/db/expression/gt/contents.lr index 3d96d714..7d92b342 100644 --- a/content/docs/api/db/expression/gt/contents.lr +++ b/content/docs/api/db/expression/gt/contents.lr @@ -16,7 +16,7 @@ or [floats :ref](../../types/float/).

    Well Rated Items

    ``` diff --git a/content/docs/api/db/expression/le/contents.lr b/content/docs/api/db/expression/le/contents.lr index 6ec15b4d..3a4fbd0a 100644 --- a/content/docs/api/db/expression/le/contents.lr +++ b/content/docs/api/db/expression/le/contents.lr @@ -16,7 +16,7 @@ or equal to it. This behavior works best with [integers

    Projects From Before Including 2000

    ``` diff --git a/content/docs/api/db/expression/lt/contents.lr b/content/docs/api/db/expression/lt/contents.lr index 5195694d..cd4e1958 100644 --- a/content/docs/api/db/expression/lt/contents.lr +++ b/content/docs/api/db/expression/lt/contents.lr @@ -16,7 +16,7 @@ or equal to it. This behavior works best with [integers

    Projects From Before 2000

    ``` diff --git a/content/docs/api/db/expression/ne/contents.lr b/content/docs/api/db/expression/ne/contents.lr index d9caf2b1..0ba661a7 100644 --- a/content/docs/api/db/expression/ne/contents.lr +++ b/content/docs/api/db/expression/ne/contents.lr @@ -15,7 +15,7 @@ by doing an exact comparison:

    Everything Other Than Houses

    ``` diff --git a/content/docs/api/db/expression/or/contents.lr b/content/docs/api/db/expression/or/contents.lr index 7851cf7e..07941077 100644 --- a/content/docs/api/db/expression/or/contents.lr +++ b/content/docs/api/db/expression/or/contents.lr @@ -20,7 +20,7 @@ differs between Python and templates. In templates you have to use the ``` diff --git a/content/docs/api/db/expression/startswith-cs/contents.lr b/content/docs/api/db/expression/startswith-cs/contents.lr index 22ce74e3..89927d34 100644 --- a/content/docs/api/db/expression/startswith-cs/contents.lr +++ b/content/docs/api/db/expression/startswith-cs/contents.lr @@ -19,7 +19,7 @@ see [startswith :ref](../startswith/).

    A

    ``` diff --git a/content/docs/api/db/expression/startswith/contents.lr b/content/docs/api/db/expression/startswith/contents.lr index beddd1ab..cf558cb3 100644 --- a/content/docs/api/db/expression/startswith/contents.lr +++ b/content/docs/api/db/expression/startswith/contents.lr @@ -19,7 +19,7 @@ see [startswith_cs :ref](../startswith-cs/).

    A

    ``` diff --git a/content/docs/api/db/f/contents.lr b/content/docs/api/db/f/contents.lr index c5550773..50dc90d3 100644 --- a/content/docs/api/db/f/contents.lr +++ b/content/docs/api/db/f/contents.lr @@ -22,7 +22,7 @@ Accessing an attributes creates an [Expression :ref](../expression/). ```html+jinja ``` diff --git a/content/docs/api/db/get-alts/contents.lr b/content/docs/api/db/get-alts/contents.lr index 460bf7a5..a87216f2 100644 --- a/content/docs/api/db/get-alts/contents.lr +++ b/content/docs/api/db/get-alts/contents.lr @@ -28,7 +28,7 @@ used to provide alts with a humand readable title.

    Other languages:

    ``` diff --git a/content/docs/api/db/pad/query/contents.lr b/content/docs/api/db/pad/query/contents.lr index 55086332..1b39b141 100644 --- a/content/docs/api/db/pad/query/contents.lr +++ b/content/docs/api/db/pad/query/contents.lr @@ -18,7 +18,7 @@ and will also include hidden pages. ```html+jinja ``` diff --git a/content/docs/api/db/query/all/contents.lr b/content/docs/api/db/query/all/contents.lr index 311fd4bc..ec57ec48 100644 --- a/content/docs/api/db/query/all/contents.lr +++ b/content/docs/api/db/query/all/contents.lr @@ -18,7 +18,7 @@ handy. {% if items %} {% endif %} diff --git a/content/docs/api/db/query/contents.lr b/content/docs/api/db/query/contents.lr index 51b351a2..9ed89074 100644 --- a/content/docs/api/db/query/contents.lr +++ b/content/docs/api/db/query/contents.lr @@ -22,7 +22,7 @@ Here a basic example of how to filter something in a template: ```html+jinja ``` diff --git a/content/docs/api/db/query/filter/contents.lr b/content/docs/api/db/query/filter/contents.lr index 9a1aefef..5b19acc7 100644 --- a/content/docs/api/db/query/filter/contents.lr +++ b/content/docs/api/db/query/filter/contents.lr @@ -22,7 +22,7 @@ Here a basic example of how to filter something in a template: ```html+jinja ``` diff --git a/content/docs/api/db/query/include-hidden/contents.lr b/content/docs/api/db/query/include-hidden/contents.lr index 0e0ac0e7..871eb449 100644 --- a/content/docs/api/db/query/include-hidden/contents.lr +++ b/content/docs/api/db/query/include-hidden/contents.lr @@ -24,7 +24,7 @@ Here a basic example of how to filter something in a template: ```html+jinja ``` diff --git a/content/docs/api/db/query/include-undiscoverable/contents.lr b/content/docs/api/db/query/include-undiscoverable/contents.lr index d0abada9..0b23f5d2 100644 --- a/content/docs/api/db/query/include-undiscoverable/contents.lr +++ b/content/docs/api/db/query/include-undiscoverable/contents.lr @@ -25,7 +25,7 @@ Here a basic example of how to filter something in a template: ```html+jinja ``` diff --git a/content/docs/api/db/query/limit/contents.lr b/content/docs/api/db/query/limit/contents.lr index 3229a7c7..0d2efe61 100644 --- a/content/docs/api/db/query/limit/contents.lr +++ b/content/docs/api/db/query/limit/contents.lr @@ -17,7 +17,7 @@ of matching records.

    Our Top 3

    ``` diff --git a/content/docs/api/db/query/order-by/contents.lr b/content/docs/api/db/query/order-by/contents.lr index b4952e9e..3e719ef4 100644 --- a/content/docs/api/db/query/order-by/contents.lr +++ b/content/docs/api/db/query/order-by/contents.lr @@ -23,7 +23,7 @@ order by year and within a year it will order by name. ```html+jinja ``` diff --git a/content/docs/api/db/query/request-page/contents.lr b/content/docs/api/db/query/request-page/contents.lr index 64fa975f..b1b0a7f1 100644 --- a/content/docs/api/db/query/request-page/contents.lr +++ b/content/docs/api/db/query/request-page/contents.lr @@ -25,6 +25,7 @@ there is a good reason to use it.
  • Items on the first page of {{ child.title }}: {{ child.pagination.items.count() }} +
    • {% endfor %} ``` diff --git a/content/docs/api/db/record/children/contents.lr b/content/docs/api/db/record/children/contents.lr index 0f7969fc..04e6b5c9 100644 --- a/content/docs/api/db/record/children/contents.lr +++ b/content/docs/api/db/record/children/contents.lr @@ -27,7 +27,7 @@ via the [query :ref](../../pad/query/) method of the pad. ```html+jinja ``` diff --git a/content/docs/api/db/record/pagination/contents.lr b/content/docs/api/db/record/pagination/contents.lr index 1c8fec77..a208b9d0 100644 --- a/content/docs/api/db/record/pagination/contents.lr +++ b/content/docs/api/db/record/pagination/contents.lr @@ -19,7 +19,7 @@ The following attributes exist on the pagination object: | ------------ | ------------ | `current` | The current record | `prev` | The record for the last page (might be `None`) -| `next` | The record for the net page (might be `None`) +| `next` | The record for the next page (might be `None`) | `total` | The total number of items across all pages | `pages` | The total number of pages | `page` | The number of current page @@ -42,7 +42,7 @@ page: ```html+jinja ``` diff --git a/content/docs/api/db/record/record-label/contents.lr b/content/docs/api/db/record/record-label/contents.lr index 319c4d31..a5cad561 100644 --- a/content/docs/api/db/record/record-label/contents.lr +++ b/content/docs/api/db/record/record-label/contents.lr @@ -17,7 +17,7 @@ a page that might use different independent models. ```html+jinja ``` diff --git a/content/docs/api/db/system-fields/model/contents.lr b/content/docs/api/db/system-fields/model/contents.lr index d8f2f3b8..9ecb508a 100644 --- a/content/docs/api/db/system-fields/model/contents.lr +++ b/content/docs/api/db/system-fields/model/contents.lr @@ -17,7 +17,7 @@ This field is most useful for filtering when operating on mixed collections. ```html+jinja ``` diff --git a/content/docs/api/db/types/strings/contents.lr b/content/docs/api/db/types/strings/contents.lr index 9691b23b..012fcab9 100644 --- a/content/docs/api/db/types/strings/contents.lr +++ b/content/docs/api/db/types/strings/contents.lr @@ -6,7 +6,7 @@ type: type --- body: -The `strings` type one that is a mixture of the [string :ref](../string/) +The `strings` type one that is a mixture of the [string :ref](../string/) and [text :ref](../text/) type. It renders as a multi-line text area in the admin but the template will see each line of text separately. It's primarily useful for some advanced scenarios where enumerations and other things @@ -28,7 +28,7 @@ description = A list of things that would be good to buy

    Shopping List

    ``` diff --git a/content/docs/api/templates/filters/url/contents.lr b/content/docs/api/templates/filters/url/contents.lr index cdb203d6..2bcda92a 100644 --- a/content/docs/api/templates/filters/url/contents.lr +++ b/content/docs/api/templates/filters/url/contents.lr @@ -32,8 +32,8 @@ the website. ```html+jinja ``` diff --git a/content/docs/guides/blog/contents.lr b/content/docs/guides/blog/contents.lr index 2077b2bc..477c09f6 100644 --- a/content/docs/guides/blog/contents.lr +++ b/content/docs/guides/blog/contents.lr @@ -102,6 +102,7 @@ page. {{ post.title }} — by {{ post.author }} on {{ post.pub_date|dateformat }} + {% endfor %} diff --git a/content/docs/guides/categories/contents.lr b/content/docs/guides/categories/contents.lr index 8ddc8510..1a44fa26 100644 --- a/content/docs/guides/categories/contents.lr +++ b/content/docs/guides/categories/contents.lr @@ -197,7 +197,7 @@ markup that appears on multiple pages. {% endmacro %} @@ -205,7 +205,7 @@ markup that appears on multiple pages. {% macro render_project_list(projects) %} {% endmacro %} diff --git a/content/docs/guides/sitemap/contents.lr b/content/docs/guides/sitemap/contents.lr index 7f33e5d1..b8a36913 100644 --- a/content/docs/guides/sitemap/contents.lr +++ b/content/docs/guides/sitemap/contents.lr @@ -65,6 +65,7 @@ create a `sitemap/contents.lr` file instead and use a template like {% if page.children %} {% endif %} + {% endfor %} {% endblock %} diff --git a/content/docs/models/flow/contents.lr b/content/docs/models/flow/contents.lr index 07c9301a..064ecc4b 100644 --- a/content/docs/models/flow/contents.lr +++ b/content/docs/models/flow/contents.lr @@ -43,9 +43,14 @@ a flow. ## Templates Now that we have a model for our flow block, we need to create a template -for it. When a flow block is added to a Flow, it will automatically -render it by default through the template `blocks/NAME.html` (so in our -case `blocks/text.html`). Here is a suitable template for this: +for it. Templates for blocks are stored in the `blocks` subdirectory of the +`templates` folder. +The name for the block template is automatically derived from the config file +that keeps the flow block definition (`templates/blocks/NAME.html`): +In our case the expected template is `templates/blocks/text.html`, +as our flow block is defined in a file called `text.ini`. + +Here is a suitable template for this: ```html+jinja
    diff --git a/content/docs/plugins/list/contents.lr b/content/docs/plugins/list/contents.lr index 1d8094dc..8d5f23b3 100644 --- a/content/docs/plugins/list/contents.lr +++ b/content/docs/plugins/list/contents.lr @@ -43,6 +43,7 @@ so they might not keep pace with development on Lektor. * [tags :ext](https://github.com/ajdavis/lektor-tags): For each tag on site, build a list of pages with that tag. * [i18n :ext](https://github.com/numericube/lektor-i18n-plugin): Use GetText .PO files to translate your site **content**. * [htmlmin :ext](https://github.com/vesuvium/lektor-htmlmin): Automatically minifies .html files in build directory +* [creative-commons :ext](https://github.com/humrochagf/lektor-creative-commons): Add Creative Commons license to your pages ! Have your own plugin and you want to see it here? Just [edit this page on GitHub :ref](https://github.com/lektor/lektor-website/edit/master/content/docs/plugins/list/contents.lr), diff --git a/content/docs/quickstart/contents.lr b/content/docs/quickstart/contents.lr index 1e0eba30..7f8573ae 100644 --- a/content/docs/quickstart/contents.lr +++ b/content/docs/quickstart/contents.lr @@ -32,7 +32,7 @@ some basic configuration for you. If you want a video walkthrough you can have a look at the screencast which explains the quickstart project a bit: - diff --git a/content/docs/templates/urls/contents.lr b/content/docs/templates/urls/contents.lr index 145ed3d6..f5f27b3d 100644 --- a/content/docs/templates/urls/contents.lr +++ b/content/docs/templates/urls/contents.lr @@ -27,8 +27,8 @@ Because the path starts with a slash it will be treated as absolute path: ```html+jinja ``` @@ -59,7 +59,7 @@ link to all children of a page: ```html+jinja ``` diff --git a/templates/blog-archive/index.html b/templates/blog-archive/index.html index f1342024..08de6a98 100644 --- a/templates/blog-archive/index.html +++ b/templates/blog-archive/index.html @@ -8,7 +8,7 @@ There have been posts in the following years: {% endblock %} diff --git a/templates/blog-archive/month.html b/templates/blog-archive/month.html index bd5301f0..fb3c7083 100644 --- a/templates/blog-archive/month.html +++ b/templates/blog-archive/month.html @@ -6,7 +6,7 @@ « Back to {{ this.year }} {% endblock %} diff --git a/templates/blog-archive/year.html b/templates/blog-archive/year.html index 0b15b286..c8c96b31 100644 --- a/templates/blog-archive/year.html +++ b/templates/blog-archive/year.html @@ -10,9 +10,10 @@ + {% endfor %} {% endblock %} diff --git a/templates/blog-layout.html b/templates/blog-layout.html index 26faf6f1..6820d626 100644 --- a/templates/blog-layout.html +++ b/templates/blog-layout.html @@ -21,12 +21,12 @@ Subscribe for the latest news about Lektor as well as content management and web development.

    Missed a Post?

    diff --git a/templates/doc-page.html b/templates/doc-page.html index 17063ced..518ffef9 100644 --- a/templates/doc-page.html +++ b/templates/doc-page.html @@ -23,7 +23,7 @@ @@ -35,19 +35,19 @@ diff --git a/templates/layout.html b/templates/layout.html index e3b03a50..12b415e9 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -4,6 +4,7 @@ + {% block title %}Hello{% endblock %} | Lektor Static Content Management System