Merge branch 'master' into wip-asset-obscure

This commit is contained in:
2018-03-28 12:42:42 +02:00
55 changed files with 945 additions and 222 deletions

View File

@@ -28,7 +28,7 @@
| {% if project.description %}
.node-details-description
| {{ project.description | markdown }}
| {{ project | markdowned('description') }}
| {% endif %}
| {# Until we implement urls for pages
@@ -73,9 +73,9 @@
a.title(href="{{ url_for_node(node=n) }}") {{ n.name }}
p.description(href="{{ url_for_node(node=n) }}")
| {% if n.node_type == 'post' %}
| {{ n.properties.content | markdown | striptags | truncate(140, end="... <small>read more</small>") | safe | hide_none }}
| {{ n.properties | markdowned('content') | striptags | truncate(140, end="... <small>read more</small>") | safe | hide_none }}
| {% else %}
| {{ n.description | markdown | striptags | truncate(140, end="... <small>read more</small>") | safe | hide_none }}
| {{ n | markdowned('description') | striptags | truncate(140, end="... <small>read more</small>") | safe | hide_none }}
| {% endif %}
span.details
span.what {% if n.properties.content_type %}{{ n.properties.content_type | undertitle }}{% else %}{{ n.node_type | undertitle }}{% endif %} ·