diff options
| author | Komal Sheth | 2016-11-23 14:40:54 +0530 |
|---|---|---|
| committer | GitHub | 2016-11-23 14:40:54 +0530 |
| commit | c6e5aa0b4b4a750e149847bbc7cc344a1bf92f85 (patch) | |
| tree | e437771e08364cb21fd43eb76fa4aaab9ddc99a4 | |
| parent | da62e761312a22db3c359568635b309e00808208 (diff) | |
| parent | 3a6aaa21788fe634f45560f97ea9ae31daf613b5 (diff) | |
| download | SciPy2016-c6e5aa0b4b4a750e149847bbc7cc344a1bf92f85.tar.gz SciPy2016-c6e5aa0b4b4a750e149847bbc7cc344a1bf92f85.tar.bz2 SciPy2016-c6e5aa0b4b4a750e149847bbc7cc344a1bf92f85.zip | |
Merge pull request #33 from FOSSEE/Home_page
Conference Schedule modified
| -rwxr-xr-x | website/templates/base.html | 15 | ||||
| -rwxr-xr-x | website/templates/cfp.html | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/website/templates/base.html b/website/templates/base.html index b061d07..1188ca4 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -306,8 +306,17 @@ <tbody><tr style="background-color:#f0f0f0">
<td>Tutorials (Parallel tracks) :</td>
</tr>
- <tr><td><li>Basic</li></td></tr>
- <tr> <td><li>Advanced</li></td></tr>
+ <tr><td><li style ="font-weight:700">Basic Track</li></br>
+ <ul>1 .Introductory Scientific Computing with Python: Ipython, Matplotlib, NumPy, SciPy</ul>
+ <ul>2. Introduction to Git</ul>
+ <ul>3. Python for Microcontrollers</ul>
+ <ul style ="font-weight:700">Other topics: TBD</ul>
+</td></tr>
+ <tr> <td><li style ="font-weight:700">Advanced Track</li></br>
+ <ul>1. Microhope </ul>
+ <ul style ="font-weight:700">Other topics: TBD</ul>
+
+ </td></tr>
</tbody></table>
@@ -383,7 +392,7 @@ <section id="contact">
<h2>Write to Us</h2>
<p>Feel free to send us an email if you have any questions.</p>
- <form id="contact_us" action='#' class="form" role="form" method=POST onSubmit="alert('Your query has been submitted. We will email our response to you shortly!');" enctype="multipart/form-data">{% csrf_token %}
+ <form id="contact_us" action='#' class="form" role="form" method=POST onSubmit="alert('Your query has been submitted. We will email our img-responsive to you shortly!');" enctype="multipart/form-data">{% csrf_token %}
<div class="col-md-6 form-group">
<input class="form-control" id="name" name="name" placeholder="Name" type="text" required />
</div>
diff --git a/website/templates/cfp.html b/website/templates/cfp.html index 9f4c533..8edf1e2 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -75,7 +75,7 @@ <span><h2><u>Important Dates</u></h2></span> <ul> <li>Call for proposals opens: <b>October 4, 2016</b></li> - <li>Last date for submission of proposals: <b>November 20, 2016</b></li> + <li>Last date for submission of proposals: <b>November 28, 2016</b></li> <li>Announcement of selected proposals: <b>December 1, 2016</b></li> </ul> @@ -85,7 +85,7 @@ {% else %} <center> <a href="{% url 'website:submitcfp' %}" style="background:#D44727" class="button special">Submit an Abstract</a> - <a href="{% url 'website:submitcfw' %}" style="background:#D44727" class="button special">Submit a Workshop</a> + <a href="{% url 'website:submitcfw' %}" style="background:#D44727" class="button special">Submit a Workshop</a> <a href="{% url 'website:view_abstracts' %}" style="background:#D44727" class="button special">View Proposals</a> </center> {% endif %} @@ -124,7 +124,7 @@ <span><h2><u>Important Dates</u></h2></span> <ul> <li>Call for proposal opens: <b>October 4, 2016</b></li> - <li>Last date for submission of proposals: <b>November 20, 2016</b></li> + <li>Last date for submission of proposals: <b>November 28, 2016</b></li> <li>Announcement of selected proposals: <b>December 1, 2016</b></li> </ul> </li> |