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

merged

Browse Source
This commit is contained in:
Andreas Stephanides
2020-09-13 08:21:41 +00:00
parent c0285001d5 72b4b7d982
commit 8522b33025
8 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fet2020/posts/models.py
View File

@@ -6,17 +6,12 @@ from django.utils import timezone
from django.utils.text import slugify from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from taggit.managers import TaggableManager from taggit.managers import TaggableManager
import logging
request_logger = logging.getLogger('django.request')
# import documents
from documents import ep from documents import ep
from .managers import ( from .managers import (
PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager
) )
# from ckeditor_uploader import RichTextUploadingField
# import uuid
import re import re
from rest_framework import serializers from rest_framework import serializers
@@ -24,6 +19,7 @@ from datetime import timedelta
import logging import logging
logger = logging.getLogger('posts') logger = logging.getLogger('posts')
request_logger = logging.getLogger('django.request')
class Category(models.Model): class Category(models.Model):
@@ -101,8 +97,10 @@ class Post(models.Model):
def get_tags(self): def get_tags(self):
"""Returns assigned tags as a comma seperated list.""" """Returns assigned tags as a comma seperated list."""
return ",".join(self.tags.names()) return ",".join(self.tags.names())
@property @property
def agenda_html(self): def agenda_html(self):
<<<<<<< HEAD
if not self.agenda_key: if not self.agenda_key:
return None return None
h=ep.getPadHTML(self.agenda_key) h=ep.getPadHTML(self.agenda_key)
@@ -116,6 +114,13 @@ class Post(models.Model):
request_logger.info("set etherpad!") request_logger.info("set etherpad!")
return value return value
=======
return "<h1>Agenda</h1>"
# @agenda_html.setter
# def agenda_html_set(self, value):
# return value
>>>>>>> 72b4b7d982139cd76d2d5389e7b906097d75a0c0
@property @property
def get_tagnames(self): def get_tagnames(self):
return ["#%s" % t for t in self.tags.names()] return ["#%s" % t for t in self.tags.names()]
@@ -198,7 +203,7 @@ class PostSerializer(serializers.HyperlinkedModelSerializer):
'event_end', 'event_end',
'is_hidden', 'is_hidden',
'agenda_html' 'agenda_html'
# 'author'#, # 'author',
] ]

8
fet2020/posts/views.py
View File

@@ -48,8 +48,16 @@ def tags(request, tag=""):
(job_names[idx], active_members[idx], tag + "#" + slug_list[idx]) (job_names[idx], active_members[idx], tag + "#" + slug_list[idx])
) )
author_image = None
if featured_post:
post_author = Member.all_members.filter(nickname=featured_post.author).first()
if post_author:
author_image = post_author.image['avatar'].url
context = { context = {
"posts": posts, "posts": posts,
"author_image": author_image,
"featured_post": featured_post, "featured_post": featured_post,
"members": members, "members": members,
"tags_list": None, "tags_list": None,

90
fet2020/templates/home.html
View File

@@ -6,62 +6,60 @@
<div class="grid-x"> <div class="grid-x">
<div class="medium-8 small cell" style="background: grey"> <div class="medium-8 small cell" style="background: grey">
{% with post=featured_post %} {% with post=featured_post %}
<a href="{{post.url}}"> <a href="{{post.url}}">
<div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)"> <div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)">
<div class="news-hero-text" > <div class="news-hero-text" >
<hr> <hr>
<div class="article-date"> <div class="article-date">
<p>{{post.public_date}}</p> <p>{{post.public_date}}</p>
</div> </div>
<div class="article-title">
<h1>{{post.title| safe}}</h1>
<p>{{post.subtitle | safe}}</p>
</div>
</div> <div class="article-title">
</div> <h1>{{post.title| safe}}</h1>
</a> <p>{{post.subtitle | safe}}</p>
{% endwith %} </div>
</div> </div>
</div>
</a>
{% endwith %}
</div>
<div class="medium-4 responsive-side-box cell"> <div class="medium-4 responsive-side-box cell">
<a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1> <a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a>
</a> <div class="article-row-section">
<div class="article-row-section"> {% with post=featured_post %}
{% with post=featured_post %} {% include 'posts/partials/_article_row.html' %}
{% include 'posts/partials/_article_row.html' %} {% endwith %}
{% endwith %} {% for post in featured_meeting %}
{% for post in featured_meeting %} {% include 'posts/partials/_meeting_row.html' %}
{% include 'posts/partials/_meeting_row.html' %} {% endfor %}
{% endfor %} </div>
</div>
</div> </div>
</div> </div>
<div class="grid-container"> <div class="grid-container">
<div class="grid-x grid-padding-x padding-top-1"> <div class="grid-x grid-padding-x padding-top-1">
{{ tags_list|tags_to_url }} {{ tags_list|tags_to_url }}
</div>
<div class="grid-x grid-x-padding">
<div class="medium-8 small-12 small-order-2 medium-order-1"">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% endfor %}
</div> </div>
<div class="medium-4 small-12 small-order-1 medium-order-2 padding-1">
{% for post in events %}
{% include 'posts/partials/_date_box.html' %}
{% endfor %}
<div class="grid-x grid-x-padding">
<div class="medium-8 small-12 small-order-2 medium-order-1"">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% endfor %}
</div>
<div class="medium-4 small-12 small-order-1 medium-order-2 padding-1">
{% for post in events %}
{% include 'posts/partials/_date_box.html' %}
{% endfor %}
</div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

10
fet2020/templates/members/partials/_job_membership_grid.html
View File

@@ -1,11 +1,11 @@
<div class="grid-x"> <div class="grid-x">
{% for mem in job_memberships %} {% for mem in job_memberships %}
{% with member=mem.member %} {% with member=mem.member %}
<div class="medium-3 large-2 small-6 cell"> <div class="medium-3 large-2 small-6 cell">
<h2>{{mem.member.surname}}</h2> <h2>{{mem.member.surname}}</h2>
{% include 'members/partials/_member.html' %} {% include 'members/partials/_member.html' %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})</h2> <h2>{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})</h2>
</div> </div>
{%endwith %} {% endwith %}
{% endfor %} {% endfor %}
</div> </div>

5
fet2020/templates/members/show.html
View File

@@ -1,5 +0,0 @@
{% extends 'layout.html' %}
{% block content %}
Memeber
{% endblock %}

16
fet2020/templates/posts/index.html
View File

@@ -3,16 +3,12 @@
{% block content %} {% block content %}
<div class="grid-container"> <div class="grid-container">
<div class="grid-x">
<div class="medium-8 cell">
<div class="grid-x"> {% for post in posts %}
<div class="medium-8 cell"> {% include 'posts/partials/_posts_hero.html' %}
{% for post in posts %} {% endfor %}
{% include 'posts/partials/_posts_hero.html' %} </div>
{% endfor %}
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

2
fet2020/templates/posts/show.html
View File

@@ -91,4 +91,4 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endblock %}fffsdfag {% endblock %}

3
fet2020/templates/posts/tag.html
View File

@@ -1,6 +1,5 @@
{% extends 'layout.html' %} {% extends 'layout.html' %}
{% load post_helpers %} {% load post_helpers %}
{% load thumbnail %}
{% block content %} {% block content %}
{% if featured_post != None %} {% if featured_post != None %}
{% with post=featured_post %} {% with post=featured_post %}
@@ -17,7 +16,7 @@
{{post.subtitle | tags_to_url }} {{post.subtitle | tags_to_url }}
{% if post.author_member != None %} {% if post.author_member != None %}
<div class="article-author"><a href="{% url 'member' post.author_member.nickname %}"> <div class="article-author"><a href="{% url 'member' post.author_member.nickname %}">
<img src="{{post.author_member.image | thumbnail_url:'avatar'}}" alt="" /> <img src="{{author_image}}" alt="" />
{{post.author}}</a> {{post.author}}</a>
</div> </div>
{% else %} {% else %}