fmartingr
/
fmartingr.com-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some asset inclusion

This commit is contained in:
Felipe Martín 2016-03-08 21:13:31 +01:00
parent f48900d586
commit fa7e00f1bb
2 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
fmartingrcom/themes/v1/templates/blog/entry.jinja
View File

@ -16,7 +16,51 @@
{% endif %}
{% endblock %}
{% block javascript %}
{% block content %}
<article class="blog-entry {% if item.draft %}draft{% endif %}"
{% if request.user.is_superuser %}data-liveedit-url="{{ item.get_absolute_url() }}edit/"{% endif %}>
<h1 class="entry-title">
<a class="dark" href="#">{{ item.title }}</a>
</h1>
<div class="info text-left">
{% if request.user.is_superuser %}
<div class="pull-right">
<a class="pure-button button-small button-secondary" data-button="live-edit">Live edit</a>
<a class="pure-button button-small" href="{{ url('admin:blog_entry_change', item.pk) }}">Edit in admin</a>
<a class="pure-button hidden" data-button="save">Save</a>
</div>
{% endif %}
<i class="fa fa-calendar"></i>
<time datetime="{{ item.date }}"
pubdate=""
data-updated="true">{{ item.date|dt('%B %e, %Y') }}</time>
{% if config.disqus_shortname and config.enable_comments %}
&nbsp;
<i class="fa fa-comment"></i> <a href="{{ item.get_absolute_url() }}#disqus_thread">0 Comments</a>
{% endif %}
{% if item.tags.count() > 0 %}
&nbsp;
<i class="fa fa-tag"></i> {{ item.tags.all()|join(', ') }}
{% endif %}
</div>
<div class="content">{{ item.content|safe }}</div>
<div class="clearfix"></div>
{% if config.show_share_buttons %}
<div class="share">
<a href="https://twitter.com/share" class="twitter-share-button" data-text="{{ item.title }} - {{ config.base_url }}{{ item.get_absolute_url() }}" data-via="{{ config.twitter_username }}" data-size="large">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
</div>
<div class="clearfix"></div>
{% endif %}
{% if config.disqus_shortname and config.enable_comments %}
<hr class="big" />
<div class="comments" id="disqus_thread"></div>
{% endif %}
</article>
{% endblock %}
{% block endbody %}
{{ super() }}
<script type="text/javascript">
(function() {
@ -111,47 +155,3 @@
})();
</script>
{% endblock %}
{% block content %}
<article class="blog-entry {% if item.draft %}draft{% endif %}"
{% if request.user.is_superuser %}data-liveedit-url="{{ item.get_absolute_url() }}edit/"{% endif %}>
<h1 class="entry-title">
<a class="dark" href="#">{{ item.title }}</a>
</h1>
<div class="info text-left">
{% if request.user.is_superuser %}
<div class="pull-right">
<a class="pure-button button-small button-secondary" data-button="live-edit">Live edit</a>
<a class="pure-button button-small" href="{{ url('admin:blog_entry_change', item.pk) }}">Edit in admin</a>
<a class="pure-button hidden" data-button="save">Save</a>
</div>
{% endif %}
<i class="fa fa-calendar"></i>
<time datetime="{{ item.date }}"
pubdate=""
data-updated="true">{{ item.date|dt('%B %e, %Y') }}</time>
{% if config.disqus_shortname and config.enable_comments %}
&nbsp;
<i class="fa fa-comment"></i> <a href="{{ item.get_absolute_url() }}#disqus_thread">0 Comments</a>
{% endif %}
{% if item.tags.count() > 0 %}
&nbsp;
<i class="fa fa-tag"></i> {{ item.tags.all()|join(', ') }}
{% endif %}
</div>
<div class="content">{{ item.content|safe }}</div>
<div class="clearfix"></div>
{% if config.show_share_buttons %}
<div class="share">
<a href="https://twitter.com/share" class="twitter-share-button" data-text="{{ item.title }} - {{ config.base_url }}{{ item.get_absolute_url() }}" data-via="{{ config.twitter_username }}" data-size="large">Tweet</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
</div>
<div class="clearfix"></div>
{% endif %}
{% if config.disqus_shortname and config.enable_comments %}
<hr class="big" />
<div class="comments" id="disqus_thread"></div>
{% endif %}
</article>
{% endblock %}

12
fmartingrcom/themes/v1/templates/blog/layout.jinja
View File

@ -4,17 +4,11 @@
{% block stylesheets %}
<link rel="stylesheet" href="{{ static('bower/google-code-prettify/bin/prettify.min.css') }}" />
{% if request.user.is_superuser %}
<link rel="stylesheet" href="{{ static('bower/pen/src/pen.css') }}" />
{% endif %}
<link rel="stylesheet" href="{{ static('bower/pen/src/pen.css') }}" />
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{{ static('bower/google-code-prettify/bin/run_prettify.min.js') }}"></script>
{% if request.user.is_superuser %}
<script type="text/javascript" src="{{ static('bower/pen/src/pen.js') }}"></script>
<script type="text/javascript" src="{{ static('bower/pen/src/markdown.js') }}"></script>
{% endif %}
{% endblock %}
{% block menu %}
@ -41,4 +35,8 @@
{% from '_macros.jinja' import disqus with context %}
{{ disqus() }}
{% endif %}
{% if request.user.is_superuser %}
<script type="text/javascript" src="{{ static('bower/pen/src/pen.js') }}"></script>
<script type="text/javascript" src="{{ static('bower/pen/src/markdown.js') }}"></script>
{% endif %}
{% endblock %}