renamed slice-request templates more consistently
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 9 Sep 2013 09:10:37 +0000 (11:10 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 9 Sep 2013 09:10:37 +0000 (11:10 +0200)
portal/slicerequestview.py
portal/templates/slice-request-ack-view.html [moved from portal/templates/slicereq_recvd.html with 100% similarity]
portal/templates/slice-request-email.txt [moved from portal/templates/slice_request_email.txt with 100% similarity]
portal/templates/slice-request-view.html [moved from portal/templates/slice_request.html with 100% similarity]
portal/util.py

index 4f332e4..85faad8 100644 (file)
@@ -54,10 +54,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
             if cc_myself:
                 recipients.append(email)
-            msg = render_to_string('slice_request_email.txt', form.cleaned_data)
+            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
             send_mail("Onelab New Slice request form submitted", msg, email, recipients)
 
-            return render(request,'slicereq_recvd.html') # Redirect after POST
+            return render(request,'slice-request-ack-view.html') # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -65,7 +65,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
         return self._display (request, SliceRequestForm(initial=self.authority_hrn_initial(request)))
 
     def _display (self, request, form):
-        return render(request, 'slice_request.html', {
+        return render(request, 'slice-request-view.html', {
                 'form': form,
                 'topmenu_items': topmenu_items('Request a slice', request),
                 'username': the_user (request) 
index df3606c..918f16c 100644 (file)
@@ -169,7 +169,7 @@ def slice_request(request):
             slice_name = form.cleaned_data['slice_name']
     else:
         form = SliceRequestForm()
-    return render(request, 'slice_request.html', locals())
+    return render(request, 'slice-request-view.html', locals())
 
 def slice_validate(request):
     pass