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

9 files changed, 112 insertions, 14 deletions

diff --git a/static/website/bootstrap-css/assets/css/main.css b/static/website/bootstrap-css/assets/css/main.css
index dc3871f..87039e0 100644
--- a/static/website/bootstrap-css/assets/css/main.css
+++ b/static/website/bootstrap-css/assets/css/main.css
@@ -383,6 +383,14 @@ ul li {
   font-weight: 300;
 }
 
+@media(max-width: 768px){
+    .site-header .img {
+  width: 100% !important;
+  margin-top: 60px; 
+}
+
+}
+
 @media (min-width: 768px) {
   .navbar-custom {
     background-color: #b3a366;
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/bg.png b/static/website/bootstrap-css/assets/images/backgrounds/bg.png
new file mode 100644
index 0000000..a18fd0e
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/bg.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_2.png b/static/website/bootstrap-css/assets/images/backgrounds/top_2.png
index a18fd0e..3856988 100644
--- a/static/website/bootstrap-css/assets/images/backgrounds/top_2.png
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_2.png
diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index 063cac1..e56e8c2 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -4,8 +4,8 @@
 <div id="home" data="home"></div>
     <header id="site-header" class="site-header valign-center img-fluid"> 
         <div class="intro">
-            <img class="img img-fluid" src="{% static 'website/bootstrap-css/assets/images/backgrounds/top_2.png' %}" alt=""> <br><br>
-            <a class="btn btn-primary" href="{% url 'website:cfp' %}">Submit a paper</a> <br><br>
+            <img class="img img-fluid" src="{% static 'website/bootstrap-css/assets/images/backgrounds/top_2.png' %}" alt=""><br><br><!-- 
+            <a class="btn btn-primary" href="{% url 'website:cfp' %}">Submit a paper</a> <br><br>  -->
         </div>
     </header>
 
@@ -114,6 +114,31 @@
             </div><!-- /.row -->
         </div>
     </section>
+
+    <section id="workshops" class="section workshops">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-12">
+            <h3 class="section-title">Workshops</h3>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12">
+            <p class="text-justify">Improve your skills by attending workshops on DWSIM and OpenModelica organized at NCCPS-2018.
+            </p>
+            <p class="text-justify">We are organizing free workshops for all who register for NCCPS-2018.  Attend the workshop suitable to you and explore the free tools that are of interest to you.
+            </p>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12"> 
+            <center>
+              <a href="{% url 'website:workshops' %}" class="btn btn-primary"> Read more</a>
+            </center>
+          </div>
+        </div>
+      </div>
+    </section>
   
     <section id="registration" class="section registration">
       <div class="container">
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 15814f7..993a4e9 100644
--- a/static/website/templates/navbar.html
+++ b/static/website/templates/navbar.html
@@ -32,6 +32,7 @@
                     <!-- navigation menu -->
                     <li class="active"><a data-scroll href="{{SITE_URL}}/#about">About</a></li>
                     <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 data-scroll href="{{SITE_URL}}/#submit">CFP</a></li> -->
                     <li><a data-scroll href="{{SITE_URL}}/#coc">C0C</a></li>
@@ -41,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
new file mode 100644
index 0000000..43900e3
--- /dev/null
+++ b/static/website/templates/workshops.html
@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+{% include 'header.html' %}
+<body data-spy="scroll" data-target="#site-nav">
+<!-- <div class="se-pre-con"></div> -->
+
+    {% include 'navbar.html' %}
+      {% block content %}
+    <section id="workshop" class="section workshop" style="font-weight: 400;">
+    <h3 class="section-title" style="margin-left: 6%;">Workshops</h3>
+    <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        <p class="text-justify">Improve your skills by attending workshops on DWSIM and OpenModelica organized at NCCPS-2018.
+            </p>
+            <p class="text-justify">We are organizing free workshops for all who register for NCCPS-2018.  Attend the workshop suitable to you and explore the free tools that are of interest to you.
+            </p>
+      </div>
+    </div>
+    <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="#dwsim-workshop">DWSIM</a>
+        </h4>
+      </div>
+      <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.  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, 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>
+
+      </div>
+    </div>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a data-toggle="collapse" data-parent="#accordion" href="#students">OpenModelica</a>
+        </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.  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.  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, 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>
+
+      </div>
+    </div>
+  </div> 
+    </div>
+	</section>
+
+
+      {% endblock %}
diff --git a/website/urls.py b/website/urls.py
index aaed150..841f338 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -15,7 +15,7 @@ urlpatterns = [
     #path('proposal/view', views.view_abstracts, name='view_abstracts'),
     #path('proposal/submitcfp', views.submitcfp, name='submitcfp'),
     #path('accounts/register', views.userregister, name='userregister'),
-
+    re_path(r'^workshops/$', views.workshops, name='workshops'),
     re_path(r'^dwsimquiz/$', views.dwsimquiz, name='dwsimquiz'),
     re_path(r'^jobfair/$', views.jobfair, name='jobfair'),
     re_path(r'^cfp/$', views.cfp, name='cfp'),
diff --git a/website/views.py b/website/views.py
index e40661a..5aee28e 100644
--- a/website/views.py
+++ b/website/views.py
@@ -68,6 +68,11 @@ def jobfair(request):
     template = loader.get_template('job-fair.html')
     return HttpResponse(template.render(context, request))
 
+def workshops(request):
+    context = {}
+    template = loader.get_template('workshops.html')
+    return HttpResponse(template.render(context, request))
+
 # def proposal(request):
 #    context = {}
 #    template = loader.get_template('proposal.html')