From ea7c44c4570fa54f4f9e47f3b74b4d1909b73669 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 29 Jul 2015 15:46:31 +0530 Subject: add sponsor/organiser details. Other changes as per suggestion --- scipy2015/settings.py | 6 ++++ website/static/css/main.css | 18 +++++++++++ website/static/img/mhrd.png | Bin 0 -> 2214 bytes website/static/img/s1.jpg | Bin 0 -> 18404 bytes website/static/img/s2.jpg | Bin 0 -> 10484 bytes website/static/img/s3.jpg | Bin 0 -> 14514 bytes website/templates/base.html | 76 ++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 website/static/img/mhrd.png create mode 100644 website/static/img/s1.jpg create mode 100644 website/static/img/s2.jpg create mode 100644 website/static/img/s3.jpg 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 Binary files /dev/null and b/website/static/img/mhrd.png differ diff --git a/website/static/img/s1.jpg b/website/static/img/s1.jpg new file mode 100644 index 0000000..6c36579 Binary files /dev/null and b/website/static/img/s1.jpg differ diff --git a/website/static/img/s2.jpg b/website/static/img/s2.jpg new file mode 100644 index 0000000..f839b1b Binary files /dev/null and b/website/static/img/s2.jpg differ diff --git a/website/static/img/s3.jpg b/website/static/img/s3.jpg new file mode 100644 index 0000000..0917a79 Binary files /dev/null and b/website/static/img/s3.jpg differ 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 @@
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.
SciPy India 2014 + |
SciPy India 2013 + |
SciPy India 2012 + |
The FOSSEE project undertaken by IIT Bombay is funded by Ministry of Human Resource Development (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.
+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).
+