From 924103f2a41944b7f6e53d4e408a61cb4afd4752 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Fri, 20 Nov 2020 20:48:49 +0000
Subject: [PATCH] update member view in small version

---
 fet2020/templates/layout.html                 | 14 ++++----
 .../members/partials/_member_details.html     | 32 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index d09257d0..fc19a816 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -48,9 +48,9 @@ footer {
     <div class="top-bar-right">
         <ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
             {% if request.user.is_authenticated %}
-                <li class=""><a role="menuitem" style="color: black">Hallo {{request.user.username}}</a></li>
-                <li class=""><a href="/admin">Admin</a></li>
-                <li class=""><a href="{%url 'tasks'%}">Tasks</a></li>
+                <li class=""><a role="menuitem" style="color: black; background: lightgrey">Hallo {{request.user.username}}</a></li>
+                <li class=""><a href="/admin" style="background: lightgrey;">Admin</a></li>
+                <li class=""><a href="{%url 'tasks'%}" style="background: lightgrey;">Tasks</a></li>
             {% endif %}
             <li class=""><a href="{% url 'posts.index' %}">Aktuelles</a></li>
             <!-- show active members first -->
@@ -72,15 +72,15 @@ footer {
 
 <footer>
     <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="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>
                 </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.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>
diff --git a/fet2020/templates/members/partials/_member_details.html b/fet2020/templates/members/partials/_member_details.html
index 9584f317..42a61446 100644
--- a/fet2020/templates/members/partials/_member_details.html
+++ b/fet2020/templates/members/partials/_member_details.html
@@ -1,20 +1,22 @@
 {#  This template shows one member and all the details (that are ment for public) including a list of current jobs #}
-<div class="media-object">
-    <div class="media-object-section">
-        <div class="thumbnail">
-            <img src= "{{member.image.url}}" style="width:150px;">
-        </div>
+{% load softhyphen_tags %}
+
+<div class="media-object stack-for-small">
+    <div class="media-object-section padding-bottom-2">
+        <img src= "{{member.image.url}}" style="width:150px;">
     </div>
-    <div class="media-object-section main-section">
-        <h1>{{member.firstname}} {{member.surname}}</h1>
-        <p>Spitzname: {{member.nickname}} </br>
-        Name: {{member.firstname}} {{member.surname}} </br>
-        Mailaccount: {{member.mailaccount}} </br>
-        Beschreibung: {{member.description|safe}} </br>
+    <div class="media-object-section main-section padding-bottom-1"">
+        <h1>{{ member.firstname }} {{ member.surname }}</h1>
+        <p>Spitzname: {{ member.nickname }} </br>
+        Mailaccount: {{ member.mailaccount }} </br>
         </p>
-        ehrenamtliche Tätigkeiten </br>
-        {% for jobm in jobs %}
-            {{jobm.job.name}}: {{jobm.job_start|date}} - {{jobm.job_end|date}} </br>
-        {% endfor %}
+        {{ member.description|softhyphen|safe }}
+        </p>
+        {% if jobs %}
+            Ehrenamtliche Tätigkeiten: </br>
+            {% for jobm in jobs %}
+                {{ jobm.job.name }}: {{ jobm.job_start|date }} - {{ jobm.job_end|date }} </br>
+            {% endfor %}
+        {% endif %}
     </div>
 </div>