From c96a56f6c901b7dcdac7f0bed13f1b058748b2a0 Mon Sep 17 00:00:00 2001 From: papi Date: Tue, 16 Jan 2024 23:15:44 +0300 Subject: [PATCH] Few UI adjustments --- course/forms.py | 2 - ...ter_upload_file_alter_uploadvideo_video.py | 24 ++++++++ course/models.py | 2 + course/views.py | 15 +++-- static/css/style.min.css.map | 2 +- static/scss/style.scss | 7 --- templates/course/course_single.html | 31 +++------- templates/upload/upload_file_form.html | 61 ++++++------------- templates/upload/upload_video_form.html | 46 +++----------- templates/upload/video_single.html | 13 ++-- 10 files changed, 79 insertions(+), 124 deletions(-) create mode 100644 course/migrations/0007_alter_upload_file_alter_uploadvideo_video.py diff --git a/course/forms.py b/course/forms.py index 863d11f..ce568d3 100644 --- a/course/forms.py +++ b/course/forms.py @@ -85,7 +85,6 @@ class UploadFormFile(forms.ModelForm): fields = ( "title", "file", - "course", ) def __init__(self, *args, **kwargs): @@ -101,7 +100,6 @@ class UploadFormVideo(forms.ModelForm): fields = ( "title", "video", - "course", ) def __init__(self, *args, **kwargs): diff --git a/course/migrations/0007_alter_upload_file_alter_uploadvideo_video.py b/course/migrations/0007_alter_upload_file_alter_uploadvideo_video.py new file mode 100644 index 0000000..872ba5d --- /dev/null +++ b/course/migrations/0007_alter_upload_file_alter_uploadvideo_video.py @@ -0,0 +1,24 @@ +# Generated by Django 4.0.8 on 2024-01-16 20:14 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('course', '0006_courseoffer'), + ] + + operations = [ + migrations.AlterField( + model_name='upload', + name='file', + field=models.FileField(help_text='Valid Files: pdf, docx, doc, xls, xlsx, ppt, pptx, zip, rar, 7zip', upload_to='course_files/', validators=[django.core.validators.FileExtensionValidator(['pdf', 'docx', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', 'zip', 'rar', '7zip'])]), + ), + migrations.AlterField( + model_name='uploadvideo', + name='video', + field=models.FileField(help_text='Valid video formats: mp4, mkv, wmv, 3gp, f4v, avi, mp3', upload_to='course_videos/', validators=[django.core.validators.FileExtensionValidator(['mp4', 'mkv', 'wmv', '3gp', 'f4v', 'avi', 'mp3'])]), + ), + ] diff --git a/course/models.py b/course/models.py index d516dc9..d00f55a 100644 --- a/course/models.py +++ b/course/models.py @@ -165,6 +165,7 @@ class Upload(models.Model): course = models.ForeignKey(Course, on_delete=models.CASCADE) file = models.FileField( upload_to="course_files/", + help_text="Valid Files: pdf, docx, doc, xls, xlsx, ppt, pptx, zip, rar, 7zip", validators=[ FileExtensionValidator( [ @@ -233,6 +234,7 @@ class UploadVideo(models.Model): course = models.ForeignKey(Course, on_delete=models.CASCADE) video = models.FileField( upload_to="course_videos/", + help_text="Valid video formats: mp4, mkv, wmv, 3gp, f4v, avi, mp3", validators=[ FileExtensionValidator(["mp4", "mkv", "wmv", "3gp", "f4v", "avi", "mp3"]) ], diff --git a/course/views.py b/course/views.py index c64a07b..80fc39a 100644 --- a/course/views.py +++ b/course/views.py @@ -311,10 +311,12 @@ def deallocate_course(request, pk): def handle_file_upload(request, slug): course = Course.objects.get(slug=slug) if request.method == "POST": - form = UploadFormFile(request.POST, request.FILES, {"course": course}) - # file_name = request.POST.get('name') + form = UploadFormFile(request.POST, request.FILES) if form.is_valid(): - form.save() + obj = form.save(commit=False) + obj.course = course + obj.save() + messages.success( request, (request.POST.get("title") + " has been uploaded.") ) @@ -369,9 +371,12 @@ def handle_file_delete(request, slug, file_id): def handle_video_upload(request, slug): course = Course.objects.get(slug=slug) if request.method == "POST": - form = UploadFormVideo(request.POST, request.FILES, {"course": course}) + form = UploadFormVideo(request.POST, request.FILES) if form.is_valid(): - form.save() + obj = form.save(commit=False) + obj.course = course + obj.save() + messages.success( request, (request.POST.get("title") + " has been uploaded.") ) diff --git a/static/css/style.min.css.map b/static/css/style.min.css.map index 9e19150..49185df 100644 --- a/static/css/style.min.css.map +++ b/static/css/style.min.css.map @@ -1 +1 @@ -{"version":3,"sources":["../scss/style.scss"],"names":[],"mappings":"AACA,WACE,mBAAA,CACA,iBAAA,CACA,eAAA,CACA,2DAAA,CACA,iZAAA,CAcF,OAEE,8BAAA,CAEF,KACE,wBAAA,CAIF,oBACE,UAAA,CACA,WAAA,CAIF,0BACE,kBAAA,CACA,kBAAA,CAIF,0BACE,eAAA,CACA,kBAAA,CAIF,gCACE,eAAA,CAOF,KAEE,kDAAA,CAEA,kDAAA,CAIA,oBAEE,qBAAA,CAEF,qBACE,YAAA,CACA,aAAA,CACA,kBAAA,CACA,cAAA,CAEA,2BACE,qCAAA,CACA,kBAAA,CAEF,2BACE,2CAAA,CAGJ,aACE,YAAA,CACA,eAAA,CACA,iBAAA,CACA,qBAAA,CACA,oBAAA,CACA,cAAA,CAEA,mBACE,aAAA,CACA,qBAAA,CACA,oBAAA,CACA,SAAA,CACA,0CAAA,CAGJ,qCACE,UAAA,CAIJ,aACE,wBAAA,CACA,cAAA,CACA,YAAA,CACA,aAAA,CACA,aAAA,CAKF,MAEE,gBAAA,CACA,mBAAA,CACA,kBAAA,CACA,cAAA,CAEF,yBACE,MACE,iBAAA,CAAA,CAOJ,YACE,cAAA,CACA,KAAA,CACA,OAAA,CACA,UAAA,CACA,0BAAA,CACA,UAAA,CAEA,kBAAA,CAGA,yCAAA,CACA,cAAA,CAEA,yBACE,YAAA,CACA,cAAA,CACA,6BAAA,CACA,kBAAA,CAEA,sCAKE,YAAA,CACA,OAAA,CAEA,gDACE,OAAA,CAEF,6CACE,OAAA,CAGJ,qCACE,cAAA,CACA,mBAAA,CACA,2CACE,qBAAA,CAIN,0BACE,MAAA,CAIJ,yBACE,sCACE,OAAA,CAEF,qCACE,OAAA,CAEF,mCACE,OAAA,CAAA,CAKJ,aACE,cAAA,CACA,QAAA,CACA,OAAA,CACA,UAAA,CACA,aAAA,CACA,UAAA,CACA,qCAAA,CACA,4BAAA,CACA,cAAA,CAEA,2BACE,MAAA,CAKJ,UACE,YAAA,CACA,UAAA,CACA,gBAAA,CACA,wBAAA,CACA,mBAAA,CACA,cAAA,CACA,UAAA,CACA,cAAA,CAGA,iBAAA,CAIA,uBAAA,CAEF,gBACE,wBAAA,CAEF,cACE,eAAA,CAGF,0BACE,cACE,eAAA,CAAA,CAIJ,0BACE,cACE,eAAA,CAAA,CAIJ,yBACE,cACE,eAAA,CACA,eAAA,CAAA,CAIJ,yBACE,0BAEE,OAAA,CACA,UAAA,CAEF,wCACE,UAAA,CAEF,yBAEE,OAAA,CAEF,uBAEE,OAAA,CAAA,CAMJ,QACE,UAAA,CACA,WAAA,CACA,iBAAA,CACA,eAAA,CACA,YACE,UAAA,CACA,WAAA,CACA,mBAAA,CAAA,gBAAA,CACA,kBACE,oBAAA,CAGJ,kBACE,UAAA,CACA,WAAA,CAEF,kBACE,UAAA,CACA,WAAA,CAQJ,eACE,oCAAA,CAGA,8BACE,eAAA,CACA,kBAAA,CAIJ,oBACE,GACE,oBAAA,CAEF,KACE,kBAAA,CAAA,CAOJ,UACE,WAAA,CACA,cAAA,CACA,MAAA,CACA,KAAA,CACA,QAAA,CACA,YAAA,CACA,qBAAA,CACA,6BAAA,CACA,WAAA,CACA,eAAA,CACA,iBAAA,CACA,qBAAA,CAGA,2EAAA,CAEA,cAAA,CAEA,YACE,gBAAA,CAEF,iBACE,eAAA,CAEF,oBACE,kBAAA,CAGA,yCAAA,CACA,kBAAA,CACA,kBAAA,CAEA,kCACE,YAAA,CAEA,8CACE,iBAAA,CACA,KAAA,CACA,OAAA,CACA,MAAA,CACA,qBAAA,CACA,aAAA,CACA,cAAA,CACA,iBAAA,CACA,cAAA,CACA,gBAAA,CACA,cAAA,CAEA,gDACE,UAAA,CACA,aAAA,CAEA,sDACE,UAAA,CACA,cAAA,CAKR,8BACE,SAAA,CAGJ,aACE,SAAA,CACA,gBACE,eAAA,CAGA,2BACE,kBAAA,CAEF,kBACE,YAAA,CACA,kBAAA,CACA,kBAAA,CACA,UAAA,CACA,yBAAA,CACA,eAAA,CAEA,wBACE,aAAA,CACA,6BAAA,CAGJ,yBAEE,4BAAA,CACA,UAAA,CAIN,wBACE,kCAAA,CACA,WAAA,CAGJ,sCACE,oBACE,gBAAA,CAEF,kCACE,aAAA,CAAA,CAGJ,oBACE,kCAAA,CACA,gBAAA,CAGF,sCACE,UACE,WAAA,CAEF,wBACE,MAAA,CAEA,uCAAA,CAEF,MACE,cAAA,CAEF,YACE,MAAA,CAEF,aACE,MAAA,CAAA,CAOJ,WACE,YAAA,CACA,cAAA,CACA,kBAAA,CACA,mBAAA,CACA,kBAAA,CACA,aAAA,CACA,iBAAA,CACA,gCAAA,CACA,0CAAA,CAEA,aACE,aAAA,CACA,mBACE,yBAAA,CAEF,oBACE,WAAA,CACA,UAAA,CACA,YAAA,CACA,qBAAA,CAQN,QACE,QAAA,CACA,QAAA,CACA,aAAA,CACA,iBAAA,CACA,sBAAA,CACA,sBAAA,CACA,eAAA,CACA,gCAAA,CACA,mCAAA,CAEA,mBACE,uDAAA,CAIJ,EACE,uBAAA,CACA,oBAAA,CAGF,SACE,iBAAA,CACA,mBAAA,CACA,kBAAA,CACA,mBAAA,CACA,yBAAA,CACA,eAAA,CACA,cAAA,CACA,kBAAA,CAEA,iBACE,UAAA,CACA,iBAAA,CACA,QAAA,CACA,UAAA,CACA,SAAA,CACA,WAAA,CACA,UAAA,CACA,iBAAA,CACA,oCAAA,CACA,sCAAA,CAEF,WACE,gBAAA,CAIJ,oBACE,GACE,SAAA,CACA,UAAA,CAEF,IACE,SAAA,CACA,UAAA,CAEF,KACE,SAAA,CACA,WAAA,CAAA,CAIJ,YACE,YAAA,CACA,kBAAA,CACA,sBAAA,CACA,eAAA,CACA,cAAA,CACA,YAAA,CAEA,mDAAA,CACA,UAAA,CACA,iBAAA,CACA,kBAAA,CACA,cACE,gBAAA,CAIJ,MAEE,8DAAA,CACA,UAAA,CAEF,QAEE,8DAAA,CACA,UAAA,CAGF,cAEE,iBAAA,CACA,UAAA,CAEA,iBAAA,CAEA,cAAA,CACA,aAAA,CACA,qBAAA,CACA,kBAAA,CACA,cAAA,CAEF,oBACE,eAAA,CAGF,MACE,aAAA,CACA,eAAA,CACA,cAAA,CAEF,YACE,aAAA,CAIF,eACE,iBAAA,CAEA,YAAA,CACA,UAAA,CACA,WAAA,CACA,eAAA,CACA,gBAAA,CACA,wBAAA,CACA,iBAAA,CACA,mCAAA,CAGF,kCACE,iBAAA,CACA,QAAA,CACA,UAAA,CACA,wBAAA,CAGF,mCACE,iBAAA,CACA,cAAA,CACA,WAAA,CACA,UAAA,CACA,SAAA,CACA,UAAA,CACA,YAAA,CACA,sBAAA,CACA,kBAAA,CAGF,2BACE,mCAAA,CAEF,2BACE,mCAAA,CAEF,0BACE,mCAAA,CAEF,aACE,mCAAA,CACA,UAAA,CAEF,eACE,gDAAA,CAEF,0BACE,GACE,kBAAA,CAEF,IACE,kBAAA,CAEF,KACE,kBAAA,CAAA,CAIJ,eACE,YAAA,CACA,kBAAA,CACA,sBAAA,CACA,cAAA,CACA,KAAA,CACA,MAAA,CACA,OAAA,CACA,QAAA,CACA,YAAA,CACA,eAAA,CACA,eAAA,CAIF,QACE,iBAAA,CACA,YAAA,CACA,sBAAA,CACA,kBAAA,CACA,eAAA,CACA,+CAAA,CAEF,yBACE,GACE,kBAAA,CAEF,IACE,kBAAA,CAEF,IACE,kBAAA,CAEF,KACE,kBAAA,CAAA,CAIJ,cACE,4CAAA,CAEF,sBACE,OAEE,QAAA,CAEF,QAEE,SAAA,CAEF,QAEE,SAAA,CAEF,KACE,UAAA,CAAA,CAIJ,qCACE,gBACE,aAAA,CAEF,iBACE,YAAA,CAEF,UACE,cAAA,CAEF,SACE,cAAA,CAAA,CAIJ,qCACE,iBACE,YAAA,CAAA,CAQJ,YACE,iBAAA,CAGF,qCACE,YACE,cAAA,CAAA,CAQJ,oBACE,iBAAA,CACA,oBAAA,CACA,kBAAA,CACA,UAAA,CACA,WAAA,CACA,8BAAA,CACA,cAAA,CAGF,kCACE,iBAAA,CACA,KAAA,CACA,MAAA,CACA,SAAA,CAGF,kCACE,iBAAA,CACA,aAAA,CACA,cAAA,CACA,cAAA,CACA,eAAA,CACA,wBAAA,CACA,wBAAA,CAIA,iBAAA,CACA,iDAAA,CAGF,mFAEE,iBAAA,CACA,OAAA,CACA,SAAA,CACA,iBAAA,CACA,aAAA,CACA,iBAAA,CAIA,kBAAA,CAGF,0CACE,SAAA,CACA,aAAA,CACA,sBAAA,CAGF,yCACE,QAAA,CACA,UAAA,CACA,qBAAA,CACA,SAAA,CAGF,gEACE,SAAA,CAGF,+DACE,SAAA,CAGF,mCACE,iBAAA,CACA,OAAA,CACA,QAAA,CACA,UAAA,CACA,WAAA,CACA,eAAA,CACA,iBAAA,CAGA,iBAAA,CAIA,6BAAA,CAGF,yDACE,SAAA,CAGF,8BACE,UAAA,CACA,WAAA,CAGF,4CACE,cAAA,CAGF,6CACE,UAAA,CACA,WAAA,CAGF,mEACE,SAAA,CAGF,8BACE,UAAA,CACA,WAAA,CAGF,4CACE,aAAA,CAGF,6CACE,UAAA,CACA,WAAA,CAGF,mEACE,SAAA,CAGF,8BACE,UAAA,CACA,WAAA,CAGF,4CACE,aAAA,CAGF,6CACE,UAAA,CACA,WAAA,CAGF,mEACE,SAAA,CAGF,wHAME,6BAAA,CAGF,2EAEE,oBAAA,CAGF,yEAEE,mBAAA,CAGF,oDACE,6BAAA,CACA,oBAAA,CAGF,qDACE,oBAAA,CAGF,4DACE,0BAAA,CACA,oBAAA,CAGF,mEACE,aAAA,CAGF,6DACE,oBAAA,CAGF,gEACE,0BAAA,CACA,oBAAA,CAGF,uEACE,aAAA,CAGF,iEACE,6BAAA,CACA,oBAAA,CAGF,SAEE,cAAA,CACA,mBAAA,CACA,kBAAA,CACA,sBAAA,CACA,UAAA,CACA,WAAA,CACA,iCAAA,CACA,iBAAA,CAIF,iCAEE,cAAA,CACA,eAAA,CACA,mBAAA,CACA,uBAAA,CACA,aAAA,CACA,cAAA,CACA,wBAAA,CACA,qBAAA","file":"style.min.css"} \ No newline at end of file +{"version":3,"sources":["../scss/style.scss"],"names":[],"mappings":"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","file":"style.min.css"} \ No newline at end of file diff --git a/static/scss/style.scss b/static/scss/style.scss index 23e9501..185c0ab 100644 --- a/static/scss/style.scss +++ b/static/scss/style.scss @@ -135,8 +135,6 @@ body { z-index: 90; /*padding: 0.4rem 1rem;*/ background: #f5f5f5; - -webkit-box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.1); transition: 0.3s; @@ -213,12 +211,7 @@ body { font-size: 13px; color: #666; padding: 0 17px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; border-radius: 3px; - -webkit-transition: all 0.2s ease; - -o-transition: all 0.2s ease; - -moz-transition: all 0.2s ease; transition: all 0.2s ease; } .au-input:focus { diff --git a/templates/course/course_single.html b/templates/course/course_single.html index 562653e..1d9d000 100644 --- a/templates/course/course_single.html +++ b/templates/course/course_single.html @@ -41,21 +41,9 @@
{{ course }}

{{ course.summary }}

-
+{% include 'snippets/messages.html' %} - {% if messages %} - {% for message in messages %} - {% if message.tags == 'error' %} -
- {{ message }} -
- {% else %} -
- {{ message }} -
- {% endif %} - {% endfor %} - {% endif %} +
@@ -77,9 +65,9 @@ {% for video in videos %} {{ forloop.counter }} - - - {{ video.title|title }} + + + {{ video.title|title }} {{ video.timestamp|date }} @@ -87,7 +75,7 @@
- Get Started + Play now
@@ -154,9 +142,8 @@ {% for file in files %} {{ forloop.counter }} - - + + {{ file.title|title }} @@ -165,7 +152,7 @@
- Download + Download
diff --git a/templates/upload/upload_file_form.html b/templates/upload/upload_file_form.html index 3859999..84057e1 100644 --- a/templates/upload/upload_file_form.html +++ b/templates/upload/upload_file_form.html @@ -14,54 +14,27 @@ -

File upload for {{ course }}

-

+

File upload for {{ course|truncatechars:25 }}

+

-{% if messages %} - {% for message in messages %} - {% if message.tags == 'error' %} -
- {{ message }} -
- {% else %} -
- {{ message }} -
- {% endif %} - {% endfor %} -{% endif %} +{% include 'snippets/messages.html' %}
-
-
-

File Upload Form


-
{% csrf_token %} -
- -
- File Name{{ form.title }} - {{ form.title.errors }} -
-
- File
{{ form.file }} - {{ form.file.errors }} -
-

Valid Files: pdf, docx, doc, xls, xlsx, ppt, pptx, zip, rar, 7zip

-
- -
-
- - Cancel -
- -
-
+
- -
+

File Upload Form

+ +
+
{% csrf_token %} + {{ form|crispy }} + +
+ + Cancel +
+
+
+
{% endblock content %} diff --git a/templates/upload/upload_video_form.html b/templates/upload/upload_video_form.html index 33beaaf..7b06945 100644 --- a/templates/upload/upload_video_form.html +++ b/templates/upload/upload_video_form.html @@ -14,53 +14,25 @@ -

Video upload for {{ course }}

+

Video upload for {{ course|truncatechars:25 }}


-{% if messages %} - {% for message in messages %} - {% if message.tags == 'error' %} -
- {{ message }} -
- {% else %} -
- {{ message }} -
- {% endif %} - {% endfor %} -{% endif %} +{% include 'snippets/messages.html' %}
-
+
-

Video Upload Form


-
{% csrf_token %} -
+

Video Upload Form

+
+ {% csrf_token %} + {{ form|crispy }} -
- Video Name{{ form.title }} - {{ form.title.errors }} -
-
- Video
{{ form.video }} - {{ form.video.errors }} -
-

Valid video formats: 'mp4', 'mkv', 'wmv', '3gp', 'f4v', 'avi', 'mp3'

-
- -
Cancel
- -
-
-
- + +
diff --git a/templates/upload/video_single.html b/templates/upload/video_single.html index 408613e..2ab3044 100644 --- a/templates/upload/video_single.html +++ b/templates/upload/video_single.html @@ -15,9 +15,7 @@

{{ video.title }}

-

- -

Video tutorial for course {{ video.course }}

+

-

{{ video.timestamp|timesince }} ago

+

{{ video.timestamp|timesince }} ago

+ {% if video.summary %} +

{{ video.summary }}

+ {% else %} + No video description set. + {% endif %}
-

{{ video.summary }}

- {% endblock content %}