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

diverse verbesserungen posts

Browse Source
This commit is contained in:
Andreas Stephanides
2020-08-29 11:45:47 +00:00
parent 488ef97ba6
commit 6440af89b9
10 changed files with 800 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fet2020/fet2020/settings.py
View File

@@ -189,3 +189,8 @@ THUMBNAIL_ALIASES = {
'thumb': {'size': (150, 150), 'crop': True}, 'thumb': {'size': (150, 150), 'crop': True},
}, },
} }
ETHERPAD_CLIENT = {
'url': "http://localhost:9003"
}

1
fet2020/members/urls.py
View File

@@ -7,4 +7,5 @@ urlpatterns = [
path('', views.index, name='members'), path('', views.index, name='members'),
path('<str:filter>', views.index), path('<str:filter>', views.index),
path('jobs/<str:slug>', views.index), path('jobs/<str:slug>', views.index),
path('m/<str:nickname>',views.show, name="member")
] ]

4
fet2020/members/views.py
View File

@@ -10,6 +10,10 @@ from rest_framework import permissions
# from django_filters.rest_framework import DjangoFilterBackend # from django_filters.rest_framework import DjangoFilterBackend
def show(request,nickname=None):
return render(request, 'members/index.html', context)
def index(request, slug=None, filter=None): def index(request, slug=None, filter=None):
job_group = deque(JobGroup.objects.all()) job_group = deque(JobGroup.objects.all())
job_list = [] job_list = []

6
fet2020/posts/models.py
View File

@@ -5,7 +5,7 @@ from django.urls import reverse
from django.utils import timezone 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 members.models import Member
from taggit.managers import TaggableManager from taggit.managers import TaggableManager
# from ckeditor_uploader import RichTextUploadingField # from ckeditor_uploader import RichTextUploadingField
@@ -182,6 +182,10 @@ class Post(models.Model):
def url(self): def url(self):
return reverse('posts.show', kwargs={"id": self.slug}) return reverse('posts.show', kwargs={"id": self.slug})
@property
def username(self):
return (Member.all_members.get(nickname=self.author.username))
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
"save the post with some defaults" "save the post with some defaults"
if (self.id is None) and (not self.slug): if (self.id is None) and (not self.slug):

21
fet2020/posts/templatetags/post_helpers.py
View File

@@ -3,10 +3,29 @@ import re
from django.template.defaultfilters import stringfilter from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
register = template.Library() register = template.Library()
from django.urls import reverse
from members.models import Member
@register.filter(is_safe=True) @register.filter(is_safe=True)
@stringfilter @stringfilter
def tags_to_url(value): def tags_to_url(value):
# return "Tag to url: %s" % value # return "Tag to url: %s" % value
return mark_safe(re.sub(r'\#([\d\w-]+)', r'<a href="/posts/t/\g<1>">#\g<1></a>', value)) return mark_safe(re.sub(r'\#([\d\w-]+)', r'<a href="/posts/t/\g<1>">#\g<1></a>', value))
def create_a_link_for(v):
v=v.group(1)
try:
m = Member.all_members.get(nickname=v)
except:
m = None
if not m is None:
return '<a href="' + str(reverse('member', kwargs= {"nickname": m.nickname})) + '">' + v + "</a>"
return "<a href=\"/posts/%s\">%s</a>" % (v,v)
@register.filter(is_safe=True)
def add_internal_links(value):
#m=Member.all_members.get(value)
return mark_safe(re.sub(r'\[\[([\d\w-]+)\]\]',create_a_link_for, value))

733
fet2020/static/app.css
View File

File diff suppressed because one or more lines are too long

2
fet2020/templates/home.html
View File

@@ -62,6 +62,6 @@
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

14
fet2020/templates/layout.html
View File

@@ -12,7 +12,7 @@
{% block header %} {% block header %}
{% endblock %} {% endblock %}
</head> </head>
<body> <body style="min-height:100%;">
<div class="top-bar" id="main-menu"> <div class="top-bar" id="main-menu">
<div class="top-bar-left"><a href="{% url 'home' %}"> <div class="top-bar-left"><a href="{% url 'home' %}">
@@ -30,10 +30,16 @@
</div> </div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
<div class="grid-x">
<div class="cell medium-6"> <div class="grid-y footer" style="height:8em; bottom:0">
<a href ="/admin">admin</a>
<div class="grid-x medium-padding-1 large-padding-left-2" style="">
<div class="cell">
<ul class="no-bullet">
<li><a href="/admin">admin</a></li>
<li><a href="{% url 'posts.show' 'impressum'%}">Impressum</a></li>
</div> </div>
</div> </div>
<!-- App.js --> <!-- App.js -->
<script src="{%static 'app.js' %}"></script> <script src="{%static 'app.js' %}"></script>

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

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

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

@@ -1,7 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% load post_helpers %} {% load post_helpers %}
{% load thumbnail %}{% load admin_urls %}
{% block content %} {% block content %}
<div class="large-article-header" style="background-image:url('{{post.imageurl}}')"> <div class="large-article-header" style="background-image:url('{{post.imageurl}}')">
@@ -15,32 +15,36 @@
</div> </div>
<div class="article-details"> <div class="article-details">
{{post.subtitle | tags_to_url }} {{post.subtitle | tags_to_url }}
{% if post.username != None %}
<div class="article-author"> <div class="article-author">
<img src="https://unsplash.it/50/50?image=1005" alt="" /> <img src="{{post.username.image | thumbnail_url:'avatar'}}" alt="" />
<a href="#">Jane Austen</a> <a href="{% url 'member' post.username.nickname %}">{{post.username.nickname}}</a>
</div> </div>
{% endif %}
<div class="article-comments"> </div> <button class="">
<a href="#"><i class="fa fa-comment" aria-hidden="true"></i> 3 Comments</a>
</div> <span class="nav fa fa-chevron-right fa-3x"></span>
</div> </button>
</div> </div>
</div></div> </div></div>
<div class="grid-container"> <div class="grid-container">
<h1>{{post.title | tags_to_url }}</h1><br> <h1>{{post.title | tags_to_url }}</h1>
<a href="{% url 'posts.show' next %}">Nächster Artikel</a> <strong>{{post.subtitle | tags_to_url }}</strong><span class="nav fa fa-chevron-right fa-3x"></span>
<br>
<a href="{% url 'posts.show' next %}">Nächster Artikel</a><br>
{{post.event_start}} {{post.event_start}}
{{post.event_end}} {{post.event_end}}
<a href="{{ep_link}}">EP</a> <a href="{{ep_link}}">EP</a>
<strong>{{post.subtitle | tags_to_url }}</strong> <a href="{% url "admin:posts_news_change" post.id %}">{% url "admin:posts_news_change" post.slug %}</a>
<hr> <hr>
{{post.body | safe}} {{post.body | safe | add_internal_links | tags_to_url}}
<hr> <hr>
{% for tag in post.get_tagnames %} {% for tag in post.get_tagnames %}
{{tag |tags_to_url}} {{tag |tags_to_url}}
{% endfor %} {% endfor %}
<hr> <hr>
<div class="grid-x grid-padding"> <div class="grid-x grid-margin-x">
{% for post in related_posts %} {% for post in related_posts %}
<div class="medium-6 large-4 small-12 cell"> <div class="medium-6 large-4 small-12 cell">