Merge pull request #26 from FOSSEE/Home_page

Home page

1 files changed, 17 insertions, 13 deletions

diff --git a/website/views.py b/website/views.py
index 5ce2666..3cd80b4 100755
--- a/website/views.py
+++ b/website/views.py
@@ -134,7 +134,7 @@ def cfp(request):
         return render_to_response('cfp.html',
                              context_instance=context)
 
-
+@login_required
 def submitcfp(request):
     context = {}
     if request.user.is_authenticated():
@@ -185,6 +185,8 @@ def submitcfp(request):
         context['login_required'] = True
         return render_to_response('cfp.html', context)
 
+
+@login_required
 def submitcfw(request):
     context = {}
     if request.user.is_authenticated():
@@ -235,7 +237,7 @@ def submitcfw(request):
         context['login_required'] = True
         return render_to_response('cfp.html', context)
 
-
+@login_required
 def view_abstracts(request):
     user = request.user
     context = {}
@@ -258,11 +260,10 @@ def view_abstracts(request):
         else:
             return render(request, 'cfp.html')
     else:
-        form = UserLoginForm()
-        context['form'] = form
         return render(request, 'cfp.html', context)
 
 
+@login_required
 def edit_proposal(request, proposal_id = None):
     user = request.user
     context = {}
@@ -296,7 +297,7 @@ def edit_proposal(request, proposal_id = None):
         context['proposal'] = proposal
     return render(request, 'edit-proposal.html', context)
 
-
+@login_required
 def abstract_details(request, proposal_id=None):
     user = request.user
     context = {}
@@ -308,18 +309,20 @@ def abstract_details(request, proposal_id=None):
             return render(request, 'abstract_details.html', context)
         elif user is not None:
             proposal = Proposal.objects.get(id=proposal_id)
+            url = '/2016'+str(proposal.attachment.url) 
             comments = Comments.objects.filter(proposal=proposal)
             context['proposal'] = proposal
             context['user'] = user
+            context['url'] = url
             context['comments'] = comments
             path, filename = os.path.split(str(proposal.attachment))
             context['filename'] = filename
             return render(request, 'abstract-details.html', context)
-        else:
-            return render(request, 'cfp.html')
     else:
-        return render(request, 'cfp.html')
+        return render(request, 'cfp.html', context)
+
 
+@login_required
 def rate_proposal(request, proposal_id = None):
     user = request.user
     context = {}
@@ -357,12 +360,13 @@ def rate_proposal(request, proposal_id = None):
 
 
 
-
+@login_required
 def comment_abstract(request, proposal_id = None):
     user = request.user
     context = {}
     if user.is_authenticated():
         proposal = Proposal.objects.get(id=proposal_id)
+        url = '/2016'+str(proposal.attachment.url) 
         if request.method == 'POST':
             comment = Comments()
             comment.comment = request.POST['comment']
@@ -412,6 +416,7 @@ def comment_abstract(request, proposal_id = None):
             context['rates'] = rates
             context['proposal'] = proposal
             context['comments'] = comments
+            context['url'] = url
             path, filename = os.path.split(str(proposal.attachment))
             context['filename'] = filename
             context.update(csrf(request))
@@ -421,18 +426,17 @@ def comment_abstract(request, proposal_id = None):
             rates = Ratings.objects.filter(proposal=proposal)
             context['rates'] = rates
             context['proposal'] = proposal
+            context['url'] = url
             context['comments'] = comments
             path, filename = os.path.split(str(proposal.attachment))
             context['filename'] = filename
             context.update(csrf(request))
             return render(request, 'comment-abstract.html', context)
     else:
-        form = UserLoginForm()
-        context['form'] = form
         return render(request, 'cfp.html', context)
 
 
-
+@login_required
 def status(request, proposal_id= None):
     user = request.user
     context = {}
@@ -521,7 +525,7 @@ def status(request, proposal_id= None):
     return render(request, 'view-abstracts.html', context)  
     
 
-
+@login_required
 def status_change(request):
     user = request.user
     context = {}