bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.fet.at/bofh/fet2020

Browse Source
This commit is contained in:
Andreas Stephanides
2020-11-21 21:17:43 +00:00
parent 3be64cc03b 924103f2a4
commit 185ad3ead3
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fet2020/templates/layout.html
View File

@@ -48,9 +48,9 @@ footer {
<div class="top-bar-right"> <div class="top-bar-right">
<ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true"> <ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class=""><a role="menuitem" style="color: black">Hallo {{request.user.username}}</a></li> <li class=""><a role="menuitem" style="color: black; background: lightgrey">Hallo {{request.user.username}}</a></li>
<li class=""><a href="/admin">Admin</a></li> <li class=""><a href="/admin" style="background: lightgrey;">Admin</a></li>
<li class=""><a href="{%url 'tasks'%}">Tasks</a></li> <li class=""><a href="{%url 'tasks'%}" style="background: lightgrey;">Tasks</a></li>
{% endif %} {% endif %}
<li class=""><a href="{% url 'posts.index' %}">Aktuelles</a></li> <li class=""><a href="{% url 'posts.index' %}">Aktuelles</a></li>
<!-- show active members first --> <!-- show active members first -->
@@ -72,15 +72,15 @@ footer {
<footer> <footer>
<div class="grid-container"> <div class="grid-container">
<div class="grid-x padding-top-1"> <div class="grid-x padding-top-1 padding-bottom-1">
<div class="cell medium-6 large-9"> <div class="cell medium-6 large-9">
<div class="grid-y" style="height: 150px;"> <div class="grid-y" style="height: 100%;">
<div class="cell small-6 medium-6 large-6"> <div class="cell small-6 medium-9 large-9">
<a href="{% url 'posts.show' 'impressum'%}" style="color: white">Impressum</a> <a href="{% url 'posts.show' 'impressum'%}" style="color: white">Impressum</a>
</div> </div>
<div class="cell small-6 medium-6 large-6"> <div class="cell small-6 medium-3 large-3 padding-bottom-2">
<a href="https://www.facebook.com/FachschaftET"><i class="fab fa-facebook-square" style="font-size:30px; color: white;"></i></a> <a href="https://www.facebook.com/FachschaftET"><i class="fab fa-facebook-square" style="font-size:30px; color: white;"></i></a>
<a href="https://www.instagram.com/fet_tuwien/"><i class="fab fa-instagram-square" style="font-size:30px; color: white;"></i></a> <a href="https://www.instagram.com/fet_tuwien/"><i class="fab fa-instagram-square" style="font-size:30px; color: white;"></i></a>
<a href="https://discord.gg/7qRuuMA"><i class="fab fa-discord" style="font-size:30px; color: white;"></i></a> <a href="https://discord.gg/7qRuuMA"><i class="fab fa-discord" style="font-size:30px; color: white;"></i></a>

32
fet2020/templates/members/partials/_member_details.html
View File

@@ -1,20 +1,22 @@
{# This template shows one member and all the details (that are ment for public) including a list of current jobs #} {# This template shows one member and all the details (that are ment for public) including a list of current jobs #}
<div class="media-object"> {% load softhyphen_tags %}
<div class="media-object-section">
<div class="thumbnail"> <div class="media-object stack-for-small">
<img src= "{{member.image.url}}" style="width:150px;"> <div class="media-object-section padding-bottom-2">
</div> <img src= "{{member.image.url}}" style="width:150px;">
</div> </div>
<div class="media-object-section main-section"> <div class="media-object-section main-section padding-bottom-1"">
<h1>{{member.firstname}} {{member.surname}}</h1> <h1>{{ member.firstname }} {{ member.surname }}</h1>
<p>Spitzname: {{member.nickname}} </br> <p>Spitzname: {{ member.nickname }} </br>
Name: {{member.firstname}} {{member.surname}} </br> Mailaccount: {{ member.mailaccount }} </br>
Mailaccount: {{member.mailaccount}} </br>
Beschreibung: {{member.description|safe}} </br>
</p> </p>
ehrenamtliche Tätigkeiten </br> {{ member.description|softhyphen|safe }}
{% for jobm in jobs %} </p>
{{jobm.job.name}}: {{jobm.job_start|date}} - {{jobm.job_end|date}} </br> {% if jobs %}
{% endfor %} Ehrenamtliche Tätigkeiten: </br>
{% for jobm in jobs %}
{{ jobm.job.name }}: {{ jobm.job_start|date }} - {{ jobm.job_end|date }} </br>
{% endfor %}
{% endif %}
</div> </div>
</div> </div>