diff options
author | Sashi20 | 2018-11-06 11:29:59 +0530 |
---|---|---|
committer | GitHub | 2018-11-06 11:29:59 +0530 |
commit | 6e4bfa40c3aae76c27c57d25f0d7761eb411f0c6 (patch) | |
tree | f040bf979246031aa9078a3021b24bf44966973d | |
parent | 3f6123d24af7e0dd76323496e360ecdeb733ad37 (diff) | |
parent | 9fac63d218a5391b0873d04e863189794f3efabe (diff) | |
download | nccps-2018-6e4bfa40c3aae76c27c57d25f0d7761eb411f0c6.tar.gz nccps-2018-6e4bfa40c3aae76c27c57d25f0d7761eb411f0c6.tar.bz2 nccps-2018-6e4bfa40c3aae76c27c57d25f0d7761eb411f0c6.zip |
Merge pull request #53 from Sashi20/master
Added workshop content and modified background image
-rw-r--r-- | static/website/bootstrap-css/assets/css/main.css | 8 | ||||
-rw-r--r-- | static/website/bootstrap-css/assets/images/backgrounds/bg.png | bin | 0 -> 74949 bytes | |||
-rw-r--r-- | static/website/bootstrap-css/assets/images/backgrounds/top_2.png | bin | 74949 -> 70098 bytes | |||
-rw-r--r-- | static/website/templates/home.html | 4 | ||||
-rw-r--r-- | static/website/templates/navbar.html | 1 | ||||
-rw-r--r-- | static/website/templates/workshops.html | 61 | ||||
-rw-r--r-- | website/urls.py | 2 | ||||
-rw-r--r-- | website/views.py | 5 |
8 files changed, 78 insertions, 3 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 Binary files differnew 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 Binary files differindex 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..1aa6ce1 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> diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index 15814f7..632bb92 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -41,6 +41,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:workshop' %}">Workshop</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 %} diff --git a/static/website/templates/workshops.html b/static/website/templates/workshops.html new file mode 100644 index 0000000..35f3de3 --- /dev/null +++ b/static/website/templates/workshops.html @@ -0,0 +1,61 @@ +{% 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 for you at NCCPS-2018. </p> + + <p class="text-justify">We are organizing free workshops for all the participants who have registered for NCCPS-2018. Attend the workshop suitable for you and explore the tools available, free of cost for your field of interest.</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.</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">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.</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">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">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..4d959c3 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'^workshop/$', views.workshop, name='workshop'), 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..3a21f94 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 workshop(request): + context = {} + template = loader.get_template('workshops.html') + return HttpResponse(template.render(context, request)) + # def proposal(request): # context = {} # template = loader.get_template('proposal.html') |