X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=796c8b049125ea485b7759dad2f446d8231a5833;hb=08a5dcb65c29f21f1b08cc43a6fd5a946004ae53;hp=0b459a3a7ccf775dafd60d97a8c82b2770514f0d;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git

diff --git a/portal/contactview.py b/portal/contactview.py
index 0b459a3a..796c8b04 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,15 +1,17 @@
 from django.shortcuts           import render
-
+from django.template.loader     import render_to_string
 from django.views.generic       import View
+from django.core.mail           import send_mail
 
-from myslice.viewutils          import topmenu_items, the_user
+from unfold.loginrequired       import FreeAccessView
+from ui.topmenu                 import topmenu_items, the_user
 
 from portal.forms               import ContactForm
 
 # splitting the 2 functions done here
 # GET is for displaying the empty form
 # POST is to process it once filled - or show the form again if anything is missing
-class ContactView (View):
+class ContactView (FreeAccessView):
     def post (self, request):
         form = ContactForm(request.POST) # A form bound to the POST data
         if form.is_valid(): # All validation rules pass
@@ -27,9 +29,8 @@ class ContactView (View):
             if cc_myself:
                 recipients.append(email)
 
-            from django.core.mail import send_mail
-            send_mail("Onelab user %s submitted a query "%email, 
-                      [first_name,last_name,affiliation,subject,message], email, recipients)
+            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
+            send_mail("Onelab user %s submitted a query "%email, msg, email, recipients)
             return render(request,'contact_sent.html') # Redirect after POST
         else:
             return self._display (request, form)
@@ -40,6 +41,6 @@ class ContactView (View):
     def _display (self, request, form):
         return render(request, 'contact.html', {
                 'form': form,
-                'topmenu_items': topmenu_items('Contact Us', request),
+                'topmenu_items': topmenu_items('Contact', request),
                 'username': the_user (request)
                 })