Merge branch 'master' of https://github.com/FOSSEE/nccps-2018

4 files changed, 22 insertions, 5 deletions

diff --git a/static/website/bootstrap-css/assets/images/recruiters/equinox.jpg b/static/website/bootstrap-css/assets/images/recruiters/equinox.jpg
new file mode 100644
index 0000000..d693c7e
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/equinox.jpg
diff --git a/static/website/bootstrap-css/assets/images/recruiters/ingenero.jpg b/static/website/bootstrap-css/assets/images/recruiters/ingenero.jpg
new file mode 100644
index 0000000..ab221f7
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/ingenero.jpg
diff --git a/static/website/templates/job-fair.html b/static/website/templates/job-fair.html
index dc0541b..b9bc423 100644
--- a/static/website/templates/job-fair.html
+++ b/static/website/templates/job-fair.html
@@ -9,13 +9,15 @@
     {% include 'navbar.html' %}
       {% block content %}
     <section id="jobfair" class="section jobfair" style="font-weight: 400;">
-    <h3 class="section-title" style="margin-left: 6%;">Job Fair</h3>
+
     <div class="container">
+    <h3 class="section-title">Job Fair</h3>
+    <p class="text-justify">The FOSSEE Team and the Department of Chemical Engineering are organising a National Conference on Chemical Process Simulation - 2018 on Monday, 26 Nov. 2018, at IIT Bombay.  This is being organised as a part of the Diamond Jubilee celebration of IIT Bombay.  Prof. Madhavan and Mr. Alok Pandit of Equinox will give Keynote speeches. As a part of conference, a job fair has been organised with the objective to increase the employment opportunities for young and talented chemical engineers and offer wider choice for recruiters in the core areas.</p>
     <div class="panel-group" id="accordion">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title">
-          <a data-toggle="collapse" data-parent="#accordion" href="#employers">Employers</a>
+          <a data-toggle="collapse" data-parent="#accordion" href="#employers">For Employers</a>
         </h4>
       </div>
       <div id="employers" class="panel-collapse collapse" style="padding: 20px;">
@@ -37,7 +39,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title">
-          <a data-toggle="collapse" data-parent="#accordion" href="#students">Students</a>
+          <a data-toggle="collapse" data-parent="#accordion" href="#students">For Job Aspirants</a>
         </h4>
       </div>
       <div id="students" class="panel-collapse collapse"  style="padding: 20px;">
@@ -45,11 +47,25 @@
     		<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>
 
         <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>
+        <p class="text-justify">Please note that it is mandatory for the job aspirants 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>
   </div> 
+    <div class="row">
+    <h3>Recruiters</h3>
+      <div class="col-md-6">
+        <figure>
+            <a href="http://www.equinoxsoftwareservices.com/index.php/Home"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/equinox.jpg' %}"></a>
+        </figure>
+      </div>
+      <div class="col-md-6">
+        <figure>
+            <a href="http://www.ingenero.com/"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/ingenero.jpg' %}"></a>                
+        </figure>
+      </div><br><br>
+      <p class="text-justify">More companies will be updated soon...</p>
+    </div>
     </div>
 	</section>
 
diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html
index 993a4e9..c82582e 100644
--- a/static/website/templates/navbar.html
+++ b/static/website/templates/navbar.html
@@ -34,6 +34,7 @@
                     <li><a data-scroll href="{{SITE_URL}}/#speakers">Speakers</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#workshops">Workshops</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#registration">Register</a></li>
+                    <li><a href="{% url 'website:jobfair' %}">Job Fair</a></li>
                    <!-- <li><a data-scroll href="{{SITE_URL}}/#submit">CFP</a></li> -->
                     <li><a data-scroll href="{{SITE_URL}}/#coc">C0C</a></li>
                     <li><a data-scroll href="{{SITE_URL}}/#schedule">Schedule</a></li>
@@ -42,7 +43,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:cfp' %}">cfp</a></li>
                     {% if user.is_authenticated %}
                       <li class="dropdown">