Merge branch 'main' into #5_Rating

Author: LeonardBongard

.github/workflows/django.yml

@@ -2,9 +2,9 @@ name: Django CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

README.md

@@ -1,5 +1,7 @@
 # Collab Coursebook
 
+![Django CI](https://github.com/DataManagementLab/collab-coursebook/workflows/Django%20CI/badge.svg)
+
 ## Description
 
 Collab Coursebook is a plattform for collaborative learning und knowledge organization. It provides a place to share and re-use notes and other learning materials.

collab_coursebook/settings.py

@@ -51,6 +51,7 @@
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -166,3 +167,5 @@
     "impress_text": "",
     "impress_url": ""
 }
+
+ALLOW_PUBLIC_COURSE_EDITING_BY_EVERYONE = True

collab_coursebook/urls.py

@@ -27,4 +27,5 @@
     path('accounts/logout/', django_cas_ng.views.LogoutView.as_view(), name='cas_ng_logout'),
     path('accounts/callback/', django_cas_ng.views.CallbackView.as_view(), name='cas_ng_proxy_callback'),
     path('', include('frontend.urls', namespace='frontend')),
+    path('i18n/', include('django.conf.urls.i18n')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

content/forms.py

@@ -0,0 +1,20 @@
+from django import forms
+from content.models import YTVideoContent, ImageContent
+
+
+class AddContentFormYoutubeVideo(forms.ModelForm):
+    class Meta:
+        model = YTVideoContent
+        exclude = ['content']
+
+
+class AddContentFormImage(forms.ModelForm):
+    class Meta:
+        model = ImageContent
+        exclude = ['content']
+
+
+CONTENT_TYPE_FORMS = {
+    YTVideoContent.TYPE: AddContentFormYoutubeVideo,
+    ImageContent.TYPE: AddContentFormImage,
+}

content/templates/content/cards/Image.html

@@ -1,2 +1 @@
-{# TODO Replace with real preview #}
-<div class="card-img-top fit bg-success" style="height: 180px;"></div>
+<img class="card-img-top fit" style="height: 180px;" src="{{ content.imagecontent.image.url }}" alt="{{ content.description }}" width="500" height="600">

content/templates/content/cards/YouTubeVideo.html

@@ -1,2 +1 @@
-{# TODO Replace with real preview #}
-<div class="card-img-top fit bg-success" style="height: 180px;"></div>
+<img class="card-img-top fit" style="height: 180px;" src="https://img.youtube.com/vi/{{ content.ytvideocontent.id }}/0.jpg" alt="{{ content.description }}" width="500" height="600">

content/templates/content/export/Image.tex

@@ -0,0 +1,10 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+
+\textbf{Image}
+\Image{ {{content.description|tex_escape}} }{% templatetag openbrace %}{{content.imagecontent.image.path}}{% templatetag closebrace%}
+\newline
+ {{content.description|tex_escape}}
+\newline
+
+{% endautoescape %}

content/templates/content/export/YouTubeVideo.tex

@@ -0,0 +1,9 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+\textbf{YouTube video}
+\newline
+\href{ {{ content.ytvideocontent.url }} }{ {{ content.ytvideocontent.url }} }
+\newline
+{{content.description|tex_escape}}
+\newline
+{% endautoescape %}

content/templates/content/export/base.tex

@@ -0,0 +1,34 @@
+{% load cc_export_tags %}
+{% autoescape off %}
+
+\documentclass[a4paper]{article}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[ngerman]{babel}
+\usepackage{graphicx}
+\usepackage{float}
+\usepackage{grffile}
+\usepackage{hyperref}
+\usepackage[left=1cm, right=1cm, top=2cm, bottom=2cm]{geometry}
+
+%% Generate a latex graphic
+% 1: caption
+% 2: image path
+\newcommand{\Image}[2]{
+    \begin{figure}[H]
+    \centering
+    \includegraphics[width=\textwidth]{#2}
+    \caption{#1}
+    \end{figure}
+}
+
+\begin{document}
+
+    \title{ {{ course.title|tex_escape }} }
+    \author{ {{user|tex_escape}} }
+    \maketitle
+
+% \end{document} gets appended in code
+
+{% endautoescape %}