add sponsor/organiser details. Other changes as per suggestion

7 files changed, 98 insertions, 2 deletions

diff --git a/scipy2015/settings.py b/scipy2015/settings.py
index 3ad1f05..611e1f5 100644
--- a/scipy2015/settings.py
+++ b/scipy2015/settings.py
@@ -66,6 +66,7 @@ AUTHENTICATION_BACKENDS = (
    'social.backends.facebook.FacebookOAuth2',
    'social.backends.google.GoogleOAuth2',
    'social.backends.twitter.TwitterOAuth',
+   'social.backends.github.GithubOAuth2',
    'django.contrib.auth.backends.ModelBackend',
 )
 
@@ -106,6 +107,9 @@ SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET
 SOCIAL_AUTH_FACEBOOK_KEY = LOCAL_SOCIAL_AUTH_FB_KEY
 SOCIAL_AUTH_FACEBOOK_SECRET = LOCAL_SOCIAL_AUTH_FB_SECRET
 
+SOCIAL_AUTH_GITHUB_KEY = LOCAL_SOCIAL_AUTH_GITHUB_KEY
+SOCIAL_AUTH_GITHUB_SECRET = LOCAL_SOCIAL_AUTH_GITHUB_SECRET
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
 
@@ -126,3 +130,5 @@ USE_TZ = True
 STATIC_URL = '/static/'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, '../website/static/uploads')
+
+LOGIN_REDIRECT_URL = '/cfp'
diff --git a/website/static/css/main.css b/website/static/css/main.css
index c28a222..21909d8 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -595,3 +595,21 @@ body .header {
 .pwd-recovery-btn {

     height:45px;

 }

+

+#sponsors {

+	background: #fff;

+	padding: 60px 0;

+}

+#sponsors .col-md-4 {

+	margin-left: 10%;

+	margin-top: 2.5%;

+	width: 20%;

+}

+

+#sponsors a {

+    text-decoration: underline;

+}

+

+#about img {

+    margin-top: 10%;

+}

diff --git a/website/static/img/mhrd.png b/website/static/img/mhrd.png
new file mode 100644
index 0000000..f949b42
--- /dev/null
+++ b/website/static/img/mhrd.png
diff --git a/website/static/img/s1.jpg b/website/static/img/s1.jpg
new file mode 100644
index 0000000..6c36579
--- /dev/null
+++ b/website/static/img/s1.jpg
diff --git a/website/static/img/s2.jpg b/website/static/img/s2.jpg
new file mode 100644
index 0000000..f839b1b
--- /dev/null
+++ b/website/static/img/s2.jpg
diff --git a/website/static/img/s3.jpg b/website/static/img/s3.jpg
new file mode 100644
index 0000000..0917a79
--- /dev/null
+++ b/website/static/img/s3.jpg
diff --git a/website/templates/base.html b/website/templates/base.html
index f2cad0c..3cecd93 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -52,6 +52,7 @@
           <li> <a href="#speakers" class="smoothScroll">Speakers</a></li>
           <li> <a href="{% url 'website:cfp' %}">Call for Papers</a></li>
           <li> <a href="#venue" class="smoothScroll">Venue</a></li>
+          <li> <a href="#sponsors" class="smoothScroll">Sponsors</a></li>
           <li> <a href="#contact" class="smoothScroll">Contact</a></li>
         </ul>
       </div>
@@ -96,13 +97,43 @@
     <div class="row white">
       <h2 class="centered">ABOUT</h2>
       <hr>
-      <div class="col-md-6">  <a class="twitter-timeline" href="https://twitter.com/SciPyIndia" data-widget-id="611058996728868864">Tweets by @SciPyIndia</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></div>
       <div class="col-md-6">
         <h3>Python for Scientific Computing</h3>
         <br>
         <p align="justify">SciPy India is a conference providing opportunities to spread the use of the Python programming language in the Scientific Computing community in India. It provides a unique opportunity to interact with the "Who's who" of the Python for Scientific Computing fraternity and learn, understand, participate, and contribute to Scientific Computing using Python. One of the goals of the conference is to combine education, engineering, and science with computing through the medium of Python.</p>
       </div>
+      <div class="col-md-6">
+        <h3>SciPy India Conferences down the lane</h3>
+        <table>
+            <tr>
+                <td><a href="http://scipy.in/2014" target="_blank"><u>SciPy India 2014</u></a>
+            </tr>
+            <tr>
+                <td><a href="http://scipy.in/2013" target="_blank"><u>SciPy India 2013</u></a>
+            </tr>
+            <tr>
+                <td><a href="http://scipy.in/2012" target="_blank"><u>SciPy India 2012</u></a>
+            </tr>
+        </table>
+        <hr>
+        <u><h5>Few snaps from SciPy India 2014</h5></u>
+        <div class="col-md-4">
+          <a href="https://www.flickr.com/photos/111275739@N03/15973038815/in/album-72157647327666464/" target="_blank">
+            <img src="{% static 'img/s1.jpg'%}" />
+          </a>
+        </div>
+        <div class="col-md-4">
+          <a href="https://www.flickr.com/photos/111275739@N03/15971073121/in/album-72157647327666464/" target="_blank">
+            <img src="{% static 'img/s2.jpg'%}" />
+          </a>
+        </div>
+        <div class="col-md-4">
+          <a href="https://www.flickr.com/photos/111275739@N03/15947289216/in/album-72157647327666464/" target="_blank">
+            <img src="{% static 'img/s3.jpg'%}" />
+          </a>
+        </div>
+        <p align="right"><a href="https://www.flickr.com/gp/111275739@N03/KiDiz4/" target="_blank">More >>></a></p>
+      </div>
     </div>
     <!-- row --> 
   </div>
@@ -152,6 +183,47 @@
   </div>
 </div>
 
+<!--div id="organiser" name="organiser">
+  <div class="container">
+    <div class="row">
+      <h2 class="centered">Organiser</h2>
+      <hr>
+      <div class="col-lg-4 col-lg-offset-2 centered">
+        
+      </div>
+      <div class="col-lg-8 col-lg-offset-2 centered">
+        <p></p>
+      </div>
+
+    </div>
+  </div>
+</div-->
+
+<div id="sponsors" name="sponsors">
+  <div class="container">
+    <div class="row">
+      <h2 class="centered">Sponsors</h2>
+      <hr>
+      <div class="col-md-4">
+        <a href="http://mhrd.gov.in/" target="_blank"><img width=200 height=70 src="{% static 'img/mhrd.png'%}" /></a>
+      </div>
+      <div class="col-md-8">
+        <p align="justify">The <a href="http://fossee.in/" target="_blank">FOSSEE</a> project undertaken by IIT Bombay is funded by <a href="http://mhrd.gov.in/" target="_blank">Ministry of Human Resource Development</a> (Govt. of India) under National Mission on Education through ICT. The essence of Human Resource Development is education, which plays a significant and remedial role in balancing the socio-economic fabric of the Country. Since citizens of India are its most valuable resource, our billion-strong nation needs the nurture and care in the form of basic education to achieve a better quality of life.</p>
+      </div>
+      <hr>
+      <center><u><h4>Organiser</h4></u></center>
+      <div class="col-md-4">
+        <a href="http://fossee.in/" target="_blank"><img width=200 height=70 src="{% static 'img/fossee.png'%}" /></a>
+      </div>
+      <div class="col-md-8">
+        <p align="justify">The Annual SciPy India conference is organised by the team members of FOSSEE project which is part of the National Mission on Education through ICT with the thrust area being Adaptation and deployment of open source simulation packages equivalent to proprietary software, funded by MHRD, based at the Indian Institute of Technology Bombay (IITB).</p>
+      </div>
+      <hr>
+      <center><h4>We are open for sponsorships. Kindly write to us at <u>scipy[at]fossee[dot]in</u> for details.</h4></center>
+   </div>
+  </div>
+</div>
+
 <!--div id="cfp" name="cfp">
   <div class="container">
     <div class="row">