archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Merge branch 'production'

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-07-13 17:31:28 +02:00
commit 7f336cb47c
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/templates/nodes/custom/post/view.jade
View File

@ -1,6 +1,22 @@
| {% extends 'projects/view.html' %} | {% extends 'projects/view.html' %}
| {% set title = 'blog' %} | {% set title = 'blog' %}
| {% block og %}
meta(property="og:title", content="{{ node.name }}")
meta(property="og:url", content="{{ url_for('main.project_blog', project_url=project.url, url=node.properties.url, _external=True)}}")
meta(property="og:type", content="website")
| {% if node.picture %}
meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% endif %}
meta(property="og:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
meta(name="twitter:title", content="{{ node.name }}")
meta(name="twitter:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
| {% if node.picture %}
meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% endif %}
| {% endblock %}
| {% block page_title %}{{node.name}} - Blog{% endblock%} | {% block page_title %}{{node.name}} - Blog{% endblock%}
| {% block css %} | {% block css %}

51
src/templates/nodes/custom/post/view_main_project.jade
View File

@ -1,4 +1,21 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% block og %}
meta(property="og:title", content="{{ node.name }}")
meta(property="og:url", content="{{ url_for('main.main_blog', url=node.properties.url, _external=True)}}")
meta(property="og:type", content="website")
| {% if node.picture %}
meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% endif %}
meta(property="og:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
meta(name="twitter:title", content="{{ node.name }}")
meta(name="twitter:description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
| {% if node.picture %}
meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% endif %}
| {% endblock %}
| {% block page_title %}{{node.name}} - Blog{% endblock%} | {% block page_title %}{{node.name}} - Blog{% endblock%}
| {% set title = 'blog' %} | {% set title = 'blog' %}
@ -6,7 +23,7 @@
| {% block body %} | {% block body %}
.container .container
| {% include 'nodes/custom/post/view_embed.html' %} | {% include 'nodes/custom/post/view_embed.html' %}
| {% endblock %} | {% endblock %}
@ -14,24 +31,24 @@
| {% block footer_scripts %} | {% block footer_scripts %}
script. script.
hopToTop(); // Display jump to top button hopToTop(); // Display jump to top button
/* Expand images when their link points to a jpg/png/gif */ /* Expand images when their link points to a jpg/png/gif */
/* TODO: De-duplicate code from view post */ /* TODO: De-duplicate code from view post */
var page_overlay = document.getElementById('page-overlay'); var page_overlay = document.getElementById('page-overlay');
$('.blog_index-item .item-content a img').on('click', function (e) { $('.blog_index-item .item-content a img').on('click', function (e) {
e.preventDefault(); e.preventDefault();
var href = $(this).parent().attr('href').split("?")[0]; var href = $(this).parent().attr('href').split("?")[0];
var src = $(this).attr('src'); var src = $(this).attr('src');
if (href.match("jpg$") || href.match("png$") || href.match("gif$")) { if (href.match("jpg$") || href.match("png$") || href.match("gif$")) {
$(page_overlay) $(page_overlay)
.addClass('active') .addClass('active')
.html('<img src="' + src + '"/>'); .html('<img src="' + src + '"/>');
} else { } else {
window.location.href = href; window.location.href = href;
} }
}); });
| {% endblock %} | {% endblock %}