Skip to content
Snippets Groups Projects
Commit c2fec699 authored by Julian Rother's avatar Julian Rother
Browse files

Fixed alert layout and moved page border in base template

parent 478c5c74
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
templates/base.html
+ 17
− 7
View file @ c2fec699
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
] -%} ] -%}
{% set active_page = active_page|default('none') -%} {% set active_page = active_page|default('none') -%}
{% set page_border = page_border|default(1) -%}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -94,13 +96,21 @@ ...@@ -94,13 +96,21 @@
</div> </div>
</nav> </nav>
<div class="container-fluid"> <div class="container-fluid">
<div class="row">
{% if page_border == 0 %}
<div class="col-xs-12">
{% else %}
<div class="col-xs-12 col-md-offset-{{ page_border }} col-md-{{ 12-(2*page_border) }}">
{% endif %}
{% for msg in get_flashed_messages() %} {% for msg in get_flashed_messages() %}
<div class="row"><div class="alert alert-danger col-xs-12" role="alert">{{ msg }}</div></div> <div class="alert alert-danger" role="alert">{{ msg }}</div>
{% endfor %} {% endfor %}
{% block content %} {% block content %}
<h1>This is a Heading</h1> <h1>This is a Heading</h1>
<p>This is a paragraph.</p> <p>This is a paragraph.</p>
{% endblock %} {% endblock %}
</div> </div>
</div>
</div>
</body> </body>
</html> </html>
templates/course.html
+ 8
− 10
View file @ c2fec699
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1 class="panel-title">Veranstaltungen</h1> <h1 class="panel-title">Veranstaltungen</h1>
...@@ -13,5 +12,4 @@ ...@@ -13,5 +12,4 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div>
{% endblock %} {% endblock %}
templates/faq.html
+ 40
− 44
View file @ c2fec699
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% set active_page = "faq" %} {% set active_page = "faq" %}
{% block content %} {% block content %}
<div class="row">
<div class="col-xs-10 col-xs-offset-1">
<div class="alert alert-warning alert-dismissible" role="alert" id="kontakt"> <div class="alert alert-warning alert-dismissible" role="alert" id="kontakt">
Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit. Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit.
</div> </div>
...@@ -52,8 +50,6 @@ ...@@ -52,8 +50,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<style> <style>
.faqHeader { .faqHeader {
......
templates/index.html
+ 1
− 0
View file @ c2fec699
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% set active_page = "index" %} {% set active_page = "index" %}
{% set page_border = 0 %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-md-6 panel-group"> <div class="col-md-6 panel-group">
......
templates/login.html
+ 13
− 17
View file @ c2fec699
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="row">
<div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1 class="panel-title">Login für Moderatoren</h1> <h1 class="panel-title">Login für Moderatoren</h1>
...@@ -17,6 +15,4 @@ ...@@ -17,6 +15,4 @@
</form> </form>
</div> </div>
</div> </div>
</div>
</div>
{% endblock %} {% endblock %}
templates/search.html
+ 26
− 28
View file @ c2fec699
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="col-xs-offset-1 col-xs-10">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1 class="panel-title">Veranstaltungen</h1> <h1 class="panel-title">Veranstaltungen</h1>
...@@ -33,5 +32,4 @@ ...@@ -33,5 +32,4 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
templates/videos.html
+ 28
− 30
View file @ c2fec699
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="row"><div class="col-xs-offset-1 col-xs-10">
<div class="row"> <div class="row">
<div class="col-xs-12 dropdown" style="margin-bottom: 10px;"> <div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
<button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung <button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung
...@@ -33,6 +32,5 @@ ...@@ -33,6 +32,5 @@
</div></div> </div></div>
</div> </div>
{% endfor %} {% endfor %}
</div></div>
{% endblock %} {% endblock %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment