From e64ea92a86be22bc4da2a078057004f615da2105 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Thu, 8 Aug 2019 17:36:11 +0530 Subject: create about page --- fossee_manim/templates/fossee_manim/about.html | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 fossee_manim/templates/fossee_manim/about.html diff --git a/fossee_manim/templates/fossee_manim/about.html b/fossee_manim/templates/fossee_manim/about.html new file mode 100644 index 0000000..ed15c4a --- /dev/null +++ b/fossee_manim/templates/fossee_manim/about.html @@ -0,0 +1,5 @@ +{% extends 'fossee_manim/base.html' %} + + {% block title %} + FOSSEE About + {% endblock %} -- cgit From bc74fa75ee49c088312249213e246ada03d66617 Mon Sep 17 00:00:00 2001 From: Sh-Ac Date: Tue, 20 Aug 2019 11:16:00 +0530 Subject: Correct pagenation bug --- .../templates/fossee_manim/proposal_status.html | 88 ++++++---------------- fossee_manim/views.py | 24 +++--- 2 files changed, 31 insertions(+), 81 deletions(-) diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index a5cf74e..7294d3a 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -8,7 +8,6 @@
- {% if request.user.profile.position == 'contributor' %}

Proposal Status


@@ -17,6 +16,9 @@ + {% if request.user.profile.position == 'reviewer' %} + + {% endif %} {% for an in anime %} @@ -31,41 +33,13 @@ {% endif %} - - - - {% endfor %} -
Title Status Created DateContributor Name
{{ an.status }}{{ an.created }}
- {% else %} - - - - - - - - - - - {% for an in anime_list %} - - - - - {% if an.status == 'rejected' %} - - {% elif an.status == 'released' %} - - {% else %} - + {% if request.user.profile.position == 'reviewer' %} + {% endif %} - - + {% endfor %} - {% endif %} -
TitleContributor NameStatusCreated Date
{{ an.title }}{{ an.contributor.get_full_name }}{{ an.status }}{{ an.status }}{{ an.status }}{{ an.contributor.get_full_name }}{{ an.created }}
@@ -76,41 +50,21 @@ diff --git a/fossee_manim/views.py b/fossee_manim/views.py index 06c7b3b..27173a5 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -297,32 +297,28 @@ def proposal_status(request): user = request.user if is_email_checked(user) and user.is_authenticated(): profile = Profile.objects.get(user_id=user) - anime = {} - anime_list = {} categories = Category.objects.all() if profile.position == 'contributor': - anime = Animation.objects.filter(contributor_id=user).order_by('-created') + animations = Animation.objects.filter(contributor_id=user).order_by('-created') else: - anime_list = Animation.objects.order_by('-created') + animations = Animation.objects.order_by('-created') + # print(animations) # Show upto 9 proposals per page - paginator_c = Paginator(list(anime), 9) - paginator_r = Paginator(list(anime_list), 9) + paginator = Paginator(list(animations), 9) page = request.GET.get('page') try: - anime = paginator_c.page(page) - anime_list = paginator_r.page(page) + anime = paginator.page(page) + print(animations.count(), anime) except PageNotAnInteger: - # If page is not an integer, deliver first page. - anime = paginator_c.page(1) - anime_list = paginator_r.page(1) + # If page is not an integer, deliver first page. + anime = paginator.page(1) except EmptyPage: # If page is out of range(e.g 999999), deliver last page. - anime = paginator_c.page(paginator_c.num_pages) - anime_list = paginator_r.page(paginator_r.num_pages) + anime = paginator.page(paginator.num_pages) return render(request, 'fossee_manim/proposal_status.html', - {'anime': anime, 'anime_list': anime_list, + {'anime': anime, 'categories': categories}) else: return redirect('/login/') -- cgit From 2761928443203eea957906c347d3c1c82ada3756 Mon Sep 17 00:00:00 2001 From: Sh-Ac Date: Fri, 23 Aug 2019 14:30:53 +0530 Subject: Add developmental-changes alert and some about content --- fossee_manim/templates/fossee_manim/about.html | 12 +++++++++++- fossee_manim/templates/fossee_manim/base.html | 14 +++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/fossee_manim/templates/fossee_manim/about.html b/fossee_manim/templates/fossee_manim/about.html index ed15c4a..281c8d7 100644 --- a/fossee_manim/templates/fossee_manim/about.html +++ b/fossee_manim/templates/fossee_manim/about.html @@ -1,5 +1,15 @@ {% extends 'fossee_manim/base.html' %} {% block title %} - FOSSEE About + About {% endblock %} + +{% block content %} +
+ +

About FOSSEE Animations

+

What we do and why do we do it?

+
+
+
+ {% endblock %} diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index f54e373..395177c 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -13,6 +13,7 @@ + @@ -79,7 +80,7 @@
- + @@ -91,6 +92,7 @@ {% block content %}

Base Template Content. Please override me

+ {% endblock %} @@ -127,6 +129,16 @@
{% endblock footer%} + + + + + -- cgit From 737b74b57b6ae73e33388b6344fd80945819959b Mon Sep 17 00:00:00 2001 From: Sh-Ac Date: Fri, 23 Aug 2019 17:08:34 +0530 Subject: Add the explore feature --- fossee_manim/templates/fossee_manim/base.html | 16 +++++++++- fossee_manim/templates/fossee_manim/explore.html | 38 ++++++++++++++++++++++++ fossee_manim/urls.py | 2 ++ fossee_manim/views.py | 7 ++++- 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 fossee_manim/templates/fossee_manim/explore.html diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index 395177c..a7115ab 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -13,8 +13,9 @@ - + + @@ -40,6 +41,19 @@