diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..3889a9e --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,6 @@ + +# Default ignored files +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml \ No newline at end of file diff --git a/.idea/FOSSEE_animations.iml b/.idea/FOSSEE_animations.iml new file mode 100644 index 0000000..201c35f --- /dev/null +++ b/.idea/FOSSEE_animations.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..4ab70d8 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,33 @@ + + + + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:$PROJECT_DIR$/db.sqlite3 + + + + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/sqlite-jdbc-3.25.1.jar + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt + + + + + sqlite.xerial + true + true + $PROJECT_DIR$/fossee_anime/settings.py + org.sqlite.JDBC + jdbc:sqlite:$PROJECT_DIR$/db.sqlite3 + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f99b311 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3dd842f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/fossee_manim/forms.py b/fossee_manim/forms.py index 69f8458..1860bee 100644 --- a/fossee_manim/forms.py +++ b/fossee_manim/forms.py @@ -1,5 +1,7 @@ from django import forms from django.utils import timezone +from taggit.forms import TagWidget + from .models import ( Profile, User, Animation, Comment, AnimationStats @@ -264,6 +266,9 @@ def __init__(self, *args, **kwargs): class Meta: model = Animation fields = ['category', 'subcategory', 'title', 'outline', 'tags'] + widgets = { + 'tags': TagWidget(), + } class CommentForm(forms.ModelForm): diff --git a/fossee_manim/models.py b/fossee_manim/models.py index 273ebe6..e49726e 100644 --- a/fossee_manim/models.py +++ b/fossee_manim/models.py @@ -166,6 +166,12 @@ def __str__(self): return u"{0}".format(self.name) +# test +class Example(models.Model): + name = models.CharField(max_length=20) + tags = TaggableManager() + + class Animation(models.Model): title = models.CharField(max_length=255) contributor = models.ForeignKey(User, on_delete=models.CASCADE) diff --git a/fossee_manim/static/css/index.css b/fossee_manim/static/css/index.css index 0a7895e..5994fb1 100644 --- a/fossee_manim/static/css/index.css +++ b/fossee_manim/static/css/index.css @@ -62,7 +62,7 @@ form.example::after { } #btns { - padding: 25 25 25 25; + padding:25 25 25 25; font-size: 155%; font-family: 'Lato', sans-serif; } @@ -124,3 +124,33 @@ hr { background-color: #ffe0b2; border-radius: 50%; } + +.footer{ + right: 0; + left: 0; + position: relative; + bottom: 0; + + owerflow: hidden; + padding: 95px; + text-align: center; +} +a{ + color:white; +} + +a:hover{ + color:white; + background-color: gray; +} + +.navbar-toggler-icon { + display: inline-block; + width: 1.5em; + height: 1.5em; + vertical-align: middle; + content: ""; + background: no-repeat center center; + background-size: 100% 100%; + background-color: white; +} \ No newline at end of file diff --git a/fossee_manim/static/img/logo_main.png b/fossee_manim/static/img/logo_main.png index 572f4b1..d0d094c 100644 Binary files a/fossee_manim/static/img/logo_main.png and b/fossee_manim/static/img/logo_main.png differ diff --git a/fossee_manim/templates/fossee_manim/about.html b/fossee_manim/templates/fossee_manim/about.html index 13b5a01..744aecf 100644 --- a/fossee_manim/templates/fossee_manim/about.html +++ b/fossee_manim/templates/fossee_manim/about.html @@ -5,8 +5,8 @@ {% endblock %} {% block content %} -
- +
+ {% comment %}style="padding-top:120px"> {% endcomment %}

About FOSSEE Animations

What do we do and why?

@@ -16,4 +16,7 @@

What do we do and why?

- {% endblock content %} +
+ {% endblock content %} +
+ diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index 06d7071..3286020 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -1,15 +1,16 @@ + {% block title %} - HomePage + HomePage {% endblock %} - + @@ -19,116 +20,113 @@ - - + + + - - {% block extra %} + +{% block extra %} - {% endblock %} +{% endblock %} - {% block header %} - - - -
-
- -
-
- {% endblock %} - - {% block content %} -

-

Base Template Content. Please override me

- {% endblock %} - + {% block content %} +

+

Base Template Content. Please override me

+ + {% endblock %} {% block footer %} - {% endblock footer %} - - - {% endblock %} diff --git a/fossee_manim/templates/fossee_manim/honorarium.html b/fossee_manim/templates/fossee_manim/honorarium.html index 3896717..5fff216 100644 --- a/fossee_manim/templates/fossee_manim/honorarium.html +++ b/fossee_manim/templates/fossee_manim/honorarium.html @@ -57,10 +57,10 @@

Forms


Kindly print out the forms below, fill the required fields and mail them to the address:

diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index a598513..4a9cc6d 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -60,7 +60,7 @@
you receive a certificate and an

HOW IT WORKS

Infographic
- Want to know more? Visit our Guidelines page! + Want to know more? Visit our page! {% endblock %} diff --git a/fossee_manim/templates/fossee_manim/internship.html b/fossee_manim/templates/fossee_manim/internship.html new file mode 100644 index 0000000..33c3c0c --- /dev/null +++ b/fossee_manim/templates/fossee_manim/internship.html @@ -0,0 +1,23 @@ +{% extends 'fossee_manim/base.html' %} + + {% block title %} + Internship + {% endblock %} + +{% block content %} +
+ {% comment %}style="padding-top:120px"> {% endcomment %} +
+

Internship

+ {% comment %}

What do we do and why?

{% endcomment %} +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum

+
+ +
+
+
+
+
+ {% endblock content %} +
+ diff --git a/fossee_manim/templates/fossee_manim/logout.html b/fossee_manim/templates/fossee_manim/logout.html index b326547..03f655b 100644 --- a/fossee_manim/templates/fossee_manim/logout.html +++ b/fossee_manim/templates/fossee_manim/logout.html @@ -9,7 +9,7 @@

You have logged out successfully.

-

If you want to Login again please click here

+

If you want to Login again please click here


diff --git a/fossee_manim/templates/fossee_manim/outreach.html b/fossee_manim/templates/fossee_manim/outreach.html index bc85714..9299023 100644 --- a/fossee_manim/templates/fossee_manim/outreach.html +++ b/fossee_manim/templates/fossee_manim/outreach.html @@ -5,7 +5,7 @@ {% endblock %} {% block content %} -
+

FOSSEE Animations Outreach

diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index 7294d3a..2091a46 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -18,6 +18,7 @@

Proposal Status

Created Date {% if request.user.profile.position == 'reviewer' %} Contributor Name + {% endif %} diff --git a/fossee_manim/urls.py b/fossee_manim/urls.py index dac61e2..42c0ff9 100644 --- a/fossee_manim/urls.py +++ b/fossee_manim/urls.py @@ -23,6 +23,7 @@ url(r'^edit_profile/$', views.edit_profile, name='edit_profile'), url(r'^video/([1-9][0-9]*)$', views.video, name='video'), url(r'^honorarium/$', views.honorarium, name='honorarium'), + url(r'^internship/$', views.internship, name='internship'), url(r'^faqs/$', views.faqs, name='faqs'), url(r'^search_category/(?P.+)$', views.search_category, name='search_category'), diff --git a/fossee_manim/views.py b/fossee_manim/views.py index 3732ce7..0a040b1 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -558,3 +558,7 @@ def libraryPhys(request): def libraryCS(request): categories = Category.objects.all() return render(request, 'fossee_manim/libraryCS.html', {'categories': categories}) +def internship(request): + categories = Category.objects.all() + return render(request, 'fossee_manim/internship.html', {'categories': categories}) + diff --git a/static/img/logo_center.png b/static/img/logo_center.png index e4ac736..d0d094c 100644 Binary files a/static/img/logo_center.png and b/static/img/logo_center.png differ