diff --git a/templates/base.html b/templates/base.html index cf1702f035702d7ad83bed1a1fbccde59853600a..e219bb4cad45a76e33e1fe46a23cac03939a8a6e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,5 @@ {% load i18n %} +<<<<<<< HEAD {% load staticfiles %} @@ -96,53 +97,105 @@
  • {% trans "Dashboard" %}
  • -
  • - {% trans "Rules" %} + + {% if user.is_authenticated %} +
  • + {% else %}
  • - {% trans "Add Rule" %} + + {% trans "Shibboleth Login" %} +
  • - {% if perms.accounts.overview %}
  • - {% trans "Overview" %} -
  • {% endif %} - {% if user.is_superuser %} -
  • {% trans "Admin" %} -
  • - {% endif %} - {% if user.get_profile.peer %} -
  • - {% trans "My profile" %} -
  • - {% endif %} + {% endif %} + - + + + + {% block sidenav %} + + + {% endblock %} +
    + {% if messages %} +
    +
    +
    + {% for message in messages %} +
    + + {{ message }}
    +
    + {% endfor %} +
    +
    +
    + {% endif %} + + {% block contentplaceholder %} + {% endblock %}
    - {% endif %} - - - - {% endblock %} -
    - - {% if messages %} -
    -
    -
    - {% for message in messages %} -
    - - {{ message }}
    - {% endfor %} -
    -
    -
    - {% endif %} - - {% block contentplaceholder %} - {% endblock %} +
    -
    {% block footerblock %} @@ -175,5 +228,4 @@ - diff --git a/templates/flatpages/default.html b/templates/flatpages/default.html index ce8fa5d9a3efd5a5a8eaa14f0eac6133471735e4..644e35e0f1262a2a57a858796f920184efe71dd7 100644 --- a/templates/flatpages/default.html +++ b/templates/flatpages/default.html @@ -1,7 +1,9 @@ {% extends "base.html" %} -{% block sidenav %}{% endblock %} {% load i18n %} - {% block title %}{{ flatpage.title }}{% endblock %} + +{% block sidenav %}{% endblock %} +{% block title %}{{ flatpage.title }}{% endblock %} + {% block extraheadbottom %} {% endblock %} - {% block pagejsbottom %} - - {% endblock %} - - {% block extrahead %} - - - {% endblock %} - {% block contentplaceholder %} +{% block extrahead %} + + +{% endblock %} -
    +{% block contentplaceholder %} +
    +
    +
    +

    {{ flatpage.title }}

    +
    + +
    -
    -

    {{ flatpage.title }}

    +
    +
    +
    + {{ flatpage.title }} +
    + +
    + {{ flatpage.content|linebreaks }}
    - -
    - - - -
    -
    -
    -
    - {{ flatpage.title }} -
    - -
    - - {{ flatpage.content|linebreaks }} -
    -
    -
    -
    - - - {% endblock %} - +
    +
    +
    +{% endblock %}