Enabled link for job fair in the navigation menu

3 files changed, 13 insertions, 16 deletions

diff --git a/static/website/templates/job-fair.html b/static/website/templates/job-fair.html
index fedf936..dc0541b 100644
--- a/static/website/templates/job-fair.html
+++ b/static/website/templates/job-fair.html
@@ -22,16 +22,16 @@
         <h3>For Employers</h3>
 
 		<h4>Introduction</h4>
-		<p class="text-justify">The conference committee is excited to invite your esteemed organisation to the job fair to be conducted in connection with the National Conference on Chemical Process Simulation-2018 to be held on 26 November 2018 at IIT Bombay. </p>
+		<p class="text-justify">FOSSEE, IIT Bombay, is excited to invite your esteemed organisation to the job fair to be conducted in connection with the National Conference on Chemical Process Simulation-2018 to be held on 26 November 2018 at IIT Bombay.</p>
 
-		<p class="text-justify">The conference will bring together people from both industry and academia. An important aim of this job fair is to offer networking opportunities with prospective recruits. Your organisation can meet bright chemical engineering students who are experts in process modelling and simulation. We have sent invites to more than 300 chemical engineering departments across the country.</p>
+    <p class="text-justify">In this conference, we shall showcase the excellent work done in the area of chemical process simulation by faculty members and students of top engineering colleges in India, who have created 100 flowsheets of interesting and important processes using the open source process simulator DWSIM.  Some of these smart students are very keen to take up core chemical engineering jobs.  They are also likely to stay with your company for a reasonable period of time.  A select number of them will participate in the Job Fair, to be organised along with the Conference.</p>
 		<span>What we offer?</span>
 		<ul>
 			<li>Meeting bright chemical engineering students who are experts in process modelling and simulation</li>
 			<li>Accommodation for the company/ organisation representatives (for 2 people) for one night</li>
 			<li>One room at the venue where your organization can meet and interact with prospective recruits</li>
 		</ul>
-		<!-- <p>If you are interested, please fill the <a href="" target="_blank">form</a> with the details.</p>  -->
+		<p>If you are interested, please fill the <a href="https://docs.google.com/forms/d/e/1FAIpQLSch3uui8LBI_TxNifCpjv6imLSKsSxjToSo1AotLReUjAkbew/viewform" target="_blank">form</a> with the details.In case of any queries, please reach out to us at <a href="mailto:contact-dwsim@fossee.in">contact-dwsim@fossee.in </a></p>
       </div>
     </div>
     <div class="panel panel-default">
@@ -41,14 +41,11 @@
         </h4>
       </div>
       <div id="students" class="panel-collapse collapse"  style="padding: 20px;">
-        
-		<h3>For Students</h3>
+    		<h4>Introduction</h4>
+    		<p class="text-justify">FOSSEE, IIT Bombay, is pleased to invite all the bright chemical engineering minds to the job fair which is to be conducted in connection with the the National Conference on Chemical Process Simulation - 2018 to be held at IIT Bombay on 26 November 2018.</p>
 
-		<h4>Introduction</h4>
-		<p class="text-justify">The conference committee is pleased to invite to the job fair which is to be conducted in connection with the the National Conference on Chemical Process Simulation-2018 to be held at IIT Bombay on 26 November 2018.</p>
-
-		<p class="text-justify">We have invited many companies to participate in the job fair. Some of the companies who have confirmed of their presence are Equinox, Ingenero,......
-		<!-- If you are interested in meeting the companies, please fill this <a href="https://docs.google.com/forms/d/1cArwdS8mLZ45vFLpwejJaYZvnOCLWP2dsejy6bTqnmY/viewform" target="_blank">form</a>--></p>
+        <p>Many chemical engineering core industries have been invited to participate in this job fair. Equinox, Ingenero are few among those who have confirmed their presence. If you are interested in meeting the companies, please fill this <a href="https://docs.google.com/forms/d/e/1FAIpQLScYn5tIpiMwlw553rn1V01Lt2scKft9JwmcHgmWPDYVJ7KTtQ/viewform" target="_blank">form</a>. In case of any queries, please reach out to us at <a href="mailto:contact-dwsim@fossee.in">contact-dwsim@fossee.in</a>.</p>
+        <p class="text-justify">Please note that it is mandatory for the students to register for the conference to participate in the job fair. More details about registration is available <a href="https://dwsim.fossee.in/nccps-2018/#registration">here</a>.</p>
 
       </div>
     </div>
diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html
index 6e451b7..d43f6d0 100644
--- a/static/website/templates/navbar.html
+++ b/static/website/templates/navbar.html
@@ -42,7 +42,7 @@
                     <!--<li><a data-scroll href="{{SITE_URL}}/#organiser">Organiser</a></li> -->
                     <li><a data-scroll href="{{SITE_URL}}/#contact-us">Contact Us</a></li>
                     <li><a href="{% url 'website:dwsimquiz' %}">DWSIM QUIZ</a></li>
-                    <!-- <li><a href="{% url 'website:jobfair' %}">Job Fair</a></li> -->
+                    <li><a href="{% url 'website:jobfair' %}">Job Fair</a></li>
                     <li><a href="{% url 'website:cfp' %}">cfp</a></li>
                     {% if user.is_authenticated %}
                       <li class="dropdown">
diff --git a/static/website/templates/workshops.html b/static/website/templates/workshops.html
index c8d6092..43900e3 100644
--- a/static/website/templates/workshops.html
+++ b/static/website/templates/workshops.html
@@ -29,9 +29,9 @@
       <div id="dwsim-workshop" class="panel-collapse collapse" style="padding: 20px;">
         <p class="text-justify">DWSIM is an open-source CAPE-OPEN compliant chemical process simulator. It features a Graphical User Interface (GUI), advanced thermodynamics calculations, reactions support and petroleum characterization / hypothetical component generation tools. DWSIM can simulate steady-state, vapor–liquid, vapor–liquid-liquid, solid–liquid and aqueous electrolyte equilibrium processes and has built-in thermodynamic models and unit operations (<a href="https://en.wikipedia.org/wiki/DWSIM" target="_blank">https://en.wikipedia.org/wiki/DWSIM</a> ). It is available for Windows, Linux and Mac OS.</p>
 
-        <p class="text-justify">The objective of this workshop is to create awareness about the open source process simulator DWSIM among academia and industry. This workshop will start from introduction to DWSIM and will extend to flowsheet creation and the use of some basic unit operations. This workshop will make use of Spoken Tutorials created at IIT Bombay.</p>
+        <p class="text-justify">The objective of this workshop is to create awareness about the open source process simulator DWSIM among academia and industry. This workshop will start from introduction to DWSIM and will extend to flowsheet creation and the use of some basic unit operations. This workshop will make use of Spoken Tutorials created at IIT Bombay.  This workshop will present to the participants flowsheets of <a href="https://dwsim.fossee.in/flowsheeting-project/completed-flowsheet" target="_blank">100 interesting and important processes</a> already available on DWSIM.</p>
 
-        <p class="text-justify">After attending this workshop, participants will be able to create simulation using DWSIM and use tools available in DWSIM. Being a free and open-source tool, the workshop will enable the faculty members to establish process simulation lab in their institutes/departments and offer lab course on process simulation to their undergraduate and graduate chemical engineering degree programmes. Industry people will enable to do their plant simulations on their own computers free of cost.</p>
+        <p class="text-justify">After attending this workshop, the participants will be able to build and simulate flowsheets using DWSIM. The workshop will help the faculty members interested in establishing process simulation labs, which can be used to offer one or more lab courses on process simulation to their students, both undergraduate and postgraduate.  The proposed workshop will be useful to people from industry also.</p>
 
         <p class="text-justify">Participation certificate will be provided to all participants.</p>
 
@@ -44,11 +44,11 @@
         </h4>
       </div>
       <div id="students" class="panel-collapse collapse"  style="padding: 20px;">
-        <p class="text-justify">OpenModelica is an open-source Modelica-based modeling and simulation environment intended for industrial and academic usage (<a href="https://en.wikipedia.org/wiki/OpenModelica" target="_blank">https://en.wikipedia.org/wiki/OpenModelica</a>). Modelica is a non-proprietary, object-oriented, equation based language to conveniently model complex physical systems containing, e.g., mechanical, electrical, electronic, hydraulic, thermal, control, electric power or process-oriented subcomponents.</p>
+        <p class="text-justify">OpenModelica is an open-source Modelica-based modeling and simulation environment intended for industrial and academic usage (<a href="https://en.wikipedia.org/wiki/OpenModelica" target="_blank">https://en.wikipedia.org/wiki/OpenModelica</a>). Modelica is a non-proprietary, object-oriented, equation based language to conveniently model complex physical systems containing, e.g., mechanical, electrical, electronic, hydraulic, thermal, control, electric power or process-oriented subcomponents.  OpenModelica is capable of dealing with algebraic, differential, and differential algebraic equations.</p>
 
-        <p class="text-justify">The objective of this workshop is to introduce OpenModelica to academia and industry. This workshop will be covering basic concepts of OpenModelica. Spoken tutorials created at IIT Bombay will be used for the workshop.</p>
+        <p class="text-justify">The objective of this workshop is to introduce OpenModelica to academia and industry.  OpenModelica, being capable of handling dynamic simulation, is useful to simulate batch processes as well.  This workshop will cover basic concepts of OpenModelica.  The workshop will be based on Spoken tutorials created at IIT Bombay.</p>
 
-        <p class="text-justify">After attending this workshop, participant will be able to create and simulate simple models using OpenModelica. Being an open-source tool , this workshop will enable the people from academia to use OpenModelica for their research. Industry people can also explore use of OpenModelica for their simulations.</p>
+        <p class="text-justify">After attending this workshop, participants will be able to create models and simulate them using OpenModelica.  This state of the art free tool will be useful to industry and academia.</p>
 
         <p class="text-justify">Participation certificate will be provided to all participants.</p>