Merge pull request #40 from Sashi20/devel

Added Workshop and general Instructions

10 files changed, 29 insertions, 24 deletions

diff --git a/website/static/pdf/GPU_Computing_using_PyOpenCL.pdf b/website/static/pdf/GPU_Computing_using_PyOpenCL.pdf
new file mode 100644
index 0000000..d51f597
--- /dev/null
+++ b/website/static/pdf/GPU_Computing_using_PyOpenCL.pdf
diff --git a/website/static/pdf/Model_Evaluation_and_Selection_with_Scikit-Learn.pdf b/website/static/pdf/Model_Evaluation_and_Selection_with_Scikit-Learn.pdf
new file mode 100644
index 0000000..514c7ff
--- /dev/null
+++ b/website/static/pdf/Model_Evaluation_and_Selection_with_Scikit-Learn.pdf
diff --git a/website/static/pdf/SciPy2017-Workshop_instructions.pdf b/website/static/pdf/SciPy2017-Workshop_instructions.pdf
new file mode 100644
index 0000000..37df584
--- /dev/null
+++ b/website/static/pdf/SciPy2017-Workshop_instructions.pdf
diff --git a/website/static/pdf/geospatial_analysis.pdf b/website/static/pdf/geospatial_analysis.pdf
new file mode 100644
index 0000000..4dff6cf
--- /dev/null
+++ b/website/static/pdf/geospatial_analysis.pdf
diff --git a/website/static/pdf/geospatial_instructions.pdf b/website/static/pdf/geospatial_instructions.pdf
new file mode 100644
index 0000000..1f3986d
--- /dev/null
+++ b/website/static/pdf/geospatial_instructions.pdf
diff --git a/website/static/pdf/instructions.pdf b/website/static/pdf/instructions.pdf
new file mode 100644
index 0000000..2c81e59
--- /dev/null
+++ b/website/static/pdf/instructions.pdf
diff --git a/website/static/pdf/workshop_instructions.pdf b/website/static/pdf/workshop_instructions.pdf
new file mode 100644
index 0000000..7a5a775
--- /dev/null
+++ b/website/static/pdf/workshop_instructions.pdf
diff --git a/website/templates/footer.html b/website/templates/footer.html
index 7f2de0b..5b9b017 100644
--- a/website/templates/footer.html
+++ b/website/templates/footer.html
@@ -60,8 +60,8 @@
         </div>
     </div>
 </section>
-<!-------------------------->
-<!--------------------------->
+<!-- ---------------------- -->
+<!-- ---------------------- -->
 <!-- Footer -->
 <br>
 <footer class="py-5 bg-dark">
@@ -136,4 +136,3 @@ function validateMessage() {
         });
     }
 </script>
-
diff --git a/website/templates/home.html b/website/templates/home.html
index 93f065d..f086e39 100644
--- a/website/templates/home.html
+++ b/website/templates/home.html
@@ -392,7 +392,9 @@
                         <tr >
                            <td>09:00 AM - 10:55 AM</td>
                            <td> Controlling devices with Python using KuttyPy<br> - Dr. Ajith Kumar </td>
-                           <td> Image Classification using deep learning (keras/Tensorflow)<br> - Kashyap Raval</td>
+                           <td> Image Classification using deep learning (keras/Tensorflow)<br> - Kashyap Raval <span style="float: right;">
+                           <!--<a href="{% static 'pdf/SciPy2017-Workshop instructions.pdf' %}" target="_blank">Instructions</a>-->        
+                           </span></td>
                         </tr>
                         <tr style="background-color: #9de8f1;">
                            <td>10:55 AM - 11 :05 AM</td>
@@ -401,8 +403,9 @@
                         </tr>
                         <tr >
                            <td>11:05 AM - 01:00 PM</td>
-                           <td > Scientific Computing using Orange<br> - Ankit Mahato</td>
-                           <td> GPU Computing using PyOpenCL<br> - Aditya Bhosale</td>
+                           <td > Scientific Computing using Orange<br> - Ankit Mahato <span style="float: right;"><!--<a href="https://static.fossee.in/python/abstract/Ankit-Workshop.pdf" target="_blank">Instructions</a>--></span></td>
+                           <td> GPU Computing using PyOpenCL<br> - Aditya Bhosale <span style="float: right;">
+                           <a href="{% static 'pdf/GPU_Computing_using_PyOpenCL.pdf' %}" target="_blank">Instructions</a></span></td>
                         </tr>
                         <tr style="background-color: #9de8f1;">
                            <td>01:00 PM - 02:00 PM</td>
@@ -411,8 +414,10 @@
                         </tr>
                         <tr >
                            <td>02:00 PM - 03:55 PM</td>
-                           <td > Python for Data Analysis<br> - Anamika Gupta</td>
-                           <td> Model Evaluation and Selection with Scikit-Learn<br> -  Jaidev Deshpande</td>
+                           <td > Python for Data Analysis<br> - Anamika Gupta &amp; Naveen Kumar<span style="float: right;">
+                           <!--<a href="https://static.fossee.in/python/abstract/Anamika-workshop.pdf" target="_blank">Instructions</a> --></span> </td>
+                           <td> Model Evaluation and Selection with Scikit-Learn<br> -  Jaidev Deshpande <span style="float: right;">
+                           <a href="{% static 'pdf/Model_Evaluation_and_Selection_with_Scikit-Learn.pdf' %}" target="_blank">Instructions</a></span></td>
                         </tr>
                         <tr style="background-color: #9de8f1;">
                            <td>03:55 PM - 04:05 PM</td>
@@ -420,8 +425,9 @@
                         </tr>
                         <tr >
                            <td>04:05 PM - 06:00 PM</td>
-                           <td> FOSS Python tools for geospatial analysis<br> - Nishadh K A</td>
-                           <td> Next Generation Number Theory and Numeric Optimization!<br> - Shivam Patel</td>
+                           <td> FOSS Python tools for geospatial analysis<br> - Nishadh K A <span style="float: right;"><a href="{% static 'pdf/geospatial_instructions.pdf' %}" target="_blank">Instructions</a></span></td>
+                           <td> Next Generation Number Theory and Numeric Optimization!<br> - Shivam Patel <span style="float: right;">
+                           <!--<a href="https://static.fossee.in/python/abstract/Shivam-workshop.pdf" target="_blank">Instructions</a>--></span></td>
                         </tr>
                      </tbody>
                   </table>
@@ -494,7 +500,7 @@
                         </tr>
                         <tr >
                            <td>02:30 PM - 02:50 PM</td>
-                           <td> Reliability analysis of Power electronic circuits in Grid-connected Photo-voltaic system using fiabilipy-2.7 Python package<br> - Priyadarshini Kori</td>
+                           <td> Reliability analysis of Power electronic circuits in Grid-connected Photo-voltaic system using fiabilipy-2.7 Python package<br> - Priyadarshini Kori </td>
                            <td><a href="https://static.fossee.in/python/abstract/priyadarshini-talk.pdf" target="_blank" >View here</a></td>
                         </tr>
                         </tr>
@@ -505,7 +511,7 @@
                         </tr>
                         <tr >
                            <td>03:10 PM - 03:30 PM</td>
-                           <td> Smart Meter Data Analytics using Orange<br> - Ankit Mahato</td>
+                           <td> Smart Meter Data Analytics using Orange<br> - Ankit Mahato &amp; Ashita Prasad</td>
                            <td><a href="https://static.fossee.in/python/abstract/Ankit-talk.pdf" target="_blank" >View here</a></td>
                         </tr>
                         <tr >
@@ -566,40 +572,40 @@
    <div class="container">
       <center>
          <h2>Instructions</h2>
-         <p style="font-weight: normal;">TBD
-         </p>
       </center>
+      
       <hr>
       <div class="row align-items-center">
          <div class="col-md-offset-4">
             <div class="panel panel-default">
                <div class="panel-body">
-                  <!-- <table class="table table-condensed" style="text-align: justify;">
+                   <table class="table table-condensed table-bordered" style="text-align: justify;">
                      <tbody>
                         <tr>
                            <td>General Instructions</td>
                            <td width="60%">These instructions will help you during the stay at IIT Bombay. </td>
-                           <td><a href="http://scipy.in/2016/downloads/General_instruction.pdf" target="_blank">View here</a> </td>
+                           <td><a href="{% static 'pdf/instructions.pdf' %}" target="_blank">View here</a> </td>
                         </tr>
+                        <!--
                         <tr>
                            <td>SciPy 2017: <br>Preferred Workshop Track</td>
                            <td>Please select the workshop in which you wish to participate (Satellite conference registrants need not submit this form).</td>
                            <td><a href="http://tinyurl.com/SciPy2016-Workshop" target="_blank">View here</a> </td>
-                        <tr>
+                        </tr>-->
                         <tr >
                            <td>Workshop Instructions</td>
-                           <td >These instructions are for all the registered participants. It has the details of the workshops which will be conducted in SciPy India 2016 conference. Please read it carefully and follow the steps to install various software packages.<br>
+                           <td >These instructions are for all the registered participants. It has the details of the workshops which will be conducted in SciPy India 2017 conference. Please read it carefully and follow the steps to install various software packages.<br>
                               <b>Note:</b> You will not be able to participate in the workshops without installing the above packages. There will not be any separate setup session at the venue.
                            </td>
-                           <td><a href="http://scipy.in/2016/downloads/SciPy_instruction_workshop.pdf" target="_blank">View here</a> </td>
+                           <td><a href="{% static 'pdf/workshop_instructions.pdf' %}" target="_blank">View here</a> </td>
                         </tr>
-                        <tr >
+                        <!--<tr >
                            <td>Workshop Material </td>
                            <td >1)<b> Workshop</b>: Introductory Scientific Computing with Python: Ipython, Matplotlib, NumPy, SciPy - Prof. Prabhu Ramachandran<br></td>
                            <td><a href="http://scipy.in/2016/downloads/workshop/intro_scipy_circulate.zip" target="_blank">View here</a> </td>
-                        </tr>
+                        </tr>-->
                      </tbody>
-                     </table> -->
+                     </table> 
                </div>
             </div>
          </div>
diff --git a/website/templates/navbar.html b/website/templates/navbar.html
index 56eed85..3d794e1 100644
--- a/website/templates/navbar.html
+++ b/website/templates/navbar.html
@@ -36,9 +36,9 @@
             <li class="nav-item">
                <a href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a>
             </li>
-            <!-- <li class="nav-item">
+            <li class="nav-item">
                <a class="nav-link" href="#instructions" class="nav-link js-scroll-trigger" >Instructions</a>
-               </li> -->
+            </li> 
             <li class="nav-item">
                <a href="/#venue" class="nav-link js-scroll-trigger" >Venue</a>
             </li>