Merge branch 'ticket-testing' into 'master'

Update sitetree to allow multi-level menus

See merge request LCA2018/symposion_app!31

make_dev_container.sh

@@ -11,7 +11,13 @@ docker exec symposion ./manage.py migrate
 docker exec symposion ./manage.py loaddata ./fixtures/*.json
 docker exec symposion ./manage.py populate_inventory
 docker exec symposion ./manage.py create_review_permissions
+if [ -e ./symposion-fixtures ]; then
+    pushd ./symposion-fixtures
+    ./load_data_local.sh
+    popd
+else
     docker exec -it symposion ./manage.py createsuperuser --username root --email root@example.com
+fi
 
 set +x
 echo "Now you can log into http://localhost:28000/admin"

pinaxcon/templates/content_page.html

@@ -20,7 +20,3 @@
     </div>
   {% endblock %}
 {% endblock %}
-
-{% block extra_script %}
-  <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
-{% endblock %}

pinaxcon/templates/sitetree_header.html

@@ -17,8 +17,14 @@
         <div id="navbar" class="navbar-collapse collapse">
         <ul class="nav navbar-nav">
       {% endif %}
-      <li class="{% if item.is_current or item.in_current_branch %}active{% endif %}">
+      <li class="{% if item.has_children %}dropdown{% endif %} {% if item.is_current or item.in_current_branch %}active{% endif %}">
-        <a href="{% sitetree_url for item %}">{{ item.title_resolved }}</a>
+        <a href="{% if item.has_children %}#{% else %}{% sitetree_url for item %}{% endif %}" {% if item.has_children %}class="dropdown-toggle" data-toggle="dropdown"{% endif %}>
+          {{ item.title_resolved }}
+          {% if item.has_children %}<b class="caret"></b>{% endif %}
+        </a>
+        {% if item.has_children %}
+        {% sitetree_children of item for menu template "sitetree/menu_bootstrap3_dropdown.html" %}
+        {% endif %}
       </li>
     {% endif %}
   {% endfor %}