X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=3da2e0525b6458725a333de1953b5b6e9b849ad2;hb=13aebd01514329394c6663834c3dc473ddb969a6;hp=c07f3977b7cd70a7a7136d2f0e658ecd990aaa03;hpb=0c8a634162f3271018102e75a3934c5db5e48f59;p=unfold.git

diff --git a/portal/contactview.py b/portal/contactview.py
index c07f3977..3da2e052 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,36 +1,69 @@
 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 unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items, the_user
-
+from django.core.mail           import EmailMultiAlternatives, send_mail
 from portal.forms               import ContactForm
 
+from myslice.theme import ThemeView
+theme = ThemeView()
+
 # 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, ThemeView):
+    template_name = 'contact.html'
     def post (self, request):
         form = ContactForm(request.POST) # A form bound to the POST data
         if form.is_valid(): # All validation rules pass
             # Process the data in form.cleaned_data
-            first_name = form.cleaned_data['first_name']
-            last_name = form.cleaned_data['last_name']
-            affiliation = form.cleaned_data['affiliation']
+            #first_name = form.cleaned_data['first_name']
+            #last_name = form.cleaned_data['last_name']
+            #authority = form.cleaned_data['authority']
             subject = form.cleaned_data['subject']
-            message = form.cleaned_data['message']
+            description = form.cleaned_data['description']
             email = form.cleaned_data['email'] # email of the sender
             cc_myself = form.cleaned_data['cc_myself']
 
-            #recipients = authority_get_pi_emails(authority_hrn)
-            recipients = ['yasin.upmc@gmail.com', 'thierry.parmentelat@inria.fr', ]
+            #try:
+                # Send an email: the support recipients
+            #theme.template_name = 'email_support.txt'
+            #recipients = render_to_string(theme.template, form.cleaned_data)
+            #recipients = subject.replace('\n', '')
+            recipients = ['support@myslice.info','contact@fed4fire.eu']
             if cc_myself:
                 recipients.append(email)
+            #recipients = ['support@myslice.info']
+            theme.template_name = 'contact_support_email.html'
+            html_content = render_to_string(theme.template, form.cleaned_data)
+        
+            theme.template_name = 'contact_support_email.txt'
+            text_content = render_to_string(theme.template, form.cleaned_data)
+        
+            theme.template_name = 'contact_support_email_subject.txt'
+            subject = render_to_string(theme.template, form.cleaned_data)
+            subject = subject.replace('\n', '')
+        
+            #    if not email:
+            #        theme.template_name = 'email_default_sender.txt'
+            #        sender =  render_to_string(theme.template, form.cleaned_data)
+            #        sender = sender.replace('\n', '')
+            #    else:
+            sender = email
+        
+            msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
+            msg.attach_alternative(html_content, "text/html")
+            msg.send()
+            #except Exception, e:
+                #print "Failed to send email, please check the mail templates and the SMTP configuration of your server"
 
-            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
+            if request.user.is_authenticated() :
+                username = request.user.email
+            else :
+                username = None
+            return render(request,'contact_sent.html', { 'theme' : self.theme,  'username': username}) # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -38,8 +71,14 @@ class ContactView (View):
         return self._display (request, ContactForm()) # A fresh unbound form
         
     def _display (self, request, form):
-        return render(request, 'contact.html', {
+        if request.user.is_authenticated() :
+            username = request.user.email
+        else :
+            username = None
+        return render(request, self.template, {
                 'form': form,
                 'topmenu_items': topmenu_items('Contact', request),
-                'username': the_user (request)
+                'theme' : self.theme,
+                'username': username,
+                'section': "Contact"
                 })