layouting food

This commit is contained in:
Götz 2017-10-18 22:19:25 +02:00
parent 84c60a9402
commit 2460945512
4 changed files with 15 additions and 29 deletions

View File

@ -9,10 +9,10 @@
{% block content %} {% block content %}
<div class="container text-dark"> <div class="container text-dark">
<div class="row"> <div class="row">
{{ macros.home_item_with_icon(icon='fa-cutlery', url_id='daily-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') }} {{ 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') }} {{ macros.home_item_with_icon(icon='fa-compass', url_id='donar', title='Nav') }}
{{ macros.home_item_with_icon(icon='fa-th-large', url_id='links-home') }} {{ macros.home_item_with_icon(icon='fa-th-large', url_id='links-home', title='Links') }}
</div> </div>
</div> </div>
{% endblock %}fa-cutlery {% endblock %}fa-cutlery

View File

@ -6,22 +6,12 @@
{% block content %} {% block content %}
<div class="container text-dark"> <div class="container text-dark">
<div class="row"> <div class="row">
{{ macros.link_item(title='Roofis', url='https://suche.wiai.de/', description='Finde deinen Raum zum lernen.') }}
{{ macros.link_item(title='VC', url='https://vc.uni-bamberg.de/moodle/', description='Virtueller Campus') }} {{ macros.link_item(title='VC', url='https://vc.uni-bamberg.de/moodle/', description='Virtueller Campus') }}
</div>
<div class="row">
{{ macros.link_item(title='Flexnow2', url='https://www.uni-bamberg.de/pruefungsamt/flexnow/', description='') }} {{ macros.link_item(title='Flexnow2', url='https://www.uni-bamberg.de/pruefungsamt/flexnow/', description='') }}
{{ macros.link_item(title='Univis', url='http://univis.uni-bamberg.de/', description='') }} {{ macros.link_item(title='Univis', url='http://univis.uni-bamberg.de/', description='') }}
</div>
<div class="row">
{{ macros.link_item(title='Bus und Bahn',
url='https://www.vgn.de/verbindungen/?to=de%3A09461%3A20080&td=coord%3A4418901%3A629758%3ANAV4%3ABamberg%2C%20An%20der%20Weberei%205',
description='') }}
{{ macros.link_item(title='Zuv Portal', url='https://zul.zuv.uni-bamberg.de/qisserver/rds?state=user&type=0', description='') }} {{ macros.link_item(title='Zuv Portal', url='https://zul.zuv.uni-bamberg.de/qisserver/rds?state=user&type=0', description='') }}
</div>
<div class="row">
{{ macros.link_item(title='WIAI Open', url='https://isfswiaiopen.wiai.de/', {{ macros.link_item(title='WIAI Open', url='https://isfswiaiopen.wiai.de/',
description='Du willst der Fachschaft WIAI einen Besuch abstatten, aber weißt nicht, ob gerade jemand da ist? Dann kannst du jetzt hier nachschauen.') }} 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='RZ Störungen', url='https://www.uni-bamberg.de/rz/wir/itsm/reporting/', description='') }}
</div> </div>
</div> </div>

View File

@ -13,12 +13,12 @@
{% endmacro %} {% endmacro %}
{% macro week_menu(title, location_menus, fail_text) -%} {% macro week_menu(title, location_menus, fail_text) -%}
<div class="col p-2"> <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 p-2">
<div class="p-3 border border-dark rounded bg-light text-dark"> <div class="p-3 border border-dark rounded bg-light text-dark">
<h2>{{ title }}</h2> <h2>{{ title }}</h2>
{% if location_menus %} {% if location_menus %}
{% for menu in location_menus %} {% for menu in location_menus %}
<p><strong>{{ menu.date.strftime('%A.%m.%Y') }}</strong></p> <p><strong>{{ menu.date.strftime('%A, %m.%Y') }}</strong></p>
{{ get_menu(menu.menu.all()) }} {{ get_menu(menu.menu.all()) }}
{% endfor %} {% endfor %}
{% else %} {% else %}
@ -29,7 +29,7 @@
{% endmacro %} {% endmacro %}
{% macro get_menu(menu) -%} {% macro get_menu(menu) -%}
<ul> <ul class="border">
{% for single_food in menu %} {% for single_food in menu %}
<li><p>{{ single_food.name }}</p></li> <li><p>{{ single_food.name }}</p></li>
{% endfor %} {% endfor %}
@ -39,19 +39,16 @@
{% macro happy_hours(happy_hours) %} {% macro happy_hours(happy_hours) %}
<div class="col p-2"> <div class="col p-2">
<div class="p-3 border border-dark rounded bg-light text-dark"> <div class="p-3 border border-dark rounded bg-light text-dark">
<h2>Happy Hours <small>von Feki.de</small></h2> <h2>Happy Hours
<small>von Feki.de</small>
</h2>
{% if happy_hours %} {% if happy_hours %}
<div class="row">
<div class="col-4"><strong>Location</strong></div>
<div class="col-4"><strong>Time</strong></div>
<div class="col-4"><strong>Description</strong></div>
</div>
{% for happy_hour in happy_hours %} {% for happy_hour in happy_hours %}
<div class="row"> <div class="row border">
<div class="col-4">{{ happy_hour.location }}</div> <div class="col-7 col-sm-8 col-md-4 col-lg-4 col-xl-4">{{ happy_hour.location }}</div>
<div class="col-4">{{ happy_hour.starttime.strftime('%H:%M') }} <div class="col-5 col-sm-4 col-md-3 col-lg-3 col-xl-3">{{ happy_hour.starttime.strftime('%H:%M') }}
- {{ happy_hour.endtime.strftime('%H:%M') }}</div> - {{ happy_hour.endtime.strftime('%H:%M') }}</div>
<div class="col-4">{{ 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> </div>

View File

@ -2,7 +2,6 @@
<div class="col-6 p-3"> <div class="col-6 p-3">
<div class="card"> <div class="card">
<a href="{{ url(url_id) }}"> <a href="{{ url(url_id) }}">
<div class="card-body"> <div class="card-body">
<h4 class="card-title">{{ title }}</h4> <h4 class="card-title">{{ title }}</h4>
<p class="card-text">{{ description }}</p> <p class="card-text">{{ description }}</p>