Merge branch 'master' into federate

This commit is contained in:
Valentin Samir
2016-06-21 18:04:17 +02:00
2 changed files with 17 additions and 12 deletions

View File

@ -14,23 +14,21 @@
<div class="container">
{% if auto_submit %}<noscript>{% endif %}
<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<h1 id="app-name">
{% if settings.CAS_LOGO_URL %}<img src="{{settings.CAS_LOGO_URL}}"></img> {% endif %}
{% trans "Central Authentication Service" %}</h1>
</div>
<div class="col-md-2"></div>
</div>
{% if auto_submit %}</noscript>{% endif %}
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6">
<div class="col-lg-3 col-md-3 col-sm-2 col-xs-12"></div>
<div class="col-lg-6 col-md-6 col-sm-8 col-xs-12">
{% bootstrap_messages %}
{% block content %}
{% endblock %}
</div>
<div class="col-md-3"></div>
<div class="col-lg-3 col-md-3 col-sm-2 col-xs-0"></div>
</div>
</div> <!-- /container -->
{% endblock %}