From 299e6fd9d75e6a8f2828dde7e2c090d3a28e4226 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Mon, 14 Oct 2013 17:18:18 +0530
Subject: minor CSS changes

---
 scipy/templates/login.html           |  2 +-
 scipy/templates/profile.html         |  2 +-
 scipy/templates/upload-document.html |  2 +-
 scipy/views.py                       | 40 +++++++++++++++++++-----------------
 website/static/css/main.css          |  4 ++--
 website/static/css/override.css      |  4 ++--
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/scipy/templates/login.html b/scipy/templates/login.html
index a9ba696..c360438 100644
--- a/scipy/templates/login.html
+++ b/scipy/templates/login.html
@@ -4,7 +4,7 @@
   <form class="form-signin" action="/2013/accounts/login/" method="POST" enctype="multipart/form-data"> {% csrf_token %}
     <h3 class="form-signin-heading">Please sign in</h3>
     {{ form.as_p }}
-    <input type="hidden" name = "next" value="/2013/{{ next }}">
+    <input type="hidden" name = "next" value="{{ next }}">
     <button class="success expand" type="submit">Sign in</button>
   </form>
   <h6>Dont have an scipy account? <a href="/2013/accounts/register"><u>Register Here.</u></a></h6>
diff --git a/scipy/templates/profile.html b/scipy/templates/profile.html
index f6c629a..d64b87c 100644
--- a/scipy/templates/profile.html
+++ b/scipy/templates/profile.html
@@ -1,5 +1,5 @@
 <h3>Register</h3>
-<form action="/accounts/profile/" method="POST"> {% csrf_token %}
+<form action="/2013/accounts/profile/" method="POST"> {% csrf_token %}
 	{{ form.as_p }}
 	<input type="submit" value="Update">
 </form>
diff --git a/scipy/templates/upload-document.html b/scipy/templates/upload-document.html
index 19aed25..00ff130 100644
--- a/scipy/templates/upload-document.html
+++ b/scipy/templates/upload-document.html
@@ -2,7 +2,7 @@
 {% block content %}
 <div class="large-6 large-centered columns">
   <form class="form-signin" action="/2013/accounts/upload-document/" method="POST" enctype="multipart/form-data"> {% csrf_token %}
-    <h3 class="form-signin-heading">Upload your abstract</h3>
+    <h3 class="form-signin-heading">Submit Proposal</h3>
     {{ form }}
     <input type="hidden" name = "next" value="{{ next }}">
     <button class="success expand" type="submit">Submit</button>
diff --git a/scipy/views.py b/scipy/views.py
index 61bd9b5..078923a 100644
--- a/scipy/views.py
+++ b/scipy/views.py
@@ -70,25 +70,27 @@ def user_profile(request):
         return HttpResponseRedirect('/2013/accounts/login?next=/2013/accounts/profile')
 
 # Document Upload View
-@login_required
 def upload_document(request):
-    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")
+    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:
-            context = {}
-            context.update(csrf(request))
-            context['form'] = form
-            return render_to_response('upload-document.html', context)
+            form = DocumentUploadForm()
+            
+        context = {}
+        context.update(csrf(request))
+        context['form'] = DocumentUploadForm()
+        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)
+        return HttpResponseRedirect('/2013/accounts/login')
diff --git a/website/static/css/main.css b/website/static/css/main.css
index b815e6b..7ac9d2b 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -100,7 +100,7 @@
 }
 /* Page css */
 #page-jumbo{
-  height: 100px;
+  height: 50px;
   background-image: url('../img/square_bg_2.png');
   background-color: #86c543;
   font-family: gtrg;
@@ -123,4 +123,4 @@
 }
 .sponsor p{
   text-align: justify;
-}
\ No newline at end of file
+}
diff --git a/website/static/css/override.css b/website/static/css/override.css
index 9d87cc1..88ab4e2 100644
--- a/website/static/css/override.css
+++ b/website/static/css/override.css
@@ -13,7 +13,7 @@
   background-color: transparent;
   border: none;
   padding-left: 0;
-  padding-top: 35px;
+  padding-top: 0;
 }
 .breadcrumbs > *:before {
   content: "/";
@@ -27,4 +27,4 @@
 }
 .breadcrumbs .current a{
   color: #ffffff;
-}
\ No newline at end of file
+}
-- 
cgit