Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18

website/scripts/setup_pelican.sh

@@ -4,5 +4,6 @@
 
 /remote/python/2.7.9/bin/virtualenv ./
 source bin/activate
+pip install --upgrade pip
 pip install pelican
 pip install Markdown

website/themes/notmyidea/templates/base.html

@@ -27,7 +27,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 %}