Files @ b06daba446a6
Branch filter:

Location: symposion_app/symposion/templates/site_base.html

Luke Hatcher
Merge branch 'master' into cms-features

* master:
added BSD license
Update master
use django-forms-bootstrap
fixed account links on homepage
fixed staticfiles settings
removed homepage use of ifsetting_tag
updated urls
updated templates
updated imports to reflect new layout
updated imports to reflect new layout
updated settings
updated manage.py
updated requirements to 1.4 / DUA and latest versions
updated project layout for 1.4 (without content changes)

Conflicts:
requirements/base.txt
symposion/settings.py
symposion_project/urls.py
{% extends "theme_base.html" %}

{% load metron_tags %}
{% load i18n %}
{% load sitetree %}

{% block extra_head_base %}
    {% block extra_head %}{% endblock %}
{% endblock %}

{% block nav %}
    {% sitetree_menu from "root" include "trunk" %}
{% endblock %}

{% block footer %}
    {% include "_footer.html" %}
{% endblock %}

{% block extra_script %}
    {% analytics %}
    {% block extra_body %}{% endblock %}
{% endblock %}