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

12 files changed, 277 insertions, 50 deletions

diff --git a/static/website/bootstrap-css/assets/images/recruiters/anukoolan.png b/static/website/bootstrap-css/assets/images/recruiters/anukoolan.png
new file mode 100644
index 0000000..19976f8
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/anukoolan.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/equinox.png b/static/website/bootstrap-css/assets/images/recruiters/equinox.png
new file mode 100644
index 0000000..37715b0
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/equinox.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/honeywell.png b/static/website/bootstrap-css/assets/images/recruiters/honeywell.png
new file mode 100644
index 0000000..df1046d
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/honeywell.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/ingenero.png b/static/website/bootstrap-css/assets/images/recruiters/ingenero.png
new file mode 100644
index 0000000..effea51
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/ingenero.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/l&t-chiyoda.png b/static/website/bootstrap-css/assets/images/recruiters/l&t-chiyoda.png
new file mode 100644
index 0000000..bcd7c22
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/l&t-chiyoda.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/l&t.png b/static/website/bootstrap-css/assets/images/recruiters/l&t.png
new file mode 100644
index 0000000..719f35b
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/l&t.png
diff --git a/static/website/bootstrap-css/assets/images/recruiters/tcs.jpg b/static/website/bootstrap-css/assets/images/recruiters/tcs.jpg
new file mode 100644
index 0000000..5188dc3
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/tcs.jpg
diff --git a/static/website/bootstrap-css/assets/images/recruiters/tcs.png b/static/website/bootstrap-css/assets/images/recruiters/tcs.png
new file mode 100644
index 0000000..4edf47c
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/recruiters/tcs.png
diff --git a/static/website/bootstrap-css/assets/pdf/Information-Guide-for-NCCPS-2018-Conference.pdf b/static/website/bootstrap-css/assets/pdf/Information-Guide-for-NCCPS-2018-Conference.pdf
new file mode 100644
index 0000000..377d067
--- /dev/null
+++ b/static/website/bootstrap-css/assets/pdf/Information-Guide-for-NCCPS-2018-Conference.pdf
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index efb2595..e1903c3 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -227,7 +227,7 @@
                     </tr>
                     <tr>
 
-              <td colspan="4">
+              <!-- <td colspan="4">
               <p style="color: red" class="text-justify">
               *If you are a group of 5 and above please contact us at <a style="color: black" href="mailto:contact-dwsim@fossee.in">contact-dwsim[at]fossee[dot]in</a> for the registrations.
             </p>
@@ -250,7 +250,7 @@
                 <li><span class="text-justify">After verification of your payment by our team, we shall send you the ticket for the conference via email. This shall take 2-3 working days.</span>
                 </li>
                 </ol>
-              </td>
+              </td> -->
               </tr>
                   </table>
                 </div>
@@ -274,7 +274,10 @@
                   Add on
                 </div>
               </td>
-              <td style="vertical-align:bottom;border-top:none;!important">
+              <td>
+                <span style="color:red;">We are no longer accepting accommodation requests.</span>
+              </td>
+              <!-- <td style="vertical-align:bottom;border-top:none;!important">
                 <div class="align-baseline">
                 <ul>
                   <li>We have limited Low cost accommodation, guaranteed only if you register early. Approximate cost  of the accomodation for 1 night will be INR. 1250/- to INR. 1400/-.</li>
@@ -282,7 +285,7 @@
                   <li>You have to make the payment directly to the hotel during check-out via cash / card.</li>
                 </ul>
                 </div>
-              </td>
+              </td> -->
               </tr>
               <tr>
               <td style="vertical-align:bottom;border-top:none;!important">
@@ -374,14 +377,14 @@
         <div class="container">
             <div class="row">
                 <div class="col-md-12">
-                    <h3 class="section-title">Tentative Schedule</h3>
+                    <h3 class="section-title">Conference Schedule</h3>
                 </div>
             </div>
-            <div class="row">
+            <!-- <div class="row">
               <div class="col-md-12">
                 <p class="text-justify" style="font-weight: 500;"> Poster session - 8AM onwards</p>
               </div>
-            </div>
+            </div> -->
             <div class="row">
                 <div class="col-md-12">
                   <div>
@@ -394,119 +397,302 @@
                         </td>
                         <td style="vertical-align:bottom;border-top:none;!important">
                           <div class="align-baseline">
-                          Program
+                          Session
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;" colspan="2">
+                          <div class="align-baseline">
+                          Speaker
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
                               08:00  - 09:00 
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td colspan="3">
+                          <div class="align-baseline" style="text-align: center;">
+                            Registration & Breakfast <br>
+                            Venue: LC Foyer (1st Floor)
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                            09:00  - 09:45
+                          </div>
+                        </td>
+                        <td colspan="3">
+                          <div class="align-baseline" style="text-align: center;">
+                            Conference Inauguration<br>Venue: LC 101
+                          </div>
+                        </td>
+                    </tr>
+                    <tr style="background-color: #806600;color: #fff;">
+                        <td>
                           <div class="align-baseline">
-                              Registration
+                              09:45  - 10:45 
+                          </div>
+                        </td>
+                        <td colspan="3">
+                          <div class="align-baseline" style="text-align: center;">
+                             Keynote Lectures<br>Venue: LC 101
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                            09:00  - 09:30 
+                              09:45  - 10:15 
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
+                          <div class="align-baseline">
+                              Keynote Lecture-1
+                          </div>
+                        </td>
+                        <td colspan="2">
                           <div class="align-baseline">
-                            Inauguration
+                              Prof. K. P. Madhavan<br>Emeritus Professor, Dept. of Chemical Engineering, IIT Bombay
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              09:30  - 10:30 
+                              10:15  - 10:45 
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              Invited talks
+                              Keynote Lecture-2
+                          </div>
+                        </td>
+                        <td colspan="2">
+                          <div class="align-baseline">
+                              Mr. Alok Pandit<br>Equinox Software and Services Private Limited
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              10:30  - 11:00 
+                              10:45  - 11:00 
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="3">
+                          <div class="align-baseline">
+                              Tea<br>Venue: LC Foyer (First Floor)
+                          </div>
+                        </td>
+                    </tr>
+                    <tr style="background-color: #806600;color: #fff;">
+                        <td>
                           <div class="align-baseline">
-                              Tea
+                             11:00 - 12:35
+                          </div>
+                        </td>
+                        <td colspan="3">
+                          <div class="align-baseline" style="text-align: center;">
+                             Oral Presentations<br>Venue: LC 101
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              11:00  - 01:00 
+                             11:00 - 11:20
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
+                          <div class="align-baseline">
+                              Oral Presentation - 1
+                          </div>
+                        </td>
+                        <td colspan="2">
                           <div class="align-baseline">
-                              Oral Presentations
+                             Prof. Sanjay M Mahajani: "Natural Gas Processing Simulation (Course on Wheels)"<br>Professor, Department of Chemical Engineering, IIT Bombay
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              01:00  - 02:00 
+                              11:20  - 11:35
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              Lunch
+                             Oral Presentation - 2
+                          </div>
+                        </td>
+                        <td colspan="2">
+                          <div class="align-baseline">
+                              Dr. Jogesh Mankar: "Process modeling of power generation in Carbon Black Manufacturing unit"<br>Senior Scientist, Process Engineering, Aditya Birla Science and Technology
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              02:00  - 04:00 
+                             11:35 - 11:50
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
+                          <div class="align-baseline">
+                              Oral Presentation - 3
+                          </div>
+                        </td>
+                        <td colspan="2">
                           <div class="align-baseline">
-                              DWSIM/OpenModelica Workshop
+                             Mr. Aakash Subramanian: "Elucidating Concepts of Separation Techniques and Thermodynamics in Process Development using DWSIM"<br>School of Chemical & Biotechnology, SASTRA Deemed University
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              04:00  - 04:15 
+                              11:50  - 12:05
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              Tea
+                             Oral Presentation - 4
+                          </div>
+                        </td>
+                        <td colspan="2">
+                          <div class="align-baseline">
+                              Ms. Anusha Halageri, Ms. Glen Pauls & Ms. Ananya Srivastava: "Production of Aniline by Hydrogenation of Nitrobenzene"<br>Department of Chemical Engineering, Ramaiah Institute of Technology
                           </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              04:15  - 05:30 
+                             12:05 - 12:20
                           </div>
                         </td>
-                        <td style="vertical-align:bottom;border-top:none;!important">
+                        <td>
                           <div class="align-baseline">
-                              Panel Discussion, Valedictory
+                              Oral Presentation - 5
+                          </div>
+                        </td>
+                        <td colspan="2">
+                          <div class="align-baseline">
+                             Mr. Nikhil Sharma: "Thermo-Mechanical Modeling of Shape and Non-shape Memory Polymers using OpenModelica"<br>Department of Petroleum Engineering, Rajasthan Technical University
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              12:20  - 12:35
+                          </div>
+                        </td>
+                        <td>
+                          <div class="align-baseline">
+                             Oral Presentation - 6
+                          </div>
+                        </td>
+                        <td colspan="2">
+                          <div class="align-baseline">
+                              Ms. Gowri Shankar K, Mr. Rajat Subramanian & Ms. Sravanthi V: "Chlorination of Benzene"<br>Department of Chemical Engineering, Ramaiah Institute of Technology
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              12:35 - 13:30
+                          </div>
+                        </td>
+                        <td rowspan="5" style="padding-top: 10%;">
+                          <div style="text-align: center;">
+                            Job Fair
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="2">
+                          <div class="align-baseline">
+                              Poster Presentation<br>Venue: LC Foyer (First Floor)
+                          </div>
+                        </td>
+                        
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              13:30 - 14:30
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="2">
+                          <div class="align-baseline">
+                              Lunch<br>Venue: LC Foyer (First Floor)
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              14:30 - 16:00
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="2">
+                          <div class="align-baseline">
+                             Workshop on DWSIM & OpenModelica using Spoken Tutorial - Part I<br>Venue: LC 101
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              16:00 - 16:15
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="2">
+                          <div class="align-baseline">
+                             Tea<br>Venue: LC Foyer (First Floor)
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              16:15 - 17:00
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="2">
+                          <div class="align-baseline">
+                             Workshop on DWSIM & OpenModelica using Spoken Tutorial - Part II<br>Venue: LC 101
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              17:00 - 17:30
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="3">
+                          <div class="align-baseline">
+                             Panel Discussion<br>Venue: LC 101
+                          </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                          <div class="align-baseline">
+                              17:30 - 18:00
+                          </div>
+                        </td>
+                        <td style="vertical-align:bottom;border-top:none;!important;text-align: center;"  colspan="3">
+                          <div class="align-baseline">
+                             Valedictory & Vote of Thanks<br>Venue: LC 101
                           </div>
                         </td>
                     </tr>
-
                     
                     </table>
                 </div>
@@ -514,6 +700,24 @@
             </div>
     </section>
 
+    <section id="general-instructions" class="section">
+      <div class="container">
+      <div class="row">
+      <div class="col-sm-3">
+        <h3 class="section-title">General Instructions</h3></div>
+        </div>
+        <div class="row">
+        <div class="col-md-12">
+        <p>
+          These instructions are for all the participants attending the conference. It has the details of the workshops which will be conducted in the conference, job fair and your stay at IIT Bombay.</p>
+          <p>
+          <a href="{% static 'website/bootstrap-css/assets/pdf/Information-Guide-for-NCCPS-2018-Conference.pdf' %}" target="_blank">Click here</a> to download the instructions.
+        </p>
+        </div>
+        </div>
+      </div>
+    </section>
+
     <section id="location" class="section location">
         <div class="container">
             <div class="row">
diff --git a/static/website/templates/job-fair.html b/static/website/templates/job-fair.html
index 5134aa5..0932556 100644
--- a/static/website/templates/job-fair.html
+++ b/static/website/templates/job-fair.html
@@ -59,19 +59,42 @@
     </p>
       <div class="col-md-4">
         <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>
+            <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.png' %}"></a>
         </figure>
       </div>
-      <div class="col-md-4" style="margin-top: 1%;">
+      <div class="col-md-4">
+        <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.png' %}"></a>                
+        </figure>
+      </div>
+      <div class="col-md-4">
+        <figure>
+            <a href="https://www.tcs.com/engineering"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/tcs.png' %}"></a>
+        </figure>
+      </div>
+      </div>
+      <div class="row"  style="margin-top: 5%;">
+      <div class="col-md-3">
+        <figure>
+            <a href="http://www.lnthydrocarbon.com/"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/l&t.png' %}"></a>                
+        </figure>
+      </div>
+      <div class="col-md-3">
+        <figure>
+            <a href="http://www.lntchiyoda.com"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/l&t-chiyoda.png' %}"></a>                
+        </figure>
+      </div>
+      <div class="col-md-3">
         <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>                
+            <a href="https://www.anukoolan.com"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/anukoolan.png' %}"></a>                
         </figure>
       </div>
-      <div class="col-md-4" style="margin-top: 1%;">
+      <div class="col-md-3">
         <figure>
-            <a href="http://www.lnthydrocarbon.com/"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/l&t.jpg' %}"></a>                
+            <a href="https://www.honeywell.com/oil-and-gas"><img alt="" class="img-responsive center-block img-rounded" src="{% static 'website/bootstrap-css/assets/images/recruiters/honeywell.png' %}"></a>                
         </figure>
       </div>
+      
     </div><br><br>
       <p class="text-justify">More companies will be updated soon...</p>
     </div>
diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html
index 89a65e0..baba10e 100644
--- a/static/website/templates/navbar.html
+++ b/static/website/templates/navbar.html
@@ -38,7 +38,7 @@
                    <!-- <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>
-                    
+                    <li><a data-scroll href="{{SITE_URL}}/#general-instructions">Instructions</a></li>
                     <!-- <li><a data-scroll href="{{SITE_URL}}/#location">Venue</a></li> -->
                     <!--<li><a data-scroll href="{{SITE_URL}}/#organiser">Organiser</a></li> 
                     <li><a data-scroll href="{{SITE_URL}}/#contact-us">Contact Us</a></li> -->