summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fossee_manim/static/css/custom_base.css3
-rw-r--r--fossee_manim/templates/fossee_manim/about.html4
-rw-r--r--fossee_manim/templates/fossee_manim/base.html43
-rw-r--r--fossee_manim/templates/fossee_manim/index.html17
-rw-r--r--fossee_manim/templates/fossee_manim/library.html62
-rw-r--r--fossee_manim/templates/fossee_manim/libraryCS.html16
-rw-r--r--fossee_manim/templates/fossee_manim/libraryMath.html16
-rw-r--r--fossee_manim/templates/fossee_manim/libraryPhys.html16
-rw-r--r--fossee_manim/templates/fossee_manim/outreach.html13
-rw-r--r--fossee_manim/urls.py5
-rw-r--r--fossee_manim/views.py18
11 files changed, 182 insertions, 31 deletions
diff --git a/fossee_manim/static/css/custom_base.css b/fossee_manim/static/css/custom_base.css
index e2623b1..5c2fd14 100644
--- a/fossee_manim/static/css/custom_base.css
+++ b/fossee_manim/static/css/custom_base.css
@@ -1,6 +1,3 @@
-#basefooter{
- font-family: 'Lato', sans-serif;
-}
.navbar{
font-family: 'Montserrat', sans-serif;
font-size: 15px;
diff --git a/fossee_manim/templates/fossee_manim/about.html b/fossee_manim/templates/fossee_manim/about.html
index aaae771..13b5a01 100644
--- a/fossee_manim/templates/fossee_manim/about.html
+++ b/fossee_manim/templates/fossee_manim/about.html
@@ -13,9 +13,7 @@
</center>
<div class="container" style= "font-family: 'Lato', sans-serif; background-color: #e7edee;">
-
<hr>
-
</div>
</div>
- {% endblock %}
+ {% endblock content %}
diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html
index 0c600db..76a3615 100644
--- a/fossee_manim/templates/fossee_manim/base.html
+++ b/fossee_manim/templates/fossee_manim/base.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html style="height: 100%;">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>
@@ -8,11 +8,13 @@
{% endblock %}
</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
- <link rel="stylesheet" href="{{ URL_ROOT }}/static/css/sticky-footer.css" type="text/css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/Wruczek/Bootstrap-Cookie-Alert@gh-pages/cookiealert.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -30,7 +32,7 @@
<body>
{% block header %}
- <nav class="navbar navbar-expand-lg row fixed-top" style="background-color:#222222; padding-top: 20px; padding-bottom: 20px;">
+ <nav class="navbar navbar-expand-md row fixed-top" style="background-color:#222222; padding-top: 20px; padding-bottom: 20px;">
<a class="navbar-brand" href="{% url 'index' %}">
<img src="{{ URL_ROOT }}/static/img/logo_main.png" width="150" height="33.75" alt="" style="margin-right: 50px; margin-left: 20px">
</a>
@@ -93,39 +95,42 @@
</ul>
</div>
</nav>
- <div class="jumbotron sticky-top" style="padding-top: 90px; padding-bottom: 0.2%; margin-bottom: 0px; background-color: #dddddd">
+ <!-- <nav class="navbar navbar-expand-md navbar-dark bg-dark"> -->
+
+ <div class="jumbotron sticky-top" style="padding-top: 90px; padding-bottom: 0.2%; margin-bottom: 0px; background-color: #dddddd;width:auto">
<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">Why FOSSEE Animations?</a></button>
+ <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>
+ <button class="btn btn-link perma_link" type="button"><a href="{% url 'send_proposal' %}" style="color:#dd1100"><b>Submit Proposal</b></a></button>
+ <button class="btn btn-link perma_link" type="button"><a href="{% url 'outreach' %}" style="color:#222222">Outreach</a></button>
+ <button class="btn btn-link perma_link" type="button"><a href="{% url 'library' %}" style="color:#222222">Library</a></button>
</div>
</div>
{% endblock %}
- <!-- <main role="main" class="container"> -->
+
{% block content %}
<br><br>
<h1>Base Template Content. Please override me</h1>
-
+ </div>
{% endblock %}
<!-- </main> -->
{% block footer %}
- <div class="jumbotron" id="basefooter" style="background-color: #222222; margin-bottom: 0px; padding: 40px;border-radius: 0 !important;">
-
+<footer class= "footer" style="background-color: #222222; font-family: 'Lato', sans-serif; padding:30px;">
<div class="container">
<div class="row">
- <div class="col-md text-center">
+ <div class="col-md-4 text-center">
<img src="{{ URL_ROOT }}/static/img/fossee_logo_iitb.png" style="">
</div>
- <div class="col-md text" style="color:#dddddd;">
+ <div class="col-md-4 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">
+ <div class="col-md-4 text-center" style="color:#dddddd; margin-top: 15px">
Follow us on:<br/>
<a href="https://twitter.com/fosseenmeict" class="fa fa-twitter"></a>
&nbsp; &nbsp; &nbsp;
@@ -137,24 +142,28 @@
</div>
</div>
<hr>
- <div class="text-center row" style="color: #dddddd; color:white; padding:10px;margin-left: 10px; text-align:center">
+ <div class="text-center row" style="color: #dddddd; color:white; padding:10px;margin-left: 10px; text-align:center; margin-bottom:0px;">
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>
- {% endblock footer%}
+</footer>
+
+ {% endblock footer %}
+
<!-- START Bootstrap-Alert -->
<div class="alert text-center cookiealert" role="alert" style="background: #d1ff3c; color: black;">
- The website is currently undergoing some developmental changes. If you encounter any glitches / malfunctioning, write to us at animations@fossee.in ; we value your feedback and suggestions !
+ The website is currently undergoing some developmental changes. If you encounter any glitches, write to us at animations@fossee.in ; we value your feedback and suggestions !
<button type="button" class="close" data-dismiss="alert" aria-label="Close" >
<span aria-hidden="true">&times;</span>
</button>
</div>
<!-- END Bootstrap-Alert -->
+
<!-- JS for alert -->
<script src="https://cdn.jsdelivr.net/gh/Wruczek/Bootstrap-Cookie-Alert@gh-pages/cookiealert.js"></script>
+
</body>
</html>
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html
index 20f9a34..a598513 100644
--- a/fossee_manim/templates/fossee_manim/index.html
+++ b/fossee_manim/templates/fossee_manim/index.html
@@ -5,15 +5,16 @@
{% endblock %}
{% block content %}
- <div class="container-fluid jumbotron row" align = "justify" style= "padding:0px; height: 550px;">
+ <div class="container-fluid jumbotron" align = "justify" style= "padding:0px; height: 550px;">
+
+ <div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel" style="margin-top: 0px">
+ <ol class="carousel-indicators">
+ <li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
+ <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
+ <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
+ </ol>
+ <div class="carousel-inner">
- <div id="carouselExampleIndicators" class="carousel slide row" data-ride="carousel" style="margin-top: 0px">
- <ol class="carousel-indicators">
- <li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
- <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
- <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
- </ol>
- <div class="carousel-inner">
<div class="carousel-item active">
<img class="d-block w-100" src="{{ URL_ROOT }}/static/img/carousel1.png" alt="First slide" style= "height:550px;">
diff --git a/fossee_manim/templates/fossee_manim/library.html b/fossee_manim/templates/fossee_manim/library.html
new file mode 100644
index 0000000..259eec4
--- /dev/null
+++ b/fossee_manim/templates/fossee_manim/library.html
@@ -0,0 +1,62 @@
+{% extends 'fossee_manim/base.html' %}
+
+ {% block title %}
+ FOSSEE Animations | Topic Library
+ {% endblock %}
+
+ {% block content %}
+ <div class="container-fluid jumbotron" align = "justify" style="padding: 50px; background-color: transparent;">
+ <center><h2>Library of Topics</h2></center>
+ <div class="container" style= "font-family: 'Lato', sans-serif; background-color: transparent;">
+ <center style= "color: #555555;">
+ Muddled about what you could possibly animate? <br>
+ You can pick up topics from the lists below! <br>
+ <!-- We like to call it "<i>low-hanging fruit</i>". -->
+ </center>
+ <hr>
+ <br>
+ <div class="row">
+ <!-- Math Category -->
+ <div class="col-md-4">
+ <div class="card mb-4 box-shadow">
+ <a>
+ <img class="card-img-top" alt="Category Thumbnail">
+ </a>
+ <div class="card-body" align= "center">
+ <a href="{% url 'libraryMath' %}">
+ <h4 class="card-text" style="color: #157b80;">Mathematics</h4>
+ </a>
+ </div>
+ </div>
+ </div>
+ <!-- Physics Category -->
+ <div class="col-md-4">
+ <div class="card mb-4 box-shadow">
+ <a>
+ <img class="card-img-top" alt="Category Thumbnail">
+ </a>
+ <div class="card-body" align= "center">
+ <a href="{% url 'libraryPhys' %}">
+ <h4 class="card-text" style="color: #157b80;">Physics</h4>
+ </a>
+ </div>
+ </div>
+ </div>
+ <!-- CS Category -->
+ <div class="col-md-4">
+ <div class="card mb-4 box-shadow">
+ <a>
+ <img class="card-img-top" alt="Category Thumbnail">
+ </a>
+ <div class="card-body" align= "center">
+ <a href="{% url 'libraryCS' %}">
+ <h4 class="card-text" style="color: #157b80;">Computer Science</h4>
+ </a>
+ </div>
+ </div>
+ </div>
+ <!-- end of library -->
+ </div>
+ </div>
+ </div>
+ {% endblock %}
diff --git a/fossee_manim/templates/fossee_manim/libraryCS.html b/fossee_manim/templates/fossee_manim/libraryCS.html
new file mode 100644
index 0000000..a40408d
--- /dev/null
+++ b/fossee_manim/templates/fossee_manim/libraryCS.html
@@ -0,0 +1,16 @@
+{% extends 'fossee_manim/base.html' %}
+
+ {% block title %}
+ FOSSEE Animations | Library of Computer Science Topics
+ {% endblock %}
+
+ {% block content %}
+ <div class="container-fluid jumbotron" align = "justify" style="background-color: transparent">
+ <center><h2>CS Topics</h2></center>
+ <div class="container" style= "font-family: 'Lato', sans-serif; background-color: transparent;">
+ <hr>
+ <script src="https://gist.github.com/Sh-Ac/59779adf6cd8ff74e451567a1868a36d.js"></script>
+ </div>
+ </div>
+
+ {% endblock %}
diff --git a/fossee_manim/templates/fossee_manim/libraryMath.html b/fossee_manim/templates/fossee_manim/libraryMath.html
new file mode 100644
index 0000000..cbdd765
--- /dev/null
+++ b/fossee_manim/templates/fossee_manim/libraryMath.html
@@ -0,0 +1,16 @@
+{% extends 'fossee_manim/base.html' %}
+
+ {% block title %}
+ FOSSEE Animations | Library of Mathematics Topics
+ {% endblock %}
+
+{% block content %}
+ <div class="container-fluid jumbotron" align = "justify" style="background-color: transparent">
+ <center><h2>Mathematics Topics</h2></center>
+ <div class="container" style= "font-family: 'Lato', sans-serif; background-color: transparent;">
+ <hr>
+ <script src="https://gist.github.com/Jar-win/b8207bb59110a459ab7a9089144d1621.js"></script>
+ </div>
+ </div>
+
+ {% endblock %}
diff --git a/fossee_manim/templates/fossee_manim/libraryPhys.html b/fossee_manim/templates/fossee_manim/libraryPhys.html
new file mode 100644
index 0000000..883a59b
--- /dev/null
+++ b/fossee_manim/templates/fossee_manim/libraryPhys.html
@@ -0,0 +1,16 @@
+{% extends 'fossee_manim/base.html' %}
+
+ {% block title %}
+ FOSSEE Animations | Library of Physics Topics
+ {% endblock %}
+
+{% block content %}
+ <div class="container-fluid jumbotron" align = "justify" style="background-color: transparent">
+ <center><h2>Physics Topics</h2></center>
+ <div class="container" style= "font-family: 'Lato', sans-serif; background-color: transparent;">
+ <hr>
+ <script src="https://gist.github.com/Jar-win/e7601528c911fe35250d19b86b652a02.js"></script>
+ </div>
+ </div>
+
+ {% endblock %}
diff --git a/fossee_manim/templates/fossee_manim/outreach.html b/fossee_manim/templates/fossee_manim/outreach.html
new file mode 100644
index 0000000..bc85714
--- /dev/null
+++ b/fossee_manim/templates/fossee_manim/outreach.html
@@ -0,0 +1,13 @@
+{% extends 'fossee_manim/base.html' %}
+
+ {% block title %}
+ FOSSEE Animations | Outreach
+ {% endblock %}
+
+{% block content %}
+ <div class="container-fluid jumbotron" align = "justify" style="background-color: transparent">
+ <center><h2>FOSSEE Animations Outreach</h2></center>
+ <hr>
+ </div>
+
+ {% endblock %}
diff --git a/fossee_manim/urls.py b/fossee_manim/urls.py
index e22df91..dac61e2 100644
--- a/fossee_manim/urls.py
+++ b/fossee_manim/urls.py
@@ -27,6 +27,11 @@ urlpatterns = [
url(r'^search_category/(?P<cat>.+)$', views.search_category,
name='search_category'),
url(r'^about/$',views.about, name='about'),
+ url(r'^outreach/$',views.outreach, name='outreach'),
+ url(r'^library/$',views.library, name='library'),
+ url(r'^libraryMath/$',views.libraryMath, name='libraryMath'),
+ url(r'^libraryPhys/$',views.libraryPhys, name='libraryPhys'),
+ url(r'^libraryCS/$',views.libraryCS, name='libraryCS'),
url(r'^explore/(?P<category>.+)$', views.explore,
name='explore'),
]
diff --git a/fossee_manim/views.py b/fossee_manim/views.py
index 3ba5e91..3732ce7 100644
--- a/fossee_manim/views.py
+++ b/fossee_manim/views.py
@@ -540,3 +540,21 @@ def honorarium(request):
def faqs(request):
categories = Category.objects.all()
return render(request, 'fossee_manim/faqs.html', {'categories': categories})
+
+def outreach(request):
+ categories = Category.objects.all()
+ return render(request, 'fossee_manim/outreach.html', {'categories': categories})
+
+def library(request):
+ categories = Category.objects.all()
+ return render(request, 'fossee_manim/library.html', {'categories': categories})
+
+def libraryMath(request):
+ categories = Category.objects.all()
+ return render(request, 'fossee_manim/libraryMath.html', {'categories': categories})
+def libraryPhys(request):
+ categories = Category.objects.all()
+ return render(request, 'fossee_manim/libraryPhys.html', {'categories': categories})
+def libraryCS(request):
+ categories = Category.objects.all()
+ return render(request, 'fossee_manim/libraryCS.html', {'categories': categories})