Merge branch 'master' into v0.9

1 files changed, 9 insertions, 0 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 4f10014de..462300317 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -26,6 +26,7 @@ from django import forms
 from django.conf import settings
 from django.core import validators
 from django.forms.formsets import formset_factory
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.models import valid_id
@@ -116,6 +117,7 @@ class RecordFormSelection(forms.Form):
 
 class RecordFormGeneral(ManageOldType, forms.Form):
     form_label = _("General")
+    file_upload = True
     associated_models = {'parcel': Parcel, 'unit': models.Unit}
     pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
     operation_id = forms.IntegerField(widget=forms.HiddenInput)
@@ -132,6 +134,13 @@ class RecordFormGeneral(ManageOldType, forms.Form):
     location = forms.CharField(
         label=_(u"Location"), widget=forms.Textarea,
         required=False, validators=[validators.MaxLengthValidator(200)])
+    image = forms.ImageField(
+        label=_(u"Image"), help_text=mark_safe(
+            _(u"<p>Heavy images are resized to: %(width)dx%(height)d "
+              u"(ratio is preserved).</p>") % {
+                'width': settings.IMAGE_MAX_SIZE[0],
+                'height': settings.IMAGE_MAX_SIZE[1]}),
+        required=False, widget=widgets.ImageFileInput())
 
     def __init__(self, *args, **kwargs):
         operation = None