# HG changeset patch # User anoop # Date 1279121699 -19800 # Node ID 9f305face605e9148d96a6133a0275a332df2977 # Parent 9fab907060a7dca9debe774a30e8a118cc150c22# Parent 1a6e1af986248951e0a2a78902dece85321b44e0 merged. diff -r 1a6e1af98624 -r 9f305face605 sdi/views.py --- a/sdi/views.py Wed Jul 14 20:47:37 2010 +0530 +++ b/sdi/views.py Wed Jul 14 21:04:59 2010 +0530 @@ -156,28 +156,31 @@ return render_to_response("logout.html") def homepage(request): - return render_to_response("index.html") + return render_to_response("index.html") def schedule(request): - return render_to_response("schedule.html") + return render_to_response("schedule.html") def organizers(request): - return render_to_response("organizers.html") + return render_to_response("organizers.html") def venue(request): - return render_to_response("about_venue.html") + return render_to_response("about_venue.html") def contact(request): - return render_to_response("contact.html") + return render_to_response("contact.html") def about(request): - return render_to_response("about.html") + return render_to_response("about.html") def accomodation(request): - return render_to_response("accomodation.html") + return render_to_response("accomodation.html") def about_mumbai(request): return render_to_response("about_mumbai.html") def reaching_iitb(request): return render_to_response("reaching_iitb.html") + +def talks_proposed(request): + return render_to_response("talks_proposed.html") diff -r 1a6e1af98624 -r 9f305face605 templates/base.html --- a/templates/base.html Wed Jul 14 20:47:37 2010 +0530 +++ b/templates/base.html Wed Jul 14 21:04:59 2010 +0530 @@ -876,8 +876,8 @@ title="Conference Registration">Registration
  • Schedule
    • -
  • Organizers
    • +
  • Organizers
    • +
  • Talks Proposed
  • Sage Days Wiki
    • diff -r 1a6e1af98624 -r 9f305face605 templates/talks_proposed.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/talks_proposed.html Wed Jul 14 21:04:59 2010 +0530 @@ -0,0 +1,84 @@ +{% extends 'base.html' %} +{% block title %} +Talks Proposed +{% endblock %} +{% block content %} +

    Talks Proposed

    + +
    +
    + +
    +
    + +
    +

    1 Introduction to Sage and the Sage Notebook

    +
    + +

    Submitted by - Prof. William Stein +

    + +
    + +
    +

    2 Running a Sage notebook server

    +
    + +

    Submitted by - Prof. William Stein +

    + +
    + +
    +

    3 Cryptography in Sage

    +
    + +

    Submitted by - Sourav Sen Gupta +

    + +
    + +
    +

    4 SAGE (PARI) for Number Theory

    +
    + +

    Submitted by - Dr. P. Vanchinatan +

    + +
    + +
    +

    5 SAGE (GAP) for Groups and Representation

    +
    + +

    Submitted by - Dr. P. Vanchinatan +

    + +
    + +
    +

    6 Number Theory and its Applications to Cryptography

    +
    + +

    Submitted by - Dr. P. Vanchinatan +

    + +
    + +
    +

    7 Introduction to Python programming

    +
    + +

    Submitted by - Dr. P. Vanchinatan +

    +
    + +{% endblock %} diff -r 1a6e1af98624 -r 9f305face605 urls.py --- a/urls.py Wed Jul 14 20:47:37 2010 +0530 +++ b/urls.py Wed Jul 14 21:04:59 2010 +0530 @@ -4,7 +4,7 @@ from django.contrib import admin admin.autodiscover() -from sage_days.sdi.views import register, homepage, schedule, organizers, venue, contact, about, accomodation, about_mumbai, reaching_iitb +from sage_days.sdi.views import register, homepage, schedule, organizers, venue, contact, about, accomodation, about_mumbai, reaching_iitb, talks_proposed from sage_days.settings import APACHE_URL_PREFIX as aup urlpatterns = patterns('', @@ -28,4 +28,5 @@ (r'^captcha/', include('captcha.urls')), (r'^about_mumbai/',about_mumbai), (r'^reaching_iitb/',reaching_iitb), + (r'^talks_proposed/',talks_proposed), )