diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index fded00c..c00264e 100644 --- a/ofu_app/apps/food/views.py +++ b/ofu_app/apps/food/views.py @@ -11,7 +11,7 @@ from django.http import HttpResponse # Create your views here. def daily_food(request): - today = datetime.datetime.now() + today = datetime.datetime.now() - datetime.timedelta(3) feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last() austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last() erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last() diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index c65670b..52727f1 100644 Binary files a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/settings.py b/ofu_app/ofu_app/settings.py index 9dc661b..72c22c4 100644 --- a/ofu_app/ofu_app/settings.py +++ b/ofu_app/ofu_app/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = '7tm($-7tz!co8762!)ptmj%)80)qa^z0odee*8-!be!i(a!p4j' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['mg-server.ddns.net', 'localhost', '127.0.0.1', '192.168.100.8'] +ALLOWED_HOSTS = ['mg-server.ddns.net', 'localhost', '127.0.0.1', '192.168.100.8', '141.13.129.250'] # Application definition diff --git a/ofu_app/static/css/food/main.css b/ofu_app/static/css/food/main.css index 2f1322a..05851a7 100644 --- a/ofu_app/static/css/food/main.css +++ b/ofu_app/static/css/food/main.css @@ -22,9 +22,21 @@ footer { } .custom-pic-upload { - /*border: 1px solid #ccc;*/ display: inline-block; - /*padding: 6px 12px;*/ padding-right: 5px; cursor: pointer; +} + +.image-wrapper:active img { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: auto; + z-index: 8000; +} + +.image-wrapper img { + width: 80px; + height: 80px; } \ No newline at end of file diff --git a/ofu_app/static/js/food/image_capturing.js b/ofu_app/static/js/food/image_capturing.js index 85f4e60..26adfed 100644 --- a/ofu_app/static/js/food/image_capturing.js +++ b/ofu_app/static/js/food/image_capturing.js @@ -5,7 +5,7 @@ function add_img_class() { $('.food-item').each(function () { var food_id = $(this).data('food'); console.log("ITEM: " + $(this) + " FOOD-ID: " + food_id); - $(this).find('.img').addClass('img-' + food_id); + $(this).find('.image-wrapper').addClass('img-' + food_id); $(this).find('.pic-upload').addClass('img-upload-' + food_id).on('change', function () { readURL(this) }); @@ -33,8 +33,12 @@ function readURL(obj) { function showUploadedItem(source, picClass) { console.log("Show Image: " + picClass + " source: " + source); $('.' + picClass).each(function () { - console.log($(this)); - $(this).attr('src',source); + console.log(this); + var img = this.childNodes[0]; + var placeholder = this.childNodes[1]; + console.log(img); + $(img).attr('src', source); + placeholder.style.display = 'none'; }); } diff --git a/ofu_app/templates/links/home.jinja b/ofu_app/templates/links/home.jinja index 7a543b1..f170a41 100644 --- a/ofu_app/templates/links/home.jinja +++ b/ofu_app/templates/links/home.jinja @@ -13,7 +13,7 @@ {{ macros.link_item(title='WIAI Open', url='https://isfswiaiopen.wiai.de/', description='Ist gerade jemand in der FS?') }} {{ macros.link_item(title='RZ Störungen', url='https://www.uni-bamberg.de/rz/wir/itsm/reporting/', description='') }} - {{ macros.link_item(title='WIAI Soundboard', url='https://sound.fswiai.de', description='Teil deinen Sound mit der FS') }} + {{ macros.link_item(title='WIAI Soundboard', url='http://sound.fswiai.de', description='Teil deinen Sound mit der FS') }} {% endblock %} \ No newline at end of file diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index 16d9a53..c0699c9 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -35,22 +35,22 @@ {% for single_food in menu %}
  • -

    {{ single_food.name }}

    - {#
    Gericht
    #} +

    {{ single_food.name }}

    +
    - {#
    +
    - #}{# TODO: extract style to external css file #}{# +{# TODO: extract style to external css file#}
    -
    #} +
  • {% endfor %}