About and Contact page updated

3 files changed, 75 insertions, 324 deletions

diff --git a/views/about.html b/views/about.html
index 2ba0e0f..79f179f 100644
--- a/views/about.html
+++ b/views/about.html
@@ -7,15 +7,18 @@
 	<header>
 		<% include header.html %>
 	</header>
-	<h1>About</h1>
-	<section>
-		<p>
-			FOSSEE (Free and Open Software in Education) project promotes the use of FOSS tools to improve the quality of education in our country. We aim to reduce dependency on proprietary software in educational institutions. We encourage the use of FOSS tools through various activities to ensure commercial software is replaced by equivalent FOSS tools. We also develop new FOSS tools and upgrade existing tools to meet requirements in academia and research. 
-		</p>
-		<p>
-			The FOSSEE project is part of the National Mission on Education through Information and Communication Technology (ICT), Ministry of Human Resources and Development, Government of India.
-		</p>	
-	</section>
+	<div class="container">
+		<h1>About</h1>
+		<section>
+			<p>
+				FOSSEE (Free and Open Software in Education) project promotes the use of FOSS tools to improve the quality of education in our country. We aim to reduce dependency on proprietary software in educational institutions. We encourage the use of FOSS tools through various activities to ensure commercial software is replaced by equivalent FOSS tools. We also develop new FOSS tools and upgrade existing tools to meet requirements in academia and research. 
+			</p>
+			<p>
+				The FOSSEE project is part of the National Mission on Education through Information and Communication Technology (ICT), Ministry of Human Resources and Development, Government of India.
+			</p>	
+		</section>	
+	</div>
+	
 
 	<footer class="footer">
 		<% include footer.html %>	
diff --git a/views/contact.html b/views/contact.html
index 4775e4c..04caed4 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -7,8 +7,69 @@
 	<header>
 		<% include header.html %>
 	</header>
-	<h1>Contact</h1>
-	
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-8 col-lg-offset-2">
+				<h3>Contact Us</h3>
+				<form id="contact-form" method="post" action="#" role="form">
+				    <div class="messages"></div>
+
+    				<div class="controls">
+
+	        			<div class="row">
+	            			<div class="col-md-6">
+	                			<div class="form-group">
+	                    			<label for="form_name">Firstname *</label>
+	                    			<input id="form_name" type="text" name="name" class="form-control" placeholder="Please enter your firstname *" required="required" data-error="Firstname is required.">
+	                    			<div class="help-block with-errors"></div>
+	                			</div>
+	            			</div>
+				            <div class="col-md-6">
+				                <div class="form-group">
+				                    <label for="form_lastname">Lastname *</label>
+				                    <input id="form_lastname" type="text" name="surname" class="form-control" placeholder="Please enter your lastname *" required="required" data-error="Lastname is required.">
+				                    <div class="help-block with-errors"></div>
+				                </div>
+				            </div>
+	        			</div>
+	        			<div class="row">
+				            <div class="col-md-6">
+				                <div class="form-group">
+				                    <label for="form_email">Email *</label>
+				                    <input id="form_email" type="email" name="email" class="form-control" placeholder="Please enter your email *" required="required" data-error="Valid email is required.">
+				                    <div class="help-block with-errors"></div>
+				                </div>
+				            </div>
+				            <div class="col-md-6">
+				                <div class="form-group">
+				                    <label for="form_phone">Phone</label>
+				                    <input id="form_phone" type="tel" name="phone" class="form-control" placeholder="Please enter your phone">
+				                    <div class="help-block with-errors"></div>
+				                </div>
+				            </div>
+	        			</div>
+				        <div class="row">
+				            <div class="col-md-12">
+				                <div class="form-group">
+				                    <label for="form_message">Message *</label>
+				                    <textarea id="form_message" name="message" class="form-control" placeholder="Message for us *" rows="4" required="required" data-error="Please,leave us a message."></textarea>
+				                    <div class="help-block with-errors"></div>
+				                </div>
+				            </div>
+				            <div class="col-md-12">
+				                <input type="submit" class="btn btn-success btn-send" value="Send message">
+				            </div>
+				        </div>
+				        <div class="row">
+				            <div class="col-md-12">
+				                <p class="text-muted"><strong>*</strong> These fields are required.</p>
+				            </div>
+				        </div>
+    				</div>
+    			</form>
+			</div>
+		</div>
+	</div>
 	<footer class="footer">
 		<% include footer.html %>	
 	</footer>
diff --git a/views/indexes.html b/views/indexes.html
deleted file mode 100644
index 69fc532..0000000
--- a/views/indexes.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<!doctype html>

-<html lang="en">

-<head>

-	<meta charset="UTF-8">

-	<title><%= title %></title>

-	<!-- Bootstrap core CSS -->

-	<link rel="stylesheet" href="../css/bootstrap.min-3.3.6.css">

-

-    <!-- Custom styles for this template -->

-    <link href="../css/customstylesheet.css" rel="stylesheet">

-

-    <!--Favicon-->

-    <link rel="shortcut icon" href="../images/favicon.ico" />

-

-	<script src="/socket.io/socket.io.js"></script>

-	<script src="../js/plotly-latest.min.js"></script>	

-	

-		

-	<!-- Bootstrap JQuery -->

-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>

-    <script>window.jQuery || document.write('<script src="../js/jquery.min.js"><\/script>')</script>

-    <!-- Bootstrap core JS -->

-	<script src="../js/bootstrap.min-3.3.6.js"></script>

-

-</head>

-<body>

-	<nav class="navbar navbar-inverse navbar-fixed-top">

-		<div class="container">

-    		<div class="navbar-header">

-      			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

-      				<span class="sr-only">Toggle navigation</span>

-        			<span class="icon-bar"></span>

-        			<span class="icon-bar"></span>

-        			<span class="icon-bar"></span> 

-      			</button>

-      		<a class="navbar-brand" href="#">Online Simulator</a>

-    		</div>

-    		<div class="collapse navbar-collapse" id="navbar">

-      			<ul class="nav navbar-nav">

-        			<li class="active"><a href="#">Home</a></li>

-        			<li><a href="/about">About</a></li>

-        			<li><a href="/contact">Contact</a></li> 

-            	</ul>

-      			<!-- <ul class="nav navbar-nav navbar-right">

-        			<li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li>

-        			<li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>

-      			</ul> -->

-    		</div>

-  		</div>

-	</nav>

-

-	

-

-	 <!-- Main jumbotron for a primary marketing message or call to action -->

-    <div class="descNgspice">

-      <div class="container">

-        <h2>Ngspice</h2>

-        <p3>SPICE (Simulation Program with Integrated Circuit Emphasis) is a widely used tool for simulating electrical circuits. The original version was developed at the Electronics Research Laboratory of the University of California, Berkeley. Dozens of variations of SPICE exist, with both free and commercial versions available.

-

-		This site allows you to run ngspice simulations from a web browser environment. Whether you are using a Windows, Linux, or Mac computer, a smart phone, or a tablet, you always should be able to run a SPICE simulation.

-		</p3>

-      </div>

-    </div>

-

-

-	<div class="container">

-		<h2>Editor</h2>

-  		<p>Please write your ngspice netlist in the below editor.</p>

-  		<form role="form">

-    		<div class="form-group editorArea">

-    		

-      			<textarea class="form-control" id="netlist" rows="20"> 

-* Author: FOSSEE

-* Date:

-

-*Netlist Connection Information

-r1  in out 1k

-c1  out gnd 10u

-v1  in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)

-

-*Analysis information

-.tran 10e-03 100e-03 0e-03

-

-*Please do not remove this line

-.control

-	run

-.endc

-.end

-      			</textarea>

-      			<h3>Plots:</h3>

-      			<textarea class="form-control" id="plotOption" rows="3">

-v(in) v(out)      			

-    			</textarea>

-    		</div>

- 		</form>

- 		<div class="buttonArea">

-			<button id="doSubmit" class="btn btn-success">Submit</button>

-			<button id="doSaveNetlist" class="btn btn-success">Save Netlist</button>

-			<button id="doClear" class="btn btn-danger">Clear Plots</button>

-		</div>

-		

-		<hr>

-		

-		<div id="messages">

-			<p class="fromServer">Server acknowledgement goes here</p>

-		</div>

-

-		<div class="container" id="plot" style="display:none;">

-		<div class="row">

-			<div id="graph" style="width:600px;height:400px;" class="col-lg-6">

-

-				

-			</div>

-			

-		</div>

-			

-		</div>

-	

-

-	</div>

-	<footer class="footer">

-			<div class="container">

-				<!-- <div> -->

-					 <p style="text-align:center;">This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License.</a><br><a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank"><img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a> 

-					 </p>

-					

-					<!-- <p>&copy; 2016 FOSSEE, IIT Bombay</p>	 -->

-				<!-- </div> -->

-			</div>

-    </footer> 

-

-

-	<script>

-		console.log("Client Started!!!");

-    	//var socket = io.connect('http://localhost:3000');

-    	var socket = io.connect();

-  		console.log("Socket Created!!!");

-  		socket.on('loadingPage', function (data) {

-  			console.log('Client : '+data);

-  			socket.emit('user',{socketID:socket.id});

-  		});

-

-  		var editorContent = document.getElementById("netlist");

-  		var submitButton = document.getElementById("doSubmit");

-		var saveButton = document.getElementById("doSaveNetlist");

-		var clearButton = document.getElementById("doClear");

-		var messages  = document.getElementById("messages");

-		var plotArea = document.getElementById("plotArea");

-		var plotVariable = document.getElementById("plotOption");

-

-		submitButton.addEventListener("click", function() {

-			var netlist = editorContent.value;

-			var plotDetails = plotVariable.value.split("\n");

-			// var plotDetails = plotOption.split("\n");

-			var plotList = [];			

-			for(var i = 0;i < plotDetails.length;i++){

-				if (plotDetails[i].trim()==""){

-					continue

-				}

-				else{

-					plotList.push(plotDetails[i].trim());	

-				}

-							

-    		}

-

-			console.log("Netlist :"+editorContent.value);

-			messages.innerHTML = "";

-			socket.emit("netlist",{"netlist":netlist,"plotList":plotList});

-			document.getElementById('plot').style.display = 'block';

-		});

-

-		clearButton.addEventListener("click",function(){

-			document.getElementById('plot').style.display = 'none';

-			messages.innerHTML = "";

-	

-		});

-

-		saveButton.addEventListener("click",function(){

-			var netlist = editorContent.value;

-			//  create a new Blob (html5 magic) that conatins the data from your form feild

-    		var textFileAsBlob = new Blob([netlist], {type:'text/plain'});

-        	

-        	var netListFileName = prompt('Enter name of netlist file to be saved');

-        	if(!netListFileName){

-        		alert("Please give the proper name");

-        	} 

-

-        	// console.log(textFileAsBlob);

-

-        	// create a link for our script to 'click'

-    		var downloadLink = document.createElement("a");

-

-        	downloadLink.download = netListFileName+'.cir.out';

-

-        	// Link Name

-    		downloadLink.innerHTML = "Netlist Download Link";

-

-    		// allow our code to work in webkit & Gecko based browsers

-			// without the need for a if / else block.

-    		window.URL = window.URL || window.webkitURL;

-

-    		// Create the link Object.

-    		downloadLink.href = window.URL.createObjectURL(textFileAsBlob);

-			// when link is clicked call a function to remove it from

-			// the DOM in case user wants to save a second file.

-    		downloadLink.onclick = destroyClickedElement;

-			// make sure the link is hidden.

-    		downloadLink.style.display = "none";

-			// add the link to the DOM

-    		document.body.appendChild(downloadLink);

-    

-			// click the new link

-    		downloadLink.click();

-		

-

-		});

-

-		socket.on("serverMessage", function(message) {

-			// console.log("RECEIVED : " + message);

-			messages.innerHTML = "<br>" + message.stdout + "<br>"+message.stderr;

-			

-		});

-

-		socket.on("clearPlot",function(){

-			document.getElementById('plot').style.display = 'none';

-			messages.innerHTML = "";

-		});

-        

-		socket.on("plotData",function(data){

-			var outData = data['outData'];

-			plotList = data['plotList'];

-			console.log("PlotList---->"+plotList);

-			var keys = Object.keys(outData);

-			

-			nonStackPlot(keys,outData,plotList);

-			

-		});

-        

-        function destroyClickedElement(event)

-		{

-			// remove the link from the DOM

-    		document.body.removeChild(event.target);

-		}

-

-		function nonStackPlot(keys,outData,PlotList)

-		{

-			traces = getTraces(keys,outData);	

-

-			var layout = getLayout(keys,plotList);	

-

-    		Plotly.newPlot(document.getElementById('graph'), traces, layout);

-

-		}

-

-		function getTraces(keys,outData)

-		{

-			var traceObj = {};

-			var traces = [];

-			//Dynamically creating traces

-			for(var i=0; i<keys.length; i++){

-				if(keys[i]=='x-axis'){

-					continue;

-				}

-				else{

-					var trace = {

-						x: outData['x-axis'],

-						y: outData[keys[i]],

-						name:keys[i],

-						type: 'scatter'

-					};

-					traceObj[keys[i]] = trace;

-				}

-			}

-

-			var traceKey = Object.keys(traceObj);

-			for (var i=0;i<traceKey.length;i++) {

-  				var value = traceObj[traceKey[i]];

-  				traces.push(value);

-			}

-			return traces;

-		}

-

-		function getLayout(keys,PlotList)

-		{

-			var layout = {

-			  				

-							'title':'Simulation Output',

-							yaxis: { 

-										title: "Voltage(Volts) / Current(Amp)",      

-										titlefont: {

-														family: 'Courier New, monospace',

-      													size: 15,

-      													color: '#7f7f7f'

-    									}

-							}, 

-							xaxis: {

-										title:"time(Sec) / Frequency(Hz)",

-										showgrid: true,                 // remove the x-axis grid lines

-										titlefont: {

-	      												family: 'Courier New, monospace',

-	      												size: 15,

-	      												color: '#7f7f7f'

-    									}

-							}

-    		};

-

-			return layout;

-

-		}

-					 		

-	</script>

-</body>

-</html>