summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSharanya A2019-07-31 15:16:30 +0530
committerSharanya A2019-07-31 15:16:30 +0530
commit92ff0fc1a4c95f62d74ec43f75107944e23bed0f (patch)
tree2b48b7b75d80c40034bb94c89f31f1cc90ee0e5e
parent3b718f137645eba6e419e30ce4695d724b4f5be8 (diff)
downloadFOSSEE_animations-92ff0fc1a4c95f62d74ec43f75107944e23bed0f.tar.gz
FOSSEE_animations-92ff0fc1a4c95f62d74ec43f75107944e23bed0f.tar.bz2
FOSSEE_animations-92ff0fc1a4c95f62d74ec43f75107944e23bed0f.zip
Migrate index.html to base.html; applied css changes across html files
-rw-r--r--fossee_manim/static/css/custom_base.css25
-rw-r--r--fossee_manim/static/css/custom_index.css8
-rw-r--r--fossee_manim/templates/fossee_manim/base.html23
-rw-r--r--fossee_manim/templates/fossee_manim/edit_profile.html6
-rw-r--r--fossee_manim/templates/fossee_manim/edit_proposal.html30
-rw-r--r--fossee_manim/templates/fossee_manim/faqs.html13
-rw-r--r--fossee_manim/templates/fossee_manim/guidelines.html2
-rw-r--r--fossee_manim/templates/fossee_manim/honorarium.html18
-rw-r--r--fossee_manim/templates/fossee_manim/index.html130
-rw-r--r--fossee_manim/templates/fossee_manim/login.html8
-rw-r--r--fossee_manim/templates/fossee_manim/profile_updated.html6
-rw-r--r--fossee_manim/templates/fossee_manim/proposal_status.html5
-rw-r--r--fossee_manim/templates/fossee_manim/register.html8
-rw-r--r--fossee_manim/templates/fossee_manim/search_results.html5
-rw-r--r--fossee_manim/templates/fossee_manim/send_proposal.html15
-rw-r--r--fossee_manim/templates/fossee_manim/video.html2
-rw-r--r--fossee_manim/templates/fossee_manim/view_profile.html5
17 files changed, 116 insertions, 193 deletions
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 @@
<!-- favicon -->
<link rel="shortcut icon" href="{{ URL_ROOT }}/static/img/favicon.ico" />
- <style type="text/css">
- .perma_link:hover{
- background-color:#d1d2d3;
- text-decoration: none;
- }
- .perma_link a{
- text-decoration: none;
- }
- </style>
<link href="https://fonts.googleapis.com/css?family=Raleway:400,500|Lato&display=swap" rel="stylesheet">
<link rel="stylesheet" href="{{ URL_ROOT }}/static/css/custom_base.css" type="text/css" />
</head>
@@ -48,11 +39,11 @@
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
- <form class="form-inline" method="POST" action="/search/" style="margin-left: 10px; margin-top: 10px">
+ <form class="form-inline" method="POST" action="/search/" style="margin-left: 10px; margin-top: 10px; ">
{% csrf_token %}
<input class="form-control mr-sm-2" type="search" id="sbox" name="sbox" placeholder="Search for animations">
- <button class="btn btn-primary my-2 my-sm-0" type="submit">
- Search
+ <button class="btn btn-primary my-2 my-sm-0" type="submit" style="background-color: #1facb3; border:0px">
+ Search
</button>
</form>
@@ -86,7 +77,7 @@
</ul>
</div>
</nav>
- <div class="jumbotron sticky-top" style="padding-top: 90px; padding-bottom: 0.2%; margin-bottom: 0px; background-color: #dddddd">
+ <div class="jumbotron sticky-top" style="padding-top: 90px; padding-bottom: 0.2%; margin-bottom: 0px; background-color: #dddddd">
<div class="btn-group btn-group-lg" role="group">
<button class="btn btn-link perma_link" type="button"><a href="{% url 'about' %}" style="color:#157b80">About</a></button>
<button class="btn btn-link perma_link" type="button"><a href="{% url 'guidelines' %}" style="color:#222222">Guidelines</a></button>
@@ -96,15 +87,15 @@
</div>
</div>
{% endblock %}
- <main role="main" class="container">
+ <!-- <main role="main" class="container"> -->
{% block content %}
<br><br>
<h1>Base Template Content. Please override me</h1>
{% endblock %}
- </main>
+ <!-- </main> -->
{% block footer %}
- <div class="jumbotron" id="basefooter" style="background-color: #222222; margin-bottom: 0px; border-radius: 0 !important;">
+ <div class="jumbotron" id="basefooter" style="background-color: #222222; margin-bottom: 0px; padding: 40px;border-radius: 0 !important;">
<div class="container">
<div class="row">
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 %}
<br>
<div class="container">
+ <center> <h1> Edit Profile </h1> </center>
<form action="{{URL_ROOT}}/edit_profile/" method="post" >
{% csrf_token %}
<center>
@@ -20,7 +21,8 @@
</table>
</center>
<br>
- <button class="btn btn-primary pull-right" type="submit">Save Profile</button>
+ <button class="btn btn-primary pull-right" type="submit" style="background-color: #1facb3; border-width:0px;">Save Profile</button>
</form>
+ <br> <br> <br>
</div>
-{% 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 %}
</ul>
{% endif %}
-
+
<form method="POST" >
{% csrf_token %}
-
+
<table class="table table-bordered">
{{ proposal_form.as_table }}
</table>
-
+
<br>
- <button class="btn btn-primary pull-right" type="submit">Save</button>
+ <button class="btn btn-primary pull-right" type="submit" style = "background-color: #1facb3; border-width: 0px;">Save</button>
<br>
</form>
<br>
@@ -46,10 +46,10 @@
{% elif proposal_form.instance.status == 'pending' and request.user.profile.position == 'contributor' %}
<h3>Awaiting Reviewer's Moderation </h3>
<h6>Further details regarding the second stage of Proposal will be shared with you over the email shortly</h6>
-
+
{% else %}
<video width="100%" height="100%" controls>
- <source src="{{video.0.video_path.url}}" type="video/mp4">
+ <source src="{{video.0.video_path.url}}" type="video/mp4">
</video>
{% endif %}
@@ -59,11 +59,11 @@
{% csrf_token %}
<div class="form-group">
<div class="row">
- <button class="btn btn-success pull-left" type="submit" name="release" value="1">Approve</button>
+ <button class="btn btn-success pull-left" type="submit" name="release" value="1">Approve</button>
<button class="btn btn-danger pull-left" type="submit" name="rejected" value="2" style="margin-left: 1%">Reject</button>
<button class="btn btn-info pull-left" type="submit" name="proposal_form" value="3" style="margin-left: 1%" >Send Proposal 2 Form</button>
- </div>
- </div>
+ </div>
+ </div>
</form>
{% endif %}
<br><br>
@@ -76,7 +76,7 @@
{{ comment_form.as_p }}
<button type="submit" class="btn btn-default">Post</button>
</form>
-
+
</div>
<hr style="background-color: #fff;
border-top: 5px double #8c8b8b;">
@@ -85,7 +85,7 @@
<tbody>
<tr>
<td>
- <h5>{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}</h5>
+ <h5>{{ comment.commentor.profile.user.get_full_name }} | {{ comment.created_date | date }}</h5>
<h6 style="background-color: #ecf0f1; padding:10px;">{{ comment.comment }}</h6>
<hr style="border-top: 0.5px solid #8c8b8b;">
</td>
@@ -93,7 +93,7 @@
</tbody>
{% endfor %}
</table>
-
+
<br><br>
</div>
@@ -104,7 +104,7 @@
<ul class="pagination pagination-sm">
<li class="page-item">
{% if comments.has_previous %}
- <a class="page-link" tabindex="-1"
+ <a class="page-link" tabindex="-1"
href="?page={{ comments.previous_page_number }}">Previous</a>
{% endif %}
</li>
@@ -116,7 +116,7 @@
<li class="page-item">
{% if comments.has_next %}
<a class="page-link" href="?page={{ comments.next_page_number }}">Next
- </a>
+ </a>
{% endif %}
</li>
</ul>
@@ -127,4 +127,4 @@
</div>
-{% 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 %}
-
+<style>
+ span {
+ background-color: #f2e680;
+ }
+ li,
+ ul{
+ font-family: 'Lato', sans-serif;
+ }
+</style>
<div class="container-fluid jumbotron" align = "justify" style="margin-top:20px">
<!-- style="padding-top:120px"> -->
<h1><center>Frequently Asked Questions</center></h1>
@@ -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.
+ <span>Please place the terms and conditions of the MIT license on the GitHub page of your code.</span>
<br><br>
<li><h5>When will I receive my Honorarium?</h5></li>
Honorarium would generally be processed within 45 days from the day we receive your forms.
@@ -79,4 +87,5 @@
<h5>If you have any other queries, email us at <a href="mailto: animations@fossee.in">animations@fossee.in</a> </h2>
</div>
+</div>
{% 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 @@
}
</style>
<div class="container-fluid jumbotron" align = "justify" style="margin-top:20px;">
- <h2><center>Guidelines for Submitting Proposals</center></h2>
+ <h1><center>Guidelines for Submitting Proposals</center></h1>
<div class="container">
<hr>
<div id="accordion">
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;
+ }
</style>
<div class="container-fluid jumbotron" align = "justify" style="margin-top:20px;">
@@ -21,7 +24,8 @@
<div class="container"">
<hr>
- <h4><center>Amount</center></h4>
+ <h2><center>Amount</center></h2>
+ <br>
<ol>
<li> The honorarium amount is assigned based on:
<ul>
@@ -38,8 +42,9 @@
<li> A quality bonus of Rs 500-1000 per video can be granted if deemed fit by the reviewer. </li>
<li> <strong>The final amount is up to the discretion of the moderators.</strong></li>
</ol>
+ <br> <br>
+ <h2><center>Procedure</center></h2>
<br>
- <h4><center>Procedure</center></h4>
<p> A contributor can begin with the honorarium process only after submission of the final video and its release on the website.
<br>The procedure for acquiring the honorarium is as follows:
<ol>
@@ -48,10 +53,11 @@
<li>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.</li>
<li>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.</li>
</ol>
- <span>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.</span>
-
- <h4><center>Forms</center></h4>
- Kindly print out the forms below, fill the required fields and mail them to the address:
+ <p><span>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.</span><p>
+ <br> <br>
+ <h2><center>Forms</center></h2>
+ <br>
+ <p>Kindly print out the forms below, fill the required fields and mail them to the address:<p>
<ul>
<li> <a href = "https://static.fossee.in/animations/forms/Copyright_Transfer.pdf"> Copyright Transfer Form </a> </li>
<li> <a href = "https://static.fossee.in/animations/forms/Contributor_Details.pdf"> Contributor Details Form </a> </li>
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 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
+{% extends 'fossee_manim/base.html' %}
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="Akshen Doke" content="FOSSEE-IITB">
- <meta name="title" content="Welcome to FOSSEE's Animation for Education">
- <meta name="description" content=".">
- <meta name="keywords" content="fossee, iit bombay, animation based learning math, manim, python based animations">
+{% block title %}
+ FOSSEE Animations Homepage
+{% endblock %}
- <title>FOSSEE Animations</title>
-
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
- <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
-
- <style type="text/css">
- .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;
- }
- .bck_clr{
- background-color: #222222;
- }
- .fa{
- padding: 10px;
- }
- </style>
- <link href="https://fonts.googleapis.com/css?family=Raleway:400,500|Lato&display=swap" rel="stylesheet">
- <link rel="stylesheet" href="{{ URL_ROOT }}/static/css/custom_index.css" type="text/css" />
- <!-- favicon -->
- <link rel="shortcut icon" href="{{ URL_ROOT }}/static/img/favicon.ico" />
- </head>
-
- <body>
- <!--<div class="container-fluid">-->
- <div class="col-md-12">
- <nav class="navbar navbar-expand-lg navbar-light row bck_clr fixed-top" style="padding-top: 20px; padding-bottom: 20px;">
- <a class="navbar-brand" href="#">
- <img src="{{ URL_ROOT }}/static/img/logo_main.png" width="150" height="33.75" alt="Main_Logo" style="margin-right: 50px; margin-left: 20px">
- </a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
-
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
- <form class="form-inline" method="POST" action="/search/" style="margin-left: 10px; margin-top: 10px; ">
- {% csrf_token %}
- <input class="form-control mr-sm-2" type="search" id="sbox" name="sbox" placeholder="Search for animations">
- <button class="btn btn-primary my-2 my-sm-0" type="submit" style="background-color: #1facb3; border:0px">
- Search
- </button>
- </form>
-
-
- <ul class="navbar-nav ml-md-auto">
- <li class="nav-item dropdown">
- <a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" style="color:white">Login / Register</a>
- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item" href="{% url 'login' %}">Login</a>
- <div class="dropdown-divider">
- </div>
- <a class="dropdown-item" href="{% url 'register' %}">Register</a>
- </div>
- </li>
- </ul>
-
- </div>
- </nav>
- <!-- Remove sticky-top if the buttons are not supposed to scroll down-->
- <div class="jumbotron row sticky-top" style="padding-top: 90px; padding-bottom: 0.2%; margin-bottom: 0px; background-color:#dddddd">
- <div class="btn-group btn-group-lg" role="group">
- <button class="btn btn-link perma_link" type="button"><a href="{% url 'about' %}" style="color:#157b80">About</a></button>
- <button class="btn btn-link perma_link" type="button"><a href="{% url 'guidelines' %}" style="color:#222222">Guidelines</a></button>
- <button class="btn btn-link perma_link" type="button"><a href="{% url 'faqs' %}" style="color:#222222">FAQ</a></button>
- <button class="btn btn-link perma_link" type="button"><a href="{% url 'honorarium' %}" style="color:#222222">Honorarium</a></button>
- <button class="btn btn-link perma_link" type="button"><a href="{% url 'send_proposal' %}" style="color:#dd1100">Submit Proposal</a></button>
- </div>
- </div>
+ {% block content %}
+ <div class="container-fluid jumbotron row" align = "justify" style= "padding:0px; height: 550px;">
<div id="carouselExampleIndicators" class="carousel slide row" data-ride="carousel" style="margin-top: 0px">
<ol class="carousel-indicators">
@@ -115,7 +34,7 @@
<div class="carousel-item">
<img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel2.png" alt="Third slide" height=550>
<div class="carousel-caption col-md-4" style="margin-left:560px; margin-bottom:250px;float:right; font-family: 'Lato', sans-serif; text-align:right">
- <h3><b><a style="font-family: 'Raleway', sans-serif; font-weight: 500;">On successful submission</a></h3>
+ <h3><a style="font-family: 'Raleway', sans-serif; font-weight: 500;">On successful submission</a></h3>
<h5>you receive a certificate and an<br>
honorarium from FOSSEE,<br>IIT-Bombay</h5>
</div>
@@ -130,6 +49,7 @@
<span class="sr-only">Next</span>
</a>
</div>
+ </div>
<!--Infographics-->
@@ -142,36 +62,4 @@
Want to know more? Visit our <a href="{{URL_ROOT}}/guidelines/" style="background-color:#157b80; color:white;">Guidelines</a> page!
</div>
</div>
-
- <!--Footer-->
- <div class="jumbotron row" id="mainfooter" style="background-color: #222222; margin-bottom: 0px; border-radius: 0 !important;">
-
- <div class="container">
- <div class="row" style= >
- <div class="col-md text-center">
- <img src="{{ URL_ROOT }}/static/img/fossee_logo_iitb.png" style="">
- </div>
- <div class="col-md text" style="color:#dddddd;">
- FOSSEE | IIT-Bombay <br>
- Mumbai, India - 400-076 <br>
- Phone: (+91) 22-2576-4133<br>
- Email: animations@fossee.in
- </div>
- <div class="col-md text-center" style="color:#dddddd; margin-top: 15px">
- Follow us on:<br/>
- <a href="https://twitter.com/fosseenmeict" class="fa fa-twitter"></a>
- <a href="https://www.instagram.com/fossee_nmeict/" class="fa fa-instagram"></a>
- <a href="https://www.facebook.com/FOSSEENMEICT/" class="fa fa-facebook"></a>
- <a href="https://github.com/FOSSEE/" class="fa fa-github"></a>
- </div>
- </div>
- <hr>
- <div class="text-center row" style="color: #dddddd; color:white; padding:10px;margin-left: 10px; text-align:center">
- 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
- </div>
- </div>
- </div>
-
- </body>
-</html>
+ {% 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 %}
<div class="container" align="center">
<br>
- <h3>Login</h3>
+ <h1>Login</h1>
<form method="post">
{% csrf_token %}
<table class="table table-bordered">
@@ -16,10 +16,10 @@
<br>
</table>
<button class="btn btn-success btn-sm" type="submit" style="background-color:#e45700;color:white; border:0px">Login</button>
- <a href="{{URL_ROOT}}/forgotpassword/" class="btn btn-default btn-sm" style="color:#1facb3;">Forgot Password?</a>
+ <a href="{{URL_ROOT}}/forgotpassword/" class="btn btn-default btn-sm" style="color:#157b80; ">Forgot Password?</a>
</form>
<br>
- Don't have an account yet? <a href="{{URL_ROOT}}/register/" style="background-color:#157b80; color:white;">Register here!</a>
- <br><br>
+ <p>Don't have an account yet? <a href="{{URL_ROOT}}/register/" style="background-color:#157b80; color:white;">Register here!</a></p>
+ <br>
</div>
{% 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 @@
<script src="{{URL_ROOT}}/static/fossee_manim/js/bootstrap-3.3.7.min.js"></script>
{% endblock %}
{% block content %}
+<br> <br> <br>
<div class="container">
- <div class="jumbotron">
+ <div class="jumbotron row">
<h3>Your Profile has changed {{ user.first_name }}</h3>
</div>
</div>
-{% endblock %} \ No newline at end of file
+ <br>
+{% 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 %}
+
<div class = "jumbotron" style = "background-color: white; margin-top: 0px;">
<div class="container" align="center">
{% if request.user.profile.position == 'contributor' %}
<h2> Proposal Status </h2>
- <table class="table table-hover">
+ <table class="table table-hover" style= "font-family: 'Lato', sans-serif;">
<thead>
<tr>
<th>Title</th>
@@ -29,7 +30,7 @@
<td><span class="text-info">{{ an.status }}</span></td>
{% endif %}
<td><span class="badge">{{ an.created }}</span></td>
- <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info">Edit</button></a></td>
+ <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info" style="background-color: #1facb3;">Edit</button></a></td>
</tr>
</tbody>
{% 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 @@
<div class="container" >
<br>
- <h3>Contributor Registration Form</h3>
+ <center>
+ <h1>Contributor Registration Form</h1>
<br>
<form action="" method="post">
{% csrf_token %}
@@ -26,12 +27,13 @@
{{ form.as_table }}
</table>
- <button class="btn btn-success" type="submit">Register</button>
+ <button class="btn btn-success" type="submit" style="background-color: #157b80; border-width:0px;">Register</button>
</form><br>
+ </center>
<!-- Activate when reviwers registeration starts -->
<!-- <div class="alert alert-info">
<strong>Info!</strong> reviwerss, please wait for our admin approval, if your reviwers account is not activated in 7 days, please mail us at workshops[at]fossee[dot]in
</div> -->
<br>
</div>
-{% 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 %}
+<br> <br>
<div class="container-fluid jumbotron" style="margin-top:20px">
{% if s_result %}
{% for anime in s_result %}
@@ -16,8 +17,8 @@
</a>
</div>
<div class="col-md-4">
- <p style="color:#26A669; font-size: 300%;"> {{ anime.animation.title }} </p>
- <p style="color:#26A669; font-size: 100%;"> {{ anime.animation.description | truncatewords:5}} </p>
+ <p style="color:#157b80; font-size: 300%;"> {{ anime.animation.title }} </p>
+ <p style="color:black; font-size: 100%;"> {{ anime.animation.description | truncatewords:5}} </p>
<a target="_blank" href="{{ anime.animation.github }}"><p style="font-size: 70%;"> {{ anime.animation.github }} </p></a>
</div>
</div>
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 @@
</ul>
{% endif %}
-
- <!-- <div class="container-fluid jumbotron" align = "justify"> -->
- <!-- <h1><center>Proposal - Stage 1</center></h1> -->
- <!-- </div> -->
-
<div class="container-fluid jumbotron" align="center" style="background-color: white;">
<h1><center>Proposal - Stage 1</center></h1>
<div class="alert alert-info">
@@ -38,6 +33,14 @@
<br>
<br>
<button class="btn btn-success" type="submit">Save</button>
- </form>
+ </form>
+
+ <!-- Initialize Quill editor -->
+ <script>
+ var quill = new Quill('#custom_editor', {
+ theme: 'snow'
+ });
+ </script>
+
</div>
{% 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>
<div class="row">
<div class="col-md-8">
- <p style="color:#26A669; font-size: 200%; float: left;"> {{ video.0.animation.title }} </p>
+ <p style="color: #157b80; font-size: 200%; float: left;"> {{ video.0.animation.title }} </p>
</div>
<div class="col-md-4">
<p style="font-size: 70%; float: right;"> {{ video.0.animation.subcategory }} </p>
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 %}
- <br>
<div class="container jumbotron" style="background-color:white;">
+ <center> <h1> View Profile </h1> </center>
+ <br>
<table class="table table-bordered">
<tr>
<th><label for="id_first_name"><h5>First name:</h5></label></th>
@@ -49,7 +50,7 @@
</tr>
</table>
<br>
- <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/edit_profile/">Edit Profile</a>
+ <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/edit_profile/" style= "background-color: #1facb3; border-width: 0px;">Edit Profile</a>
</div>
<br><br>
{% endblock %}