Skip to content
Permalink
Browse files

Merge branch 'master' into start-1782

  • Loading branch information...
Kwpolska committed Jun 4, 2015
2 parents ab8765e + 5fd5478 commit c13b6bc3dff7b0cf65471e1050a1fb06ccb18631
@@ -7,7 +7,7 @@
{% for link, text in crumbs %}
{% if text != index_file %}
{% if link == '#' %}
<li>{{ text }}</li>
<li>{{ text.rsplit('.html', 1)[0] }}</li>
{% else %}
<li><a href="{{ link }}">{{ text }}</a></li>
{% endif %}
@@ -7,7 +7,7 @@
% for link, text in crumbs:
% if text != index_file:
% if link == '#':
<li>${text}</li>
<li>${text.rsplit('.html', 1)[0]}</li>
% else:
<li><a href="${link}">${text}</a></li>
% endif
@@ -124,18 +124,18 @@ def _find_gallery_path(self, name):
def gallery_path(self, name, lang):
gallery_path = self._find_gallery_path(name)
return [_f for _f in [self.site.config['TRANSLATIONS'][lang]] +
list(os.path.split(gallery_path)) +
gallery_path.split(os.sep) +
[self.site.config['INDEX_FILE']] if _f]

def gallery_global_path(self, name, lang):
gallery_path = self._find_gallery_path(name)
return [_f for _f in list(os.path.split(gallery_path)) +
return [_f for _f in gallery_path.split(os.sep) +
[self.site.config['INDEX_FILE']] if _f]

def gallery_rss_path(self, name, lang):
gallery_path = self._find_gallery_path(name)
return [_f for _f in [self.site.config['TRANSLATIONS'][lang]] +
list(os.path.split(gallery_path)) +
gallery_path.split(os.sep) +
['rss.xml'] if _f]

def gen_tasks(self):
@@ -256,7 +256,7 @@ def listing_path(self, namep, lang):
else:
utils.LOGGER.error("Unknown listing name {0}!".format(namep))
sys.exit(1)
if not name.endswith('/' + self.site.config["INDEX_FILE"]):
if not name.endswith(os.sep + self.site.config["INDEX_FILE"]):
name += '.html'
path_parts = list(os.path.split(name))
path_parts = name.split(os.sep)
return [_f for _f in path_parts if _f]
@@ -5,3 +5,4 @@ pytest==2.7.1
pytest-cov==1.8.1
freezegun==0.3.3
python-coveralls==2.5.0
colorama==0.3.3
@@ -78,7 +78,7 @@ def jinjify(in_theme, out_theme):
parent = mappings[child]

with io.open(os.path.join(out_theme, "parent"), "w+", encoding='utf-8') as outf:
outf.write(unicode(parent) + u'\n')
outf.write(u'{0}\n'.format(parent))

with io.open(os.path.join(out_theme, "engine"), "w+", encoding='utf-8') as outf:
outf.write(u"jinja\n")

0 comments on commit c13b6bc

Please sign in to comment.
You can’t perform that action at this time.