From 1f90b97eedb702c53ec71d2ff097e5d8e3b4f36b Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Mon, 29 Jul 2019 11:38:13 +0530 Subject: html/css changes to buttons --- fossee_manim/templates/fossee_manim/index.html | 6 ++++-- fossee_manim/templates/fossee_manim/login.html | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index f37d79b..e0ba5a5 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -75,7 +75,7 @@

- + @@ -129,10 +129,12 @@ -

HOW IT WORKS

+
+ Want to know more? Visit our Guidelines page!

diff --git a/fossee_manim/templates/fossee_manim/login.html b/fossee_manim/templates/fossee_manim/login.html index 611f6ca..ae42718 100644 --- a/fossee_manim/templates/fossee_manim/login.html +++ b/fossee_manim/templates/fossee_manim/login.html @@ -8,7 +8,6 @@

Login

-

+ Don't have an account yet? Register here! +

- {% endblock %} \ No newline at end of file + {% endblock %} -- cgit From 6f0fa11e5c26998b88b165dde4842e321f4fcf8d Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Mon, 29 Jul 2019 11:49:23 +0530 Subject: Just quirky indentation changes --- .../templates/fossee_manim/guidelines.html | 267 ++++++++++----------- 1 file changed, 131 insertions(+), 136 deletions(-) diff --git a/fossee_manim/templates/fossee_manim/guidelines.html b/fossee_manim/templates/fossee_manim/guidelines.html index e1fd8c6..dd2c499 100644 --- a/fossee_manim/templates/fossee_manim/guidelines.html +++ b/fossee_manim/templates/fossee_manim/guidelines.html @@ -11,151 +11,146 @@ }

Guidelines for Submitting Proposals

- -

Guidelines for Submitting Proposals

+ +

Create your account on the FOSSEE Animations website.
Upon successful registration, an email is sent to your registered email ID. Activate your account by clicking on the activation link provided.

- -

- Before you start creating the animation videos, you need to send a proposal. The proposal submission is divided into two stages, Stage 1 and Stage 2. The details for both the stages are given below. -

Stage 1
-
1. Once the account is activated and you are logged in, proposals for video ideas can be submitted. Click on “Send Proposal” in the drop-down list next to your username (in the top-right corner). -
2. Enter your Category and Subcategory. The Subcategory field refers to the specific subdomain in which the topic to be animated lies.
  - For example, if any topic related to Newtonian motion is to be animated, the Category would be Physics and the Subcategory would be Classical Mechanics.
  - Note: If there is any ambiguity regarding the Subcategory (or sub-categories) that the chosen topic comes under, enter your best guess after performing a Google Search. -
3. The Title field refers to the specific topic that you have chosen to animate. - Concerning the the previous example, your title would be something like “Angular Momentum” or “Newton’s Laws of Motion”.
4. The Outline field should ideally include: -
  - a general description of the chosen topic,
  - the key points you intend to cover in your animation/ video,
  - the tools you might use
  - Note: If you haven’t zeroed-down on all the above specifics, try to mention a fair estimate. 150-300 words would be sufficient. -
5. The Tags field should be filled with keywords relating to your topic of animation (i.e., your Title). - Some of the possible tags for “Angular Momentum” are “Newtonian Physics”, “Classical Mechanics” and “Rotational Motion”.
6. Click on Save to Submit your proposal. You will now be able to view and edit your proposals on the proposals page. You can access this page by selecting “View Proposals” in the drop-down list next to your username in the top-right corner of the website.
-
Stage 2
-
1. Once you have submitted Stage 1 of the proposal, you will receive an email on your registered email within 3 working days. It will contain an attached Writer document (.odt), where specific details of the animation(s) proposed have to be filled in.
2. Further correspondence between the contributor and the moderator usually happens in the same email thread.
3. After the document has been submitted and has passed the moderator’s review, the proposal is cleared for submission on the FOSSEE Animations website. The contributor is notified of the same via email.
-
- Please note that the second form is completed and sent after the contributor has worked out the more precise details of their proposed animation. The moderators should get a fair idea of what the video you animate will consist of such as the approach to visualising a concept, the tools used and the books used for reference, among other things. -

Create your account on the FOSSEE Animations website.
Upon successful registration, an email is sent to your registered email ID. Activate your account by clicking on the activation link provided.

+ +

+ Before you start creating the animation videos, you need to send a proposal. The proposal submission is divided into two stages, Stage 1 and Stage 2. The details for both the stages are given below. +

Stage 1
+
1. Once the account is activated and you are logged in, proposals for video ideas can be submitted. Click on “Send Proposal” in the drop-down list next to your username (in the top-right corner). +
2. Enter your Category and Subcategory. The Subcategory field refers to the specific subdomain in which the topic to be animated lies.
  + For example, if any topic related to Newtonian motion is to be animated, the Category would be Physics and the Subcategory would be Classical Mechanics.
  + Note: If there is any ambiguity regarding the Subcategory (or sub-categories) that the chosen topic comes under, enter your best guess after performing a Google Search. +
3. The Title field refers to the specific topic that you have chosen to animate. + Concerning the the previous example, your title would be something like “Angular Momentum” or “Newton’s Laws of Motion”.
4. The Outline field should ideally include: +
  - a general description of the chosen topic,
  - the key points you intend to cover in your animation/ video,
  - the tools you might use
  + Note: If you haven’t zeroed-down on all the above specifics, try to mention a fair estimate. 150-300 words would be sufficient. +
5. The Tags field should be filled with keywords relating to your topic of animation (i.e., your Title). + Some of the possible tags for “Angular Momentum” are “Newtonian Physics”, “Classical Mechanics” and “Rotational Motion”.
6. Click on Save to Submit your proposal. You will now be able to view and edit your proposals on the proposals page. You can access this page by selecting “View Proposals” in the drop-down list next to your username in the top-right corner of the website.
+
Stage 2
+
1. Once you have submitted Stage 1 of the proposal, you will receive an email on your registered email within 3 working days. It will contain an attached Writer document (.odt), where specific details of the animation(s) proposed have to be filled in.
2. Further correspondence between the contributor and the moderator usually happens in the same email thread.
3. After the document has been submitted and has passed the moderator’s review, the proposal is cleared for submission on the FOSSEE Animations website. The contributor is notified of the same via email.
+
+ Please note that the second form is completed and sent after the contributor has worked out the more precise details of their proposed animation. The moderators should get a fair idea of what the video you animate will consist of such as the approach to visualising a concept, the tools used and the books used for reference, among other things. +

- -

You may use any tool for creating your animation. More than one tool may also be used, as per the discretion of the contributor. However, you are expected to use only open source tools such as manim, mayavi and blender. You may also use an open-source game engine. For more details contact: animations@fossee.in
Submit the final video in a .mp4 format.
Any queries can be clarified by email or through the comments on the proposal submission page.
In case you feel that the animation video requires narration, you may provide a complementary script in a .txt file over email. A voiceover would be provided for the animations from FOSSEE. You may refer to the videos already published on the website for instances of animations with and without an additional script. Email animations@fossee.in if you want to add a script.

References for animations

You may refer to this blog and this blog for getting started with manim. Here's the link for getting started with mayavi.

+ +

You may use any tool for creating your animation. More than one tool may also be used, as per the discretion of the contributor. However, you are expected to use only open source tools such as manim, mayavi and blender. You may also use an open-source game engine. For more details contact: animations@fossee.in
Submit the final video in a .mp4 format.
Any queries can be clarified by email or through the comments on the proposal submission page.
In case you feel that the animation video requires narration, you may provide a complementary script in a .txt file over email. A voiceover would be provided for the animations from FOSSEE. You may refer to the videos already published on the website for instances of animations with and without an additional script. Email animations@fossee.in if you want to add a script.

References for animations

You may refer to this blog and this blog for getting started with manim. Here's the link for getting started with mayavi.

- -

- After submitting the Proposal - Form 2, and after the moderator has approved, you will receive a link on your proposals page for uploading the required video. FOSSEE notifies you of the same via email. -

+ +

+ After submitting the Proposal - Form 2, and after the moderator has approved, you will receive a link on your proposals page for uploading the required video. FOSSEE notifies you of the same via email. +

- -

- The criterion for obtaining a certificate from FOSSEE, IITB is that you should have successfully submitted and uploaded your animation on the FOSSEE animations website. - FOSSEE sends the certificate to your registered email within 15 working days. If you submit a bunch of closely related videos in a series, you receive a certificate for that set. Otherwise, for every standalone contribution, you receive a certificate. The certificate is issued by FOSSEE, IIT Bombay. -

+ +

+ The criterion for obtaining a certificate from FOSSEE, IITB is that you should have successfully submitted and uploaded your animation on the FOSSEE animations website. + FOSSEE sends the certificate to your registered email within 15 working days. If you submit a bunch of closely related videos in a series, you receive a certificate for that set. Otherwise, for every standalone contribution, you receive a certificate. The certificate is issued by FOSSEE, IIT Bombay. +

- -

- Click here to learn about the procedure for receiving the honorarium. -

+ +

+ Click here to learn about the procedure for receiving the honorarium. +

- - - - -

{% endblock %} -- cgit From 0ee67999bcf12b3c871bd6621ba05ab211f13e60 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Mon, 29 Jul 2019 11:53:51 +0530 Subject: Removed the 3 video constraint; quirky indentation changes --- fossee_manim/templates/fossee_manim/video.html | 88 ++++++++++++-------------- 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/fossee_manim/templates/fossee_manim/video.html b/fossee_manim/templates/fossee_manim/video.html index 31867da..c0f8d29 100644 --- a/fossee_manim/templates/fossee_manim/video.html +++ b/fossee_manim/templates/fossee_manim/video.html @@ -10,11 +10,11 @@

@@ -22,68 +22,58 @@

- +

- {{ video.0.animation.outline }} +

+ {{ video.0.animation.outline|safe }}

- - -

- -

+ {% if reco %} + {% for item in reco %}

- + -

- -

- - -

+ {% endfor %} + {% endif %}

-

-

Comments

- - -

- - {% for comment in comments %} - - - - - - {% endfor %} -

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

- -
+

+

Comments

+ +

+ + {% for comment in comments %} + + + + + + {% endfor %} +

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

-{% endblock %} \ No newline at end of file +{% endblock %} -- cgit From ef9cf827cd30f114b04c6537755b9754c5554b35 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Tue, 30 Jul 2019 11:48:27 +0530 Subject: css changes on landing page --- fossee_manim/static/css/custom_font.css | 4 ++++ fossee_manim/templates/fossee_manim/index.html | 30 +++++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 fossee_manim/static/css/custom_font.css diff --git a/fossee_manim/static/css/custom_font.css b/fossee_manim/static/css/custom_font.css new file mode 100644 index 0000000..1d90f6a --- /dev/null +++ b/fossee_manim/static/css/custom_font.css @@ -0,0 +1,4 @@ +.navbar{ + font-family: 'Raleway', sans-serif; + font-size: 15px; +} diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index e0ba5a5..487e888 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -11,21 +11,23 @@ FOSSEE Animations + + + + @@ -73,7 +77,7 @@

@@ -93,8 +97,8 @@

FOSSEE Animations

endeavors to be an extensive library of community-curated videos on STEM topics

@@ -102,16 +106,16 @@

Anyone can contribute to the project

The only requirement is that the video should be made using OpenSource tools

like Blender, Manim, Mayavi, etc.

Upon successful submission
- you receive a certificate and an
+
+
On successful submission
+
you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

@@ -161,7 +165,7 @@

-
+
The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License
-- cgit From 6bf9a8edd05de55b4c666d74c3cca7e6668cab86 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Tue, 30 Jul 2019 13:02:57 +0530 Subject: Font and css changes to index.html; fix base.html fonts and footer --- fossee_manim/static/css/custom_font.css | 4 ---- fossee_manim/static/css/custom_index.css | 8 +++++++ fossee_manim/templates/fossee_manim/index.html | 32 +++++++++++++------------- 3 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 fossee_manim/static/css/custom_font.css create mode 100644 fossee_manim/static/css/custom_index.css diff --git a/fossee_manim/static/css/custom_font.css b/fossee_manim/static/css/custom_font.css deleted file mode 100644 index 1d90f6a..0000000 --- a/fossee_manim/static/css/custom_font.css +++ /dev/null @@ -1,4 +0,0 @@ -.navbar{ - font-family: 'Raleway', sans-serif; - font-size: 15px; -} diff --git a/fossee_manim/static/css/custom_index.css b/fossee_manim/static/css/custom_index.css new file mode 100644 index 0000000..3984c29 --- /dev/null +++ b/fossee_manim/static/css/custom_index.css @@ -0,0 +1,8 @@ +.navbar{ + font-family: 'Raleway', sans-serif; + font-size: 15px; +} +#mainfooter{ + font-family: 'Lato', sans-serif; + font-weight: 400; +} diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index 487e888..dc9b272 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -37,7 +37,7 @@ } - + @@ -54,14 +54,15 @@
-
+ {% csrf_token %} - -
+

Login / Register @@ -133,9 +134,9 @@ -
+

-
HOW IT WORKS
+
HOW IT WORKS

Want to know more? Visit our Guidelines page! @@ -143,31 +144,30 @@
-
+

-
+

-
+
FOSSEE | IIT-Bombay
Mumbai, India - 400-076
Phone: (+91) 22-2576-4133
Email: animations@fossee.in
-
- Follow us on:
+
+ Follow us on:

-
-
-
- The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. - This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License +
+ The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. + This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License +

-- cgit From 140b189fb53a68c182082b4812838c02e1633dda Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 11:20:49 +0530 Subject: Fixed footer with fonts in base and index --- fossee_manim/static/css/custom_base.css | 8 ++++++ fossee_manim/templates/fossee_manim/base.html | 37 +++++++++++++++++++------- fossee_manim/templates/fossee_manim/index.html | 34 ++++++++++++----------- 3 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 fossee_manim/static/css/custom_base.css diff --git a/fossee_manim/static/css/custom_base.css b/fossee_manim/static/css/custom_base.css new file mode 100644 index 0000000..5970f3a --- /dev/null +++ b/fossee_manim/static/css/custom_base.css @@ -0,0 +1,8 @@ +.navbar{ + font-family: 'Raleway', sans-serif; + font-size: 15px; +} +#basefooter{ + font-family: 'Lato', sans-serif; + font-weight: 400; +} diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index bacb95d..ad3e6d8 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -7,15 +7,29 @@ HomePage {% endblock %} + - + - + + + - + + + @@ -72,9 +86,9 @@

-
+

- + @@ -90,29 +104,32 @@ {% block footer %} -
+

-
+
FOSSEE | IIT-Bombay
Mumbai, India - 400-076
Phone: (+91) 22-2576-4133
Email: animations@fossee.in
-
- Follow us on:
+
+ Follow us on:
+ + +

-
+
The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index dc9b272..d1d4467 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -144,32 +144,34 @@
-
+

-
- FOSSEE | IIT-Bombay
- Mumbai, India - 400-076
- Phone: (+91) 22-2576-4133
- Email: animations@fossee.in -
-
- Follow us on:
- - +
+ FOSSEE | IIT-Bombay
+ Mumbai, India - 400-076
+ Phone: (+91) 22-2576-4133
+ Email: animations@fossee.in +
+
+ Follow us on:
+ +
-
- The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. - This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License -
+
+
+
+ The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. + This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License +

-
+ -- cgit From 4a14541f8bfb682f9726b62d9d2b457803fc9a10 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 11:29:35 +0530 Subject: Made changes to mail subject text --- fossee_manim/send_mails.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fossee_manim/send_mails.py b/fossee_manim/send_mails.py index 15b2e87..363a0ec 100644 --- a/fossee_manim/send_mails.py +++ b/fossee_manim/send_mails.py @@ -117,7 +117,7 @@ def send_email(request, call_on, contributor=None, key=None, proposal=None): logging.info("FOSSEE Animations | Proposal Outcome: %s", request.user.email) send_mail( - "FOSSEE Animation Status Update", message, SENDER_EMAIL, + "FOSSEE Animations Status Update", message, SENDER_EMAIL, [contributor.profile.user.email], fail_silently=True ) elif call_on == 'changes': @@ -136,7 +136,7 @@ def send_email(request, call_on, contributor=None, key=None, proposal=None): logging.info("Comment by Reviewer: %s", request.user.email) send_mail( - "FOSSEE Animation Comment by Reviewer", message, SENDER_EMAIL, + "FOSSEE Animations Comment by Reviewer", message, SENDER_EMAIL, [contributor.profile.user.email], fail_silently=True) elif call_on == 'proposal_form': message = dedent("""\ @@ -152,7 +152,7 @@ def send_email(request, call_on, contributor=None, key=None, proposal=None): FOSSEE Animations Team""".format(contributor.profile.user.username)) logging.info("Animation Proposal Form 2: %s", request.user.email) - subject = "FOSSEE Animation Proposal Form 2" + subject = "FOSSEE Animations Proposal Form 2" msg = EmailMultiAlternatives(subject, message, SENDER_EMAIL, [contributor.profile.user.email]) attachment_paths = path.join(settings.MEDIA_ROOT, "Proposal_Form") -- cgit From 3b718f137645eba6e419e30ce4695d724b4f5be8 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 11:35:07 +0530 Subject: Find where used or delete index.css --- fossee_manim/static/css/index.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fossee_manim/static/css/index.css b/fossee_manim/static/css/index.css index 176126e..0a7895e 100644 --- a/fossee_manim/static/css/index.css +++ b/fossee_manim/static/css/index.css @@ -1,15 +1,13 @@ #brand{ font-size: 2vw; - /* font-family: "Times New Roman", Georgia, serif; */ - font-family: 'Raleway', sans-serif; + font-family: "Times New Roman", Georgia, serif; } #tag { padding: 15 15 15 15; font-size: 3vw; color: goldenrod; - /* font-family: Arial, Helvetica, sans-serif; */ - font-family: 'Raleway', sans-serif; + font-family: Arial, Helvetica, sans-serif; } -- cgit From 92ff0fc1a4c95f62d74ec43f75107944e23bed0f Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 15:16:30 +0530 Subject: Migrate index.html to base.html; applied css changes across html files --- fossee_manim/static/css/custom_base.css | 25 ++++ fossee_manim/static/css/custom_index.css | 8 -- fossee_manim/templates/fossee_manim/base.html | 23 ++-- .../templates/fossee_manim/edit_profile.html | 6 +- .../templates/fossee_manim/edit_proposal.html | 30 ++--- fossee_manim/templates/fossee_manim/faqs.html | 13 ++- .../templates/fossee_manim/guidelines.html | 2 +- .../templates/fossee_manim/honorarium.html | 18 ++- fossee_manim/templates/fossee_manim/index.html | 130 ++------------------- fossee_manim/templates/fossee_manim/login.html | 8 +- .../templates/fossee_manim/profile_updated.html | 6 +- .../templates/fossee_manim/proposal_status.html | 5 +- fossee_manim/templates/fossee_manim/register.html | 8 +- .../templates/fossee_manim/search_results.html | 5 +- .../templates/fossee_manim/send_proposal.html | 15 ++- fossee_manim/templates/fossee_manim/video.html | 2 +- .../templates/fossee_manim/view_profile.html | 5 +- 17 files changed, 116 insertions(+), 193 deletions(-) delete mode 100644 fossee_manim/static/css/custom_index.css diff --git a/fossee_manim/static/css/custom_base.css b/fossee_manim/static/css/custom_base.css index 5970f3a..7ddc1cd 100644 --- a/fossee_manim/static/css/custom_base.css +++ b/fossee_manim/static/css/custom_base.css @@ -2,7 +2,32 @@ font-family: 'Raleway', sans-serif; font-size: 15px; } + #basefooter{ font-family: 'Lato', sans-serif; font-weight: 400; } +h1, +h2, +form, +.btn{ + font-family: 'Raleway', sans-serif; +} +p, +h3, +h4, +h5, +h6, +.card-body{ + font-family: 'Lato', sans-serif; +} +.perma_link:hover{ + background-color:#d1d2d3; + text-decoration: none; +} +.perma_link a{ + text-decoration: none; + font-family: 'Raleway', sans-serif; + font-weight: 500; + font-size: 18px; +} diff --git a/fossee_manim/static/css/custom_index.css b/fossee_manim/static/css/custom_index.css deleted file mode 100644 index 3984c29..0000000 --- a/fossee_manim/static/css/custom_index.css +++ /dev/null @@ -1,8 +0,0 @@ -.navbar{ - font-family: 'Raleway', sans-serif; - font-size: 15px; -} -#mainfooter{ - font-family: 'Lato', sans-serif; - font-weight: 400; -} diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index ad3e6d8..b144969 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -19,15 +19,6 @@ - @@ -48,11 +39,11 @@
-
+ {% csrf_token %} -
@@ -86,7 +77,7 @@
-
+

@@ -96,15 +87,15 @@

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

Base Template Content. Please override me
{% endblock %} -
+ {% block footer %} -
+

diff --git a/fossee_manim/templates/fossee_manim/edit_profile.html b/fossee_manim/templates/fossee_manim/edit_profile.html index 78d1546..e296522 100644 --- a/fossee_manim/templates/fossee_manim/edit_profile.html +++ b/fossee_manim/templates/fossee_manim/edit_profile.html @@ -12,6 +12,7 @@ {% block content %}

+
Edit Profile

{% csrf_token %} @@ -20,7 +21,8 @@
- +
+

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/edit_proposal.html b/fossee_manim/templates/fossee_manim/edit_proposal.html index f6e3f48..c872a52 100644 --- a/fossee_manim/templates/fossee_manim/edit_proposal.html +++ b/fossee_manim/templates/fossee_manim/edit_proposal.html @@ -20,16 +20,16 @@ {% endfor %} {% endif %} - +
{% csrf_token %} - + {{ proposal_form.as_table }}
- +
- +

@@ -46,10 +46,10 @@ {% elif proposal_form.instance.status == 'pending' and request.user.profile.position == 'contributor' %}
Awaiting Reviewer's Moderation

Further details regarding the second stage of Proposal will be shared with you over the email shortly
- + {% else %} {% endif %} @@ -59,11 +59,11 @@ {% csrf_token %}

- + -
-
+
+
{% endif %}

@@ -76,7 +76,7 @@ {{ comment_form.as_p }} - +

@@ -85,7 +85,7 @@ -
{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}
+
{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

{{ comment.comment }}

@@ -93,7 +93,7 @@ {% endfor %} - +

@@ -104,7 +104,7 @@

{% if comments.has_previous %} - Previous {% endif %}
@@ -116,7 +116,7 @@
{% if comments.has_next %} Next - + {% endif %}

@@ -127,4 +127,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/faqs.html b/fossee_manim/templates/fossee_manim/faqs.html index 36ad9da..b956f50 100644 --- a/fossee_manim/templates/fossee_manim/faqs.html +++ b/fossee_manim/templates/fossee_manim/faqs.html @@ -5,7 +5,15 @@ {% endblock %} {% block content %} - +

Frequently Asked Questions
@@ -57,7 +65,7 @@ Yes. One of the major focus of the FOSSEE Animations project is to promote a visual-approach to learning of science concepts. The videos are published under a Creative Commons Attribution-ShareAlike 4.0 International License licence. The code used to generate the videos is to be published under the MIT license. - Please place the terms and conditions of the MIT license on the GitHub page of your code. + Please place the terms and conditions of the MIT license on the GitHub page of your code.

When will I receive my Honorarium?
Honorarium would generally be processed within 45 days from the day we receive your forms. @@ -79,4 +87,5 @@
If you have any other queries, email us at animations@fossee.in

+
{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/guidelines.html b/fossee_manim/templates/fossee_manim/guidelines.html index dd2c499..a6256c5 100644 --- a/fossee_manim/templates/fossee_manim/guidelines.html +++ b/fossee_manim/templates/fossee_manim/guidelines.html @@ -11,7 +11,7 @@ }
-
Guidelines for Submitting Proposals
+
Guidelines for Submitting Proposals

diff --git a/fossee_manim/templates/fossee_manim/honorarium.html b/fossee_manim/templates/fossee_manim/honorarium.html index 398449e..781e70d 100644 --- a/fossee_manim/templates/fossee_manim/honorarium.html +++ b/fossee_manim/templates/fossee_manim/honorarium.html @@ -14,6 +14,9 @@ span { background-color: #f2e680; } + li{ + font-family: 'Lato', sans-serif; + }
@@ -21,7 +24,8 @@

-
Amount
+
Amount
+

The honorarium amount is assigned based on:
@@ -38,8 +42,9 @@
A quality bonus of Rs 500-1000 per video can be granted if deemed fit by the reviewer.

The final amount is up to the discretion of the moderators.

+

+
Procedure

-
Procedure

A contributor can begin with the honorarium process only after submission of the final video and its release on the website.
The procedure for acquiring the honorarium is as follows:
@@ -48,10 +53,11 @@
After FOSSEE receives the filled-in honorarium forms, the honorarium amount is transferred to your bank account through NEFT. Fill in Bankdetails_Form.pdf with details of the bank account to which you want the honorarium to be transferred.

We generally process your honorarium within 45 days from the day we receive your forms. However, if you do not receive your money within 45 days of acknowledgement of forms received, please feel free to contact us; we are happy to assist you.

- Please note that the honorarium processing only starts after we receive your completed honorarium forms. Ensure that you have made a PAN card and submit the forms in time to avoid delays. - -
Forms
- Kindly print out the forms below, fill the required fields and mail them to the address: +
Please note that the honorarium processing only starts after we receive your completed honorarium forms. Ensure that you have made a PAN card and submit the forms in time to avoid delays.
+

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

Copyright Transfer Form

Contributor Details Form
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index d1d4467..49edd78 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -1,92 +1,11 @@ - - - - +{% extends 'fossee_manim/base.html' %} - - - - - - +{% block title %} + FOSSEE Animations Homepage +{% endblock %} - FOSSEE Animations - - - - - - - - - - - - - - - - -
-
- - - - - -
-
- {% csrf_token %} - - -
- - -
-
- Login / Register -
- Login -
-
- Register -
-
-
- -
-
- -
-
- - - - - -
-
+ {% block content %} +

@@ -115,7 +34,7 @@

-
On successful submission
+
On successful submission

you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

@@ -130,6 +49,7 @@ Next
+
@@ -142,36 +62,4 @@ Want to know more? Visit our Guidelines page!

- - -
- -
-
-
- -
-
- FOSSEE | IIT-Bombay
- Mumbai, India - 400-076
- Phone: (+91) 22-2576-4133
- Email: animations@fossee.in -
-
- Follow us on:
- - - - -
-
-
-
- The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India. - This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License -
-
-
- - - + {% endblock %} diff --git a/fossee_manim/templates/fossee_manim/login.html b/fossee_manim/templates/fossee_manim/login.html index ae42718..fc5d4bc 100644 --- a/fossee_manim/templates/fossee_manim/login.html +++ b/fossee_manim/templates/fossee_manim/login.html @@ -7,7 +7,7 @@ {% block content %}

-
Login
+
Login

{% csrf_token %} @@ -16,10 +16,10 @@

- Forgot Password? + Forgot Password?

- Don't have an account yet? Register here! -

+
Don't have an account yet? Register here!
+

{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/profile_updated.html b/fossee_manim/templates/fossee_manim/profile_updated.html index ef7177c..68cf636 100644 --- a/fossee_manim/templates/fossee_manim/profile_updated.html +++ b/fossee_manim/templates/fossee_manim/profile_updated.html @@ -11,9 +11,11 @@ {% endblock %} {% block content %} +

-
+

Your Profile has changed {{ user.first_name }}

-{% endblock %} \ No newline at end of file +
+{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index a37a8be..a2f0130 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -4,12 +4,13 @@ Proposal Status {% endblock %} {% block content %} +

{% if request.user.profile.position == 'contributor' %}
Proposal Status
- +
@@ -29,7 +30,7 @@ {% endif %} - + {% endfor %} diff --git a/fossee_manim/templates/fossee_manim/register.html b/fossee_manim/templates/fossee_manim/register.html index 5b148a9..e21c5fa 100644 --- a/fossee_manim/templates/fossee_manim/register.html +++ b/fossee_manim/templates/fossee_manim/register.html @@ -18,7 +18,8 @@

-
Contributor Registration Form
+ +
Contributor Registration Form

{% csrf_token %} @@ -26,12 +27,13 @@ {{ form.as_table }}

Title {{ an.status }} {{ an.created }}

- +
+

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/search_results.html b/fossee_manim/templates/fossee_manim/search_results.html index add5004..303b735 100644 --- a/fossee_manim/templates/fossee_manim/search_results.html +++ b/fossee_manim/templates/fossee_manim/search_results.html @@ -5,6 +5,7 @@ {% endblock %} {% block content %} +

{% if s_result %} {% for anime in s_result %} @@ -16,8 +17,8 @@

-
{{ anime.animation.title }}
-
{{ anime.animation.description | truncatewords:5}}
+
{{ anime.animation.title }}
+
{{ anime.animation.description | truncatewords:5}}

{{ anime.animation.github }}

diff --git a/fossee_manim/templates/fossee_manim/send_proposal.html b/fossee_manim/templates/fossee_manim/send_proposal.html index ecfa1e0..66c807b 100644 --- a/fossee_manim/templates/fossee_manim/send_proposal.html +++ b/fossee_manim/templates/fossee_manim/send_proposal.html @@ -16,11 +16,6 @@
{% endif %} - - - - -

Proposal - Stage 1

@@ -38,6 +33,14 @@

- + + + + +
{% endblock %} diff --git a/fossee_manim/templates/fossee_manim/video.html b/fossee_manim/templates/fossee_manim/video.html index c0f8d29..e7cf6b3 100644 --- a/fossee_manim/templates/fossee_manim/video.html +++ b/fossee_manim/templates/fossee_manim/video.html @@ -14,7 +14,7 @@

-
{{ video.0.animation.title }}
+
{{ video.0.animation.title }}

{{ video.0.animation.subcategory }}
diff --git a/fossee_manim/templates/fossee_manim/view_profile.html b/fossee_manim/templates/fossee_manim/view_profile.html index 69205a2..ec54c8e 100644 --- a/fossee_manim/templates/fossee_manim/view_profile.html +++ b/fossee_manim/templates/fossee_manim/view_profile.html @@ -12,8 +12,9 @@ {% csrf_token %} {% block content %} -

+
View Profile
+
@@ -49,7 +50,7 @@

First name:

- Edit Profile + Edit Profile

{% endblock %} -- cgit From af4a10b4913cece224e0bc352c9ac62f61bcad19 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 16:19:55 +0530 Subject: changes to urls, views --- fossee_anime/settings.py | 2 +- fossee_anime/urls.py | 4 ++-- fossee_manim/forms.py | 13 ++++++++++--- fossee_manim/models.py | 5 ++--- fossee_manim/urls.py | 3 ++- fossee_manim/views.py | 17 ++++++++++------- static/css/index.css | 6 +++--- static/img/logo.png | Bin 7537 -> 17220 bytes 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/fossee_anime/settings.py b/fossee_anime/settings.py index b620525..8b5f93a 100644 --- a/fossee_anime/settings.py +++ b/fossee_anime/settings.py @@ -165,4 +165,4 @@ ADMIN_EMAIL = 'your admin email' FILE_UPLOAD_PERMISSIONS = 0o644 SESSION_EXPIRE_AT_BROWSER_CLOSE = True SESSION_SAVE_EVERY_REQUEST = True -SESSION_COOKIE_AGE = 36000 \ No newline at end of file +SESSION_COOKIE_AGE = 36000 diff --git a/fossee_anime/urls.py b/fossee_anime/urls.py index 9fb65d5..0db0fe5 100644 --- a/fossee_anime/urls.py +++ b/fossee_anime/urls.py @@ -23,7 +23,7 @@ from django.conf.urls.static import static urlpatterns = [ url(r'^admin/', admin.site.urls), url(r'^', include('fossee_manim.urls')), - url(r'^', include('fossee_manim.urls_password_reset')) + url(r'^', include('fossee_manim.urls_password_reset')), ] urlpatterns += static(settings.MEDIA_URL, - document_root=settings.MEDIA_ROOT) \ No newline at end of file + document_root=settings.MEDIA_ROOT) diff --git a/fossee_manim/forms.py b/fossee_manim/forms.py index 7dfdc77..69f8458 100644 --- a/fossee_manim/forms.py +++ b/fossee_manim/forms.py @@ -250,9 +250,16 @@ class AnimationProposal(forms.ModelForm): def __init__(self, *args, **kwargs): super(AnimationProposal, self).__init__(*args, **kwargs) self.fields['subcategory'].widget.attrs['placeholder'] = 'Eg: Quantum Mechanics, Topology' - self.fields['outline'].widget.attrs['placeholder'] = 'NOTE:-Do\ - add info about prerequisites (if any), possible textbooks and \ - any other related information' + # self.fields['outline'].widget.attrs['placeholder'] = 'NOTE: Do\ + # add info about prerequisites (if any), possible textbooks and \ + # any other related information' + self.fields['outline'].widget.attrs={ + 'id': 'custom_editor', + 'rows': 10, + 'cols': 50, + 'placeholder': ('NOTE: Do add info about prerequisites (if any), possible textbooks and ' + 'any other related information') + } class Meta: model = Animation diff --git a/fossee_manim/models.py b/fossee_manim/models.py index e2ff72c..273ebe6 100644 --- a/fossee_manim/models.py +++ b/fossee_manim/models.py @@ -10,7 +10,6 @@ from os import path, sep import tempfile import subprocess - position_choices = ( ("contributor", "Contributor"), ("reviewer", "Reviewer") @@ -220,7 +219,7 @@ class AnimationStats(models.Model): # some Django-specific additions django_file = File(que_file) self.thumbnail.save(file_name, django_file, save=True) - + def _create_ogv(self): video_input = self.video_path.path vid_output = path.join( @@ -233,4 +232,4 @@ class AnimationStats(models.Model): # Converting to Python file object with # some Django-specific additions django_file = File(que_file) - self.video_path.save(file_name, django_file, save=True) \ No newline at end of file + self.video_path.save(file_name, django_file, save=True) diff --git a/fossee_manim/urls.py b/fossee_manim/urls.py index 6d24111..c41dd11 100644 --- a/fossee_manim/urls.py +++ b/fossee_manim/urls.py @@ -25,7 +25,8 @@ urlpatterns = [ url(r'^honorarium/$', views.honorarium, name='honorarium'), url(r'^faqs/$', views.faqs, name='faqs'), url(r'^search_category/(?P.+)$', views.search_category, - name='search_category') + name='search_category'), + url(r'^about/$',views.about, name='about'), ] urlpatterns += static( diff --git a/fossee_manim/views.py b/fossee_manim/views.py index a0d0c22..06c7b3b 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -35,7 +35,7 @@ except ImportError: __author__ = "Akshen Doke" __credits__ = ["Prabhu Ramachandran", "Aditya P.", "KhushalSingh Rajput", - "Prathamesh Salunke", "Purusharth Saxsena", "Sharanya Achut" + "Prathamesh Salunke", "Purusharth Saxsena", "Sharanya Achut", "Ankit Javalkar" ] def makepath(proposal_data, reject=None): @@ -88,7 +88,7 @@ def index(request): def is_reviewer(user): - '''Check if the user is having reviewer rights''' + '''Check if the user has reviewer rights''' return user.groups.filter(name='reviewer').exists() @@ -304,7 +304,7 @@ def proposal_status(request): anime = Animation.objects.filter(contributor_id=user).order_by('-created') else: anime_list = Animation.objects.order_by('-created') - + # Show upto 9 proposals per page paginator_c = Paginator(list(anime), 9) paginator_r = Paginator(list(anime_list), 9) @@ -429,7 +429,7 @@ def search(request): Q(animation__title__contains=word) | Q(animation__outline__contains=word) | Q(animation__category__name__contains=word) | Q(animation__subcategory__contains=word), animation__status='released') - + return render(request, 'fossee_manim/search_results.html', {'s_result': anime_list, 'categories': categories}) @@ -499,7 +499,7 @@ def video(request, aid=None): return redirect('/login/') else: return redirect('/view_profile/') - + if len(suggestion_list)>3: suggestion_list = sample(suggestion_list, 3) else: @@ -525,7 +525,10 @@ def search_category(request, cat=None): def guidelines(request): categories = Category.objects.all() return render(request, 'fossee_manim/guidelines.html', {'categories': categories}) - + +def about(request): + categories = Category.objects.all() + return render(request, 'fossee_manim/about.html', {'categories': categories}) def honorarium(request): categories = Category.objects.all() @@ -533,4 +536,4 @@ def honorarium(request): def faqs(request): categories = Category.objects.all() - return render(request, 'fossee_manim/faqs.html', {'categories': categories}) \ No newline at end of file + return render(request, 'fossee_manim/faqs.html', {'categories': categories}) diff --git a/static/css/index.css b/static/css/index.css index f1b32bc..9d7643a 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -24,7 +24,7 @@ #container_img { margin: auto; - + } form.example input[type=text] { @@ -64,7 +64,7 @@ form.example::after { #btns { padding: 25 25 25 25; font-size: 155%; - font-family: Verdana, Geneva, Tahoma, sans-serif; + font-family: 'Lato', sans-serif; } #btns > a { @@ -123,4 +123,4 @@ hr { #circle:hover { background-color: #ffe0b2; border-radius: 50%; - } \ No newline at end of file +} diff --git a/static/img/logo.png b/static/img/logo.png index 8389fa1..2fef43b 100644 Binary files a/static/img/logo.png and b/static/img/logo.png differ -- cgit From 098cce53e353394cf654e4e34dd77b82cf8c8570 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Wed, 31 Jul 2019 16:46:10 +0530 Subject: removes link to about page (until created) --- fossee_manim/static/img/FA_logo.png | Bin 3443 -> 0 bytes fossee_manim/static/img/fossee_logo.png | Bin 5663 -> 0 bytes fossee_manim/static/img/logo.png | Bin 17220 -> 0 bytes fossee_manim/static/img/logo_center.png | Bin 12987 -> 0 bytes fossee_manim/templates/fossee_manim/base.html | 2 +- static/img/fossee_logo_iitb.png | Bin 14893 -> 0 bytes 6 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 fossee_manim/static/img/FA_logo.png delete mode 100644 fossee_manim/static/img/fossee_logo.png delete mode 100644 fossee_manim/static/img/logo.png delete mode 100644 fossee_manim/static/img/logo_center.png delete mode 100644 static/img/fossee_logo_iitb.png diff --git a/fossee_manim/static/img/FA_logo.png b/fossee_manim/static/img/FA_logo.png deleted file mode 100644 index 601774c..0000000 Binary files a/fossee_manim/static/img/FA_logo.png and /dev/null differ diff --git a/fossee_manim/static/img/fossee_logo.png b/fossee_manim/static/img/fossee_logo.png deleted file mode 100644 index d2d18d0..0000000 Binary files a/fossee_manim/static/img/fossee_logo.png and /dev/null differ diff --git a/fossee_manim/static/img/logo.png b/fossee_manim/static/img/logo.png deleted file mode 100644 index 2fef43b..0000000 Binary files a/fossee_manim/static/img/logo.png and /dev/null differ diff --git a/fossee_manim/static/img/logo_center.png b/fossee_manim/static/img/logo_center.png deleted file mode 100644 index e4ac736..0000000 Binary files a/fossee_manim/static/img/logo_center.png and /dev/null differ diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index b144969..0a43596 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -79,7 +79,7 @@

- + diff --git a/static/img/fossee_logo_iitb.png b/static/img/fossee_logo_iitb.png deleted file mode 100644 index 4e56081..0000000 Binary files a/static/img/fossee_logo_iitb.png and /dev/null differ -- cgit From 20c5c832b848cbe4f4c27479b83065e4501e3505 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Thu, 1 Aug 2019 15:25:45 +0530 Subject: fixes font error with raleway --- fossee_manim/static/css/custom_base.css | 28 ++++++++++++---------- fossee_manim/templates/fossee_manim/base.html | 6 ++--- .../templates/fossee_manim/edit_profile.html | 2 +- .../templates/fossee_manim/edit_proposal.html | 2 +- fossee_manim/templates/fossee_manim/faqs.html | 6 +---- .../templates/fossee_manim/honorarium.html | 6 ++--- fossee_manim/templates/fossee_manim/index.html | 8 +++---- .../templates/fossee_manim/proposal_status.html | 3 ++- .../templates/fossee_manim/send_proposal.html | 7 +++--- .../templates/fossee_manim/view_profile.html | 2 +- 10 files changed, 34 insertions(+), 36 deletions(-) diff --git a/fossee_manim/static/css/custom_base.css b/fossee_manim/static/css/custom_base.css index 7ddc1cd..e2623b1 100644 --- a/fossee_manim/static/css/custom_base.css +++ b/fossee_manim/static/css/custom_base.css @@ -1,33 +1,35 @@ -.navbar{ - font-family: 'Raleway', sans-serif; - font-size: 15px; -} - #basefooter{ font-family: 'Lato', sans-serif; - font-weight: 400; } -h1, -h2, -form, -.btn{ - font-family: 'Raleway', sans-serif; +.navbar{ + font-family: 'Montserrat', sans-serif; + font-size: 15px; } p, h3, h4, h5, h6, -.card-body{ +.card-body, +form{ font-family: 'Lato', sans-serif; } +h1, +h2, +.btn{ + font-family: 'Montserrat', sans-serif; +} .perma_link:hover{ background-color:#d1d2d3; text-decoration: none; } .perma_link a{ text-decoration: none; - font-family: 'Raleway', sans-serif; font-weight: 500; font-size: 18px; } + +#btnblue{ + background-color: #1facb3; + border-color: transparent; +} diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html index 0a43596..f54e373 100644 --- a/fossee_manim/templates/fossee_manim/base.html +++ b/fossee_manim/templates/fossee_manim/base.html @@ -19,7 +19,7 @@ - + @@ -30,7 +30,7 @@ {% block header %} -
+
@@ -42,7 +42,7 @@
{% csrf_token %} -
diff --git a/fossee_manim/templates/fossee_manim/edit_profile.html b/fossee_manim/templates/fossee_manim/edit_profile.html index e296522..e5c3bc5 100644 --- a/fossee_manim/templates/fossee_manim/edit_profile.html +++ b/fossee_manim/templates/fossee_manim/edit_profile.html @@ -21,7 +21,7 @@
- +

diff --git a/fossee_manim/templates/fossee_manim/edit_proposal.html b/fossee_manim/templates/fossee_manim/edit_proposal.html index c872a52..cfc2beb 100644 --- a/fossee_manim/templates/fossee_manim/edit_proposal.html +++ b/fossee_manim/templates/fossee_manim/edit_proposal.html @@ -29,7 +29,7 @@
- +

diff --git a/fossee_manim/templates/fossee_manim/faqs.html b/fossee_manim/templates/fossee_manim/faqs.html index b956f50..09900c2 100644 --- a/fossee_manim/templates/fossee_manim/faqs.html +++ b/fossee_manim/templates/fossee_manim/faqs.html @@ -9,15 +9,11 @@ span { background-color: #f2e680; } - li, - ul{ - font-family: 'Lato', sans-serif; - }

Frequently Asked Questions
-
+

diff --git a/fossee_manim/templates/fossee_manim/honorarium.html b/fossee_manim/templates/fossee_manim/honorarium.html index 781e70d..e281cf2 100644 --- a/fossee_manim/templates/fossee_manim/honorarium.html +++ b/fossee_manim/templates/fossee_manim/honorarium.html @@ -14,18 +14,16 @@ span { background-color: #f2e680; } - li{ - font-family: 'Lato', sans-serif; - }

Honorarium
-
+

Amount

+

The honorarium amount is assigned based on:
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html index 49edd78..2adf680 100644 --- a/fossee_manim/templates/fossee_manim/index.html +++ b/fossee_manim/templates/fossee_manim/index.html @@ -18,7 +18,7 @@

-
FOSSEE Animations
+
FOSSEE Animations

endeavors to be an extensive library of community-curated videos on STEM topics
@@ -27,14 +27,14 @@

-
Anyone can contribute to the project
+
Anyone can contribute to the project

The only requirement is that the video should be made using OpenSource tools
like Blender, Manim, Mayavi, etc.

-
On successful submission
+
On successful submission

you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

@@ -56,7 +56,7 @@

-
HOW IT WORKS
+
HOW IT WORKS

Want to know more? Visit our Guidelines page! diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index a2f0130..a5cf74e 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -10,6 +10,7 @@ {% if request.user.profile.position == 'contributor' %}
Proposal Status
+
@@ -30,7 +31,7 @@ {% endif %} - + {% endfor %} diff --git a/fossee_manim/templates/fossee_manim/send_proposal.html b/fossee_manim/templates/fossee_manim/send_proposal.html index 66c807b..b17e2bd 100644 --- a/fossee_manim/templates/fossee_manim/send_proposal.html +++ b/fossee_manim/templates/fossee_manim/send_proposal.html @@ -18,11 +18,12 @@

Proposal - Stage 1
-
+
+
Please Note: If you're not serious about creating animations, do not send us a proposal. Fake submissions can result in permanent ban.
-
+
{% csrf_token %} @@ -32,7 +33,7 @@

{{ an.status }} {{ an.created }}

- + diff --git a/fossee_manim/templates/fossee_manim/view_profile.html b/fossee_manim/templates/fossee_manim/view_profile.html index ec54c8e..1edf689 100644 --- a/fossee_manim/templates/fossee_manim/view_profile.html +++ b/fossee_manim/templates/fossee_manim/view_profile.html @@ -50,7 +50,7 @@
- Edit Profile + Edit Profile

{% endblock %} -- cgit From 8454d545a5e61fc342d89b64cad0adab4dbc4f30 Mon Sep 17 00:00:00 2001 From: Sharanya A Date: Thu, 1 Aug 2019 17:33:49 +0530 Subject: change travis.yml --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e1fb31..b9fb3d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,15 @@ python: before_install: - sudo apt-get update -qq - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start + # - "sh -e /etc/init.d/xvfb start" + # - sleep 3 # give xvfb some time to start # command to install dependencies install: - pip install -r requirements.txt +services: + - xvfb # command to run tests and coverage script: - python manage.py makemigrations @@ -22,4 +24,4 @@ script: after_success: - coverage combine - - coverage report \ No newline at end of file + - coverage report -- cgit

HOW IT WORKS

Login

Guidelines for Submitting Proposals

- - 1. Creating an account - -

Guidelines for Submitting Proposals

+ + 1. Creating an account + +

- - 2. Submitting a proposal - -

+ + 2. Submitting a proposal + +

- 3. - Creating your animation / visualisation: -

+ 3. + Creating your animation / visualisation: +

- - 4. Uploading the final video - -

+ + 4. Uploading the final video + +

- - 5. Obtaining certificates - -

+ + 5. Obtaining certificates + +

- - 6. Acquiring the honorarium - -

+ + 6. Acquiring the honorarium + +

Comments

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

{{ comment.comment }}

Comments

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

{{ comment.comment }}

FOSSEE Animations

endeavors to be an extensive library of community-curated videos on STEM topics

Anyone can contribute to the project

The only requirement is that the video should be made using OpenSource tools

Upon successful submission - you receive a certificate and an + + On successful submission + you receive a certificate and an honorarium from FOSSEE,IIT-Bombay

you receive a certificate and an honorarium from FOSSEE,IIT-Bombay

HOW IT WORKS

HOW IT WORKS

Base Template Content. Please override me

Edit Profile

Awaiting Reviewer's Moderation

Further details regarding the second stage of Proposal will be shared with you over the email shortly

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}

{{ comment.comment }}

Frequently Asked Questions

When will I receive my Honorarium?

If you have any other queries, email us at animations@fossee.in

Guidelines for Submitting Proposals

Guidelines for Submitting Proposals

Amount

Amount

Procedure

Procedure

Forms

Forms

you receive a certificate and an honorarium from FOSSEE,IIT-Bombay

Login

Login

Your Profile has changed {{ user.first_name }}

Proposal Status

Contributor Registration Form

Contributor Registration Form

Proposal - Stage 1

View Profile

First name:

Frequently Asked Questions

Honorarium

Amount

endeavors to be an extensive library of community-curated videos on STEM topics

The only requirement is that the video should be made using OpenSource tools

you receive a certificate and an honorarium from FOSSEE,IIT-Bombay

HOW IT WORKS

HOW IT WORKS

Proposal Status

Proposal - Stage 1

- -

+ +

- -

+ +

- -

+ +

- -

+ +

- -

+ +

- -

+ +

Upon successful submission
- you receive a certificate and an
+
+
On successful submission
+
you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay

you receive a certificate and an
honorarium from FOSSEE,
IIT-Bombay