-
diff --git a/showcase/frank-tisellano/home@480.png b/showcase/frank-tisellano/home@480.png
index 11e949e6..b9d919ab 100644
Binary files a/showcase/frank-tisellano/home@480.png and b/showcase/frank-tisellano/home@480.png differ
diff --git a/showcase/freedombox/index.html b/showcase/freedombox/index.html
index c46f3a1a..9451459c 100644
--- a/showcase/freedombox/index.html
+++ b/showcase/freedombox/index.html
@@ -82,7 +82,7 @@ Salsa.
@@ -94,7 +94,7 @@ Salsa.
diff --git a/showcase/happyhols/happyhols1@480.jpg b/showcase/happyhols/happyhols1@480.jpg
index ead6dbaa..2fb0d2ec 100644
Binary files a/showcase/happyhols/happyhols1@480.jpg and b/showcase/happyhols/happyhols1@480.jpg differ
diff --git a/showcase/lektor-website/index.html b/showcase/lektor-website/index.html
index 5e0e834b..49d1e931 100644
--- a/showcase/lektor-website/index.html
+++ b/showcase/lektor-website/index.html
@@ -79,12 +79,6 @@ and content is available on GitHub so you can see how it's built.
@@ -96,6 +90,12 @@ and content is available on GitHub so you can see how it's built.
+
diff --git a/showcase/mark-steve-samson/1-frontpage@480.jpg b/showcase/mark-steve-samson/1-frontpage@480.jpg
index c127396f..06e64247 100644
Binary files a/showcase/mark-steve-samson/1-frontpage@480.jpg and b/showcase/mark-steve-samson/1-frontpage@480.jpg differ
diff --git a/showcase/mark-steve-samson/index.html b/showcase/mark-steve-samson/index.html
index b649b0f2..2543a675 100644
--- a/showcase/mark-steve-samson/index.html
+++ b/showcase/mark-steve-samson/index.html
@@ -76,13 +76,13 @@
+
-
+
Previous
-
+
Next
diff --git a/plugins/lektor-atom/index.html b/plugins/lektor-atom/index.html
index e2cd656b..caba6eed 100644
--- a/plugins/lektor-atom/index.html
+++ b/plugins/lektor-atom/index.html
@@ -153,7 +153,7 @@
name = My Blog
source_path = /
url_path = /feed.xml
-items = site.query('/').filter(F.type == 'post')
+items = site.query('/').filter(F.type == 'post')
item_model = blog-post
[coffee]
diff --git a/plugins/lektor-polymorphic-type/index.html b/plugins/lektor-polymorphic-type/index.html
index 5271d146..4d94c3d6 100644
--- a/plugins/lektor-polymorphic-type/index.html
+++ b/plugins/lektor-polymorphic-type/index.html
@@ -188,7 +188,7 @@ determine whether the
diff --git a/showcase/atelier-ronacher/index.html b/showcase/atelier-ronacher/index.html
index d7c52706..992394a8 100644
--- a/showcase/atelier-ronacher/index.html
+++ b/showcase/atelier-ronacher/index.html
@@ -88,13 +88,13 @@ Maps and a booking engine.
body field is interpreted as being mark
[fields.body]
label = Body
type = polymorphic
-polymorphic_type = 'html' if this.body.lstrip().startswith('<') else 'markdown'
+polymorphic_type = 'html' if this.body.lstrip().startswith('<') else 'markdown'
In this case, the body field will be interpreted as raw HTML if the
content of that field starts with a “<”, otherwise it will be
diff --git a/plugins/lektor-shortcodes/index.html b/plugins/lektor-shortcodes/index.html
index 2b893cba..5460280d 100644
--- a/plugins/lektor-shortcodes/index.html
+++ b/plugins/lektor-shortcodes/index.html
@@ -165,7 +165,7 @@ full Jinja templates, although (due to some limitations of ini files) they need
to be on one line.
For instance, for the example above, the config file could be:
[global]
-image = '<div class="align{{ align }}">{% if link %}<a href="{{ link }}"{% if not link.startswith("http") %} data-lightbox="gallery"{% endif %}>{% endif %}<img src="{{ image }}">{% if link %}</a>{% endif %}{% if caption %}<span class="caption">{{ caption }}</span>{% endif %}</div>'
+image = '<div class="align{{ align }}">{% if link %}<a href="{{ link }}"{% if not link.startswith("http") %} data-lightbox="gallery"{% endif %}>{% endif %}<img src="{{ image }}">{% if link %}</a>{% endif %}{% if caption %}<span class="caption">{{ caption }}</span>{% endif %}</div>'
This will allow you to use shortcodes with optional arguments, like so:
# An image with no caption or link:
diff --git a/plugins/lektor-tags/index.html b/plugins/lektor-tags/index.html
index fe8073a1..d28610fc 100644
--- a/plugins/lektor-tags/index.html
+++ b/plugins/lektor-tags/index.html
@@ -202,7 +202,7 @@ tea
items = this.parent.children.filter(F.tags.contains(tag))
You can sort and filter with any expression:
-items = this.parent.children.filter(F.tags.contains(tag) and F.status == 'published').order_by('-pub_date')
+items = this.parent.children.filter(F.tags.contains(tag) and F.status == 'published').order_by('-pub_date')
If the parent page has a pagination query you may want to use it for tagged pages:
items = this.parent.pagination.items.filter(F.tags.contains(tag))
diff --git a/showcase/allnew-selfstudythai/index.html b/showcase/allnew-selfstudythai/index.html
index f5240ab8..b2c803bf 100644
--- a/showcase/allnew-selfstudythai/index.html
+++ b/showcase/allnew-selfstudythai/index.html
@@ -83,7 +83,13 @@
- 
+ 
+
+
+
+
+
+ 
@@ -101,13 +107,7 @@
-
-
-
-
-
-
-
+
diff --git a/showcase/andrew-shay/index.html b/showcase/andrew-shay/index.html
index b424342e..2f1e4563 100644
--- a/showcase/andrew-shay/index.html
+++ b/showcase/andrew-shay/index.html
@@ -76,13 +76,13 @@
- 
+ 
-
+
diff --git a/showcase/architekten-ronacher/index.html b/showcase/architekten-ronacher/index.html
index d0986b70..efc4c940 100644
--- a/showcase/architekten-ronacher/index.html
+++ b/showcase/architekten-ronacher/index.html
@@ -85,12 +85,6 @@ the overview page.
-
- 
-
-
-
-
@@ -102,6 +96,12 @@ the overview page.
+
+
+
+
+
+
- 
+
+
-
+
+
- 
+ 
+
-
+
+
-
-
-
- 
-
-
-
+
+
+
+
+
+
- 
+ 
+
-
+
+
- 
+ 
+
-
+
+
- 
+ 
+
-
+
+
- 
+ 
+
-
+
+
+
+
+
+ 
+
+
+
-
-
-
-
-
-
- 
+ 
+
-
+
+
- 
+ 
+
-
+
+
-
-
-
- 
-
-
-
-
-
-
- 
-
-
- 
+
+
+
+
+
+
+
+
+
+
+
+
+ 
diff --git a/showcase/yargies/1-home@480.png b/showcase/yargies/1-home@480.png
index e9d210d3..fbb8a448 100644
Binary files a/showcase/yargies/1-home@480.png and b/showcase/yargies/1-home@480.png differ
diff --git a/sitemap.xml b/sitemap.xml
index 8bec376e..fcbb8280 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,64 +1,32 @@