Merge pull request #53 from treavis/master

Add input placeholders.

Author: walterrenner

cmsplugin_contact_plus/admin.py

@@ -8,7 +8,7 @@
 
 class ExtraFieldInline(SortableTabularInline):
     model = ExtraField
-    fields = ('label', 'fieldType', 'initial', 'required')
+    fields = ('label', 'fieldType', 'initial', 'placeholder', 'required')
 
 
 class ContactFormPlusAdmin(NonSortableParentAdmin):

cmsplugin_contact_plus/forms.py

@@ -23,6 +23,9 @@ def __init__(self, contactFormInstance, request, *args, **kwargs):
                 if extraField.fieldType == 'CharField':
                     self.fields[slugify(extraField.label)] = forms.CharField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'BooleanField':
                     self.fields[slugify(extraField.label)] = forms.BooleanField(label=extraField.label,
@@ -31,14 +34,23 @@ def __init__(self, contactFormInstance, request, *args, **kwargs):
                 elif extraField.fieldType == 'EmailField':
                     self.fields[slugify(extraField.label)] = forms.EmailField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'DecimalField':
                     self.fields[slugify(extraField.label)] = forms.DecimalField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'FloatField':
                     self.fields[slugify(extraField.label)] = forms.FloatField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'FileField': 
                     self.fields[slugify(extraField.label)] = forms.FileField(label=extraField.label,
@@ -51,6 +63,9 @@ def __init__(self, contactFormInstance, request, *args, **kwargs):
                 elif extraField.fieldType == 'IntegerField':
                     self.fields[slugify(extraField.label)] = forms.IntegerField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'DateField':
                     self.fields[slugify(extraField.label)] = forms.DateField(label=extraField.label,
@@ -63,11 +78,16 @@ def __init__(self, contactFormInstance, request, *args, **kwargs):
                 elif extraField.fieldType == 'IPAddressField':
                     self.fields[slugify(extraField.label)] = forms.IPAddressField(label=extraField.label,
                             initial=extraField.initial,
+                            widget=forms.TextInput(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'auto_Textarea':
                     self.fields[slugify(extraField.label)] = forms.CharField(label=extraField.label,
                             initial=extraField.initial,
-                            widget=forms.Textarea,
+                            widget=forms.Textarea(
+                                attrs={'placeholder': extraField.placeholder}
+                            ),
                             required=extraField.required)
                 elif extraField.fieldType == 'auto_hidden_input':
                     self.fields[slugify(extraField.label)] = forms.CharField(label=extraField.label,
@@ -104,6 +124,9 @@ def __init__(self, contactFormInstance, request, *args, **kwargs):
                     self.fields[slugify(extraField.label)] = forms.CharField(
                         label=extraField.label,
                         initial=extraField.initial,
+                        widget=forms.Textarea(
+                            attrs={'placeholder': extraField.placeholder}
+                        ),
                         required=extraField.required,
                         validators=get_validators())
 

cmsplugin_contact_plus/migrations/0004_auto_20170410_1553.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cmsplugin_contact_plus', '0003_auto_20161102_1927'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='extrafield',
+            name='placeholder',
+            field=models.CharField(max_length=250, null=True, verbose_name='Placeholder Value', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='contactplus',
+            name='recipient_email',
+            field=models.EmailField(default=b'', max_length=254, verbose_name='Email of recipients'),
+        ),
+    ]

cmsplugin_contact_plus/models.py

@@ -101,6 +101,8 @@ class ExtraField(SortableMixin):
     fieldType = models.CharField(max_length=100, choices=FIELD_TYPE)
     initial = models.CharField(
         _('Inital Value'), max_length=250, blank=True, null=True)
+    placeholder = models.CharField(
+        _('Placeholder Value'), max_length=250, blank=True, null=True)
     required = models.BooleanField(
         _('Mandatory field'), default=True)
     widget = models.CharField(