summaryrefslogtreecommitdiff
path: root/website
diff options
context:
space:
mode:
Diffstat (limited to 'website')
-rw-r--r--website/static/css/main.css16
-rw-r--r--website/static/js/custom.js4
-rw-r--r--website/templates/invited_speakers.html34
-rw-r--r--website/templates/register_2013.html2
4 files changed, 44 insertions, 12 deletions
diff --git a/website/static/css/main.css b/website/static/css/main.css
index be49c88..2b027a7 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -122,6 +122,22 @@
.sponsor p{
text-align: justify;
}
+.speaker{
+ height: 190px;
+ padding: 25px 25px 25px 25px;
+ margin: 25px 0 25px 0;
+ border: 3px solid #f5f5f5;
+
+}
+.speaker img{
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ -o-border-radius: 5px;
+ border-radius: 5px;
+}
+.speaker p{
+ font-size: 0.9em;
+}
#reach-scipy{
height: 400px;
padding: 5px 0.9375em;
diff --git a/website/static/js/custom.js b/website/static/js/custom.js
index 31aaf27..c6da3e5 100644
--- a/website/static/js/custom.js
+++ b/website/static/js/custom.js
@@ -68,9 +68,5 @@ var shivaji_description = 'Buy a ticket to Kanjurmarg (central line) at the loca
$("#from").html(from);
$("#description").html(description);
$("#mappy").html(clicked);
-
-
- /* Map loading display */
-
});
}); \ No newline at end of file
diff --git a/website/templates/invited_speakers.html b/website/templates/invited_speakers.html
index 5fc2406..d9b56bf 100644
--- a/website/templates/invited_speakers.html
+++ b/website/templates/invited_speakers.html
@@ -3,12 +3,30 @@
{% block content %}
<div class="row">
<h4>Invited Speakers</h4>
-<table>
-<tr><td><img width="165" src="{% static 'img/ondrej.png'%}"><td><p align="justify"><a href="http://ondrejcertik.com/" target="_blank"><b>Dr. Ondrej Certik</b></a> is a scientist at Los Alamos National Laboratory. He holds a PhD in Chemical Physics from University of Nevada, Reno. Dr. Ondrej has major contributions in the <a href="http://www.numpy.org/" target="_blank">NumPy</a> & <a href="http://www.sympy.org/" target="_blank">SymPy</a> libraries. He has been active debian user since 2001 and is an offical team member of Debian Python Modules Team (DPMT), Python Applications Packaging Team (PAPT) & Debian Scientific Computing Team (pkg-scicomp). </p>
-</table>
-<table>
-<tr><td><img width="165" src="{% static 'img/ajith.png'%}"><td><p align="justify"><b>Dr. B. P. Ajith Kumar</b>, a scientist working with the <a href="http://www.iuac.res.in/" target="_blank">Inter University accelerator Centre of India</a>. His main area of work is development of instrumentation for particle accelerators and associated experiments, including radio-frequency accelerating structures, control and data acquisition systems, digital and radio frequency electronics modules. He initiated the <a href="http://www.iuac.res.in/~elab/phoenix/" target="_blank">PHOENIX</a> project by designing a parallel port based interface and organized a training program for teachers in 2005, and continuing with it. Dr. Ajith Kumar has been a user and propagator of Free Software in the field of education for several years.</p>
-</table>
-</table>
-{% endblock %}
+<div class="speaker">
+ <div class="large-2 columns">
+ <img src="{% static 'img/ondrej.png' %}" style="width: 150px;">
+ </div>
+ <div class="large-10 columns">
+ <p align="justify">
+ <a href="http://ondrejcertik.com/" target="_blank"><b>Dr. Ondrej Certik</b></a> is a scientist at Los Alamos National Laboratory. He holds a PhD in Chemical Physics from University of Nevada, Reno. Dr. Ondrej is the lead developer of <a href="http://www.sympy.org/" target="_blank">SymPy</a> library and has major contributions to <a href="http://www.numpy.org/" target="_blank">NumPy</a> and other python libraries. He has been active debian user since 2001 and is an offical team member of Debian Python Modules Team (DPMT), Python Applications Packaging Team (PAPT) & Debian Scientific Computing Team (pkg-scicomp).
+ </p>
+ </div>
+ <div class="clearfix"></div>
+</div> <!-- /speaker -->
+
+<div class="speaker">
+ <div class="large-2 columns">
+ <img src="{% static 'img/ajith.png' %}" style="width: 150px;">
+ </div>
+ <div class="large-10 columns">
+ <p align="justify">
+ <b>Dr. B. P. Ajith Kumar</b>, a scientist working with the <a href="http://www.iuac.res.in/" target="_blank">Inter University accelerator Centre of India</a>. His main area of work is development of instrumentation for particle accelerators and associated experiments, including radio-frequency accelerating structures, control and data acquisition systems, digital and radio frequency electronics modules. He initiated the <a href="http://www.iuac.res.in/~elab/phoenix/" target="_blank">PHOENIX</a> project by designing a parallel port based interface and organized a training program for teachers in 2005, and continuing with it. Dr. Ajith Kumar has been a user and propagator of Free Software in the field of education for several years.
+ </p>
+ </div>
+ <div class="clearfix"></div>
+</div> <!-- /speaker -->
+
+</div> <!-- /row -->
+{% endblock %} \ No newline at end of file
diff --git a/website/templates/register_2013.html b/website/templates/register_2013.html
index 0914ed9..2d6d7e9 100644
--- a/website/templates/register_2013.html
+++ b/website/templates/register_2013.html
@@ -1,7 +1,9 @@
{% extends 'page.html'%}
{% block content %}
+<div class="row">
<h3>Register</h3>
<iframe id="register" src="http://scipyindia2013.doattend.com/" width="100%" height="700">
fallback
</iframe>
+</div> <!-- /row -->
{% endblock %}