Ticket #801 - better editor's textarea without interfering with gallery sidebar

[redakcja.git] / apps / wiki / forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index f6e6f40..e48c5ea 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -23,7 +23,7 @@ class DocumentCreateForm(forms.Form):
         Form used for creating new documents.
     """
     title = forms.CharField()
         Form used for creating new documents.
     """
     title = forms.CharField()

-    id = forms.RegexField(regex=ur"\w+")
+    id = forms.RegexField(regex=ur"^[\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]+$")

     file = forms.FileField(required=False)
     text = forms.CharField(required=False, widget=forms.Textarea)
 
     file = forms.FileField(required=False)
     text = forms.CharField(required=False, widget=forms.Textarea)
 


@@ -42,6 +42,26 @@ class DocumentCreateForm(forms.Form):
         return self.cleaned_data
 
 
         return self.cleaned_data
 
 

+class DocumentsUploadForm(forms.Form):
+    """
+        Form used for uploading new documents.
+    """
+    file = forms.FileField(required=True, label=_('ZIP file'))
+
+    def clean(self):
+        file = self.cleaned_data['file']
+
+        import zipfile
+        try:
+            z = self.cleaned_data['zip'] = zipfile.ZipFile(file)
+        except zipfile.BadZipfile:
+            raise forms.ValidationError("Should be a ZIP file.")
+        if z.testzip():
+            raise forms.ValidationError("ZIP file corrupt.")
+
+        return self.cleaned_data
+
+

 class DocumentTextSaveForm(forms.Form):
     """
     Form for saving document's text:
 class DocumentTextSaveForm(forms.Form):
     """
     Form for saving document's text:


@@ -57,22 +77,28 @@ class DocumentTextSaveForm(forms.Form):
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.HiddenInput)
 
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.HiddenInput)
 

-    author = forms.CharField(
+    author_name = forms.CharField(
+        required=False,
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
+    )
+
+    author_email = forms.EmailField(

         required=False,
         required=False,

-        label=_(u"Autor"),
-        help_text=_(u"Twoje imie i nazwisko lub email."),
+        label=_(u"Author's email"),
+        help_text=_(u"Your email address, so we can show a gravatar :)"),

     )
 
     comment = forms.CharField(
         required=True,
         widget=forms.Textarea,
     )
 
     comment = forms.CharField(
         required=True,
         widget=forms.Textarea,

-        label=_(u"Twój komentarz"),
-        help_text=_(u"Opisz w miarę dokładnie swoje zmiany."),
+        label=_(u"Your comments"),
+        help_text=_(u"Describe changes you made."),

     )
 
     stage_completed = forms.ChoiceField(
         choices=DOCUMENT_STAGES,
         required=False,
     )
 
     stage_completed = forms.ChoiceField(
         choices=DOCUMENT_STAGES,
         required=False,

-        label=_(u"Skończyłem robić"),
-        help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),
+        label=_(u"Completed"),
+        help_text=_(u"If you completed a life cycle stage, select it."),

     )
     )