Merge pull request #32 from DataManagementLab/#2_Frontend/Content_Allow_to_add_contents

#2 frontend/content allow to add contents

Author: bhaettasch

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,
+}

frontend/forms/addcontent.py

@@ -0,0 +1,12 @@
+from django import forms
+from base.models.content import Content
+from content.models import YTVideoContent, ImageContent
+
+
+class AddContentForm(forms.ModelForm):
+    """
+    The Form for adding new content to a topic
+    """
+    class Meta:  # pylint: disable=too-few-public-methods
+        model = Content
+        exclude = ['topic', 'author', 'creation_date', 'ratings', 'preview', 'type']

frontend/locale/de_DE/LC_MESSAGES/django.po

@@ -33,27 +33,40 @@ msgstr "Diese Software ist Open Source"
 msgid "Are you sure you want to delete the following comment?"
 msgstr "Soll der folgende Kommentar wirklich gelöscht werden?"
 
+#: frontend/templates/frontend/content/addcontent.html:23
+#: frontend/templates/frontend/course/create.html:29
+msgid "Create"
+msgstr "Erzeugen"
+
+#: frontend/templates/frontend/content/addcontent.html:24
+#: frontend/templates/frontend/content/detail.html:80
+#: frontend/templates/frontend/course/create.html:30
+#: frontend/templates/frontend/profile/profile_edit.html:19
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: frontend/templates/frontend/content/detail.html:18
+#: frontend/templates/frontend/course/view.html:25
 msgid "Actions"
 msgstr "Aktionen"
 
-#: frontend/templates/frontend/content/detail.html:46
+#: frontend/templates/frontend/content/detail.html:43
 msgid "Back to course "
 msgstr "Zurück zum Kurs "
 
-#: frontend/templates/frontend/content/detail.html:52
+#: frontend/templates/frontend/content/detail.html:49
 msgid "By"
 msgstr "Von"
 
-#: frontend/templates/frontend/content/detail.html:62
+#: frontend/templates/frontend/content/detail.html:59
 msgid "Created at"
 msgstr "Erstellt am"
 
-#: frontend/templates/frontend/content/detail.html:70
+#: frontend/templates/frontend/content/detail.html:67
 msgid "Delete"
 msgstr "Löschen"
 
-#: frontend/templates/frontend/content/detail.html:74
+#: frontend/templates/frontend/content/detail.html:71
 #, python-format
 msgid ""
 "\n"
@@ -67,43 +80,31 @@ msgstr ""
 "                        "
 
 #: frontend/templates/frontend/content/detail.html:83
-#: frontend/templates/frontend/course/create.html:30
-#: frontend/templates/frontend/profile/profile_edit.html:19
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: frontend/templates/frontend/content/detail.html:86
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: frontend/templates/frontend/content/detail.html:102
+#: frontend/templates/frontend/content/detail.html:99
 #: frontend/templates/frontend/course/topic_contents.html:29
 msgid "Rating"
 msgstr "Bewertung"
 
-#: frontend/templates/frontend/content/detail.html:112
+#: frontend/templates/frontend/content/detail.html:109
 msgid "Comments"
 msgstr "Kommentare"
 
-#: frontend/templates/frontend/content/detail.html:118
+#: frontend/templates/frontend/content/detail.html:115
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #: frontend/templates/frontend/course/create.html:11
 msgid "Create a new course"
 msgstr "Neuen Kurs anlegen"
 
-#: frontend/templates/frontend/course/create.html:29
-msgid "Create"
-msgstr "Erzeugen"
-
-#: frontend/templates/frontend/course/view.html:26
-#: frontend/templates/frontend/course/view_course.html:36
-msgid "Delete Course"
-msgstr "Kurs löschen"
+#: frontend/templates/frontend/course/dropdown_topic.html:10
+msgid "Add Content"
+msgstr "Inhalte hinzufügen"
 
-#: frontend/templates/frontend/course/view.html:62
-#: frontend/templates/frontend/course/view_course.html:58
+#: frontend/templates/frontend/course/view.html:78
 msgid "No topics yet"
 msgstr "Bisher keine Themen"
 
@@ -223,10 +224,21 @@ msgstr "Kommentar erfolgreich gelöscht."
 msgid "Successfully edited Comment."
 msgstr "Kommentar erfolgreich bearbeitet."
 
+#: frontend/views/content.py:28
+msgid "Content '{cleaned_data['type']}' successfully added"
+msgstr "Inhalt '{cleaned_data['type']}' erfolgreich hinzugefügt"
+
+#: frontend/views/content.py:35
+msgid "An error occurred while processing the request"
+msgstr "Es trat ein Fehler beim Verarbeiten der Anfrage auf"
+
 #: frontend/views/course.py:26
 msgid "Course '{cleaned_data['title']}' successfully created"
 msgstr "Kurs '{cleaned_data['title']}' erfolgreich angelegt"
 
-#: frontend/views/profile.py:26
+#: frontend/views/profile.py:25
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
+
+#~ msgid "Delete Course"
+#~ msgstr "Kurs löschen"

frontend/templates/frontend/content/addcontent.html

@@ -0,0 +1,28 @@
+{% extends 'frontend/base_logged_in.html' %}
+
+{# Load the tag library #}
+{% load bootstrap4 %}
+{% load cc_frontend_tags %}
+{% load fontawesome_5 %}
+{% load static %}
+{% load i18n %}
+
+{% block imports %}
+    <link href="{% static 'css/content_detail.css' %}" type="text/css" rel="stylesheet"/>
+{% endblock %}
+
+{% block content %}
+    <form method="post" enctype=multipart/form-data>
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        {% bootstrap_form content_type_form %}
+
+        {{ form.media }}
+        <div>
+
+            <button type="submit" class="btn btn-primary float-right">{% fa5_icon 'plus-circle' 'fas' %} {% trans "Create" %}</button>
+            <a href="{% url 'frontend:dashboard' %}" class="btn btn-danger">{% fa5_icon 'times' 'fas' %} {% trans "Cancel" %}</a>
+        </div>
+
+    </form>
+{% endblock %}

frontend/templates/frontend/content/detail.html

@@ -23,12 +23,9 @@
                         {# url 'readingmode' course.id topic.id content.id #}{% if ending %}{{ ending }}{% endif %}">{% fa5_icon 'eye' 'far' %}
                     Reading Mode</a>
                 {% if user.is_authenticated %}
-                    <a class="dropdown-item" href="{# url 'favourite_content' course.id topic.id content.id #}?onDetailPage=True">
-                        {% if favourite %}{% fa5_icon 'bookmark' 'fas' %} Unsave {% else %}{% fa5_icon 'bookmark' 'far' %} Save{% endif %}</a>
-                    <div class="dropdown-divider"></div>
-                    {% if markdown %}
+                    {% if content.type|is_content_editable %}
                         <a class="dropdown-item"
-                           href="{% url 'edit_md_file' course.id topic.id content.id %}">{% fa5_icon 'pencil-alt' 'fas' %}
+                           href="{#{% url 'edit_md_file' course.id topic.id content.id %}#}">{% fa5_icon 'pencil-alt' 'fas' %}
                             Edit</a>
 
                     {% endif %}

frontend/templates/frontend/course/dropdown_topic.html

@@ -0,0 +1,21 @@
+{% load i18n %}
+{# Load the tag library #}
+{% load bootstrap4 %}
+{% load fontawesome_5 %}
+{% load cc_frontend_tags %}
+
+<div class="float-right text-right">
+    <div class="dropdown show">
+        <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            {% trans "Add Content" %}
+        </button>
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
+            {% if user.is_authenticated %}
+                {% for content in content_data %}
+                    <a class="dropdown-item"
+                       href="{% url 'frontend:content-add' course_id=course_id topic_id=topic_id type=content.0 %}">{% trans content.1 %}</a>
+                {% endfor %}
+            {% endif %}
+        </div>
+    </div>
+</div>

frontend/templates/frontend/course/view.html

@@ -18,15 +18,31 @@
 
 {% block content %}
     <!-- Course markings and actions -->
-    <div class="float-right">
-        {% if course in user.profile.stared_courses.all %}
-            {% fa5_icon 'bookmark' 'fas' %}
-        {% endif %}
-        {% if user.profile in course.owners.all %}
-            <a href="{% url 'frontend:course-delete' pk=course.pk %}" class="btn btn-warning">{% fa5_icon "trash" "fas" %} {% trans "Delete Course" %}</a>
-        {% endif %}
+
+    <div class="float-right text-right">
+        <div class="dropdown show">
+            <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                {% trans "Actions" %}
+            </button>
+
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
+                {% if user.is_authenticated %}
+                    <a class="dropdown-item" href="{# url 'favourite_content' course.id topic.id content.id ?onDetailPage=True#}">
+                        {% if favourite %}{% fa5_icon 'bookmark' 'fas' %} Unsave {% else %}{% fa5_icon 'bookmark' 'far' %} Save{% endif %}</a>
+
+                    <div class="dropdown-divider"></div>
+
+                    {% if isCurrentUserOwner or user.is_superuser or content.author == user %}
+                        <a href="{% url 'frontend:course-delete' pk=course.pk %}" class="dropdown-item text-danger"
+                          >{% fa5_icon 'trash' 'fas' %} Delete</a>
+                    {% endif %}
+                {% endif %}
+
+            </div>
+        </div>
     </div>
 
+
     <!-- Course header: Title, owners, description -->
     <h1>{{ course.title }}</h1>
 
@@ -73,14 +89,19 @@ <h5 style="margin-top: 20px;">
     {% for entry in structure %}
         <div style="margin-top: 30px;">
             {% with forloop.counter as outer_index %}
-                <h3 class="text-info">{{ outer_index }}. {{ entry.topic.title }}</h3>
-
+                {% with entry.topic as topic_replace %}
+                    {% add_content_button user course.id topic_replace.id %}
+                {% endwith %}
+                <h3 class="text-info">{{ outer_index }}. {{ topic.title }}</h3>
                 {% with entry.topic.contents.all as topic_contents %}
                     {% include "frontend/course/topic_contents.html" %}
                 {% endwith %}
                 {% if entry.subtopics %}
                         {% for subtopic in entry.subtopics %}
                             <div style="margin-top: 15px;">
+                                {% with subtopic as topic_replace %}
+                                   {% add_content_button user course.id topic_replace.id %}
+                                {%  endwith %}
                                 <h4 class="text-info">{{ outer_index }}.{{ forloop.counter }}. {{ subtopic.title }}</h4>
                                 {% with subtopic.contents.all as topic_contents %}
                                     {% include "frontend/course/topic_contents.html" %}

frontend/templatetags/cc_frontend_tags.py

@@ -86,3 +86,24 @@ def content_card(type):
     if type in CONTENT_TYPES.keys():
         return f"content/cards/{type}.html"
     return "content/cards/blank.html"
+
+
+@register.filter
+def is_content_editable(type):
+    # TODO: implement check
+    return False
+
+
+@register.inclusion_tag("frontend/course/dropdown_topic.html")
+def add_content_button(user, course_id, topic_id):
+    """
+    generate dropdown-button containing list of available content types
+    :param User user: the user
+    :param int course_id: id of the course
+    :param int topic_id: id of the topic
+    :return: dropdown button as html div
+    :rtype: dict
+    """
+    # generate list of tuple (content type, content verbose name) for add content dropdown
+    content_data = [(content_type, content_model.DESC) for content_type, content_model in CONTENT_TYPES.items()]
+    return {'user': user, 'course_id': course_id, 'topic_id': topic_id, 'content_data': content_data}

frontend/urls.py

@@ -1,5 +1,6 @@
 from django.urls import path, re_path, include
 
+from content.models import CONTENT_TYPES
 from frontend import views
 
 app_name = "frontend"
@@ -20,6 +21,7 @@
             path('delete/', views.CourseDeleteView.as_view(), name='course-delete'),
         ])),
         path('<int:course_id>/topic/<int:topic_id>/content/', include([
+            re_path(r'add/(?P<type>' + '|'.join([key for key in CONTENT_TYPES.keys()]) + ')/$', views.content.AddContentView.as_view(), name='content-add'),
             path('<int:content_id>/comment/<int:pk>/delete/', views.DeleteComment.as_view(), name='comment-delete'),
             path('<int:content_id>/comment/<int:pk>/edit/', views.EditComment.as_view(), name='comment-edit'),
             path('<pk>/', views.ContentView.as_view(), name='content'),