Update Redesign to v1.2.0-dev

This commit is contained in:
2022-05-27 08:58:10 +00:00
parent c5de36616b
commit 3544255602
36 changed files with 1781 additions and 34696 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -1,234 +0,0 @@
body {
min-height: 100%;
position: relative;
}
img.logo {
height: 50px;
width: 50px;
}
.title-bar {
background: transparent;
}
a.header-link {
background: None;
color: black;
font-size: medium;
text-align: left;
}
a.header-intern-link {
background: lightgrey;
color: black;
font-size: medium;
text-align: left;
}
.header-intern-txt {
background: lightgrey;
color: black;
font-size: medium;
text-align: left;
}
.header-btn:hover {
background: darkgrey;
color: white;
}
.header-btn:focus {
background: transparent;
color: black;
}
.header-intern-btn:hover {
background: darkgrey;
color: white;
}
.header-intern-btn:focus {
background: lightgrey;
color: black;
}
footer {
height: 100%;
background-color: #444;
}
.footer-grid-y {
height: 100%;
}
.footer-link {
background-color: #444;
color: white;
}
.footer-link i {
font-size:30px;
}
.footer-link:hover {
background: lightgrey;
color: #444;
}
.footer-text {
background-color: #444;
color: white;
}
.job-btn {
background-color: gray;
height: 70%;
display: flex;
align-items: center;
justify-content: center;
}
.job-btn:hover {
background-color: black;
}
.job-btn:focus {
background-color: gray;
}
.memb-btn {
background-color: darkgray;
height: 70%;
display: flex;
align-items: center;
justify-content: center;
}
.memb-btn:hover {
background-color: black;
}
.memb-btn:focus {
background-color: darkgray;
}
.active {
background-color: black;
}
a.thumbnail {
width: 150px;
height: 150px;
}
a.thumbnail img {
width: 150px;
height: 150px;
}
.social-media-box {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
height: 71px;
background-color: grey;
color: white;
padding-top: 0rem !important;
padding-right: 0rem !important;
padding-bottom: 0rem !important;
padding-left: 1rem !important;
margin-top: 0rem !important;
margin-right: 0rem !important;
margin-bottom: 1rem !important;
margin-left: 0rem !important; }
.social-media-box .social-media-badge {
background-color: transparent;
width: 41px; }
.social-media-box .social-media-badge .social-media-badge-symbol {
font-size:30px; }
.social-media-box .social-media-text {
margin-top: 0rem !important;
margin-right: 0rem !important;
margin-bottom: 0rem !important;
margin-left: 1rem !important; }
.social-media-footer {
background-color: transparent;
color: white;
width: 40px;
height: 40px; }
.social-media-footer .social-media-footer-symbol {
font-size:30px; }
.social-media-footer:hover {
color: grey;
}
.news-hero-compact {
border-radius: 5px;
margin-top: 1rem !important;
margin-bottom: 1rem !important;
font-size: 18px;
height: 10vh; }
@media print, screen and (min-width: 40em) {
.news-hero-compact {
height: 10vh; } }
@media print, screen and (min-width: 64em) {
.news-hero-compact {
height: 10vh; } }
.news-hero-compact-large {
height: 100%;
min-height: 10vh; }
@media print, screen and (min-width: 40em) {
.news-hero-compact-large {
min-height: 10vh 0.7; } }
@media print, screen and (min-width: 64em) {
.news-hero-compact-large {
min-height: 10vh; } }
.news-hero-compact, .news-hero-compact-large {
background-color: #444;
position: relative;
background-size: cover;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
vertical-align: middle;
text-align: left;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
width: 100%; }
.news-hero-compact .news-hero-compact-text, .news-hero-compact-large .news-hero-compact-text {
position: absolute;
left: 5%;
color: #fefefe;
text-shadow: 1px 1px 2px #000, 0px 0px 5px #000, 0px 0px 25px #000; }
@media print, screen and (min-width: 40em) {
.news-hero-compact .news-hero-compact-text, .news-hero-compact-large .news-hero-compact-text {
left: 5%; } }
@media print, screen and (min-width: 64em) {
.news-hero-compact .news-hero-compact-text, .news-hero-compact-large .news-hero-compact-text {
left: 5%; } }
.news-hero-compact .news-hero-compact-right, .news-hero-compact-large .news-hero-compact-right {
position: absolute;
right: 5%;
color: #fefefe;
text-shadow: 1px 1px 2px #000, 0px 0px 5px #000, 0px 0px 25px #000; }
@media print, screen and (min-width: 40em) {
.news-hero-compact .news-hero-compact-right, .news-hero-compact-large .news-hero-compact-right {
right: 5%; } }
@media print, screen and (min-width: 64em) {
.news-hero-compact .news-hero-compact-right, .news-hero-compact-large .news-hero-compact-right {
right: 5%; } }

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

@@ -1,75 +0,0 @@
.intern-topic {
border-radius: 5px;
margin-top: 1rem !important;
margin-bottom: 1rem !important;
height: 100px; }
@media print, screen and (min-width: 40em) {
.intern-topic {
height: 15vh; } }
@media print, screen and (min-width: 64em) {
.intern-topic {
height: 15vh; } }
.intern-topic, .intern-topic-large {
background-color: #444;
position: relative;
background-size: cover;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
vertical-align: middle;
text-align: left;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
width: 100%; }
.intern-topic .intern-topic-text, .intern-topic-large .intern-topic-text {
color: #fefefe;
text-shadow: 1px 1px 2px #0a0a0a; }
.internheader {
border-radius: 5px;
margin-top: 1rem !important;
margin-bottom: 1rem !important;
height: 30px; }
@media print, screen and (min-width: 40em) {
.internheader {
height: 5vh; } }
@media print, screen and (min-width: 64em) {
.internheader {
height: 5vh; } }
.internheader, .internheader-large {
background-color: grey;
position: relative;
background-size: cover;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
vertical-align: middle;
text-align: left;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
width: 100%; }
.internheader, .internheader-large {
color: #fefefe;
text-shadow: 1px 1px 2px #0a0a0a; }
.intern-hero {
background-color: white;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,16 +1,16 @@
{% extends 'layout.html' %}
{% extends 'base.html' %}
{% load static %}
{% block title %}Fehler 404{% endblock %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1 padding-bottom-1 padding-left-1">
<div class="cell">
<h1>404 (page not found)</h1>
</div>
<div class="cell">
Die angeforderte Seite konnte nicht gefunden werden. Hier geht es wieder zurück zur <a href="{% url 'home' %}">Startseite</a>.
</div>
</div>
</div>
<!-- Main Content -->
<main class="container mx-auto w-full px-4 my-8 flex-1">
<h1 class="page-title">Fehler 404 - Seite nicht gefunden</h1>
<section class="flex justify-center items-center">
<img src="{% static 'img/404.svg' %}" alt="" class="h-64 text-proprietary">
</section>
</main>
{% endblock %}

View File

@@ -1,58 +1,9 @@
{% extends 'footer.html' %}
{% load flatpages %}
{% load static %}
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FET: {% block title %}Startseite{% endblock %}</title>
<meta name="author" content="Fachschaft Elektrotechnik (FET)">
<meta name="description" content="Die Fachschaft Elektrotechnik besteht aus ET Studierenden, die sich um die Anliegen der Studenten und Studentinnen kümmern.">
<meta property="og:image" content="#"> <!--og:... = Facebook metadata-->
<meta property="og:description" content="Die Fachschaft Elektrotechnik besteht aus ET Studierenden, die sich um die Anliegen der Studenten und Studentinnen kümmern.">
<meta property="og:title" content="Fachschaft Elektrotechnik (FET)">
<meta name="twitter:title" content="Fachschaft Elektrotechnik (FET)">
<meta name="theme-color" content="#006599">
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicons/apple-touch-icon.png' %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicons/favicon-32x32.png' %}">
<!--<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicons/favicon-16x16.png' %}">-->
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/fet_logo_white.png' %}">
<link rel="manifest" href="{% static 'img/favicons/site.webmanifest' %}">
<link rel="mask-icon" href="{% static 'img/favicons/safari-pinned-tab.svg' %}" color="#000000">
<link rel="shortcut icon" href="{% static 'img/fet_logo_white.png' %}">
<meta name="apple-mobile-web-app-title" content="FET - Fachschaft Elektrotechnik">
<meta name="application-name" content="FET - Fachschaft Elektrotechnik">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<!-- FontAwesome Kit -->
<!--<script src="https://kit.fontawesome.com/fb26f70535.js" crossorigin="anonymous"></script>-->
<link href="{% static 'fontawesomefree/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'fontawesomefree/css/brands.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'fontawesomefree/css/solid.css' %}" rel="stylesheet" type="text/css">
<!-- Prism.js Theme -->
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prism-themes@1/themes/prism-one-dark.min.css"> -->
<link rel="stylesheet" href="{% static 'css/prism-one-dark.min.css' %}">
<!-- Fonts -->
<link rel="stylesheet" href="{% static 'fonts/Inter-3.19/inter.css' %}">
<!-- <link rel="stylesheet" href="{% static 'fonts/Poppins-4.003/poppins.css' %}"> -->
<link rel="stylesheet" href="{% static 'fonts/Besley-2.0/besley.css' %}">
<link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
{% block galleryheader %}
{% endblock %}
{% block extraheader %}
{% endblock %}
</head>
<body x-data="{ showModal: false }" :class="{ 'overflow-y-hidden sm:overflow-y-auto': showModal }">
{% block base %}
<!-- NAVBAR -->
<nav class="navbar" x-data="{ showNavBar: false }">
<div>
@@ -65,23 +16,15 @@
>
<i class="fa-solid fa-bars"></i>
</button>
<ul id="navBarContent" class="navbar-content sm:block"
x-show="showNavBar || $screen('sm')"
x-transition:enter="transition ease-out duration-300"
x-transition:enter-start="transform opacity-0 scale-90"
x-transition:enter-end="transform opacity-100 scale-100"
x-transition:leave="transition ease-in duration-150"
x-transition:leave-start="transform opacity-100 scale-100"
x-transition:leave-end="transform opacity-0 scale-90"
>
<li><a href="{% url 'posts:index' %}">News</a></li>
<li><a href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
<li><a href="{% url 'gallery:index' %}">Galerie</a></li>
<li><a href="{% url 'blackboard:index' %}">Blackboard</a></li>
<ul id="navBarContent" class="navbar-content sm:block" x-show="showNavBar || $screen('sm')" x-collapse.min.0px>
<li class="{% if 'posts' in request.path %}active{% endif %}"><a href="{% url 'posts:index' %}">News</a></li>
<li class="{% if 'members' in request.path %}active{% endif %}"><a href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
<li class="{% if 'gallery' in request.path %}active{% endif %}"><a href="{% url 'gallery:index' %}">Galerie</a></li>
<li class="{% if 'blackboard' in request.path %}active{% endif %}"><a href="{% url 'blackboard:index' %}">Blackboard</a></li>
{% get_flatpages '/kontakt/' as pages %}
{% if pages %}
<li><a href="{{ pages.first.url }}">{{ pages.first.title }}</a></li>
<li class="{% if '/kontakt/' in request.path %}active{% endif %}"><a href="{{ pages.first.url }}">{{ pages.first.title }}</a></li>
{% endif %}
{% if not request.user.is_authenticated %}
@@ -129,64 +72,4 @@
{% block content %}
{% endblock %}
<footer>
<ul class="icon-list">
<li>
<a href="{% url 'facebook' %}"><i class="fa-brands fa-facebook"></i></a>
</li>
<li>
<a href="{% url 'instagram' %}"><i class="fa-brands fa-instagram"></i></a>
</li>
<li>
<a href="{% url 'discord' %}"><i class="fa-brands fa-discord"></i></a>
</li>
<li>
<a href="{% url 'telegram' %}"><i class="fa-brands fa-telegram"></i></a>
</li>
<li>
<a href="mailto:service@fet.at"><i class="fa-solid fa-envelope"></i></a>
</li>
</ul>
{% get_flatpages '/impressum/' as pages %}
{% if pages %}
<div class="legal">
<a href="{{ pages.first.url }}" class="text-center text-sm sm:text-base">{{ pages.first.title }}</a>
</div>
{% endif %}
<hr class="legal-divider">
<p class="copyright">© {% now 'Y' %} FET - Alle Rechte vorbehalten.</p>
</footer>
<div class="super-duper-awesome-signature" x-data="{ counter: 0 }">
<span :class="counter>=4 && 'text-purple-300'">Handcrafted </span>
<span :class="counter>=5 && 'text-green-400'">with </span>
<i class="fa-solid fa-heart" aria-label="love" @click="counter++" :class="counter>=2 ? 'text-proprietary hover:text-proprietary-dark' : 'text-red-600 hover:text-red-700'"></i>
<span :class="counter>=6 && 'text-pink-400'"> by</span>
<span class="font-normal" :class="counter>=3 && 'text-yellow-500'"> Matteo Duchscher</span>
</div>
<script src="{% static 'js/gumshoe@5.1.1.js' %}"></script>
<script src="{% static 'js/smooth-scroll@16.1.2.js' %}"></script>
<script defer src="{% static 'js/vendor.js' %}"></script>
<script defer src="{% static 'js/scripts.js' %}"></script>
<!-- Prism.js Code syntax highlighting -->
<script src="{% static 'js/prism-core@1.25.0.js' %}"></script>
<script src="{% static 'js/prism-autoloader@1.25.0.js' %}"></script>
<script>
var spy = new Gumshoe('#scrollspy-subNav a', {
/***** Scrollspy *****/ // Active classes
navClass: 'active', // applied to the nav list item
});
/***** SmoothScroll *****/ // All animations will take exactly 500ms
var scroll = new SmoothScroll('a[href*="#"]', {
speed: 750,
speedAsDuration: true,
easing: 'easeInOutQuad'
});
</script>
</body>
</html>
{% endblock %}

View File

@@ -0,0 +1,13 @@
{% extends 'head.html' %}
{% block body %}
<body x-data="{ showModal: false }" :class="{ 'overflow-y-hidden sm:overflow-y-auto': showModal }">
{% block base %}
{% endblock %}
{% block footer %}
{% endblock %}
{% include 'scripts.html' %}
</body>
{% endblock %}

View File

@@ -1,87 +1,80 @@
{% extends 'layout.html' %}
{% extends 'head.html' %}
{% load static %}
{% block title %}Social Media{% endblock %}
{% block content %}
{% block body %}
<body>
<!-- Main Content -->
<div class="flex flex-col items-center justify-center min-h-screen">
<main class="flex flex-col gap-6 mb-4 mx-4 sm:mb-6">
<img src="{% static 'img/FET-Logo-2014_64_light.svg' %}" alt="Logo der Fachschaft für Elektrotechnik" class="mx-auto aspect-square w-24 dark:hidden">
<img src="{% static 'img/FET-Logo-2014_64_dark.svg' %}" alt="Logo der Fachschaft für Elektrotechnik" class="hidden dark:block mx-auto aspect-square w-24">
<div class="grid-container">
<div class="grid-x padding-top-1 align-center">
<div class="cell large-4 medium-4 text-center">
<a href="https://fet.at">
<div class="padding-bottom-1">
<img src= "{% static 'img/logo2014_64.png' %}">
</div>
</a>
<a href="{% url 'home' %}" class="sticky top-4">
<nav class="self-start px-2 py-1 w-fit rounded-full bg-blue-100 dark:bg-sky-900 text-sky-700 dark:text-blue-200">
<i class="fa-solid fa-angle-left"></i>
Zur FET-Homepage
</nav>
</a>
<a href="mailto:service@fet.at">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-solid fa-envelope"></i>
<section class="flex flex-col gap-4">
<a href="mailto:service@fet.at" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-solid fa-envelope"></i>
</div>
<span>
Schreib uns eine Mail :)
</span>
</span>
</a>
<span class="social-media-text">Schreib uns ein Mail :)</span>
</div>
</a>
<a href="{% url 'discord' %}">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-brands fa-discord"></i>
<a href="{% url 'discord' %}" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-brands fa-discord"></i>
</div>
<span>
Komm auf unseren Discord Server!
</span>
</span>
<span class="social-media-text">Komm auf unseren Discord-Server!</span>
</div>
</a>
</a>
<a href="{% url 'instagram' %}">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-brands fa-instagram-square"></i>
<a href="{% url 'instagram' %}" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-brands fa-instagram"></i>
</div>
<span>
Instagram
</span>
</span>
<span class="social-media-text">Instagram</span>
</div>
</a>
</a>
<a href="{% url 'telegram' %}">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-brands fa-telegram"></i>
<a href="{% url 'telegram' %}" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-brands fa-telegram"></i>
</div>
<span>
Telegram
</span>
</span>
<span class="social-media-text">Telegram</span>
</div>
</a>
</a>
<a href="{% url 'facebook' %}">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-brands fa-facebook-square"></i>
<a href="{% url 'facebook' %}" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-brands fa-facebook"></i>
</div>
<span>
Facebook
</span>
</span>
<span class="social-media-text">Facebook</span>
</div>
</a>
</a>
<a href="{% url 'posts:calendar' %}">
<div class="social-media-box">
<span class="social-media-badge badge">
<span class="social-media-badge-symbol">
<i class="fa-regular fa-calendar"></i>
<a href="{% url 'posts:calendar' %}" class="flex items-center p-3 bg-white dark:bg-gray-800 rounded-lg shadow-sm text-proprietary-dark dark:text-gray-300">
<div class="mr-2 text-center text-3xl">
<i class="fa-fw fa-solid fa-calendar-day"></i>
</div>
<span>
FET-Kalender abonnieren
</span>
</span>
<span class="social-media-text">FET-Ka­len­der abonnieren</span>
</div>
</a>
</a>
</section>
</main>
</div>
</div>
</div>
</body>
{% endblock %}

View File

@@ -0,0 +1,40 @@
{% extends 'body.html' %}
{% load flatpages %}
{% block footer %}
<footer>
<ul class="icon-list">
<li>
<a href="{% url 'facebook' %}"><i class="fa-brands fa-facebook"></i></a>
</li>
<li>
<a href="{% url 'instagram' %}"><i class="fa-brands fa-instagram"></i></a>
</li>
<li>
<a href="{% url 'discord' %}"><i class="fa-brands fa-discord"></i></a>
</li>
<li>
<a href="{% url 'telegram' %}"><i class="fa-brands fa-telegram"></i></a>
</li>
<li>
<a href="mailto:service@fet.at"><i class="fa-solid fa-envelope"></i></a>
</li>
</ul>
{% get_flatpages '/impressum/' as pages %}
{% if pages %}
<div class="legal">
<a href="{{ pages.first.url }}" class="text-center text-sm sm:text-base">{{ pages.first.title }}</a>
</div>
{% endif %}
<hr class="legal-divider">
<p class="copyright">© {% now 'Y' %} FET - Alle Rechte vorbehalten.</p>
</footer>
<div class="super-duper-awesome-signature" x-data="{ counter: 0 }">
<span :class="counter>=4 && 'text-purple-300'">Handcrafted </span>
<span :class="counter>=5 && 'text-green-400'">with </span>
<i class="fa-solid fa-heart" aria-label="love" @click="counter++" :class="counter>=2 ? 'text-proprietary hover:text-proprietary-dark' : 'text-red-600 hover:text-red-700'"></i>
<span :class="counter>=6 && 'text-pink-400'"> by</span>
<span class="font-normal" :class="counter>=3 && 'text-yellow-500'"> FET</span>
</div>
{% endblock %}

View File

@@ -12,18 +12,6 @@
<main class="container mx-auto w-full px-4 my-8 flex-1">
<h1 class="page-title">Fotos</h1>
{% if request.user.is_authenticated %}
{% if album.id %}
<a href="{% url 'admin:gallery_album_change' album.id %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
<i class="fa-solid fa-pen-to-square mr-1"></i>Album bearbeiten
</a>
{% else %}
<a href="{% url 'admin:gallery_album_add' %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
<i class="fa-solid fa-square-plus mr-1"></i>neues Album hinzufügen
</a>
{% endif %}
{% endif %}
<section class="text-gray-800 dark:text-gray-200 my-2 sm:my-4">
{% if album.status == album.DRAFT %}
<h2 class="text-gray-900 dark:text-gray-100 text-lg font-medium tracking-wide"><i class="fa-solid fa-eye-slash text-gray-600 dark:text-gray-300 mr-2" title="Album ist nicht öffentlich!"></i>{{ album.title }}</h2>
@@ -43,6 +31,13 @@
</div>
{% endif %}
</section>
{% if request.user.is_authenticated %}
<a href="{% url 'admin:gallery_album_change' album.id %}" class="page-subtitle block btn-small btn-primary w-full sm:w-max sm:mr-0 sm:ml-auto">
<i class="fa-regular fa-folder-open mr-1"></i>Album bearbeiten
</a>
{% endif %}
<!-- The Gallery as lightbox dialog, should be a document body child element -->
<div id="blueimp-gallery" class="blueimp-gallery" aria-label="image gallery" aria-modal="true" role="dialog">
<div class="slides" aria-live="polite"></div>

View File

@@ -7,6 +7,12 @@
<main class="container mx-auto w-full px-4 my-8 flex-1">
<h1 class="page-title">Galerie</h1>
{% if request.user.is_authenticated %}
<a href="{% url 'admin:gallery_album_add' %}" class="page-subtitle block btn-small btn-primary max-w-xs mx-auto sm:w-max sm:mr-0 sm:ml-auto">
<i class="fa-solid fa-folder-plus mr-1"></i>neues Album hinzufügen
</a>
{% endif %}
<div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 justify-items-center gap-4">
{% for album in albums %}
{% if album.status == "10" %}
@@ -21,11 +27,5 @@
{% endfor %}
</div>
{% if request.user.is_authenticated %}
<a href="{% url 'admin:gallery_album_add' %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
<i class="fa-solid fa-square-plus mr-1"></i>neues Album hinzufügen
</a>
{% endif %}
</main>
{% endblock %}

View File

@@ -0,0 +1,57 @@
{% load static %}
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FET: {% block title %}Startseite{% endblock %}</title>
<meta name="author" content="Fachschaft Elektrotechnik (FET)">
<meta name="description" content="Die Fachschaft Elektrotechnik besteht aus ET Studierenden, die sich um die Anliegen der Studenten und Studentinnen kümmern.">
<meta property="og:image" content="#"> <!--og:... = Facebook metadata-->
<meta property="og:description" content="Die Fachschaft Elektrotechnik besteht aus ET Studierenden, die sich um die Anliegen der Studenten und Studentinnen kümmern.">
<meta property="og:title" content="Fachschaft Elektrotechnik (FET)">
<meta name="twitter:title" content="Fachschaft Elektrotechnik (FET)">
<meta name="theme-color" content="#006599">
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicons/apple-touch-icon.png' %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicons/favicon-32x32.png' %}">
<!--<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicons/favicon-16x16.png' %}">-->
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/fet_logo_white.png' %}">
<link rel="manifest" href="{% static 'img/favicons/site.webmanifest' %}">
<link rel="mask-icon" href="{% static 'img/favicons/safari-pinned-tab.svg' %}" color="#000000">
<link rel="shortcut icon" href="{% static 'img/fet_logo_white.png' %}">
<meta name="apple-mobile-web-app-title" content="FET - Fachschaft Elektrotechnik">
<meta name="application-name" content="FET - Fachschaft Elektrotechnik">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<!-- FontAwesome Kit -->
<!--<script src="https://kit.fontawesome.com/fb26f70535.js" crossorigin="anonymous"></script>-->
<link href="{% static 'fontawesomefree/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'fontawesomefree/css/brands.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'fontawesomefree/css/solid.css' %}" rel="stylesheet" type="text/css">
<!-- Prism.js Theme -->
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prism-themes@1/themes/prism-one-dark.min.css"> -->
<link rel="stylesheet" href="{% static 'css/prism-one-dark.min.css' %}">
<!-- Fonts -->
<link rel="stylesheet" href="{% static 'fonts/Inter-3.19/inter.css' %}">
<!-- <link rel="stylesheet" href="{% static 'fonts/Poppins-4.003/poppins.css' %}"> -->
<link rel="stylesheet" href="{% static 'fonts/Besley-2.0/besley.css' %}">
<link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
{% block galleryheader %}
{% endblock %}
{% block extraheader %}
{% endblock %}
</head>
{% block body %}
{% endblock %}
</html>

View File

@@ -11,6 +11,7 @@
<span class="hidden">Willkommen bei der </span><span>Fachschaft</span><br>
<span class="text-proprietary-darker dark:text-proprietary-lightest">Elektrotechnik</span>
</h1>
<div class="hidden sm:block flex-none w-2/5 lg:w-1/3 bg-white dark:bg-gray-800 p-2 lg:p-4 rounded shadow-xl dark:border-2 dark:border-gray-700">
<h2 class="section-title sm:text-left"><i class="fa-solid fa-comments text-gray-300 dark:text-gray-400 mr-2"></i>Events</h2>
<div class="-mb-2 text-gray-700 dark:text-gray-200 text-sm md:text-base">
@@ -33,7 +34,7 @@
<!-- Main Content -->
<main class="container mx-auto w-full px-4 my-8 flex-1">
<section class="sm:hidden my-8">
<section class="sm:hidden">
<h2 class="section-title section-title-margins">Events</h2>
<div class="flex flex-col gap-4">
@@ -50,7 +51,7 @@
</div>
</section>
<div class="sm:flex sm:flex-row-reverse justify-center my-8">
<div class="sm:flex sm:flex-row-reverse justify-center">
<aside class="calendar-preview sm:w-2/5 xl:w-1/4 sm:pl-4 my-8 sm:my-0">
<div>
<h2 class="section-title section-title-margins">Kalender</h2>

View File

@@ -1,119 +0,0 @@
{% load flatpages %}
{% load static %}
<!doctype html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>FET - Fachschaft Elektrotechnik</title>
<link rel="shortcut icon" type="image/png" href="{% static 'img/fet_logo_white.png' %}"/>
<link rel="stylesheet" href="{% static 'app.css' %}">
<link rel="stylesheet" href="{% static 'fet.css' %}">
<link rel="stylesheet" href="{% static 'intern.css' %}">
<link href="{% static 'fontawesomefree/css/all.min.css' %}" rel="stylesheet" type="text/css">
{% block galleryheader %}
{% endblock %}
{% block extraheader %}
{% endblock %}
</head>
<body>
<div class="header-title-bar" data-responsive-toggle="example-menu" data-hide-for="large">
<div class="title-bar">
<div class="title-bar-left">
<a href="{% url 'home' %}">
<img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
</a>
</div>
<div class="title-bar-right">
<button class="menu-icon dark" type="button" data-toggle="example-menu"></button>
</div>
</div>
</div>
<div class="top-bar" id="example-menu">
<div class="top-bar-left show-for-large">
<a href="{% url 'home' %}">
<img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
</a>
</div>
<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>
<a class="button header-intern-btn header-intern-txt" role="menuitem">
{% if request.user.first_name %}
Hallo {{ request.user.first_name }}
{% else %}
Hallo {{ request.user.username }}
{% endif %}
</a>
</li>
<li><a class="button header-intern-btn header-intern-link" href="{% url 'admin:index' %}">Admin</a></li>
<li><a class="button header-intern-btn header-intern-link" href="{% url 'tasks:index' %}">Tasks</a></li>
<li><a class="button header-intern-btn header-intern-link" href="{% url 'intern:index' %}">Intern</a></li>
<li><a class="button header-intern-btn header-intern-link" href="https://legacy.fet.at/home/intern">Legacy</a></li>
{% endif %}
<li><a class="button header-btn header-link" href="{% url 'posts:index' %}">News</a></li>
<!-- show active members first -->
<li><a class="button header-btn header-link" href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
<li><a class="button header-btn header-link" href="{% url 'gallery:index' %}">Galerie</a></li>
<li><a class="button header-btn header-link" href="{% url 'blackboard:index' %}">Blackboard</a></li>
{% get_flatpages '/kontakt/' as pages %}
{% if pages %}
<li><a class="button header-btn header-link" href="{{ pages.first.url }}">{{ pages.first.title }}</a></li>
{% endif %}
{% if request.user.is_authenticated %}
<li><a class="button header-btn header-link" href="{% url 'authentications:logout' %}?next={{ request.path }}">Logout</a></li>
{% else %}
<li><a class="button header-btn header-link" href="{% url 'authentications:login' %}?next={{ request.path }}">Login</a></li>
{% endif %}
</ul>
</div>
</div>
{% block content %}
{% endblock %}
<footer>
<div class="grid-container">
<div class="grid-x padding-top-1 padding-bottom-1">
{% get_flatpages '/impressum/' as pages %}
{% if pages %}
<div class="legal">
<a class="button footer-link" href="{{ pages.first.url }}"">{{ pages.first.title }}</a>
</div>
{% endif %}
<div class="cell small-12 medium-9 large-9 text-right">
<span class="footer-text">Probiers mal social:</span>
<a class="badge social-media-footer" href="{% url 'facebook' %}">
<i class="social-media-footer-symbol fa-brands fa-facebook-square"></i>
</a>
<a class="badge social-media-footer" href="{% url 'instagram' %}">
<i class="social-media-footer-symbol fa-brands fa-instagram-square"></i>
</a>
<a class="badge social-media-footer" href="{% url 'discord' %}">
<i class="social-media-footer-symbol fa-brands fa-discord"></i>
</a>
<a class="badge social-media-footer" href="{% url 'telegram' %}">
<i class="social-media-footer-symbol fa-brands fa-telegram"></i>
</a>
</div>
</div>
</div>
</footer>
<!-- App.js -->
<script src="{% static 'app.js' %}"></script>
</body>
</html>

View File

@@ -12,8 +12,9 @@
{% endblock %}
{% block member_content %}
<section class="flex-grow max-w-prose my-8 sm:my-0 text-justify text-gray-800 dark:text-gray-300">
<section class="flex-grow w-full max-w-prose my-8 sm:my-0 text-gray-800 dark:text-gray-300">
<!-- Alternativtext auf jede Person anpassen: Name im alt="" dynamisch erzeugen -->
<div>
<img loading="lazy" src="{{ member.image.portrait.url }}" alt="Portraitfoto von {{ member.firstname }} {{ member.surname }}" class="md:float-left w-36 mr-2 mb-2">
<div x-data="{ expandList: false }">
<h2 class="mb-2 text-lg text-gray-900 dark:text-gray-100 text-left">{{ member.firstname }} {{ member.surname }}</h2>
@@ -24,7 +25,9 @@
<div class="mb-2">
{{ member.description|softhyphen|safe }}
</div>
{% if active_jobs or inactive_jobs %}
</div>
{% if active_jobs or inactive_jobs %}
<div x-data="{ expandList: false }" class="clear-left">
<h3 class="group mt-4 mb-2 text-lg text-gray-900 dark:text-gray-100">Ehrenamtliche Tätigkeiten:
{% if inactive_jobs %}
<button class="inline float-right text-sm px-2 py-1 text-gray-600 dark:text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-400 border rounded border-gray-500 dark:border-gray-500 md:border-gray-400 dark:md:border-gray-600 group-hover:border-gray-500 dark:group-hover:border-gray-500"
@@ -62,7 +65,7 @@
</li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>
{% endif %}
</section>
{% endblock %}

View File

@@ -8,9 +8,22 @@
</ul>
<div>
<a href="{{ post.get_absolute_url }}"><h3 class="text-gray-50">{{ post.title|safe }}</h3></a>
<div class="text-gray-200">
<i class="fa-solid fa-clock"></i>
{{ post.date|date:"d. F Y" }}
<div class="flex justify-between">
<div class="text-gray-200"><i class="fa-solid fa-clock"></i> {{ post.date|date:"d. F Y" }}</div>
{% if post.status == post.Status.DRAFT %}
<div>
<div class="h-7 w-7 aspect-square rounded-full bg-blue-200 text-blue-700 inline-flex justify-center items-center" title="Draft">
<i class="fa-fw fa-solid fa-pen-to-square"></i>
</div>
</div>
{% endif %}
{% if post.status == post.Status.ONLY_INTERN %}
<div>
<div class="h-7 w-7 aspect-square rounded-full bg-red-200 text-red-700 inline-flex justify-center items-center" title="Intern only">
<i class="fa-fw fa-solid fa-eye-slash"></i>
</div>
</div>
{% endif %}
</div>
</div>
</div>

View File

@@ -0,0 +1,24 @@
{% load static %}
<script src="{% static 'js/gumshoe@5.1.1.js' %}"></script>
<script src="{% static 'js/smooth-scroll@16.1.2.js' %}"></script>
<script defer src="{% static 'js/vendor.js' %}"></script>
<script defer src="{% static 'js/scripts.js' %}"></script>
<!-- Prism.js Code syntax highlighting -->
<script src="{% static 'js/prism-core@1.25.0.js' %}"></script>
<script src="{% static 'js/prism-autoloader@1.25.0.js' %}"></script>
<script>
var spy = new Gumshoe('#scrollspy-subNav a', {
/***** Scrollspy *****/ // Active classes
navClass: 'active', // applied to the nav list item
});
/***** SmoothScroll *****/ // All animations will take exactly 500ms
var scroll = new SmoothScroll('a[href*="#"]', {
speed: 750,
speedAsDuration: true,
easing: 'easeInOutQuad'
});
</script>

View File

@@ -82,17 +82,17 @@
</button>
</aside>
<section class="my-8 sm:my-0 sm:w-3/5 xl:w-2/5 flex flex-col gap-4 text-gray-700 dark:text-gray-200">
{% if tasks %}
<form action="" method="post">
{% csrf_token %}
{% if tasks %}
<form action="" method="post" class="my-8 sm:my-0 sm:w-3/5 xl:w-2/5 flex flex-col gap-2 text-gray-600 dark:text-gray-300">
{% csrf_token %}
{% regroup tasks by task_list as section_list %}
{% for group in section_list %}
<h3>{{ group.grouper }}</h3>
{% regroup tasks by task_list as section_list %}
{% for group in section_list %}
<section>
<h2 class="mb-1 text-gray-700 dark:text-gray-200">{{ group.grouper }}</h2>
{% for task in group.list %}
<label class="flex justify-between items-start">
<label class="mb-2 flex justify-between items-start">
<div class="inline-flex items-baseline mr-2">
<input type="checkbox" name="checkbox" value="{{ task.id }}" {% if task.completed %}checked{% endif %} class="rounded border-gray-300 dark:border-none text-proprietary shadow-sm focus:border-blue-300 focus:ring focus:ring-offset-0 focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
<span class="ml-2">{{ task.title|truncatechars:45 }} <a href="{% url 'tasks:task-detail' task.id %}" class="inline-block text-proprietary dark:text-proprietary-lighter">Link <i class="fa-solid fa-link"></i></a></span>
@@ -104,22 +104,24 @@
{% endif %}
</label>
{% endfor %}
{% endfor %}
</section>
{% endfor %}
<div class="flex flex-col md:flex-row gap-y-2 md:gap-y-0 md:gap-x-2 lg:justify-end mt-4">
<input type="submit" name="btn_checkbox" value="Tasks abschließen" class="btn btn-error block md:flex-grow lg:flex-grow-0">
<div class="flex flex-col md:flex-row gap-y-2 md:gap-y-0 md:gap-x-2 lg:justify-end mt-4">
<input type="submit" name="btn_checkbox" value="Tasks abschließen" class="btn btn-success block md:flex-grow lg:flex-grow-0">
<a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
</div>
</form>
{% else %}
keine Tasks in dieser Liste für dich.
<a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
</div>
</form>
{% else %}
<section>
<h2 class="mb-1 text-gray-700 dark:text-gray-200">Keine Tasks in dieser Liste für dich.</h2>
<div class="flex flex-col md:flex-row gap-y-2 md:gap-y-0 md:gap-x-2 lg:justify-end mt-4">
<a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
</div>
</section>
{% endif %}
</section>
</div>
</main>
{% endblock %}

View File

@@ -7,7 +7,7 @@
<main class="container mx-auto w-full px-4 my-8 flex-1">
<h1 class="page-title">Task hinzufügen</h1>
<div class="w-full h-full flex-1 flex justify-center items-center">
<form action="" method="POST" class="w-full max-w-prose sm:px-28 sm:py-4 grid grid-cols-1 gap-y-3 sm:gap-y-6 text-gray-900">
<form action="" method="POST" class="w-full max-w-xs sm:max-w-prose sm:px-28 sm:py-4 grid grid-cols-1 gap-y-3 sm:gap-y-6 text-gray-900">
{% csrf_token %}
{% if form.non_field_errors %}
@@ -84,10 +84,13 @@
</select>
</label>
<input type="submit" class="block btn btn-primary" value="Hinzufügen">
<div class="flex flex-col-reverse sm:flex-row gap-3 justify-end pt-4 sm:pt-0">
<a href="{% url 'admin:tasks_tasklist_add' %}" class="block btn btn-secondary-proprietary">Task-Gruppe hinzufügen</a>
<input type="submit" class="block btn btn-primary" value="Hinzufügen">
</div>
</form>
<a href="{% url 'admin:tasks_tasklist_add' %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Task-Gruppe erstellen</a>
</div>
</main>
{% endblock %}