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

food layout überarbeitet

Browse Source
This commit is contained in:
Götz 2017-10-16 15:35:51 +02:00
parent 1486cfff18
commit 67f9f4ed83
8 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ofu_app/apps/food/views.py
View File

@ -39,6 +39,7 @@ def weekly_food(request):
happy_hours = HappyHour.objects.filter(date__gte=today, date__lte=lastday)
return render(request, "food/weekly_food.jinja", {
'day': today,
'lastday': lastday,
'happy_hours': happy_hours,
'feki_menu': feki_menu,
'austr_menu': austr_menu,

BIN
ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc
View File

Binary file not shown.

13
ofu_app/static/css/food/main.css Normal file
View File

@ -0,0 +1,13 @@
footer{
/*mb equal height in #food-nav*/
margin-bottom: 60px;
}
/** Sticky Bottom Nav **/
#food-nav {
z-index: 5000;
bottom: 0;
position: fixed;
width: 100%;
height: 60px;
}

17
ofu_app/templates/base.jinja
View File

@ -10,24 +10,21 @@
<meta name="author" content="Michael Götz"/>
{# {% javascript "main_js" %}#}
{# {% block js_head %}{% endblock %}#}
{% block head_extra_first %}{% endblock %}
{% block js_extra %}{% endblock %}
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css"
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<link rel="stylesheet" href="{{ static('libs/font-awesome-4.7.0/css/font-awesome.css') }}">
{# <link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">#}
{% block head_extra %}{% endblock %}
<link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">
{% block css_extra %}{% endblock %}
</head>
{# ===== Body ===== #}
<body>
{% block body %}
{% block headline %}
{% endblock %}
{% block headline %}{% endblock %}
<div class="container-fluid bg-dark text-white">
{% block content %}
{% endblock %}
{% block content %}{% endblock %}
</div>
{% block test %}
<div class="text-center bg-warning pb-2">
<h4>Hinweis: Diese Seite dient <strong>nur</strong> zu Testzwecken.
@ -35,6 +32,8 @@
die Korrektheit der dargestellten Daten.</h4>
</div>
{% endblock %}
{% block bottom_nav %}{% endblock %}
{% block footer %}
<footer>
<div class="container-fluid bg-dark text-white">

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

@ -1,23 +1,23 @@
{% extends 'base.jinja' %}
{% extends 'food/food_wrapper.jinja' %}
{% import '/macros/food_macros.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU </h1>
<h2 class="text-center">{{ day.strftime("%d.%m.%Y") }}</h2>
<h1 class="text-center">Food </h1>
<p class="text-center">Day: {{ day.strftime("%d.%m.%Y") }}</p>
{% endblock %}
{% block content %}
<div class="container">
<div class="row">
{{ macros.day_menu(title='Speiseplan für Feldkirchenstraße Bamberg', location_menu=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
{{ macros.day_menu(title='Speiseplan für Austraße Bamberg', location_menu=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}
{{ macros.day_menu(title='Feki', location_menu=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
{{ macros.day_menu(title='Austraße', location_menu=austr_menu, fail_text='Die Austr Mensa hat heute geschlossen.') }}
</div>
<div class="row">
{{ macros.day_menu(title='Cafeteria Erba-Insel', location_menu=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.day_menu(title='Cafeteria Markusplatz', location_menu=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.day_menu(title='Erba', location_menu=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.day_menu(title='Markusplatz', location_menu=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
</div>
<div class="row">
<div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark">
<h2>Happy Hour Guide von Feki.de</h2>
<h2>Happy Hours Guide von Feki.de</h2>
{% if happy_hours %}
<table class="table">
<thead class="thead-inverse">

12
ofu_app/templates/food/food_wrapper.jinja Normal file
View File

@ -0,0 +1,12 @@
{% extends 'base.jinja' %}
{% block css_extra %}
<link rel="stylesheet" href="{{ static('css/food/main.css') }}">
{% endblock %}
{% block bottom_nav %}
<nav id="food-nav" class="navbar navbar-default bg-light">
<div class="container">
<a class="nav-link" href="{{ url('daily-food') }}">Daily</a>
<a class="nav-link" href="{{ url('weekly-food') }}">Weekly</a>
</div>
</nav>
{% endblock %}

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

@ -1,4 +1,4 @@
{% extends "base.jinja" %}
{% extends "food/food_wrapper.jinja" %}
{% import 'macros/overview_pages.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU</h1>

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

@ -1,18 +1,18 @@
{% extends 'base.jinja' %}
{% extends 'food/food_wrapper.jinja' %}
{% import '/macros/food_macros.jinja' as macros %}
{% block headline %}
<h1 class="text-center">Essen an der OFU </h1>
<h2 class="text-center">{{ day.strftime("%d.%m.%Y") }}</h2>
<h1 class="text-center">Food </h1>
<p class="text-center">Week: {{ day.strftime("%d.%m.%Y") }} - {{ lastday.strftime("%d.%m.%Y") }}</p>
{% endblock %}
{% block content %}
<div class="container">
<div class="row">
{{ macros.week_menu(title='Speiseplan für Feldkirchenstraße Bamberg', location_menus=feki_menu, fail_text='Die Feki Mensa hat heute geschlossen.') }}
{{ macros.week_menu(title='Speiseplan für Austraße Bamberg', location_menus=austr_menu, fail_text='Die Austr 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.') }}
</div>
<div class="row">
{{ macros.week_menu(title='Cafeteria Erba-Insel', location_menus=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.week_menu(title='Cafeteria Markusplatz', location_menus=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.week_menu(title='Erba', location_menus=erba_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
{{ macros.week_menu(title='Markusplatz', location_menus=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
</div>
<div class="row">
<div class="col p-2">