Merge branch 'develop' of gitlab.com:OldminTeam/expomap into develop

apps/emencia/django/newsletter/views/expo_views.py

@@ -36,16 +36,15 @@ class SubscribeView(GetUserMixin, FormView):
         return super(SubscribeView, self).post(request, *args, **kwargs)
 
     def form_valid(self, form):
-        if self.request.GET.get('save'):
+        if self.request.POST.get('save'):
             contact = form.save()
             if not self.request.user.is_authenticated():
                 contact.send_activation()
 
         if self.request.is_ajax():
-            data = {
-                'success': True,
-                'redirect_url': str(self.get_success_url())
-            }
+            data = {'success': True}
+            if self.request.POST.get('save'):
+                data['redirect_url'] = str(self.get_success_url())
             return JsonResponse(data)
 
         return redirect(self.get_success_url())

static/mailing_settings/css/main.css

@@ -882,7 +882,6 @@ a.themes_trigger{
 }
 
 .pr-form input {
-    padding:0;
     border:none;
     color:#000;
     font:17px/21px 'pf_dindisplay_promedium', Arial, Helvetica, sans-serif;