Ticket #16304: 16304.patch

docs/ref/models/fields.txt

@@ -377 +377 @@
 
 .. note::
 
+    If you are using HTML5 templates and wish to have a placeholder attribute
+    in your input box, supply a placeholder attribute containing a string when
+    creating your model fields. Using :doc:`Model Forms
+    </topics/forms/modelforms>` will automatically take care of the
+    placeholder attribute. Refer :doc:`Form Fields </ref/forms/fields>` when
+    creating your own forms.
+
+.. note::
+
     If you are writing an application that must be portable to multiple
     database backends, you should be aware that there are restrictions on
     ``max_length`` for some backends. Refer to the :doc:`database backend

docs/ref/forms/fields.txt

@@ -330 +330 @@
     If provided, these arguments ensure that the string is at most or at least
     the given length.
 
+    .. note::
+
+        If you are using HTML5 templates, you can pass a placeholder attribute
+        containg a string, which will act as the placeholder for the resulting
+        input box.
+
 ``ChoiceField``
 ~~~~~~~~~~~~~~~
 

django/db/models/fields/__init__.py

@@ -79 +79 @@
             serialize=True, unique_for_date=None, unique_for_month=None,
             unique_for_year=None, choices=None, help_text='', db_column=None,
             db_tablespace=None, auto_created=False, validators=[],
-            error_messages=None):
+            error_messages=None, placeholder=None):
         self.name = name
         self.verbose_name = verbose_name
         self.primary_key = primary_key
@@ -102 +102 @@
         self.db_column = db_column
         self.db_tablespace = db_tablespace or settings.DEFAULT_INDEX_TABLESPACE
         self.auto_created = auto_created
+        self.placeholder = placeholder
 
         # Set db_index to True if the field has a relationship and doesn't
         # explicitly set db_index.
@@ -622 +623 @@
         # will be validated twice. This is considered acceptable since we want
         # the value in the form field (to pass into widget for example).
         defaults = {'max_length': self.max_length}
+        if self.placeholder:
+            defaults.update({'placeholder': self.placeholder})
         defaults.update(kwargs)
         return super(CharField, self).formfield(**defaults)
 

django/forms/fields.py

@@ -182 +182 @@
         return result
 
 class CharField(Field):
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        self.max_length, self.min_length = max_length, min_length
+    def __init__(self, max_length=None, min_length=None, placeholder=None,
+            *args, **kwargs):
+        self.max_length, self.min_length, self.placeholder = (max_length,
+            min_length, placeholder)
         super(CharField, self).__init__(*args, **kwargs)
         if min_length is not None:
             self.validators.append(validators.MinLengthValidator(min_length))
@@ -201 +203 @@
         if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
             # The HTML attribute is maxlength, not max_length.
             attrs.update({'maxlength': str(self.max_length)})
+        if self.placeholder and isinstance(widget, TextInput):
+            attrs.update({'placeholder': str(self.placeholder)})
         return attrs
 
 class IntegerField(Field):