diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 8eed5b81..51b8481a 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -76,6 +76,7 @@ INSTALLED_APPS = [ "django_crontab", "django_filters", "django_static_jquery_ui", + "fontawesome-free", "posts.apps.PostsConfig", "members.apps.MembersConfig", "documents.apps.DocumentsConfig", @@ -183,7 +184,7 @@ LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")] # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.0/howto/static-files/ -STATIC_URL = "/assets/" +STATIC_URL = "/static/" STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] STATIC_ROOT = "assets/" @@ -218,10 +219,9 @@ THUMBNAIL_ALIASES = { }, } ETHERPAD_HOST = env("ETHERPAD_HOST").strip() -if not ETHERPAD_HOST or ETHERPAD_HOST=="": +if not ETHERPAD_HOST or ETHERPAD_HOST == "": ETHERPAD_HOST = urljoin("https://" + env("HOST_NAME"), "etherpad/") - # ETHERPAD CLIENT if DEBUG: ETHERPAD_CLIENT = { diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt index b00d74f9..81d3cdd2 100644 --- a/fet2020/requirements.txt +++ b/fet2020/requirements.txt @@ -14,3 +14,4 @@ etherpad-lite==0.5 ghostscript==0.6 ldap3==2.8.1 mysqlclient==2.0.1 +fontawesome-free==5.15.2 diff --git a/fet2020/static/fet.css b/fet2020/static/fet.css index a19eefb6..53c5fbf1 100644 --- a/fet2020/static/fet.css +++ b/fet2020/static/fet.css @@ -1,21 +1,102 @@ body { - min-height:100%; - position:relative; -} -img.logo { - height:40px; - width:40px; + min-height: 100%; + position: relative; } -div.footer { +img.logo { + height: 50px; + width: 50px; +} + +.title-bar { + background: None; +} + +a.header-link { + background: None; + color: black; + font-size: medium; + font-weight: bold; +} + +a.header-intern-link { + background: lightgrey; + color: black; + font-size: medium; + font-weight: bold; +} + +.header-intern-txt { + background: lightgrey; + color: black; + font-size: medium; +} + +.header-btn:hover { + background: None; +} +.header-btn:focus { + background: None; + color: black; +} + +.header-intern-btn:hover { + background: lightgrey; +} +.header-intern-btn:focus { + background: lightgrey; + color: black; +} + +footer { + height: 100%; + background-color: #444; +} + +.footer-grid-y { height: 100%; } -.footer a { - color: white; + +.footer-link { + color: white; } -.footer a i { - font-size:30px; + +.footer-link i { + font-size:30px; } + +.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; diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html index 951b2834..a7f10aa8 100644 --- a/fet2020/templates/home.html +++ b/fet2020/templates/home.html @@ -29,7 +29,7 @@
-

Neuigkeiten

+

Events

{% with post=featured_event %} {% include 'posts/partials/_article_row.html' %} diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index 26961578..47c1016d 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -2,49 +2,42 @@ - - - - - FET - - - - {% block extraheader %} - {% endblock %} - - - + + + + +FET + + + +{% block extraheader %} +{% endblock %} + + +
- +
-
- +
- +
-
-
{% block content %} @@ -86,28 +78,38 @@ footer {
-
+
- Impressum + Impressum
- Facebook - Instagram - Discord - Telegram + + + + + + + + + + + +
+ +
-
+
+
+ Fachschaft Elektrotechnik +
+
diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index e29c4803..b16d992c 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -1,45 +1,38 @@ -{% extends 'layout.html' %} -{% block content %} +{% extends "layout.html" %} {% load softhyphen_tags %} - - +{% block content %}
{% for job in pinned_job_groups %}
- - {{job.name}} - -
- {% endfor %} - - {% for job in unpinned_job_groups %} -
- + {{ job.name|softhyphen|safe }}
{% endfor %} -
Pension
-
Alle Mitglieder
+ {% for job in unpinned_job_groups %} +
+ + {{ job.name|softhyphen|safe }} + +
+ {% endfor %} + +
+ + Pension + +
+ +
+ + Alle Mitglieder + +
@@ -53,9 +46,8 @@ {% if member %} -
- {% include 'members/partials/_member_details.html' %} -
+ {% block members_content %} + {% endblock %} {% endif %} diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html index a8e7adac..85c4cb82 100644 --- a/fet2020/templates/members/jobs_list.html +++ b/fet2020/templates/members/jobs_list.html @@ -1,4 +1,3 @@ - {% regroup job_members by job.name as all_jobmem_list %} {% for jobmem in all_jobmem_list %} @@ -6,7 +5,6 @@

{{jobmem.grouper}} #

- Aktuelle Mitglieder:
diff --git a/fet2020/templates/members/member.html b/fet2020/templates/members/member.html index 10c2a946..fea55124 100644 --- a/fet2020/templates/members/member.html +++ b/fet2020/templates/members/member.html @@ -1,14 +1,14 @@ -{% extends 'members/member_layout.html' %} +{% extends 'members/index.html' %} + {% block extraheader %} - {% endblock %} {% block members_content %} -
+
{% include 'members/partials/_member_details.html' %} -
-{% endblock %} \ No newline at end of file +
+{% endblock %} diff --git a/fet2020/templates/members/member_layout.html b/fet2020/templates/members/member_layout.html deleted file mode 100644 index 5ec9ac0e..00000000 --- a/fet2020/templates/members/member_layout.html +++ /dev/null @@ -1,87 +0,0 @@ -{% extends 'layout.html' %} - - -{% block content %} - -{% load softhyphen_tags %} - - - -
- -
- - {% for job in pinned_job_groups %} -
- - {{job.name}} - -
- {% endfor %} - - {% for job in unpinned_job_groups %} -
- - {{ job.name|softhyphen|safe }} - -
- {% endfor %} - -
Pension
-
Alle Mitglieder
- -
- - {% if description %} -
-
- {{ description|safe }} -
-
- {% endif %} - - {% block members_content %} - - {% endblock %} -
- -{% endblock %} - -