diff options
author | hardythe1 | 2013-11-13 13:23:06 +0530 |
---|---|---|
committer | hardythe1 | 2013-11-13 13:23:06 +0530 |
commit | 300b752fb20bdf42f24422e7c2291f256e827dec (patch) | |
tree | 925fb6d12e18448ac60e61ba7fb253afa8603939 | |
parent | 9013d7c0c0a4509224ae7c3ae2bda054ee59aa13 (diff) | |
download | SciPy2012-300b752fb20bdf42f24422e7c2291f256e827dec.tar.gz SciPy2012-300b752fb20bdf42f24422e7c2291f256e827dec.tar.bz2 SciPy2012-300b752fb20bdf42f24422e7c2291f256e827dec.zip |
changes to make the static files work
-rwxr-xr-x | scipy2012/settings.py | 11 | ||||
-rw-r--r-- | templates/base.html | 19 | ||||
-rw-r--r-- | templates/conference/keynote.html | 6 | ||||
-rw-r--r-- | templates/conference/sponsors.html | 8 |
4 files changed, 28 insertions, 16 deletions
diff --git a/scipy2012/settings.py b/scipy2012/settings.py index 478ada0..8fe709b 100755 --- a/scipy2012/settings.py +++ b/scipy2012/settings.py @@ -1,5 +1,6 @@ # Django settings for scipy2012 project. from os.path import * +from local import * DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -14,11 +15,11 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'scipy2012.db', # Or path to database file if using sqlite3. + 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'scipy2012', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: - 'USER': '', - 'PASSWORD': '', + 'USER': 'root', + 'PASSWORD': DB_PASS, 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. 'PORT': '', # Set to empty string for default. } @@ -68,7 +69,7 @@ STATIC_ROOT = '' # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/static/' +STATIC_URL = '/2012/static/' # Additional locations of static files STATICFILES_DIRS = ( diff --git a/templates/base.html b/templates/base.html index 7fefd8a..266d5c3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,3 +1,4 @@ +{% load static %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
@@ -7,7 +8,7 @@ </title>
<meta name="keywords" content="" />
<meta name="description" content="" />
-<link rel="stylesheet" href="/2012/static/css/default.css" type="text/css" />
+<link rel="stylesheet" href="{% static 'css/default.css'%}" type="text/css" />
</head>
<body>
<div id="header-wrapper">
@@ -29,7 +30,6 @@ </ul>
</li>
<li><a href="{% url 'conference:sponsors' %}" accesskey="3" title="">Sponsors</a></li>
- <li><a href="#" accesskey="4" title="">About</a></li>
</ul>
</div>
</div>
@@ -45,8 +45,19 @@ <div class="title">
<h2>SciPy India 2012</h2>
<span class="byline">Conference on Python for Education & Scientific Computing</span> </div>
- <p><strong>SciPy India</strong>, a free, fully standards-compliant CSS template designed by <a href="http://www.freecsstemplates.org/" rel="nofollow">FreeCSSTemplates.org</a>. The photos in this template are from <a href="http://fotogrph.com/"> Fotogrph</a>. This free template is released under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attributions 3.0</a> license, so you are pretty much free to do whatever you want with it (even use it commercially) provided you keep the links in the footer intact. Aside from that, have fun with it :) </p>
- <a href="#" class="button">Lear More</a> </div>
+ <p><strong>SciPy India</strong>, 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. Attendees of the conference and participants of the sprints
+ planned will be able to access and review the tools available. They
+ will also be able to learn domain-specific applications and how the
+ tools apply to a plethora of application problems.
+ One of the goals of the conference is to combine education, engineering,
+ and science with computing through the medium of Python. This conference
+ also aims to spread the use of Python for Scientific Computing in
+ various fields and among different communities. This was the 4th Consecutive year of the conference. </p>
</div>
{% endblock %}
</div>
diff --git a/templates/conference/keynote.html b/templates/conference/keynote.html index dc6f377..f38e299 100644 --- a/templates/conference/keynote.html +++ b/templates/conference/keynote.html @@ -1,16 +1,16 @@ {% extends "base.html" %} - +{% load static %} {% block content %} <p><h2>Keynote by Dr. Ole Nielsen</h2></p> <div> <p>Ole Nielsen has been an Open Source adopter, promotor and developer since the early nineties during his career as technical consultant, academic researcher, government scientist and development professional within an aid organisation. Ole has a double Master's degree in Mathematics and Computer Science as well as a PhD in scientific computing from universities in Denmark. Ole joined AusAID in Jakarta in 2010 to support the Indonesian government in multi-hazard disaster risk reduction. </p> -<image src="/2012/static/images/ole.jpg"> +<image src="{% static 'images/ole.jpg' %}"> <iframe src="http://urtalk.kpoint.com/kapsule/gcc-7f6d80fa-7e37-4693-a9c3-08eaa23cfd22/v1/embedded?size=M" allowFullScreen webkitallowFullScreen mozallowFullScreen width="616" height="407" rel="nofollow"> </iframe> -<a href="/2012/static/slides/geoprocessing.zip">Download Slides</a> +<a href=" {% static 'slides/geoprocessing.zip' %}">Download Slides</a> {% endblock %} diff --git a/templates/conference/sponsors.html b/templates/conference/sponsors.html index 9a7289a..bb2238e 100644 --- a/templates/conference/sponsors.html +++ b/templates/conference/sponsors.html @@ -1,23 +1,23 @@ {% extends "base.html" %} - +{% load static %} {% block content %} <br> <h2>Sponsors</h2> <br> <table> -<tr><td><img src="/2012/static/images/enthought_logo.png" width=275> +<tr><td><img src="{% static 'images/enthought_logo.png' %}" width=275> <td><p align="justify"><a href="http://www.enthought.com/" target=_blank>Enthought Inc.</a> is a software company based in Austin, Texas, USA that develops scientific computing solutions using primarily the Python programming language. It is best known for the early development and maintenance of the <a href="http://scipy.org/" target=_blank>SciPy</a> library of mathematics, science, and engineering algorithms and for its Python for scientific computing distribution <a href="https://www.enthought.com/products/canopy/" target=_blank>Enthought Canopy</a> (formerly EPD). </table> <table> -<tr><td><img src="/2012/static/images/mhrd_logo.png" width=275> +<tr><td><img src="{% static 'images/mhrd_logo.png' %}" width=275> <td>The <a href="http://fossee.in/">FOSSEE project</a> undertaken by IIT Bombay is funded by <a href="http://mhrd.gov.in/">Ministry of Human Resource Development(Govt. of India)</a> under National Mission on Education through ICT </table> <hr> <h2>Orgranizers</h2> <table> -<tr><td><img src="/2012/static/images/fossee.jpg" height=100 width=275> +<tr><td><img src="{% static 'images/fossee.jpg' %}" height=100 width=275> <td>Annual SciPy India conference is organized by the team members of <a href="http://fossee.in/">FOSSEE</a> project. For any queries you may writes us at info[at]fossee[dot]in </table> |