Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/manifoldapi/static/css/manifold.css b/manifoldapi/static/css/manifold.css
index 535950e..dfb4ab5 100644 (file)
--- a/manifoldapi/static/css/manifold.css
+++ b/manifoldapi/static/css/manifold.css
@@ -17,3 +17,7 @@
     display:none;
     z-index:100;
 }
+.loading img {
+    vertical-align:middle;
+    margin-right:15px;
+}

diff --git a/manifoldapi/static/js/plugin.js b/manifoldapi/static/js/plugin.js
index 495bdc7..22e4be5 100644 (file)
--- a/manifoldapi/static/js/plugin.js
+++ b/manifoldapi/static/js/plugin.js
@@ -318,7 +318,7 @@ var Plugin = Class.extend({
     // you can also call spin_presets() yourself and tweak what you need to, like topmenuvalidation does
     spin: function (message) {
        if (!message) {
-               message = 'Please be patient, this can take a minute or two.';
+               message = 'Please be patient, this operation can take a minute or two.';
        }
        $('div.loading').fadeIn('fast');
        $('div.loading').find('.message').text(message);

diff --git a/portal/contactview.py b/portal/contactview.py
index 482594e..b076cd9 100644 (file)
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -28,16 +28,18 @@ class ContactView (FreeAccessView, ThemeView):
             subject = form.cleaned_data['subject']
             description = form.cleaned_data['description']
             email = form.cleaned_data['email'] # email of the sender
-            cc_myself = form.cleaned_data['cc_myself']
+            #cc_myself = form.cleaned_data['cc_myself']
 
             #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@onelab.eu']
-            if cc_myself:
-                recipients.append(email)
+            theme.template_name = 'email_default_recipients.txt'
+            recipients = render_to_string(theme.template, form.cleaned_data)
+            recipients = recipients.replace('\n', '')
+            #recipients = ['support@onelab.eu']
+            ## removed it cz recipients is not a list so append doesn't work ###
+            ## we don't need it cz the new ticketing systems sends a confirmation email ###
+            #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)
@@ -56,7 +58,7 @@ class ContactView (FreeAccessView, ThemeView):
             #    else:
             sender = email
         
-            msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
+            msg = EmailMultiAlternatives(subject, text_content, sender, [recipients])
             msg.attach_alternative(html_content, "text/html")
             msg.send()
             #except Exception, e:

diff --git a/portal/forms.py b/portal/forms.py
index 683cffb..67e02a1 100644 (file)
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -94,7 +94,7 @@ class ContactForm(forms.Form):
                                 regex=r'^[\w+\s\w+]+$',
                                  label=_("description"),
                                  error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})    
-    cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'}))
+    #cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'}))
 
 class PassResetForm(forms.Form):
     email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'}))