Commit a291bde0 authored by Stavros Kroustouris's avatar Stavros Kroustouris

reindent lines and tidy up

parent 7abe7098
{% load i18n %}
<<<<<<< HEAD
{% load staticfiles %}
<!DOCTYPE html>
<html>
......@@ -87,6 +88,57 @@
<!-- /.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>
<!-- /.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 login %}">
{% trans "Shibboleth Login" %}
</a>
</li>
{% endif %}
<!-- /.dropdown -->
</ul>
<!-- /.navbar-top-links -->
</nav>
<!-- /.navbar-static-top -->
{% block sidenav %}
<nav class="navbar-default navbar-static-side" role="navigation">
......@@ -123,7 +175,6 @@
<!-- /.navbar-static-side -->
{% endblock %}
<div id="page-wrapper">
{% if messages %}
<div class="row">
<div class="lg-col-12">
......@@ -131,7 +182,8 @@
{% 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">&times;</button>
{{ message }}</span><br />
<span>{{ message }}</span><br/>
</div>
{% endfor %}
</div>
</div>
......@@ -142,7 +194,8 @@
{% endblock %}
</div>
<!-- /#page-wrapper -->
</div>
<!-- /#page-wrapper -->
</div>
<!-- /#wrapper -->
{% block footerblock %}
......@@ -175,5 +228,4 @@
</script>
</body>
</html>
{% 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,9 +14,9 @@
}
</style>
{% endblock %}
{% block pagejsbottom %}
<script type="text/javascript">
{% block pagejsbottom %}
<script type="text/javascript">
function setlang(lang) {
$("#langsel").val(lang);
var form = $("#langform");
......@@ -27,30 +29,24 @@
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="row">
<div class="col-lg-8">
<div class="panel panel-primary">
<div class="panel-heading">
......@@ -58,14 +54,10 @@
</div>
<!-- /.panel-heading -->
<div class="panel-body">
{{ flatpage.content|linebreaks }}
</div>
</div>
</div>
</div>
</div>
{% endblock %}
</div>
{% endblock %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment