summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayaram Pai2013-11-13 16:03:53 +0530
committerJayaram Pai2013-11-13 16:03:53 +0530
commit828fbab492da5417a505c7be1aef1546d17a8735 (patch)
tree2d5343326620a856398f7e1596502871144232fa
parent48896cada6c939e7969a43a2f4efa1457e2a36c6 (diff)
downloadSciPy2013-828fbab492da5417a505c7be1aef1546d17a8735.tar.gz
SciPy2013-828fbab492da5417a505c7be1aef1546d17a8735.tar.bz2
SciPy2013-828fbab492da5417a505c7be1aef1546d17a8735.zip
previous box padding fix
-rw-r--r--scipy/views.py~101
-rw-r--r--static/cheese/document/jozf.html69
-rw-r--r--static/cheese/document/logo.pngbin19335 -> 0 bytes
-rw-r--r--static/cheese/document/thinkCSpy.pdfbin878733 -> 0 bytes
-rw-r--r--static/cheese/document/thinkCSpy_1.pdfbin878733 -> 0 bytes
-rw-r--r--website/templates/index.html2
6 files changed, 1 insertions, 171 deletions
diff --git a/scipy/views.py~ b/scipy/views.py~
deleted file mode 100644
index cc0bed1..0000000
--- a/scipy/views.py~
+++ /dev/null
@@ -1,101 +0,0 @@
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.context_processors import csrf
-from django.shortcuts import render_to_response
-from django.contrib.auth.models import User
-from django.contrib.auth import authenticate, login, logout
-from django.contrib.auth.decorators import login_required
-
-from scipy.forms import UserLoginForm, UserRegisterForm, UserProfileForm, DocumentUploadForm
-
-# User Login View
-def user_login(request):
- if request.user.is_anonymous():
- if request.method == 'POST':
- username = request.POST['username']
- password = request.POST['password']
- user = authenticate(username=username, password=password)
- if user is not None:
- if user.is_active:
- login(request, user)
- return HttpResponseRedirect(request.POST['next'])
- else:
- return HttpResponse("Not active")
- else:
- return HttpResponseRedirect("/2013/accounts/login/?status=in")
- else:
- form = UserLoginForm()
-
- next = '/2013/accounts/upload-document/'
- if 'next' in request.GET:
- next = request.GET['next']
-
- status = ''
- if status in request.GET:
- status = request.GET['status']
-
- context = {}
- context.update(csrf(request))
- context['form'] = form
- context['next'] = next
- context['status'] = status
- return render_to_response('login.html', context)
- else:
- return HttpResponseRedirect('/2013/accounts/upload-document')
-
-# User Logout View
-def user_logout(request):
- logout(request)
- return HttpResponseRedirect('/2013')
-
-# User Register View
-def user_register(request):
- if request.user.is_anonymous():
- if request.method == 'POST':
- form = UserRegisterForm(request.POST)
- if form.is_valid:
- form.save()
- return HttpResponseRedirect('/2013/accounts/upload-document')
- else:
- form = UserRegisterForm()
- context = {}
- context.update(csrf(request))
- context['form'] = form
- return render_to_response('register.html', context)
- else:
- return HttpResponseRedirect('/2013/accounts/upload-document')
-
-# User Profile View
-def user_profile(request):
- if request.user.is_authenticated():
- context = {}
- context.update(csrf(request))
- context['form'] = UserProfileForm(instance=request.user)
- return render_to_response('profile.html', context)
- else:
- return HttpResponseRedirect('/2013/accounts/login?next=/2013/accounts/profile')
-
-# Document Upload View
-def upload_document(request):
- if request.user.is_authenticated():
- if request.method == 'POST':
- form = DocumentUploadForm(request.POST, request.FILES)
- if form.is_valid():
- data = form.save(commit=False)
- data.user = request.user
- data.verified = False
- data.save()
- return HttpResponseRedirect("/2013/call-for-proposals/?status=up")
- else:
- context = {}
- context.update(csrf(request))
- context['form'] = form
- return render_to_response('upload-document.html', context)
- else:
- form = DocumentUploadForm()
-
- context = {}
- context.update(csrf(request))
- context['form'] = DocumentUploadForm()
- return render_to_response('upload-document.html', context)
- else:
- return HttpResponseRedirect('/2013/accounts/login')
diff --git a/static/cheese/document/jozf.html b/static/cheese/document/jozf.html
deleted file mode 100644
index 4b7065b..0000000
--- a/static/cheese/document/jozf.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
- <head>
-
- <style>
- html, body{
- margin: 0;
- padding: 0;
- }
-
- #header-wrapper{
- height: 100px;
- background: #86c543;
- }
- #header-inner{
- width: 800px;
- background: blue;
- margin: 0 auto;
- // i will tel you why :)
- // there is no tag like text-align or align to center a div like you center text or h1
- // then how do you do it ??
- // by using the margin tweak :)
- }
-
- #content-wrapper{
- height: 500px;
- background: #ffffff;
- }
-
- #footer-wrapper{
- height: 300px;
- background: #424242;
- }
- // ok now do me a favour , give the width: 800 to headinner and background blue
- // now check browser... stomethhing wrong, nopes, you did not put any content in that div :) now it right??
- // no no content-css is innerright :), put some text inside the header-inner mann :)
- //copy paster the curreent in your editor and tell me what you see :)
- //text became smaller and moved to the corner
- // dont worrly about the text where is the blue div ?
- //its insidw the green div
- // is it centered ?? nop // then make it :)
-
- </style>
-
- </head>
-
- <body>
- <!-- now lets give this a little style -->
-
- <div id="header-wrapper">
- <div id="header-inner">
- This is the head of the page
- </div> <!-- /header-inner -->
- </div> <!-- /header-wrapper -->
-
- <div id="content-wrapper">
- <div id="content-inner">
- <p>Hello World</p>
- </div> <!-- /content-inner -->
- </div> <!-- /content-wrapper -->
-
- <div id="footer-wrapper">
- <div id="footer-inner">
-
- </div> <!-- /footer-inner -->
- </div> <!-- /footer-wrapper -->
-
- </body>
-
-</html>
diff --git a/static/cheese/document/logo.png b/static/cheese/document/logo.png
deleted file mode 100644
index ecd7e44..0000000
--- a/static/cheese/document/logo.png
+++ /dev/null
Binary files differ
diff --git a/static/cheese/document/thinkCSpy.pdf b/static/cheese/document/thinkCSpy.pdf
deleted file mode 100644
index 63b665a..0000000
--- a/static/cheese/document/thinkCSpy.pdf
+++ /dev/null
Binary files differ
diff --git a/static/cheese/document/thinkCSpy_1.pdf b/static/cheese/document/thinkCSpy_1.pdf
deleted file mode 100644
index 63b665a..0000000
--- a/static/cheese/document/thinkCSpy_1.pdf
+++ /dev/null
Binary files differ
diff --git a/website/templates/index.html b/website/templates/index.html
index ef84514..db826b8 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -146,7 +146,7 @@
<div id="previous-conference">
<table>
<thead>
- <th style="padding-top:16px;"><a href="http://scipy.in/2012" target="_blank">Scipy 2012</a></th>
+ <th style="padding-top:15px;"><a href="http://scipy.in/2012" target="_blank">Scipy 2012</a></th>
</thead>
<tbody>
<tr>