Skip to content

Commit

Permalink
Add newlines in jinify output, map parents properly
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Mar 10, 2014
1 parent 712f738 commit 94ff2ec
Show file tree
Hide file tree
Showing 46 changed files with 65 additions and 54 deletions.
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/engine
View file
@@ -1 +1 @@
jinja
jinja
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/parent
View file
@@ -1 +1 @@
base
base
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/annotation_helper.tmpl
View file
Expand Up @@ -13,4 +13,4 @@
});
});
</script>
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/base.tmpl
View file
Expand Up @@ -42,4 +42,4 @@ lang="{{ lang }}">
{{ base.late_load_js() }}
{{ social_buttons_code }}
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/base_helper.tmpl
View file
Expand Up @@ -90,4 +90,4 @@
<a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a>
{% endif %}
{% endfor %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/comments_helper.tmpl
View file
Expand Up @@ -60,4 +60,4 @@
{% elif comment_system == 'isso' %}
{{ isso.comment_link_script() }}
{% endif %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/crumbs.tmpl
View file
Expand Up @@ -8,4 +8,4 @@
{% endfor %}
</ul>
{% endif %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/disqus_helper.tmpl
View file
Expand Up @@ -55,4 +55,4 @@

{% macro html_disqus_script() %}
{{ comment_link_script() }}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/facebook_helper.tmpl
View file
Expand Up @@ -59,4 +59,4 @@
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/gallery.tmpl
View file
Expand Up @@ -33,4 +33,4 @@
{% if enable_comments %}
{{ comments.comment_form(None, permalink, title) }}
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/googleplus_helper.tmpl
View file
Expand Up @@ -14,4 +14,4 @@
{% endmacro %}

{% macro comment_link_script() %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/index.tmpl
View file
Expand Up @@ -26,4 +26,4 @@
{{ helper.html_pager() }}
{{ comments.comment_link_script() }}
{{ helper.mathjax_script(posts) }}
{% endblock %}
{% endblock %}
6 changes: 3 additions & 3 deletions nikola/data/themes/base-jinja/templates/index_helper.tmpl
View file
Expand Up @@ -5,12 +5,12 @@
<ul class="pager">
{% if prevlink %}
<li class="previous">
<a href="{{ prevlink }}" rel="prev">&larr; {{ messages("Newer posts") }}</a>
<a href="{{ prevlink }}" rel="prev">{{ messages("Newer posts") }}</a>
</li>
{% endif %}
{% if nextlink %}
<li class="next">
<a href="{{ nextlink }}" rel="next">{{ messages("Older posts") }} &rarr;</a>
<a href="{{ nextlink }}" rel="next">{{ messages("Older posts") }}</a>
</li>
{% endif %}
</ul>
Expand All @@ -27,4 +27,4 @@
</script>
<script src="/assets/js/mathjax.js"></script>
{% endif %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/intensedebate_helper.tmpl
View file
Expand Up @@ -22,4 +22,4 @@ var idcomments_post_url = "{{ link }}";
{% endmacro %}

{% macro comment_link_script() %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/isso_helper.tmpl
View file
Expand Up @@ -17,4 +17,4 @@
{% if comment_system_id %}
<script src="{{ comment_system_id }}js/count.min.js" data-isso="{{ comment_system_id }}"></script>
{% endif %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/list.tmpl
View file
Expand Up @@ -13,4 +13,4 @@
{% endif %}
</div>
<!--End of body content-->
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/list_post.tmpl
View file
Expand Up @@ -13,4 +13,4 @@
{% endif %}
</div>
<!--End of body content-->
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/listing.tmpl
View file
Expand Up @@ -16,4 +16,4 @@
{% if code %}
{{ code }}
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/livefyre_helper.tmpl
View file
Expand Up @@ -34,4 +34,4 @@
type="text/javascript"
src="http://zor.livefyre.com/wjs/v1.0/javascripts/CommentCount.js">
</script>
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/moot_helper.tmpl
View file
Expand Up @@ -10,4 +10,4 @@

{% macro comment_link_script() %}
<script src="https://cdn.moot.it/1/moot.min.js"></script>
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/mustache-comment-form.tmpl
View file
Expand Up @@ -2,4 +2,4 @@
{% import 'comments_helper.tmpl' as comments with context %}
{% if not post.meta('nocomments') %}
{{ comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path) }}
{% endif %}
{% endif %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/post.tmpl
View file
Expand Up @@ -39,4 +39,4 @@
{% endif %}
{{ helper.mathjax_script(post) }}
</article>
{% endblock %}
{% endblock %}
8 changes: 4 additions & 4 deletions nikola/data/themes/base-jinja/templates/post_helper.tmpl
View file
Expand Up @@ -31,7 +31,7 @@
{% macro html_list_tags(post) %}
<span itemprop="keywords">
{% for tag in post.tags %}
<a class="tag p-category" href="{{ _link('tag', tag) }}"><span class="badge badge-info">{{ tag }}</span></a>
<a class="tag p-category" href="{{ _link('tag', tag) }}" rel="tag"><span class="badge badge-info">{{ tag }}</span></a>
{% endfor %}
</span>
{% endmacro %}
Expand All @@ -48,12 +48,12 @@
<ul class="pager">
{% if post.prev_post %}
<li class="previous">
<a href="{{ post.prev_post.permalink() }}" rel="prev">&larr; {{ messages("Previous post") }}</a>
<a href="{{ post.prev_post.permalink() }}" rel="prev" title="{{ post.prev_post.title() }}">{{ messages("Previous post") }}</a>
</li>
{% endif %}
{% if post.next_post %}
<li class="next">
<a href="{{ post.next_post.permalink() }}" rel="next">{{ messages("Next post") }} &rarr;</a>
<a href="{{ post.next_post.permalink() }}" rel="next" title="{{ post.next_post.title() }}">{{ messages("Next post") }}</a>
</li>
{% endif %}
</ul>
Expand Down Expand Up @@ -92,4 +92,4 @@
</script>
<script src="/assets/js/mathjax.js"></script>
{% endif %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/post_list_directive.tmpl
View file
Expand Up @@ -13,4 +13,4 @@
</ul>
{% endif %}
</div>
<!-- End post-list {{ post_list_id }} -->
<!-- End post-list {{ post_list_id }} -->
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/slides.tmpl
View file
Expand Up @@ -19,4 +19,4 @@
</div>
<a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev">&lsaquo;</a>
<a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next">&rsaquo;</a>
</div>
</div>
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/story.tmpl
View file
Expand Up @@ -13,4 +13,4 @@
{% if enable_comments and not post.meta('nocomments') %}
{{ comments.comment_form(post.permalink(absolute=True), post.title(), post.base_path) }}
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/tag.tmpl
View file
Expand Up @@ -31,4 +31,4 @@
{% endif %}
</div>
<!--End of body content-->
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/tagindex.tmpl
View file
@@ -1,2 +1,2 @@
{# -*- coding: utf-8 -*- #}
{% extends 'index.tmpl' %}
{% extends 'index.tmpl' %}
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/tags.tmpl
View file
Expand Up @@ -22,4 +22,4 @@
{% endfor %}
</ul>
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/engine
View file
@@ -1 +1 @@
jinja
jinja
4 changes: 2 additions & 2 deletions nikola/data/themes/bootstrap-jinja/templates/base.tmpl
View file
Expand Up @@ -51,7 +51,7 @@ lang="{{ lang }}">
<li>{{ base.html_translations() }}</li>
{% endif %}
{% endblock %}
{% if not hide_sourcelink %}
{% if show_sourcelink %}
<li>{% block sourcelink %}{% endblock %}</li>
{% endif %}
</ul>
Expand Down Expand Up @@ -91,4 +91,4 @@ lang="{{ lang }}">
{% endif %}
{{ body_end }}
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/bootstrap_helper.tmpl
View file
Expand Up @@ -96,4 +96,4 @@
{% endif %}
{% endif %}
{% endfor %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/gallery.tmpl
View file
Expand Up @@ -91,4 +91,4 @@ $("#gallery_container").flowr({
});
$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
</script>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap-jinja/templates/slides.tmpl
View file
Expand Up @@ -19,4 +19,4 @@
</div>
<a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev">&lsaquo;</a>
<a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next">&rsaquo;</a>
</div>
</div>
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/engine
View file
@@ -1 +1 @@
jinja
jinja
4 changes: 2 additions & 2 deletions nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
View file
Expand Up @@ -49,7 +49,7 @@ lang="{{ lang }}">
<li>{{ bootstrap.html_translations() }}</li>
{% endif %}
{% endblock %}
{% if not hide_sourcelink %}
{% if show_sourcelink %}
{% block sourcelink %}{% endblock %}
{% endif %}
</ul>
Expand Down Expand Up @@ -84,4 +84,4 @@ lang="{{ lang }}">
{% endif %}
{{ body_end }}
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/bootstrap_helper.tmpl
View file
Expand Up @@ -106,4 +106,4 @@
<li><a href="{{ _link("index", None, langname) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
{% endif %}
{% endfor %}
{% endmacro %}
{% endmacro %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/gallery.tmpl
View file
Expand Up @@ -91,4 +91,4 @@ $("#gallery_container").flowr({
});
$("a.image-reference").colorbox({rel:"gal", maxWidth:"100%",maxHeight:"100%",scalePhotos:true});
</script>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/list.tmpl
View file
Expand Up @@ -15,4 +15,4 @@
{% endif %}
</div>
<!--End of body content-->
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/list_post.tmpl
View file
Expand Up @@ -15,4 +15,4 @@
{% endif %}
</div>
<!--End of body content-->
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/listing.tmpl
View file
Expand Up @@ -16,4 +16,4 @@
{% if code %}
{{ code }}
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/post.tmpl
View file
Expand Up @@ -41,4 +41,4 @@
<a href="{{ post.source_link() }}" id="sourcelink">{{ messages("Source") }}</a>
</li>
{% endif %}
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/slides.tmpl
View file
Expand Up @@ -19,4 +19,4 @@
</div>
<a class="left carousel-control" href="#{{ carousel_id }}" data-slide="prev"><span class="icon-prev"></span></a>
<a class="right carousel-control" href="#{{ carousel_id }}" data-slide="next"><span class="icon-next"></span></a>
</div>
</div>
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/tags.tmpl
View file
Expand Up @@ -22,4 +22,4 @@
{% endfor %}
</ul>
{% endif %}
{% endblock %}
{% endblock %}
1 change: 1 addition & 0 deletions nikola/data/themes/bootstrap3/engine
View file
@@ -0,0 +1 @@
mako
16 changes: 13 additions & 3 deletions scripts/jinjify.py
View file
Expand Up @@ -47,7 +47,7 @@ def jinjify(in_theme, out_theme):
data = '\n'.join(lines)

with codecs.open(out_template, "wb+", "utf-8") as outf:
outf.write(data)
outf.write(data + '\n')

# Syntax check output
source, filename = lookup.loader.get_source(lookup, os.path.basename(template))[:2]
Expand All @@ -57,11 +57,21 @@ def jinjify(in_theme, out_theme):
error("Syntax error in {0}:{1}".format(out_template, e.lineno))

parent = os.path.basename(in_theme.rstrip('/'))
child = os.path.basename(out_theme.rstrip('/'))
mappings = {
'base-jinja': 'base',
'bootstrap-jinja': 'base-jinja',
'bootstrap3-jinja': 'bootstrap-jinja',
}

if child in mappings:
parent = mappings[child]

with open(os.path.join(out_theme, "parent"), "wb+") as outf:
outf.write(parent)
outf.write(parent + '\n')

with open(os.path.join(out_theme, "engine"), "wb+") as outf:
outf.write("jinja")
outf.write("jinja\n")

# Copy assets
#shutil.rmtree(os.path.join(out_theme, "assets"))
Expand Down

0 comments on commit 94ff2ec

Please sign in to comment.