From 3723ebeccad6e15871fe951bff76c27515c9810e Mon Sep 17 00:00:00 2001
From: Sharanya A
Date: Thu, 11 Jul 2019 11:29:41 +0530
Subject: Guidelines Fixes

---
 fossee_manim/static/img/faqs.png                   | Bin 10751 -> 0 bytes
 fossee_manim/static/img/fossee_logo_iitb.png       | Bin 12150 -> 14893 bytes
 fossee_manim/static/img/guidelines.png             | Bin 12671 -> 0 bytes
 fossee_manim/static/img/info.png                   | Bin 248227 -> 0 bytes
 fossee_manim/static/img/submit.png                 | Bin 11645 -> 0 bytes
 fossee_manim/templates/fossee_manim/base.html      |   7 +-
 .../templates/fossee_manim/guidelines.html         |  16 +--
 fossee_manim/templates/fossee_manim/index.html     |   2 +-
 .../templates/fossee_manim/indexfooter.html        | 148 ---------------------
 .../templates/fossee_manim/search_results.html     |  16 +--
 .../templates/fossee_manim/upload_success.html     |   8 +-
 11 files changed, 23 insertions(+), 174 deletions(-)
 delete mode 100644 fossee_manim/static/img/faqs.png
 delete mode 100644 fossee_manim/static/img/guidelines.png
 delete mode 100644 fossee_manim/static/img/info.png
 delete mode 100644 fossee_manim/static/img/submit.png
 delete mode 100644 fossee_manim/templates/fossee_manim/indexfooter.html

(limited to 'fossee_manim')

diff --git a/fossee_manim/static/img/faqs.png b/fossee_manim/static/img/faqs.png
deleted file mode 100644
index 38af51c..0000000
Binary files a/fossee_manim/static/img/faqs.png and /dev/null differ
diff --git a/fossee_manim/static/img/fossee_logo_iitb.png b/fossee_manim/static/img/fossee_logo_iitb.png
index f437437..4e56081 100644
Binary files a/fossee_manim/static/img/fossee_logo_iitb.png and b/fossee_manim/static/img/fossee_logo_iitb.png differ
diff --git a/fossee_manim/static/img/guidelines.png b/fossee_manim/static/img/guidelines.png
deleted file mode 100644
index 4af2c7e..0000000
Binary files a/fossee_manim/static/img/guidelines.png and /dev/null differ
diff --git a/fossee_manim/static/img/info.png b/fossee_manim/static/img/info.png
deleted file mode 100644
index e1f98da..0000000
Binary files a/fossee_manim/static/img/info.png and /dev/null differ
diff --git a/fossee_manim/static/img/submit.png b/fossee_manim/static/img/submit.png
deleted file mode 100644
index 54ba63d..0000000
Binary files a/fossee_manim/static/img/submit.png and /dev/null differ
diff --git a/fossee_manim/templates/fossee_manim/base.html b/fossee_manim/templates/fossee_manim/base.html
index 0504fe9..5409b52 100644
--- a/fossee_manim/templates/fossee_manim/base.html
+++ b/fossee_manim/templates/fossee_manim/base.html
@@ -34,8 +34,9 @@
 		</button>
 
 	    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-			<form class="form-inline" style="margin-left: 10px; margin-top: 10px">
-				<input class="form-control mr-sm-2" type="text" placeholder="Search for animations">
+			<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>
@@ -94,7 +95,7 @@
 		<div class="container">
 			<div class="row">
 				<div class="col-md text-center">
-					<img src="https://animations.fossee.in/static/img/fossee_logo_iitb.png" style="">
+					<img src="{{ URL_ROOT }}/static/img/fossee_logo_iitb.png" style="">
 				</div>
 				<div class="col-md text" style="color:#e9ecef;">
 					FOSSEE | IIT-Bombay <br>
diff --git a/fossee_manim/templates/fossee_manim/guidelines.html b/fossee_manim/templates/fossee_manim/guidelines.html
index 23fcb90..e1fd8c6 100644
--- a/fossee_manim/templates/fossee_manim/guidelines.html
+++ b/fossee_manim/templates/fossee_manim/guidelines.html
@@ -26,10 +26,10 @@
 
 		<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
 		  <div class="card-body">
-			<ol>
-			  <li> - Create your account on the FOSSEE Animations website.</li>
-			  <li> - Upon successful registration, an email is sent to your registered email ID. Activate your account by clicking on the activation link provided.</li>
-			</ol>
+			<ul>
+			  <li> Create your account on the FOSSEE Animations website.</li>
+			  <li> Upon successful registration, an email is sent to your registered email ID. Activate your account by clicking on the activation link provided.</li>
+			</ul>
 		  </div>
 		</div>
 		</div>
@@ -91,13 +91,13 @@
 		<div id="collapseThree" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
 		  <div class="card-body">
 			<ul>
-				<li>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</li>
+				<li>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: <a href="mailto:animations@fossee.in">animations@fossee.in</a></li>
 		<li>Submit the final video in a .mp4 format.</li>
 		<li>Any queries can be clarified by email or through the comments on the proposal submission page.</li>
-		<li>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. </li>
+		<li>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 <a href="mailto:animations@fossee.in">animations@fossee.in</a> if you want to add a script. </li>
 		<hr/>
 		<b>References for animations</b>
-		<li>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. You may refer to this blog for getting started with manim. Here’s the link for getting started with mayavi.</li>
+		<li>You may refer to <a href="https://purusharthsaxena.wordpress.com/">this blog</a> and <a href="https://talkingphysics.wordpress.com/2019/01/08/getting-started-animating-with-manim-and-python-3-7/">this blog</a> for getting started with <b>manim</b>. <a href="https://www.youtube.com/watch?v=r6OD07Qq2mw">Here's the link</a> for getting started with mayavi.</li>
 			</ul>
 		  </div>
 		</div>
@@ -146,7 +146,7 @@
 		</div>
 		<div id="collapseSix" class="collapse" aria-labelledby="headingSix" data-parent="#accordion">
 		  <div class="card-body">
-			Click on the above link to learn about the procedure for receiving the honorarium.
+			<a href="https://animations.fossee.in/honorarium/">Click here</a> to learn about the procedure for receiving the honorarium.
 		  </div>
 		</div>
 		</div>
diff --git a/fossee_manim/templates/fossee_manim/index.html b/fossee_manim/templates/fossee_manim/index.html
index 35d72ae..edcfc77 100644
--- a/fossee_manim/templates/fossee_manim/index.html
+++ b/fossee_manim/templates/fossee_manim/index.html
@@ -120,7 +120,7 @@
 			<div class="container">
 				<div class="row">
 				    <div class="col-md text-center">
-				        <img src="https://animations.fossee.in/static/img/fossee_logo_iitb.png" style="">
+				        <img src="{{ URL_ROOT }}/static/img/fossee_logo_iitb.png" style="">
 				    </div>
 				    <div class="col-md text" style="color:#e9ecef;">
 				        FOSSEE | IIT-Bombay <br>
diff --git a/fossee_manim/templates/fossee_manim/indexfooter.html b/fossee_manim/templates/fossee_manim/indexfooter.html
deleted file mode 100644
index 3380fbd..0000000
--- a/fossee_manim/templates/fossee_manim/indexfooter.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<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 href="https://fonts.googleapis.com/css?family=Raleway|Lato&display=swap" rel="stylesheet">
-		<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{
-				color: #222222;
-			}
-			.perma_link:hover{
-				background-color:#a0e6ee;
-				text-decoration: none;
-			}
-			.perma_link a{
-				text-decoration: none;
-			}
-			.bck_clr{
-				background-color: #222222;
-			}
-		</style>
-	</head>
-
-	<body>
-	<!--<div class="container-fluid">-->
-		<div class="col-md-12">
-		<nav class="navbar navba.r-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="" 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" style="margin-left: 10px; margin-top: 10px">
-					<input class="form-control mr-sm-2" type="text">
-					<button class="btn btn-primary my-2 my-sm-0" type="submit">
-						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: 100px; padding-bottom: 0.2%; margin-bottom: 0px; color:#dddddd">
-				<div class="btn-group btn-group-lg" role="group">
-					<button class="btn btn-link perma_link" type="button"><a href="#" 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>
-
-		<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="https://i.imgur.com/ruP33nb.png" alt="First slide" height=800>
-			  <!--  img res here-->
-		      <div class="carousel-caption d-none d-md-block">
-		    <h5>FOSSEE Animations</h5>
-		    <p>some stuff</p>
-		  </div>
-		    </div>
-		    <div class="carousel-item">
-		      <img class="d-block w-100" src="https://i.imgur.com/FgdE4et.png" alt="Second slide" height=800>
-		    </div>
-		    <div class="carousel-item">
-		      <img class="d-block w-100" src="https://i.imgur.com/b7lbXaX.png" alt="Third slide" height=800>
-		    </div>
-		  </div>
-		  <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
-		    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-		    <span class="sr-only">Previous</span>
-		  </a>
-		  <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
-		    <span class="carousel-control-next-icon" aria-hidden="true"></span>
-		    <span class="sr-only">Next</span>
-		  </a>
-		</div>
-
-
-		<!--Infographics-->
-
-		<div class="jumbotron row text-center" style="background-color: white"> <!-- style="background-image: url('');  background-size: cover;">-->
-
-
-			 <div class="container text-center">
-			 	<h1 style="color: #e45700"><b>HOW IT WORKS</b></h1>
-			 	  			<img  class="img-fluid d-block text-center" width="100%" src="{{ URL_ROOT }}/static/img/info.svg" alt="...">
-		        </div>
-
-		</div>
-
-
-
-		<!--Footer-->
-		<div class="row" style="background-color: #222222;">
-			<div class="col-md-4">
-                    <center>
-                        <img src="https://animations.fossee.in/static/img/fossee_logo_iitb.png" width = 200; style="margin:50px; float:left">
-                    </center>
-			</div>
-
-            <div class="col-md-3" style="color: white; margin:50px; float:right">
-                    FOSSEE, IIT-Bombay <br>
-                    Mumbai, India <br>
-                    Phone: (+91) 22-2576-4133 <br>
-                    Email: animations[at]fossee[dot]in
-            </div>
-
-            <div class="col-md-3" style="margin:50px">
-                <a style="color:white;" href="https://python.fossee.in/about/" target="_blank">About Us </a>
-            </div>
-		        <!-- </div> -->
-	        <div class="row" style="background-color: #444444;">
-	                <hr style="color:white;">
-	            <div class="col-md-10 mx-auto" style="background-color: #444444; color:white;  text-align: center; margin: 0.5%; ">
-	                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>
diff --git a/fossee_manim/templates/fossee_manim/search_results.html b/fossee_manim/templates/fossee_manim/search_results.html
index 1741123..add5004 100644
--- a/fossee_manim/templates/fossee_manim/search_results.html
+++ b/fossee_manim/templates/fossee_manim/search_results.html
@@ -5,14 +5,9 @@
 	{% endblock %}
 
 {% block content %}
-<br>
-<div class="container-fluid" >
-	<br>
-	
-	<hr>
-	<br>
-		{% if s_result %}	
-			{% for anime in s_result %}    
+<div class="container-fluid jumbotron" style="margin-top:20px">
+		{% if s_result %}
+			{% for anime in s_result %}
 				<div class="row">
 					<div class="col-md-4" >
 						<a href="{% url 'video' anime.id  %}" >
@@ -30,9 +25,10 @@
 			{% endfor %}
 		{% else %}
 				<h3>No Results Found </h3>
+				<hr>
 		{% endif %}
 	<br>
 </div>
 <br>
-	
-{% endblock %}
\ No newline at end of file
+
+{% endblock %}
diff --git a/fossee_manim/templates/fossee_manim/upload_success.html b/fossee_manim/templates/fossee_manim/upload_success.html
index 61a992a..4628d97 100644
--- a/fossee_manim/templates/fossee_manim/upload_success.html
+++ b/fossee_manim/templates/fossee_manim/upload_success.html
@@ -11,7 +11,7 @@
   <script src="{{URL_ROOT}}/static/fossee_manim/js/bootstrap-3.3.7.min.js"></script>
   <script type="text/javascript">
     window.setTimeout(function()
-    {   
+    {
         location.href="{% url 'proposal_status' %}"
     }, 9000);
 </script>
@@ -21,9 +21,9 @@
   <div class="container">
     <br><br>
     <div class="jumbotron">
-      <h3><strong>Congrats!</strong> video uploaded successfully!</h3>
+      <h3><strong>Congratulations!</strong>Your video uploaded successfully!</h3>
       <br>
-      <h5><strong>If you've previously uploaded any video, it would be overridden by this upload</h5>
+      <h5><strong>If you uploaded any video before this, it will be automatically overridden by this upload</h5>
     </div>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit