invalid login alert

4 files changed, 135 insertions, 3 deletions

diff --git a/scipy/templates/login.html b/scipy/templates/login.html
index c360438..2f29ea4 100644
--- a/scipy/templates/login.html
+++ b/scipy/templates/login.html
@@ -1,6 +1,13 @@
 {% extends 'page.html' %}
 {% block content %}
 <div class="large-6 large-centered columns">
+{% if status == "in" %}
+<div data-alert class="alert-box alert">
+<p>Invalid username or password.</p>
+<a href="#" class="close">&times;</a>
+</div>
+{% endif %}
+
   <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 }}
diff --git a/scipy/templates/login.html~ b/scipy/templates/login.html~
new file mode 100644
index 0000000..2f29ea4
--- /dev/null
+++ b/scipy/templates/login.html~
@@ -0,0 +1,19 @@
+{% extends 'page.html' %}
+{% block content %}
+<div class="large-6 large-centered columns">
+{% if status == "in" %}
+<div data-alert class="alert-box alert">
+<p>Invalid username or password.</p>
+<a href="#" class="close">&times;</a>
+</div>
+{% endif %}
+
+  <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="{{ 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>
+</div>
+{% endblock %}
diff --git a/scipy/views.py b/scipy/views.py
index 078923a..ee06c30 100644
--- a/scipy/views.py
+++ b/scipy/views.py
@@ -21,18 +21,23 @@ def user_login(request):
                 else:
                     return HttpResponse("Not active")
             else:
-                return HttpResponse("Invalid username or password")
+                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')
@@ -93,4 +98,4 @@ def upload_document(request):
         context['form'] = DocumentUploadForm()
         return render_to_response('upload-document.html', context)
     else:
-        return HttpResponseRedirect('/2013/accounts/login')
+        return HttpResponseRedirect('/2013/accounts/login')
\ No newline at end of file
diff --git a/scipy/views.py~ b/scipy/views.py~
new file mode 100644
index 0000000..cc0bed1
--- /dev/null
+++ b/scipy/views.py~
@@ -0,0 +1,101 @@
+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')