From c7309b368c2a6dcea1a231c9277b7e1fd118f266 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 27 Feb 2015 15:11:13 +0100
Subject: [PATCH] F4F: project request done/received page added

---
 portal/projectrequestview.py                    |  6 +++---
 portal/templates/project-request-ack-view.html  |  9 +++++++++
 portal/templates/project-request-done-view.html | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 portal/templates/project-request-ack-view.html
 create mode 100644 portal/templates/project-request-done-view.html

diff --git a/portal/projectrequestview.py b/portal/projectrequestview.py
index aaa79b2f..8a484282 100644
--- a/portal/projectrequestview.py
+++ b/portal/projectrequestview.py
@@ -109,7 +109,7 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView):
                     errors.append('Organization is mandatory')
     
                 if (post['purpose'] is None or post['purpose'] == ''):
-                    errors.append('Experiment purpose is mandatory')
+                    errors.append('Project purpose is mandatory')
 
                 if (re.search(r'^[A-Za-z0-9_]*$', post['project_name']) == None):
                     errors.append('Project name may contain only letters, numbers, and underscore.')
@@ -128,14 +128,14 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView):
                         hrn = post['authority_hrn'] + '.' + post['project_name']
                         sfa_add_authority(wsgi_request, {'authority_hrn':hrn})
                         authority_add_pis(wsgi_request, hrn, user_hrn)
-                    self.template_name = 'slice-request-done-view.html'
+                    self.template_name = 'project-request-done-view.html'
                 else:
                     # Otherwise a wsgi_request is sent to the PI
                     if 'join' in wsgi_request.POST:
                         create_pending_join(wsgi_request, post)
                     else:
                         create_pending_project(wsgi_request, post)
-                    self.template_name = 'slice-request-ack-view.html'
+                    self.template_name = 'project-request-ack-view.html'
 
         # retrieves the pending projects creation list
         pending_projects = PendingProject.objects.all().filter(user_hrn=user_hrn)
diff --git a/portal/templates/project-request-ack-view.html b/portal/templates/project-request-ack-view.html
new file mode 100644
index 00000000..9b70c5fb
--- /dev/null
+++ b/portal/templates/project-request-ack-view.html
@@ -0,0 +1,9 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+<h1><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="Slice" />Request received</h1>
+
+We will process your request and get back to you as soon as possible.
+{% endblock %}
+
diff --git a/portal/templates/project-request-done-view.html b/portal/templates/project-request-done-view.html
new file mode 100644
index 00000000..d962afdf
--- /dev/null
+++ b/portal/templates/project-request-done-view.html
@@ -0,0 +1,14 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+  <h1>Success</h1>
+
+Your request to join/create project was successful.
+<script>
+$(document).ready(function() {
+    localStorage.clear();
+});
+</script>
+{% endblock %}
+
-- 
2.43.0