Merge pull request #54 from Sashi20/master

Re-arranged navigation menu and added workshops section in home page

4 files changed, 28 insertions, 3 deletions

diff --git a/static/website/templates/home.html b/static/website/templates/home.html
index 1aa6ce1..0ca91d3 100644
--- a/static/website/templates/home.html
+++ b/static/website/templates/home.html
@@ -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 for you at NCCPS-2018.
+              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="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/navbar.html b/static/website/templates/navbar.html
index 632bb92..d6c52ae 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 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,6 @@
                     <!--<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/website/urls.py b/website/urls.py
index 4d959c3..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'^workshop/$', views.workshop, name='workshop'),
+    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 3a21f94..5aee28e 100644
--- a/website/views.py
+++ b/website/views.py
@@ -68,7 +68,7 @@ def jobfair(request):
     template = loader.get_template('job-fair.html')
     return HttpResponse(template.render(context, request))
 
-def workshop(request):
+def workshops(request):
     context = {}
     template = loader.get_template('workshops.html')
     return HttpResponse(template.render(context, request))