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 %} <!DOCTYPE html> <html> @@ -96,53 +97,105 @@ <li> <a href="{% url dashboard %}"><i class="fa fa-dashboard fa-fw"></i> {% trans "Dashboard" %}</a> </li> - <li> - <a href="{% url group-routes %}"><i class="fa fa-shield fa-fw"></i> {% trans "Rules" %}</a> + <!-- /.dropdown --> + {% if user.is_authenticated %} + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="fa fa-user fa-fw"></i> + <i class="fa fa-caret-down"></i> + </a> + <ul class="dropdown-menu dropdown-user" role="menu" > + <li role="presentation" class="dropdown-header">{{user}}</li> + <li class="divider"></li> + {% if user.get_profile.peer %} + <li> + <a href="{% url user-profile %}"><i class="fa fa-user fa-fw"></i>{% trans "My profile" %}</a> + </li> + {% endif %} + {% if user.is_superuser %} + <li class="divider"></li> + <li> + <a href="{% url admin:index %}"> + <i class="fa fa-cogs"></i> + {% trans "Admin" %} + </a> + </li> + {% endif %} + <li class="divider"></li> + <li> + <a href="{% url logout %}"><i class="fa fa-sign-out fa-fw"></i> {% trans "Logout" %}</a> + </li> + </ul> + <!-- /.dropdown-user --> </li> + {% else %} <li> - <a href="{% url add-route %}"><i class="fa fa-plus-circle fa-fw"></i> {% trans "Add Rule" %}</a> + <a href="{% url login %}"> + {% trans "Shibboleth Login" %} + </a> </li> - {% if perms.accounts.overview %}<li> - <a href="{% url overview %}"><i class="fa fa-desktop fa-fw"></i> {% trans "Overview" %}</a> - </li>{% endif %} - {% if user.is_superuser %} - <li><a href="{% url admin:index %}"><i class="fa fa-cogs fa-fw"></i> {% trans "Admin" %}</a> - </li> - {% endif %} - {% if user.get_profile.peer %} - <li> - <a href="{% url user-profile %}"><i class="fa fa-user fa-fw"></i> {% trans "My profile" %}</a> - </li> - {% endif %} + {% endif %} + <!-- /.dropdown --> </ul> - <!-- /#side-menu --> + <!-- /.navbar-top-links --> + </nav> + <!-- /.navbar-static-top --> + {% block sidenav %} + <nav class="navbar-default navbar-static-side" role="navigation"> + {% if user.is_authenticated %} + <div class="sidebar-collapse"> + <ul class="nav" id="side-menu"> + <li> + <a href="{% url dashboard %}"><i class="fa fa-dashboard fa-fw"></i> {% trans "Dashboard" %}</a> + </li> + <li> + <a href="{% url group-routes %}"><i class="fa fa-shield fa-fw"></i> {% trans "Rules" %}</a> + </li> + <li> + <a href="{% url add-route %}"><i class="fa fa-plus-circle fa-fw"></i> {% trans "Add Rule" %}</a> + </li> + {% if perms.accounts.overview %}<li> + <a href="{% url overview %}"><i class="fa fa-desktop fa-fw"></i> {% trans "Overview" %}</a> + </li>{% endif %} + {% if user.is_superuser %} + <li><a href="{% url admin:index %}"><i class="fa fa-cogs fa-fw"></i> {% trans "Admin" %}</a> + </li> + {% endif %} + {% if user.get_profile.peer %} + <li> + <a href="{% url user-profile %}"><i class="fa fa-user fa-fw"></i> {% trans "My profile" %}</a> + </li> + {% endif %} + </ul> + <!-- /#side-menu --> + </div> + {% endif %} + <!-- /.sidebar-collapse --> + </nav> + <!-- /.navbar-static-side --> + {% endblock %} + <div id="page-wrapper"> + {% if messages %} + <div class="row"> + <div class="lg-col-12"> + <div id="messages"> + {% for message in messages %} + <div {% if message.tags %} class="alert alert-{{ message.tags }} alert-dismissable"{% endif %}> + <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> + <span>{{ message }}</span><br/> + </div> + {% endfor %} + </div> + </div> + </div> + {% endif %} + + {% block contentplaceholder %} + {% endblock %} </div> - {% endif %} - <!-- /.sidebar-collapse --> - </nav> - <!-- /.navbar-static-side --> - {% endblock %} - <div id="page-wrapper"> - - {% if messages %} - <div class="row"> - <div class="lg-col-12"> - <div id="messages"> - {% for message in messages %} - <div {% if message.tags %} class="alert alert-{{ message.tags }} alert-dismissable"{% endif %}> - <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> - {{ message }}</span><br /> - {% endfor %} - </div> - </div> - </div> - {% endif %} - - {% block contentplaceholder %} - {% endblock %} + <!-- /#page-wrapper --> </div> <!-- /#page-wrapper --> - </div> <!-- /#wrapper --> {% block footerblock %} @@ -175,5 +228,4 @@ </script> </body> - </html> 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 %} <style> @media (min-width: 768px) { @@ -12,60 +14,50 @@ } </style> {% endblock %} - {% block pagejsbottom %} - <script type="text/javascript"> - - function setlang(lang) { - $("#langsel").val(lang); - var form = $("#langform"); - $.ajax({ - url: form.attr('action'), - data: form.serialize(), - type: "POST", - cache: false, - success:function(data){ - window.location.href=location.href + "../" + lang + "/"; - } - }); - } +{% block pagejsbottom %} +<script type="text/javascript"> + function setlang(lang) { + $("#langsel").val(lang); + var form = $("#langform"); + $.ajax({ + url: form.attr('action'), + data: form.serialize(), + type: "POST", + cache: false, + success:function(data){ + window.location.href=location.href + "../" + lang + "/"; + } + }); + } </script> - {% endblock %} - - {% block extrahead %} - <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> - <META HTTP-EQUIV="Expires" CONTENT="-1"> - {% endblock %} - {% block contentplaceholder %} +{% block extrahead %} +<META HTTP-EQUIV="Pragma" CONTENT="no-cache"> +<META HTTP-EQUIV="Expires" CONTENT="-1"> +{% endblock %} - <div class="container"> +{% block contentplaceholder %} +<div class="container"> + <div class="row"> + <div class="col-lg-12"> + <h1 class="page-header">{{ flatpage.title }}</h1> + </div> + <!-- /.col-lg-12 --> + </div> <div class="row"> - <div class="col-lg-12"> - <h1 class="page-header">{{ flatpage.title }}</h1> + <div class="col-lg-8"> + <div class="panel panel-primary"> + <div class="panel-heading"> + <i class="fa fa-info fa-fw"></i> {{ flatpage.title }} + </div> + <!-- /.panel-heading --> + <div class="panel-body"> + {{ flatpage.content|linebreaks }} </div> - <!-- /.col-lg-12 --> - </div> - - - -<div class="row"> - <div class="col-lg-8"> - <div class="panel panel-primary"> - <div class="panel-heading"> - <i class="fa fa-info fa-fw"></i> {{ flatpage.title }} - </div> - <!-- /.panel-heading --> - <div class="panel-body"> - - {{ flatpage.content|linebreaks }} - </div> - </div> - </div> </div> - </div> - - - {% endblock %} - + </div> + </div> +</div> +{% endblock %}