little layout fixing
This commit is contained in:
parent
5a0304242b
commit
6ca65366d7
@ -55,12 +55,7 @@
|
||||
|
||||
#menu-button {
|
||||
text-align: center;
|
||||
margin-top: 12px;;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#menu-button i {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -21,55 +21,56 @@
|
||||
<body>
|
||||
|
||||
{% block body %}
|
||||
<div class="row">
|
||||
<div class="col-2 text-center">
|
||||
{% if request.user.is_authenticated() %}
|
||||
<a href="{{ url('logout') }}"><i class="fa fa-user" aria-hidden="true"></i></a>
|
||||
{% else %}
|
||||
<a href="{{ url('login') }}"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-8">
|
||||
{% block headline %}{% endblock %}</div>
|
||||
<div class="col-2">
|
||||
<div id="menu-button"><i class="fa fa-bars" aria-hidden="true"></i>
|
||||
{{ nav.main_nav() }}
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-2 text-center m-auto">
|
||||
{% if request.user.is_authenticated() %}
|
||||
<a href="{{ url('logout') }}"><i class="fa fa-user" aria-hidden="true"></i></a>
|
||||
{% else %}
|
||||
<a href="{{ url('login') }}"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-8 pt-2">
|
||||
{% block headline %}{% endblock %}</div>
|
||||
<div class="col-2 text-center m-auto">
|
||||
<div id="menu-button"><i class="fa fa-bars" aria-hidden="true"></i>
|
||||
{{ nav.main_nav() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% block bottom_nav %}{% endblock %}
|
||||
<div class="container-fluid bg-dark text-white">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
|
||||
{% block test %}
|
||||
<div class="text-center bg-warning pb-2" style="font-size: 12px !important;">
|
||||
<p>Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken.
|
||||
Wir garantieren weder die Vollständigkeit, noch
|
||||
die Korrektheit der dargestellten Daten.</p>
|
||||
<div class="row">{% block bottom_nav %}{% endblock %}</div>
|
||||
<div class="test row bg-dark text-white">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block footer %}
|
||||
<footer>
|
||||
<div class="container-fluid bg-dark text-white">
|
||||
<div class="row pt-2 text-center">
|
||||
<div class="col">
|
||||
<p class="text-right"><a href="{{ url('impressum') }}#bug-report">Bug Report</a></p>
|
||||
{% block test %}
|
||||
<div class="row text-center bg-warning pb-2 pl-3 pr-3" style="font-size: 12px !important;">
|
||||
<div class="col-12 text-center">
|
||||
Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken.
|
||||
Wir garantieren weder die Vollständigkeit, noch
|
||||
die Korrektheit der dargestellten Daten.
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block footer %}
|
||||
<footer>
|
||||
<div class="row bg-dark text-white">
|
||||
<div class="col-6">
|
||||
<p class="text-right mb-0"><a href="{{ url('impressum') }}#bug-report">Bug Report</a></p>
|
||||
</div>
|
||||
<div class="col">
|
||||
<p class="text-left"><a href="{{ url('impressum') }}">Impressum</a></p>
|
||||
<div class="col-6">
|
||||
<p class="text-left mb-0"><a href="{{ url('impressum') }}">Impressum</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row text-center">
|
||||
<div class="row text-center bg-dark text-white pb-2">
|
||||
<div class="col">
|
||||
© Copyright 2017, Michael Götz
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
{% endblock %}
|
||||
</footer>
|
||||
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<p class="text-center">Day: {{ day.strftime("%d.%m.%Y") }}</p>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
{{ macros.day_menu(title='Feki', location_menu=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.', css_id="feki") }}
|
||||
{{ macros.day_menu(title='Austraße', location_menu=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.', css_id="austr") }}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
{% endblock %}
|
||||
{% block bottom_nav %}
|
||||
<nav id="food-nav" class="navbar navbar-default bg-light">
|
||||
<div class="container">
|
||||
<div class="container-fluid">
|
||||
<a class="nav-link" href="{{ url('daily-food') }}"> Daily </a>
|
||||
<a class="nav-link" href="{{ url('weekly-food') }}"> Weekly </a>
|
||||
</div>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<p class="text-center">Week: {{ day.strftime("%d.%m.%Y") }} - {{ lastday.strftime("%d.%m.%Y") }}</p>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
{{ macros.week_menu(title='Feki', location_menus=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
|
||||
{{ macros.week_menu(title='Austraße', location_menus=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
{% import '/macros/overview_pages.jinja' as macros %}
|
||||
{% block headline %}
|
||||
<header class="">
|
||||
<h1 class="text-center" style="font-size: 20px">BaStA</h1>
|
||||
<h1 class="text-center mb-0" style="font-size: 20px">BaStA</h1>
|
||||
<p class="text-center">Bamberger Studierenden App</p>
|
||||
</header>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="container text-dark">
|
||||
<div class="row">
|
||||
<div class="container">
|
||||
<div class="row text-dark">
|
||||
{{ macros.home_item_with_icon(icon='fa-cutlery', url_id='daily-food', title='Food') }}
|
||||
{{ macros.home_item_with_icon(icon='fa-calendar-o', url_id='day-events', title='Events') }}
|
||||
{{ macros.home_item_with_icon(icon='fa-compass', url_id='donar', title='Nav') }}
|
||||
|
||||
@ -82,9 +82,9 @@
|
||||
<div class="col-sm-12 col-md-5 col-lg-5 col-xl-5">{{ happy_hour.description }}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<p>Leider gibt es heute keine Happy Hours :(</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
@ -3,29 +3,27 @@
|
||||
{% block headline %}<h3 class="text-center">BaStA Login</h3>{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="col-12 text-center p-3 bg-light text-dark">
|
||||
<h3>Login</h3>
|
||||
<form method="post" action="{{ url('login') }}">
|
||||
{% csrf_token %}
|
||||
{% if form.errors %}
|
||||
<div class="message is-danger">
|
||||
<div class="message-body">
|
||||
Your username and password didn't match. Please try again.
|
||||
</div>
|
||||
<div class="col-12 text-center p-3 bg-light text-dark">
|
||||
<h3>Login</h3>
|
||||
<form method="post" action="{{ url('login') }}">
|
||||
{% csrf_token %}
|
||||
{% if form.errors %}
|
||||
<div class="message is-danger">
|
||||
<div class="message-body">
|
||||
Your username and password didn't match. Please try again.
|
||||
</div>
|
||||
{% endif %}
|
||||
<label for="id_username" class="label">Username:</label>
|
||||
<p class="control">
|
||||
<input id="id_username" class="input" maxlength="254" name="username" type="text">
|
||||
</p>
|
||||
<label for="id_password" class="label">Password:</label>
|
||||
<p class="control">
|
||||
<input id="id_password" class="input" name="password" type="password">
|
||||
</p>
|
||||
<input type="submit" class="button is-pulled-right" value="Login"/>
|
||||
<input type="hidden" name="next" value="{{ next }}"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<label for="id_username" class="label">Username:</label>
|
||||
<p class="control">
|
||||
<input id="id_username" class="input" maxlength="254" name="username" type="text">
|
||||
</p>
|
||||
<label for="id_password" class="label">Password:</label>
|
||||
<p class="control">
|
||||
<input id="id_password" class="input" name="password" type="password">
|
||||
</p>
|
||||
<input type="submit" class="button is-pulled-right" value="Login"/>
|
||||
<input type="hidden" name="next" value="{{ next }}"/>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user