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

@@ -25,7 +25,7 @@ a.blog_index-header(href="{{ node.url }}")
| {{ node.name }}
.item-content
| {{ node.properties.content | markdown }}
| {{ node.properties | markdowned('content') }}
| {% endmacro %}

View File

@@ -5,7 +5,7 @@
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=17320171) }}", rel="stylesheet")
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% endblock %}
| {% block project_context %}

View File

@@ -11,7 +11,7 @@
.comment-body
p.comment-author {{ comment._user.full_name }}
span {{comment.properties.content_html | safe }}
span {{comment.properties | markdowned('content') }}
// TODO: Markdown preview when editing

View File

@@ -13,10 +13,10 @@
data-placement="top")
i.pi-list
| {% if node.description %}
.node-details-description#node-description
| {{ node.description | markdown }}
| {% endif %}
| {% if node.description %}
.node-details-description
| {{ node | markdowned('description') }}
| {% endif %}
section.node-children.group

View File

@@ -7,7 +7,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
| {% if children %}

View File

@@ -7,7 +7,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
| {% if children %}

View File

@@ -17,7 +17,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
.node-details-meta.footer

View File

@@ -21,7 +21,7 @@ meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=17320171) }}", rel="stylesheet")
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% endblock %}
| {% block project_context %}

View File

@@ -2,9 +2,9 @@
| {% block page_title %}Search{% if project %} {{ project.name }}{% endif %}{% endblock %}
| {% block head %}
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-6.2.8.min.js', v=9112017) }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-ga-0.4.2.min.js', v=9112017) }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotkeys-0.2.20.min.js', v=9112017) }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-6.2.8.min.js') }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-ga-0.4.2.min.js') }}")
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotkeys-0.2.20.min.js') }}")
| {% endblock %}
| {% block og %}

View File

@@ -26,7 +26,7 @@
| {# DESCRIPTION #}
| {% if node.description %}
.node-details-description#node-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}