X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=ac3b9dd916e092affbf196b71efcb4e52916c7a8;hb=2b7a035352852f6ba9556cbb7e099c9a033576cb;hp=a97d697da71a67655978168e7b5389e2c50a1c1b;hpb=a7337c66c2c7c3312c4205a8119252f04a1fbd58;p=unfold.git

diff --git a/portal/contactview.py b/portal/contactview.py
index a97d697d..ac3b9dd9 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,14 +1,14 @@
 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 theme import ThemeView
+from myslice.theme import ThemeView
+theme = ThemeView()
 
 # splitting the 2 functions done here
 # GET is for displaying the empty form
@@ -26,14 +26,43 @@ class ContactView (FreeAccessView, ThemeView):
             email = form.cleaned_data['email'] # email of the sender
             cc_myself = form.cleaned_data['cc_myself']
 
-            #recipients = authority_get_pi_emails(authority_hrn)
-            recipients = ['support@myslice.info' ]
+            #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']
             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('contact-support-email.txt', form.cleaned_data)
-            send_mail("Onelab user %s submitted a query "%email, msg, email, recipients)
-            return render(request,'contact_sent.html', { 'theme' : self.theme}) # 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)
 
@@ -41,9 +70,14 @@ class ContactView (FreeAccessView, ThemeView):
         return self._display (request, ContactForm()) # A fresh unbound form
         
     def _display (self, request, form):
+        if request.user.is_authenticated() :
+            username = request.user.email
+        else :
+            username = None
         return render(request, 'contact.html', {
                 'form': form,
                 'topmenu_items': topmenu_items('Contact', request),
-                'username': the_user (request),
-                'theme' : self.theme
+                'theme' : self.theme,
+                'username': username,
+                'section': "Contact"
                 })