diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py index ad3af9ee..1b75974e 100644 --- a/fet2020/fet2020/views.py +++ b/fet2020/fet2020/views.py @@ -17,8 +17,13 @@ def index(request): t = set(t for t in get_tags(posts_for_tags)) # set the pinned post +<<<<<<< HEAD pinned_post = Post.articles.pinned() if pinned_post: +======= + featured_post = Post.articles.get_pinned_article() + if featured_post: +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f # remove the pinned post posts.remove(pinned_post) @@ -27,9 +32,13 @@ def index(request): if not featured_event: featured_event = Event.only_events.past_events().first() +<<<<<<< HEAD featured_meeting = deque([]) featured_meeting.append(FetMeeting.objects.future_events().first()) featured_meeting.append(FetMeeting.objects.past_events().first()) +======= + featured_meeting = deque(FetMeeting.objects.get_meetings()) +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f context = { "posts": deque(list(posts)[:5]), diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 99a70b35..4bc18e13 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -81,10 +81,15 @@ def jobs_view(request, slug=None): def members_view(request, filter=None): pinned_job_groups, unpinned_job_groups = __get_job_groups() +<<<<<<< HEAD for elem in Member.MemberRole: if filter == elem.label.lower(): members = Member.all_members.filter(role=elem.value) break +======= + if filter in Member.MemberRole: + members = Member.all_members.filter(role=filter) +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f else: logger.info("Wrong member role '{}'".format(filter)) raise Http404("no member role") diff --git a/fet2020/posts/managers.py b/fet2020/posts/managers.py index da3aee03..03748864 100644 --- a/fet2020/posts/managers.py +++ b/fet2020/posts/managers.py @@ -173,7 +173,20 @@ class FetMeetingManager(PublishedManager, Manager): qs = self.published().filter(event_start__gt=date_today) return qs.reverse() +<<<<<<< HEAD def past_events(self): date_today = timezone.now() qs = self.published().filter(event_start__lt=date_today) return qs +======= + def get_meetings(self): + meetings = [] + + if self._get_future_events().first(): + meetings.append(self._get_future_events().first()) + + if self._get_past_events().first(): + meetings.append(self._get_past_events().first()) + + return meetings +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index 9bdf536d..d46ba1f1 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -201,8 +201,13 @@ def show(request, id=None): "files": files, "author": author, "author_image": author_image, +<<<<<<< HEAD "next": __next(post, public_only), "previous": __previous(post, public_only), +======= + "next": get_next_dict(p), + "previous": get_previous_dict(p), +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f "related_posts": related_posts[0:6], "ep_agenda_link": ep_agenda_link, "ep_protocol_link": ep_protocol_link, @@ -305,3 +310,27 @@ def __previous(post=None, public=True): break return d + + +def get_previous_dict(post=None): + # TODO: Docstring + posts = None + d = post.slug + + if post: + # TODO: bad implementation but it works!! + if post.post_type == "N" or post.post_type == "E": + posts = Post.articles.get_visible_articles() + elif post.post_type == "F": + posts = FetMeeting.objects.get_queryset().order_by("-event_start") + + if posts: + for k, v in enumerate(posts): + if post.slug == v.slug: + if k < 1: + d = posts[len(posts) - 1].slug + else: + d = posts[k - 1].slug + break + + return d diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_001.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_001.jpg deleted file mode 100644 index a22296b7..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_001.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_002.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_002.jpg deleted file mode 100644 index d09956ae..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_002.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_003.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_003.jpg deleted file mode 100644 index 0553c47c..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_003.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_004.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_004.jpg deleted file mode 100644 index 9d5c9351..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_004.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_005.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_005.jpg deleted file mode 100644 index 222f1086..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_005.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_006.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_006.jpg deleted file mode 100644 index 7a97cb15..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_006.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_007.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_007.jpg deleted file mode 100644 index fefc52b9..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_007.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_008.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_008.jpg deleted file mode 100644 index 80405d7b..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_008.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_009.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_009.jpg deleted file mode 100644 index 0c9c2710..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_009.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_010.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_010.jpg deleted file mode 100644 index 77ddf9be..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_010.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_011.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_011.jpg deleted file mode 100644 index 0fe45cc3..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_011.jpg and /dev/null differ diff --git a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_012.jpg b/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_012.jpg deleted file mode 100644 index 6ddb9851..00000000 Binary files a/fet2020/static/images/Fetz'n Fliegen 2019/ff2019_012.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019001.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019001.jpg deleted file mode 100644 index 25b79a8b..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019001.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019002.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019002.jpg deleted file mode 100644 index 06d6b2a2..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019002.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019003.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019003.jpg deleted file mode 100644 index c0ebb0fe..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019003.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019004.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019004.jpg deleted file mode 100644 index cf582b96..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019004.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019005.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019005.jpg deleted file mode 100644 index 95ea73ba..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019005.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019006.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019006.jpg deleted file mode 100644 index 57b41640..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019006.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019007.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019007.jpg deleted file mode 100644 index f3718cc3..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019007.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019008.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019008.jpg deleted file mode 100644 index a2c6ec01..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019008.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019009.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019009.jpg deleted file mode 100644 index b175bd80..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019009.jpg and /dev/null differ diff --git a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019010.jpg b/fet2020/static/images/Halb(e) Zeit 2019/HZ2019010.jpg deleted file mode 100644 index 9d26ff90..00000000 Binary files a/fet2020/static/images/Halb(e) Zeit 2019/HZ2019010.jpg and /dev/null differ diff --git a/fet2020/static/images/apple.jpg b/fet2020/static/images/apple.jpg deleted file mode 100644 index a1265e02..00000000 Binary files a/fet2020/static/images/apple.jpg and /dev/null differ diff --git a/fet2020/static/images/banana.jpg b/fet2020/static/images/banana.jpg deleted file mode 100644 index a0799dc7..00000000 Binary files a/fet2020/static/images/banana.jpg and /dev/null differ diff --git a/fet2020/static/images/orange.jpg b/fet2020/static/images/orange.jpg deleted file mode 100644 index b0ff4e75..00000000 Binary files a/fet2020/static/images/orange.jpg and /dev/null differ diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 1a387e7b..a2d34fdf 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -40,8 +40,11 @@ +<<<<<<< HEAD {% block galleryheader %} {% endblock %} +======= +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f {% block extraheader %} {% endblock %} @@ -69,8 +72,13 @@ x-transition:leave-end="transform opacity-0 scale-90" >
  • News
    • +<<<<<<< HEAD
  • Fachschaft
  • Galerie
    • +======= +
  • Fachschaft
    • +
  • Fotos
    • +>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f
  • Blackboard
  • Kontakt
    • @@ -122,6 +130,7 @@