Fixed alert layout and moved page border in base template

c2fec699 · Julian Rother · 478c5c74 · c2fec699 · c2fec699 · c2fec699
Commit c2fec699 authored 8 years ago by Julian Rother
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,6 +5,8 @@
 ] -%}
 {% set active_page = active_page|default('none') -%}

+{% set page_border = page_border|default(1) -%}
+
 <!DOCTYPE html>
 <html>
 	<head>
@@ -94,13 +96,21 @@
 			</div>
 		</nav>
 		<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() %}
-				<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 %}
 					{% block content %}
 					<h1>This is a Heading</h1>
 					<p>This is a paragraph.</p>
 					{% endblock %}
 				</div>
+			</div>
+		</div>
 	</body>
 </html>
--- a/templates/course.html
+++ b/templates/course.html
@@ -2,7 +2,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="col-xs-offset-1 col-xs-10">
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h1 class="panel-title">Veranstaltungen</h1>
@@ -13,5 +12,4 @@
 		{% endfor %}
 	</ul>
 </div>
-</div>
 {% endblock %}
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -2,8 +2,6 @@
 {% extends "base.html" %}
 {% set active_page = "faq" %}
 {% 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">
 	Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit.
 </div>
@@ -52,8 +50,6 @@
 		</div>
 	</div>
 </div>
-	</div>
-</div>

 <style>
 .faqHeader {

--- a/templates/index.html
+++ b/templates/index.html
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% set active_page = "index" %}
+{% set page_border = 0 %}
 {% block content %}
 <div class="row">
 	<div class="col-md-6 panel-group">

--- a/templates/login.html
+++ b/templates/login.html
 {% extends "base.html" %}
 {% block content %}
-<div class="row">
-	<div class="col-xs-offset-1 col-xs-10">
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h1 class="panel-title">Login für Moderatoren</h1>
@@ -17,6 +15,4 @@
 		</form>
 	</div>
 </div>
-	</div>
-</div>
 {% endblock %}
--- a/templates/search.html
+++ b/templates/search.html
@@ -2,7 +2,6 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="col-xs-offset-1 col-xs-10">
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h1 class="panel-title">Veranstaltungen</h1>
@@ -33,5 +32,4 @@
 		{% endif %}
 	</div>
 </div>
-</div>
 {% endblock %}
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -3,7 +3,6 @@

 {% extends "base.html" %}
 {% block content %}
-<div class="row"><div class="col-xs-offset-1 col-xs-10">
 <div class="row">
 	<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
@@ -33,6 +32,5 @@
 	</div></div>
 </div>
 {% endfor %}
-</div></div>

 {% endblock %}