mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

little layout fixing

Browse Source
This commit is contained in:
Götz 2017-10-29 00:21:08 +02:00
parent 5a0304242b
commit 6ca65366d7
8 changed files with 67 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ofu_app/static/css/nav.css
View File

@ -55,12 +55,7 @@
#menu-button { #menu-button {
text-align: center; text-align: center;
margin-top: 12px;;
height: 100%; height: 100%;
} }
#menu-button i {
}

37
ofu_app/templates/base.jinja
View File

@ -21,55 +21,56 @@
<body> <body>
{% block body %} {% block body %}
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-2 text-center"> <div class="col-2 text-center m-auto">
{% if request.user.is_authenticated() %} {% if request.user.is_authenticated() %}
<a href="{{ url('logout') }}"><i class="fa fa-user" aria-hidden="true"></i></a> <a href="{{ url('logout') }}"><i class="fa fa-user" aria-hidden="true"></i></a>
{% else %} {% else %}
<a href="{{ url('login') }}"><i class="fa fa-sign-in" aria-hidden="true"></i></a> <a href="{{ url('login') }}"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
{% endif %} {% endif %}
</div> </div>
<div class="col-8"> <div class="col-8 pt-2">
{% block headline %}{% endblock %}</div> {% block headline %}{% endblock %}</div>
<div class="col-2"> <div class="col-2 text-center m-auto">
<div id="menu-button"><i class="fa fa-bars" aria-hidden="true"></i> <div id="menu-button"><i class="fa fa-bars" aria-hidden="true"></i>
{{ nav.main_nav() }} {{ nav.main_nav() }}
</div> </div>
</div> </div>
</div> </div>
{% block bottom_nav %}{% endblock %} <div class="row">{% block bottom_nav %}{% endblock %}</div>
<div class="container-fluid bg-dark text-white"> <div class="test row bg-dark text-white">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% block test %} {% block test %}
<div class="text-center bg-warning pb-2" style="font-size: 12px !important;"> <div class="row text-center bg-warning pb-2 pl-3 pr-3" style="font-size: 12px !important;">
<p>Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken. <div class="col-12 text-center">
Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken.
Wir garantieren weder die Vollständigkeit, noch Wir garantieren weder die Vollständigkeit, noch
die Korrektheit der dargestellten Daten.</p> die Korrektheit der dargestellten Daten.
</div>
</div> </div>
{% endblock %} {% endblock %}
{% block footer %} {% block footer %}
<footer> <footer>
<div class="container-fluid bg-dark text-white"> <div class="row bg-dark text-white">
<div class="row pt-2 text-center"> <div class="col-6">
<div class="col"> <p class="text-right mb-0"><a href="{{ url('impressum') }}#bug-report">Bug Report</a></p>
<p class="text-right"><a href="{{ url('impressum') }}#bug-report">Bug Report</a></p>
</div> </div>
<div class="col"> <div class="col-6">
<p class="text-left"><a href="{{ url('impressum') }}">Impressum</a></p> <p class="text-left mb-0"><a href="{{ url('impressum') }}">Impressum</a></p>
</div> </div>
</div> </div>
<div class="row text-center"> <div class="row text-center bg-dark text-white pb-2">
<div class="col"> <div class="col">
© Copyright 2017, Michael Götz © Copyright 2017, Michael Götz
</p>
</div>
</div> </div>
</div> </div>
</footer> </footer>
{% endblock %} {% endblock %}
</div>
{% endblock %} {% endblock %}
<!-- Optional JavaScript --> <!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS --> <!-- jQuery first, then Popper.js, then Bootstrap JS -->

2
ofu_app/templates/food/daily_food.jinja
View File

@ -5,7 +5,7 @@
<p class="text-center">Day: {{ day.strftime("%d.%m.%Y") }}</p> <p class="text-center">Day: {{ day.strftime("%d.%m.%Y") }}</p>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container"> <div class="container-fluid">
<div class="row"> <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='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") }} {{ macros.day_menu(title='Austraße', location_menu=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.', css_id="austr") }}

2
ofu_app/templates/food/food_wrapper.jinja
View File

@ -9,7 +9,7 @@
{% endblock %} {% endblock %}
{% block bottom_nav %} {% block bottom_nav %}
<nav id="food-nav" class="navbar navbar-default bg-light"> <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('daily-food') }}"> Daily </a>
<a class="nav-link" href="{{ url('weekly-food') }}"> Weekly </a> <a class="nav-link" href="{{ url('weekly-food') }}"> Weekly </a>
</div> </div>

2
ofu_app/templates/food/weekly_food.jinja
View File

@ -5,7 +5,7 @@
<p class="text-center">Week: {{ day.strftime("%d.%m.%Y") }} - {{ lastday.strftime("%d.%m.%Y") }}</p> <p class="text-center">Week: {{ day.strftime("%d.%m.%Y") }} - {{ lastday.strftime("%d.%m.%Y") }}</p>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container"> <div class="container-fluid">
<div class="row"> <div class="row">
{{ macros.week_menu(title='Feki', location_menus=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }} {{ 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.') }} {{ macros.week_menu(title='Austraße', location_menus=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}

6
ofu_app/templates/home.jinja
View File

@ -2,13 +2,13 @@
{% import '/macros/overview_pages.jinja' as macros %} {% import '/macros/overview_pages.jinja' as macros %}
{% block headline %} {% block headline %}
<header class=""> <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> <p class="text-center">Bamberger Studierenden App</p>
</header> </header>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container text-dark"> <div class="container">
<div class="row"> <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-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-calendar-o', url_id='day-events', title='Events') }}
{{ macros.home_item_with_icon(icon='fa-compass', url_id='donar', title='Nav') }} {{ macros.home_item_with_icon(icon='fa-compass', url_id='donar', title='Nav') }}

2
ofu_app/templates/macros/food_macros.jinja
View File

@ -82,9 +82,9 @@
<div class="col-sm-12 col-md-5 col-lg-5 col-xl-5">{{ happy_hour.description }}</div> <div class="col-sm-12 col-md-5 col-lg-5 col-xl-5">{{ happy_hour.description }}</div>
</div> </div>
{% endfor %} {% endfor %}
</div>
{% else %} {% else %}
<p>Leider gibt es heute keine Happy Hours :(</p> <p>Leider gibt es heute keine Happy Hours :(</p>
{% endif %} {% endif %}
</div> </div>
</div>
{% endmacro %} {% endmacro %}

2
ofu_app/templates/registration/login.jinja
View File

@ -3,7 +3,6 @@
{% block headline %}<h3 class="text-center">BaStA Login</h3>{% endblock %} {% block headline %}<h3 class="text-center">BaStA Login</h3>{% endblock %}
{% block content %} {% block content %}
<div class="row">
<div class="col-12 text-center p-3 bg-light text-dark"> <div class="col-12 text-center p-3 bg-light text-dark">
<h3>Login</h3> <h3>Login</h3>
<form method="post" action="{{ url('login') }}"> <form method="post" action="{{ url('login') }}">
@ -27,5 +26,4 @@
<input type="hidden" name="next" value="{{ next }}"/> <input type="hidden" name="next" value="{{ next }}"/>
</form> </form>
</div> </div>
</div>
{% endblock %} {% endblock %}