Merge pull request #1767 from ingwinlu/rm_PAGES

Remove PAGES; use pages instead
This commit is contained in:
Justin Mayer 2015-08-02 08:59:08 -07:00
commit ed71ad0d3a
5 changed files with 17 additions and 3 deletions

View file

@ -644,7 +644,6 @@ class PagesGenerator(CachingGenerator):
process_translations(hidden_pages))
self._update_context(('pages', 'hidden_pages'))
self.context['PAGES'] = self.pages
self.save_cache()
self.readers.save_cache()

View file

@ -25,7 +25,7 @@
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU -%}
{% for pg in PAGES %}
{% for pg in pages %}
<li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
{% endfor %}
{% endif %}

View file

@ -40,7 +40,7 @@
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in PAGES %}
{% for p in pages %}
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% else %}