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

Merge branch 'app.wiai.de'

Browse Source
This commit is contained in:
michigg 2018-04-07 23:02:20 +02:00
commit 1e8035d1c3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,6 +1,8 @@
docker.env docker.env
static_files/ static_files/
migrations/ migrations/
coverage_html/
# Created by https://www.gitignore.io/api/pycharm,python,django # Created by https://www.gitignore.io/api/pycharm,python,django
.idea/ .idea/

2
ofu_app/core/settings.py
View File

@ -74,7 +74,7 @@ TIME_FORMAT = "H:i"
ROOT_URLCONF = 'core.urls' ROOT_URLCONF = 'core.urls'
WSGI_APPLICATION = 'core.wsgi.application' WSGI_APPLICATION = 'core.wsgi.application'
STATIC_URL = '/static/' STATIC_URL = '/static-dev/'
STATIC_ROOT = os.path.join(BASE_DIR, "static_files") STATIC_ROOT = os.path.join(BASE_DIR, "static_files")
STATICFILES_DIRS = [ STATICFILES_DIRS = [
os.path.join(BASE_DIR, "static"), os.path.join(BASE_DIR, "static"),

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

@ -15,7 +15,7 @@
{{ macros.tab_menu(title='Markusplatz', location_menu=markus_cafete, location_menus=weekly_markus_cafete ,fail_text='Aktuell gibt es keine warmen Speisen',css_id="markuspl") }} {{ macros.tab_menu(title='Markusplatz', location_menu=markus_cafete, location_menus=weekly_markus_cafete ,fail_text='Aktuell gibt es keine warmen Speisen',css_id="markuspl") }}
</div> </div>
<div class="row"> <div class="row">
{{ macros.happy_hours(happy_hours=happy_hours) }} {# {{ macros.happy_hours(happy_hours=happy_hours) }}#}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}